diff --git a/README.md b/README.md
index 08792c2df..b29a3bb81 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-
+
optional uint32 world_level = 4;
*/
private int worldLevel;
/**
- * optional uint32 entity_id = 13;
+ * optional uint32 entity_id = 6;
*/
private int entityId;
@@ -39,7 +39,7 @@ public static ActivateFarmElementCsReq newInstance() {
}
/**
- * optional uint32 world_level = 10;
+ * optional uint32 world_level = 4;
* @return whether the worldLevel field is set
*/
public boolean hasWorldLevel() {
@@ -47,7 +47,7 @@ public boolean hasWorldLevel() {
}
/**
- * optional uint32 world_level = 10;
+ * optional uint32 world_level = 4;
* @return this
*/
public ActivateFarmElementCsReq clearWorldLevel() {
@@ -57,7 +57,7 @@ public ActivateFarmElementCsReq clearWorldLevel() {
}
/**
- * optional uint32 world_level = 10;
+ * optional uint32 world_level = 4;
* @return the worldLevel
*/
public int getWorldLevel() {
@@ -65,7 +65,7 @@ public int getWorldLevel() {
}
/**
- * optional uint32 world_level = 10;
+ * optional uint32 world_level = 4;
* @param value the worldLevel to set
* @return this
*/
@@ -76,7 +76,7 @@ public ActivateFarmElementCsReq setWorldLevel(final int value) {
}
/**
- * optional uint32 entity_id = 13;
+ * optional uint32 entity_id = 6;
* @return whether the entityId field is set
*/
public boolean hasEntityId() {
@@ -84,7 +84,7 @@ public boolean hasEntityId() {
}
/**
- * optional uint32 entity_id = 13;
+ * optional uint32 entity_id = 6;
* @return this
*/
public ActivateFarmElementCsReq clearEntityId() {
@@ -94,7 +94,7 @@ public ActivateFarmElementCsReq clearEntityId() {
}
/**
- * optional uint32 entity_id = 13;
+ * optional uint32 entity_id = 6;
* @return the entityId
*/
public int getEntityId() {
@@ -102,7 +102,7 @@ public int getEntityId() {
}
/**
- * optional uint32 entity_id = 13;
+ * optional uint32 entity_id = 6;
* @param value the entityId to set
* @return this
*/
@@ -177,11 +177,11 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(worldLevel);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(entityId);
}
}
@@ -205,16 +205,16 @@ public ActivateFarmElementCsReq mergeFrom(final ProtoSource input) throws IOExce
int tag = input.readTag();
while (true) {
switch (tag) {
- case 80: {
+ case 32: {
// worldLevel
worldLevel = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 48) {
break;
}
}
- case 104: {
+ case 48: {
// entityId
entityId = input.readUInt32();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java
index 823e65e14..859febdf7 100644
--- a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java
@@ -19,17 +19,17 @@ public static final class ActivateFarmElementScRsp extends ProtoMessageoptional uint32 world_level = 4;
+ * optional uint32 entity_id = 6;
*/
- private int worldLevel;
+ private int entityId;
/**
- * optional uint32 entity_id = 11;
+ * optional uint32 world_level = 13;
*/
- private int entityId;
+ private int worldLevel;
/**
- * optional uint32 retcode = 14;
+ * optional uint32 retcode = 15;
*/
private int retcode;
@@ -44,81 +44,81 @@ public static ActivateFarmElementScRsp newInstance() {
}
/**
- * optional uint32 world_level = 4;
- * @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 = 4;
+ * optional uint32 entity_id = 6;
* @return this
*/
- public ActivateFarmElementScRsp clearWorldLevel() {
+ public ActivateFarmElementScRsp clearEntityId() {
bitField0_ &= ~0x00000001;
- worldLevel = 0;
+ entityId = 0;
return this;
}
/**
- * optional uint32 world_level = 4;
- * @return the worldLevel
+ * optional uint32 entity_id = 6;
+ * @return the entityId
*/
- public int getWorldLevel() {
- return worldLevel;
+ public int getEntityId() {
+ return entityId;
}
/**
- * optional uint32 world_level = 4;
- * @param value the worldLevel to set
+ * optional uint32 entity_id = 6;
+ * @param value the entityId to set
* @return this
*/
- public ActivateFarmElementScRsp setWorldLevel(final int value) {
+ public ActivateFarmElementScRsp setEntityId(final int value) {
bitField0_ |= 0x00000001;
- worldLevel = value;
+ entityId = value;
return this;
}
/**
- * optional uint32 entity_id = 11;
- * @return whether the entityId field is set
+ * optional uint32 world_level = 13;
+ * @return whether the worldLevel field is set
*/
- public boolean hasEntityId() {
+ public boolean hasWorldLevel() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 entity_id = 11;
+ * optional uint32 world_level = 13;
* @return this
*/
- public ActivateFarmElementScRsp clearEntityId() {
+ public ActivateFarmElementScRsp clearWorldLevel() {
bitField0_ &= ~0x00000002;
- entityId = 0;
+ worldLevel = 0;
return this;
}
/**
- * optional uint32 entity_id = 11;
- * @return the entityId
+ * optional uint32 world_level = 13;
+ * @return the worldLevel
*/
- public int getEntityId() {
- return entityId;
+ public int getWorldLevel() {
+ return worldLevel;
}
/**
- * optional uint32 entity_id = 11;
- * @param value the entityId to set
+ * optional uint32 world_level = 13;
+ * @param value the worldLevel to set
* @return this
*/
- public ActivateFarmElementScRsp setEntityId(final int value) {
+ public ActivateFarmElementScRsp setWorldLevel(final int value) {
bitField0_ |= 0x00000002;
- entityId = value;
+ worldLevel = value;
return this;
}
/**
- * optional uint32 retcode = 14;
+ * optional uint32 retcode = 15;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -126,7 +126,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 14;
+ * optional uint32 retcode = 15;
* @return this
*/
public ActivateFarmElementScRsp clearRetcode() {
@@ -136,7 +136,7 @@ public ActivateFarmElementScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 14;
+ * optional uint32 retcode = 15;
* @return the retcode
*/
public int getRetcode() {
@@ -144,7 +144,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 14;
+ * optional uint32 retcode = 15;
* @param value the retcode to set
* @return this
*/
@@ -159,8 +159,8 @@ public ActivateFarmElementScRsp copyFrom(final ActivateFarmElementScRsp other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- worldLevel = other.worldLevel;
entityId = other.entityId;
+ worldLevel = other.worldLevel;
retcode = other.retcode;
}
return this;
@@ -172,12 +172,12 @@ public ActivateFarmElementScRsp mergeFrom(final ActivateFarmElementScRsp other)
return this;
}
cachedSize = -1;
- if (other.hasWorldLevel()) {
- setWorldLevel(other.worldLevel);
- }
if (other.hasEntityId()) {
setEntityId(other.entityId);
}
+ if (other.hasWorldLevel()) {
+ setWorldLevel(other.worldLevel);
+ }
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
@@ -191,8 +191,8 @@ public ActivateFarmElementScRsp clear() {
}
cachedSize = -1;
bitField0_ = 0;
- worldLevel = 0;
entityId = 0;
+ worldLevel = 0;
retcode = 0;
return this;
}
@@ -217,23 +217,23 @@ public boolean equals(Object o) {
}
ActivateFarmElementScRsp other = (ActivateFarmElementScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasWorldLevel() || worldLevel == other.worldLevel)
&& (!hasEntityId() || entityId == other.entityId)
+ && (!hasWorldLevel() || worldLevel == other.worldLevel)
&& (!hasRetcode() || retcode == other.retcode);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(worldLevel);
+ output.writeRawByte((byte) 48);
+ output.writeUInt32NoTag(entityId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 88);
- output.writeUInt32NoTag(entityId);
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(worldLevel);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(retcode);
}
}
@@ -242,10 +242,10 @@ public void writeTo(final ProtoSink output) throws IOException {
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);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
@@ -260,25 +260,25 @@ public ActivateFarmElementScRsp mergeFrom(final ProtoSource input) throws IOExce
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
- // worldLevel
- worldLevel = input.readUInt32();
+ case 48: {
+ // entityId
+ entityId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 88) {
+ if (tag != 104) {
break;
}
}
- case 88: {
- // entityId
- entityId = input.readUInt32();
+ case 104: {
+ // worldLevel
+ worldLevel = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 112) {
+ if (tag != 120) {
break;
}
}
- case 112: {
+ case 120: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000004;
@@ -305,10 +305,10 @@ public ActivateFarmElementScRsp mergeFrom(final ProtoSource input) throws IOExce
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);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.retcode, retcode);
@@ -323,11 +323,11 @@ public ActivateFarmElementScRsp mergeFrom(final JsonSource input) throws IOExcep
}
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 {
@@ -335,11 +335,11 @@ public ActivateFarmElementScRsp mergeFrom(final JsonSource input) throws IOExcep
}
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 {
@@ -411,10 +411,10 @@ public ActivateFarmElementScRsp create() {
* 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");
+
static final FieldName retcode = FieldName.forField("retcode");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java
index f6ba0505d..5379d6cd6 100644
--- a/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java
@@ -19,12 +19,12 @@ public static final class ApplyFriendCsReq extends ProtoMessageoptional uint32 uid = 6;
+ * optional uint32 uid = 11;
*/
private int uid;
/**
- * optional .FriendApplySource source = 8;
+ * optional .FriendApplySource source = 12;
*/
private int source;
@@ -39,7 +39,7 @@ public static ApplyFriendCsReq newInstance() {
}
/**
- * optional uint32 uid = 6;
+ * optional uint32 uid = 11;
* @return whether the uid field is set
*/
public boolean hasUid() {
@@ -47,7 +47,7 @@ public boolean hasUid() {
}
/**
- * optional uint32 uid = 6;
+ * optional uint32 uid = 11;
* @return this
*/
public ApplyFriendCsReq clearUid() {
@@ -57,7 +57,7 @@ public ApplyFriendCsReq clearUid() {
}
/**
- * optional uint32 uid = 6;
+ * optional uint32 uid = 11;
* @return the uid
*/
public int getUid() {
@@ -65,7 +65,7 @@ public int getUid() {
}
/**
- * optional uint32 uid = 6;
+ * optional uint32 uid = 11;
* @param value the uid to set
* @return this
*/
@@ -76,7 +76,7 @@ public ApplyFriendCsReq setUid(final int value) {
}
/**
- * optional .FriendApplySource source = 8;
+ * optional .FriendApplySource source = 12;
* @return whether the source field is set
*/
public boolean hasSource() {
@@ -84,7 +84,7 @@ public boolean hasSource() {
}
/**
- * optional .FriendApplySource source = 8;
+ * optional .FriendApplySource source = 12;
* @return this
*/
public ApplyFriendCsReq clearSource() {
@@ -94,7 +94,7 @@ public ApplyFriendCsReq clearSource() {
}
/**
- * optional .FriendApplySource source = 8;
+ * optional .FriendApplySource source = 12;
* @return the source
*/
public FriendApplySourceOuterClass.FriendApplySource getSource() {
@@ -127,7 +127,7 @@ public ApplyFriendCsReq setSourceValue(final int value) {
}
/**
- * optional .FriendApplySource source = 8;
+ * optional .FriendApplySource source = 12;
* @param value the source to set
* @return this
*/
@@ -202,11 +202,11 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(uid);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 96);
output.writeEnumNoTag(source);
}
}
@@ -230,16 +230,16 @@ public ApplyFriendCsReq mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 48: {
+ case 88: {
// uid
uid = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 64) {
+ if (tag != 96) {
break;
}
}
- case 64: {
+ case 96: {
// source
final int value = input.readInt32();
if (FriendApplySourceOuterClass.FriendApplySource.forNumber(value) != null) {
diff --git a/src/generated/main/emu/lunarcore/proto/ArchiveDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/ArchiveDataOuterClass.java
index 3d6019653..049a1c0bc 100644
--- a/src/generated/main/emu/lunarcore/proto/ArchiveDataOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ArchiveDataOuterClass.java
@@ -21,24 +21,24 @@ public static final class ArchiveData extends ProtoMessage implemen
private static final long serialVersionUID = 0L;
/**
- * repeated uint32 archive_equipment_id_list = 3;
+ * repeated uint32 archive_avatar_id_list = 7;
*/
- private final RepeatedInt archiveEquipmentIdList = RepeatedInt.newEmptyInstance();
+ private final RepeatedInt archiveAvatarIdList = RepeatedInt.newEmptyInstance();
/**
- * repeated uint32 archive_avatar_id_list = 4;
+ * repeated uint32 archive_equipment_id_list = 10;
*/
- private final RepeatedInt archiveAvatarIdList = RepeatedInt.newEmptyInstance();
+ private final RepeatedInt archiveEquipmentIdList = RepeatedInt.newEmptyInstance();
/**
- * repeated .MonsterArchive archive_monster_id_list = 7;
+ * repeated .RelicArchive relic_list = 3;
*/
- private final RepeatedMessage archiveMonsterIdList = RepeatedMessage.newEmptyInstance(MonsterArchiveOuterClass.MonsterArchive.getFactory());
+ private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicArchiveOuterClass.RelicArchive.getFactory());
/**
- * repeated .RelicArchive archive_relic_list = 11;
+ * repeated .MonsterArchive archive_monster_id_list = 14;
*/
- private final RepeatedMessage archiveRelicList = RepeatedMessage.newEmptyInstance(RelicArchiveOuterClass.RelicArchive.getFactory());
+ private final RepeatedMessage archiveMonsterIdList = RepeatedMessage.newEmptyInstance(MonsterArchiveOuterClass.MonsterArchive.getFactory());
private ArchiveData() {
}
@@ -51,39 +51,39 @@ public static ArchiveData newInstance() {
}
/**
- * repeated uint32 archive_equipment_id_list = 3;
- * @return whether the archiveEquipmentIdList field is set
+ * repeated uint32 archive_avatar_id_list = 7;
+ * @return whether the archiveAvatarIdList field is set
*/
- public boolean hasArchiveEquipmentIdList() {
+ public boolean hasArchiveAvatarIdList() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * repeated uint32 archive_equipment_id_list = 3;
+ * repeated uint32 archive_avatar_id_list = 7;
* @return this
*/
- public ArchiveData clearArchiveEquipmentIdList() {
+ public ArchiveData clearArchiveAvatarIdList() {
bitField0_ &= ~0x00000001;
- archiveEquipmentIdList.clear();
+ archiveAvatarIdList.clear();
return this;
}
/**
- * repeated uint32 archive_equipment_id_list = 3;
+ * repeated uint32 archive_avatar_id_list = 7;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
*
- * Use {@link #getMutableArchiveEquipmentIdList()} if you want to modify it.
+ * Use {@link #getMutableArchiveAvatarIdList()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public RepeatedInt getArchiveEquipmentIdList() {
- return archiveEquipmentIdList;
+ public RepeatedInt getArchiveAvatarIdList() {
+ return archiveAvatarIdList;
}
/**
- * repeated uint32 archive_equipment_id_list = 3;
+ * repeated uint32 archive_avatar_id_list = 7;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -91,67 +91,67 @@ public RepeatedInt getArchiveEquipmentIdList() {
*
* @return internal storage object for modifications
*/
- public RepeatedInt getMutableArchiveEquipmentIdList() {
+ public RepeatedInt getMutableArchiveAvatarIdList() {
bitField0_ |= 0x00000001;
- return archiveEquipmentIdList;
+ return archiveAvatarIdList;
}
/**
- * repeated uint32 archive_equipment_id_list = 3;
- * @param value the archiveEquipmentIdList to add
+ * repeated uint32 archive_avatar_id_list = 7;
+ * @param value the archiveAvatarIdList to add
* @return this
*/
- public ArchiveData addArchiveEquipmentIdList(final int value) {
+ public ArchiveData addArchiveAvatarIdList(final int value) {
bitField0_ |= 0x00000001;
- archiveEquipmentIdList.add(value);
+ archiveAvatarIdList.add(value);
return this;
}
/**
- * repeated uint32 archive_equipment_id_list = 3;
- * @param values the archiveEquipmentIdList to add
+ * repeated uint32 archive_avatar_id_list = 7;
+ * @param values the archiveAvatarIdList to add
* @return this
*/
- public ArchiveData addAllArchiveEquipmentIdList(final int... values) {
+ public ArchiveData addAllArchiveAvatarIdList(final int... values) {
bitField0_ |= 0x00000001;
- archiveEquipmentIdList.addAll(values);
+ archiveAvatarIdList.addAll(values);
return this;
}
/**
- * repeated uint32 archive_avatar_id_list = 4;
- * @return whether the archiveAvatarIdList field is set
+ * repeated uint32 archive_equipment_id_list = 10;
+ * @return whether the archiveEquipmentIdList field is set
*/
- public boolean hasArchiveAvatarIdList() {
+ public boolean hasArchiveEquipmentIdList() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * repeated uint32 archive_avatar_id_list = 4;
+ * repeated uint32 archive_equipment_id_list = 10;
* @return this
*/
- public ArchiveData clearArchiveAvatarIdList() {
+ public ArchiveData clearArchiveEquipmentIdList() {
bitField0_ &= ~0x00000002;
- archiveAvatarIdList.clear();
+ archiveEquipmentIdList.clear();
return this;
}
/**
- * repeated uint32 archive_avatar_id_list = 4;
+ * repeated uint32 archive_equipment_id_list = 10;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
*
- * Use {@link #getMutableArchiveAvatarIdList()} if you want to modify it.
+ * Use {@link #getMutableArchiveEquipmentIdList()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public RepeatedInt getArchiveAvatarIdList() {
- return archiveAvatarIdList;
+ public RepeatedInt getArchiveEquipmentIdList() {
+ return archiveEquipmentIdList;
}
/**
- * repeated uint32 archive_avatar_id_list = 4;
+ * repeated uint32 archive_equipment_id_list = 10;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -159,67 +159,67 @@ public RepeatedInt getArchiveAvatarIdList() {
*
* @return internal storage object for modifications
*/
- public RepeatedInt getMutableArchiveAvatarIdList() {
+ public RepeatedInt getMutableArchiveEquipmentIdList() {
bitField0_ |= 0x00000002;
- return archiveAvatarIdList;
+ return archiveEquipmentIdList;
}
/**
- * repeated uint32 archive_avatar_id_list = 4;
- * @param value the archiveAvatarIdList to add
+ * repeated uint32 archive_equipment_id_list = 10;
+ * @param value the archiveEquipmentIdList to add
* @return this
*/
- public ArchiveData addArchiveAvatarIdList(final int value) {
+ public ArchiveData addArchiveEquipmentIdList(final int value) {
bitField0_ |= 0x00000002;
- archiveAvatarIdList.add(value);
+ archiveEquipmentIdList.add(value);
return this;
}
/**
- * repeated uint32 archive_avatar_id_list = 4;
- * @param values the archiveAvatarIdList to add
+ * repeated uint32 archive_equipment_id_list = 10;
+ * @param values the archiveEquipmentIdList to add
* @return this
*/
- public ArchiveData addAllArchiveAvatarIdList(final int... values) {
+ public ArchiveData addAllArchiveEquipmentIdList(final int... values) {
bitField0_ |= 0x00000002;
- archiveAvatarIdList.addAll(values);
+ archiveEquipmentIdList.addAll(values);
return this;
}
/**
- * repeated .MonsterArchive archive_monster_id_list = 7;
- * @return whether the archiveMonsterIdList field is set
+ * repeated .RelicArchive relic_list = 3;
+ * @return whether the relicList field is set
*/
- public boolean hasArchiveMonsterIdList() {
+ public boolean hasRelicList() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * repeated .MonsterArchive archive_monster_id_list = 7;
+ * repeated .RelicArchive relic_list = 3;
* @return this
*/
- public ArchiveData clearArchiveMonsterIdList() {
+ public ArchiveData clearRelicList() {
bitField0_ &= ~0x00000004;
- archiveMonsterIdList.clear();
+ relicList.clear();
return this;
}
/**
- * repeated .MonsterArchive archive_monster_id_list = 7;
+ * repeated .RelicArchive relic_list = 3;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
*
- * Use {@link #getMutableArchiveMonsterIdList()} if you want to modify it.
+ * Use {@link #getMutableRelicList()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public RepeatedMessage getArchiveMonsterIdList() {
- return archiveMonsterIdList;
+ public RepeatedMessage getRelicList() {
+ return relicList;
}
/**
- * repeated .MonsterArchive archive_monster_id_list = 7;
+ * repeated .RelicArchive relic_list = 3;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -227,70 +227,67 @@ public RepeatedMessage getArchiveMonste
*
* @return internal storage object for modifications
*/
- public RepeatedMessage getMutableArchiveMonsterIdList(
- ) {
+ public RepeatedMessage getMutableRelicList() {
bitField0_ |= 0x00000004;
- return archiveMonsterIdList;
+ return relicList;
}
/**
- * repeated .MonsterArchive archive_monster_id_list = 7;
- * @param value the archiveMonsterIdList to add
+ * repeated .RelicArchive relic_list = 3;
+ * @param value the relicList to add
* @return this
*/
- public ArchiveData addArchiveMonsterIdList(
- final MonsterArchiveOuterClass.MonsterArchive value) {
+ public ArchiveData addRelicList(final RelicArchiveOuterClass.RelicArchive value) {
bitField0_ |= 0x00000004;
- archiveMonsterIdList.add(value);
+ relicList.add(value);
return this;
}
/**
- * repeated .MonsterArchive archive_monster_id_list = 7;
- * @param values the archiveMonsterIdList to add
+ * repeated .RelicArchive relic_list = 3;
+ * @param values the relicList to add
* @return this
*/
- public ArchiveData addAllArchiveMonsterIdList(
- final MonsterArchiveOuterClass.MonsterArchive... values) {
+ public ArchiveData addAllRelicList(final RelicArchiveOuterClass.RelicArchive... values) {
bitField0_ |= 0x00000004;
- archiveMonsterIdList.addAll(values);
+ relicList.addAll(values);
return this;
}
/**
- * repeated .RelicArchive archive_relic_list = 11;
- * @return whether the archiveRelicList field is set
+ * repeated .MonsterArchive archive_monster_id_list = 14;
+ * @return whether the archiveMonsterIdList field is set
*/
- public boolean hasArchiveRelicList() {
+ public boolean hasArchiveMonsterIdList() {
return (bitField0_ & 0x00000008) != 0;
}
/**
- * repeated .RelicArchive archive_relic_list = 11;
+ * repeated .MonsterArchive archive_monster_id_list = 14;
* @return this
*/
- public ArchiveData clearArchiveRelicList() {
+ public ArchiveData clearArchiveMonsterIdList() {
bitField0_ &= ~0x00000008;
- archiveRelicList.clear();
+ archiveMonsterIdList.clear();
return this;
}
/**
- * repeated .RelicArchive archive_relic_list = 11;
+ * repeated .MonsterArchive archive_monster_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 #getMutableArchiveRelicList()} if you want to modify it.
+ * Use {@link #getMutableArchiveMonsterIdList()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public RepeatedMessage getArchiveRelicList() {
- return archiveRelicList;
+ public RepeatedMessage getArchiveMonsterIdList() {
+ return archiveMonsterIdList;
}
/**
- * repeated .RelicArchive archive_relic_list = 11;
+ * repeated .MonsterArchive archive_monster_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
@@ -298,30 +295,33 @@ public RepeatedMessage getArchiveRelicList(
*
* @return internal storage object for modifications
*/
- public RepeatedMessage getMutableArchiveRelicList() {
+ public RepeatedMessage getMutableArchiveMonsterIdList(
+ ) {
bitField0_ |= 0x00000008;
- return archiveRelicList;
+ return archiveMonsterIdList;
}
/**
- * repeated .RelicArchive archive_relic_list = 11;
- * @param value the archiveRelicList to add
+ * repeated .MonsterArchive archive_monster_id_list = 14;
+ * @param value the archiveMonsterIdList to add
* @return this
*/
- public ArchiveData addArchiveRelicList(final RelicArchiveOuterClass.RelicArchive value) {
+ public ArchiveData addArchiveMonsterIdList(
+ final MonsterArchiveOuterClass.MonsterArchive value) {
bitField0_ |= 0x00000008;
- archiveRelicList.add(value);
+ archiveMonsterIdList.add(value);
return this;
}
/**
- * repeated .RelicArchive archive_relic_list = 11;
- * @param values the archiveRelicList to add
+ * repeated .MonsterArchive archive_monster_id_list = 14;
+ * @param values the archiveMonsterIdList to add
* @return this
*/
- public ArchiveData addAllArchiveRelicList(final RelicArchiveOuterClass.RelicArchive... values) {
+ public ArchiveData addAllArchiveMonsterIdList(
+ final MonsterArchiveOuterClass.MonsterArchive... values) {
bitField0_ |= 0x00000008;
- archiveRelicList.addAll(values);
+ archiveMonsterIdList.addAll(values);
return this;
}
@@ -330,10 +330,10 @@ public ArchiveData copyFrom(final ArchiveData other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- archiveEquipmentIdList.copyFrom(other.archiveEquipmentIdList);
archiveAvatarIdList.copyFrom(other.archiveAvatarIdList);
+ archiveEquipmentIdList.copyFrom(other.archiveEquipmentIdList);
+ relicList.copyFrom(other.relicList);
archiveMonsterIdList.copyFrom(other.archiveMonsterIdList);
- archiveRelicList.copyFrom(other.archiveRelicList);
}
return this;
}
@@ -344,18 +344,18 @@ public ArchiveData mergeFrom(final ArchiveData other) {
return this;
}
cachedSize = -1;
+ if (other.hasArchiveAvatarIdList()) {
+ getMutableArchiveAvatarIdList().addAll(other.archiveAvatarIdList);
+ }
if (other.hasArchiveEquipmentIdList()) {
getMutableArchiveEquipmentIdList().addAll(other.archiveEquipmentIdList);
}
- if (other.hasArchiveAvatarIdList()) {
- getMutableArchiveAvatarIdList().addAll(other.archiveAvatarIdList);
+ if (other.hasRelicList()) {
+ getMutableRelicList().addAll(other.relicList);
}
if (other.hasArchiveMonsterIdList()) {
getMutableArchiveMonsterIdList().addAll(other.archiveMonsterIdList);
}
- if (other.hasArchiveRelicList()) {
- getMutableArchiveRelicList().addAll(other.archiveRelicList);
- }
return this;
}
@@ -366,10 +366,10 @@ public ArchiveData clear() {
}
cachedSize = -1;
bitField0_ = 0;
- archiveEquipmentIdList.clear();
archiveAvatarIdList.clear();
+ archiveEquipmentIdList.clear();
+ relicList.clear();
archiveMonsterIdList.clear();
- archiveRelicList.clear();
return this;
}
@@ -380,10 +380,10 @@ public ArchiveData clearQuick() {
}
cachedSize = -1;
bitField0_ = 0;
- archiveEquipmentIdList.clear();
archiveAvatarIdList.clear();
+ archiveEquipmentIdList.clear();
+ relicList.clearQuick();
archiveMonsterIdList.clearQuick();
- archiveRelicList.clearQuick();
return this;
}
@@ -397,36 +397,36 @@ public boolean equals(Object o) {
}
ArchiveData other = (ArchiveData) o;
return bitField0_ == other.bitField0_
- && (!hasArchiveEquipmentIdList() || archiveEquipmentIdList.equals(other.archiveEquipmentIdList))
&& (!hasArchiveAvatarIdList() || archiveAvatarIdList.equals(other.archiveAvatarIdList))
- && (!hasArchiveMonsterIdList() || archiveMonsterIdList.equals(other.archiveMonsterIdList))
- && (!hasArchiveRelicList() || archiveRelicList.equals(other.archiveRelicList));
+ && (!hasArchiveEquipmentIdList() || archiveEquipmentIdList.equals(other.archiveEquipmentIdList))
+ && (!hasRelicList() || relicList.equals(other.relicList))
+ && (!hasArchiveMonsterIdList() || archiveMonsterIdList.equals(other.archiveMonsterIdList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- for (int i = 0; i < archiveEquipmentIdList.length(); i++) {
- output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(archiveEquipmentIdList.array()[i]);
+ for (int i = 0; i < archiveAvatarIdList.length(); i++) {
+ output.writeRawByte((byte) 56);
+ output.writeUInt32NoTag(archiveAvatarIdList.array()[i]);
}
}
if ((bitField0_ & 0x00000002) != 0) {
- for (int i = 0; i < archiveAvatarIdList.length(); i++) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(archiveAvatarIdList.array()[i]);
+ for (int i = 0; i < archiveEquipmentIdList.length(); i++) {
+ output.writeRawByte((byte) 80);
+ output.writeUInt32NoTag(archiveEquipmentIdList.array()[i]);
}
}
if ((bitField0_ & 0x00000004) != 0) {
- for (int i = 0; i < archiveMonsterIdList.length(); i++) {
- output.writeRawByte((byte) 58);
- output.writeMessageNoTag(archiveMonsterIdList.get(i));
+ for (int i = 0; i < relicList.length(); i++) {
+ output.writeRawByte((byte) 26);
+ output.writeMessageNoTag(relicList.get(i));
}
}
if ((bitField0_ & 0x00000008) != 0) {
- for (int i = 0; i < archiveRelicList.length(); i++) {
- output.writeRawByte((byte) 90);
- output.writeMessageNoTag(archiveRelicList.get(i));
+ for (int i = 0; i < archiveMonsterIdList.length(); i++) {
+ output.writeRawByte((byte) 114);
+ output.writeMessageNoTag(archiveMonsterIdList.get(i));
}
}
}
@@ -435,16 +435,16 @@ public void writeTo(final ProtoSink output) throws IOException {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += (1 * archiveEquipmentIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveEquipmentIdList);
+ size += (1 * archiveAvatarIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveAvatarIdList);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += (1 * archiveAvatarIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveAvatarIdList);
+ size += (1 * archiveEquipmentIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveEquipmentIdList);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += (1 * archiveMonsterIdList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(archiveMonsterIdList);
+ size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += (1 * archiveRelicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(archiveRelicList);
+ size += (1 * archiveMonsterIdList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(archiveMonsterIdList);
}
return size;
}
@@ -456,35 +456,35 @@ public ArchiveData mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 26: {
- // archiveEquipmentIdList [packed=true]
- input.readPackedUInt32(archiveEquipmentIdList, tag);
+ case 58: {
+ // archiveAvatarIdList [packed=true]
+ input.readPackedUInt32(archiveAvatarIdList, tag);
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 34) {
+ if (tag != 82) {
break;
}
}
- case 34: {
- // archiveAvatarIdList [packed=true]
- input.readPackedUInt32(archiveAvatarIdList, tag);
+ case 82: {
+ // archiveEquipmentIdList [packed=true]
+ input.readPackedUInt32(archiveEquipmentIdList, tag);
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 58) {
+ if (tag != 26) {
break;
}
}
- case 58: {
- // archiveMonsterIdList
- tag = input.readRepeatedMessage(archiveMonsterIdList, tag);
+ case 26: {
+ // relicList
+ tag = input.readRepeatedMessage(relicList, tag);
bitField0_ |= 0x00000004;
- if (tag != 90) {
+ if (tag != 114) {
break;
}
}
- case 90: {
- // archiveRelicList
- tag = input.readRepeatedMessage(archiveRelicList, tag);
+ case 114: {
+ // archiveMonsterIdList
+ tag = input.readRepeatedMessage(archiveMonsterIdList, tag);
bitField0_ |= 0x00000008;
if (tag != 0) {
break;
@@ -500,15 +500,15 @@ public ArchiveData mergeFrom(final ProtoSource input) throws IOException {
tag = input.readTag();
break;
}
- case 24: {
- // archiveEquipmentIdList [packed=false]
- tag = input.readRepeatedUInt32(archiveEquipmentIdList, tag);
+ case 56: {
+ // archiveAvatarIdList [packed=false]
+ tag = input.readRepeatedUInt32(archiveAvatarIdList, tag);
bitField0_ |= 0x00000001;
break;
}
- case 32: {
- // archiveAvatarIdList [packed=false]
- tag = input.readRepeatedUInt32(archiveAvatarIdList, tag);
+ case 80: {
+ // archiveEquipmentIdList [packed=false]
+ tag = input.readRepeatedUInt32(archiveEquipmentIdList, tag);
bitField0_ |= 0x00000002;
break;
}
@@ -520,16 +520,16 @@ public ArchiveData mergeFrom(final ProtoSource input) throws IOException {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRepeatedUInt32(FieldNames.archiveEquipmentIdList, archiveEquipmentIdList);
+ output.writeRepeatedUInt32(FieldNames.archiveAvatarIdList, archiveAvatarIdList);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRepeatedUInt32(FieldNames.archiveAvatarIdList, archiveAvatarIdList);
+ output.writeRepeatedUInt32(FieldNames.archiveEquipmentIdList, archiveEquipmentIdList);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRepeatedMessage(FieldNames.archiveMonsterIdList, archiveMonsterIdList);
+ output.writeRepeatedMessage(FieldNames.relicList, relicList);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRepeatedMessage(FieldNames.archiveRelicList, archiveRelicList);
+ output.writeRepeatedMessage(FieldNames.archiveMonsterIdList, archiveMonsterIdList);
}
output.endObject();
}
@@ -541,11 +541,11 @@ public ArchiveData mergeFrom(final JsonSource input) throws IOException {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 1521227365:
- case 967463252: {
- if (input.isAtField(FieldNames.archiveEquipmentIdList)) {
+ case 500094196:
+ case 1198392697: {
+ if (input.isAtField(FieldNames.archiveAvatarIdList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedUInt32(archiveEquipmentIdList);
+ input.readRepeatedUInt32(archiveAvatarIdList);
bitField0_ |= 0x00000001;
}
} else {
@@ -553,11 +553,11 @@ public ArchiveData mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 500094196:
- case 1198392697: {
- if (input.isAtField(FieldNames.archiveAvatarIdList)) {
+ case 1521227365:
+ case 967463252: {
+ if (input.isAtField(FieldNames.archiveEquipmentIdList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedUInt32(archiveAvatarIdList);
+ input.readRepeatedUInt32(archiveEquipmentIdList);
bitField0_ |= 0x00000002;
}
} else {
@@ -565,11 +565,11 @@ public ArchiveData mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 912174897:
- case 1817787488: {
- if (input.isAtField(FieldNames.archiveMonsterIdList)) {
+ case 204814001:
+ case 2071893482: {
+ if (input.isAtField(FieldNames.relicList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(archiveMonsterIdList);
+ input.readRepeatedMessage(relicList);
bitField0_ |= 0x00000004;
}
} else {
@@ -577,11 +577,11 @@ public ArchiveData mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 1742876687:
- case 2101828999: {
- if (input.isAtField(FieldNames.archiveRelicList)) {
+ case 912174897:
+ case 1817787488: {
+ if (input.isAtField(FieldNames.archiveMonsterIdList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(archiveRelicList);
+ input.readRepeatedMessage(archiveMonsterIdList);
bitField0_ |= 0x00000008;
}
} else {
@@ -641,13 +641,13 @@ public ArchiveData create() {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
+ static final FieldName archiveAvatarIdList = FieldName.forField("archiveAvatarIdList", "archive_avatar_id_list");
+
static final FieldName archiveEquipmentIdList = FieldName.forField("archiveEquipmentIdList", "archive_equipment_id_list");
- static final FieldName archiveAvatarIdList = FieldName.forField("archiveAvatarIdList", "archive_avatar_id_list");
+ static final FieldName relicList = FieldName.forField("relicList", "relic_list");
static final FieldName archiveMonsterIdList = FieldName.forField("archiveMonsterIdList", "archive_monster_id_list");
-
- static final FieldName archiveRelicList = FieldName.forField("archiveRelicList", "archive_relic_list");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/AvatarExpUpCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/AvatarExpUpCsReqOuterClass.java
index e8fe02406..0ae25b900 100644
--- a/src/generated/main/emu/lunarcore/proto/AvatarExpUpCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/AvatarExpUpCsReqOuterClass.java
@@ -19,12 +19,12 @@ public static final class AvatarExpUpCsReq extends ProtoMessageoptional uint32 base_avatar_id = 1;
+ * optional uint32 base_avatar_id = 8;
*/
private int baseAvatarId;
/**
- * optional .ItemCostList item_cost_list = 2;
+ * optional .ItemCostList item_cost_list = 7;
*/
private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance();
@@ -39,7 +39,7 @@ public static AvatarExpUpCsReq newInstance() {
}
/**
- * optional uint32 base_avatar_id = 1;
+ * optional uint32 base_avatar_id = 8;
* @return whether the baseAvatarId field is set
*/
public boolean hasBaseAvatarId() {
@@ -47,7 +47,7 @@ public boolean hasBaseAvatarId() {
}
/**
- * optional uint32 base_avatar_id = 1;
+ * optional uint32 base_avatar_id = 8;
* @return this
*/
public AvatarExpUpCsReq clearBaseAvatarId() {
@@ -57,7 +57,7 @@ public AvatarExpUpCsReq clearBaseAvatarId() {
}
/**
- * optional uint32 base_avatar_id = 1;
+ * optional uint32 base_avatar_id = 8;
* @return the baseAvatarId
*/
public int getBaseAvatarId() {
@@ -65,7 +65,7 @@ public int getBaseAvatarId() {
}
/**
- * optional uint32 base_avatar_id = 1;
+ * optional uint32 base_avatar_id = 8;
* @param value the baseAvatarId to set
* @return this
*/
@@ -76,7 +76,7 @@ public AvatarExpUpCsReq setBaseAvatarId(final int value) {
}
/**
- * optional .ItemCostList item_cost_list = 2;
+ * optional .ItemCostList item_cost_list = 7;
* @return whether the itemCostList field is set
*/
public boolean hasItemCostList() {
@@ -84,7 +84,7 @@ public boolean hasItemCostList() {
}
/**
- * optional .ItemCostList item_cost_list = 2;
+ * optional .ItemCostList item_cost_list = 7;
* @return this
*/
public AvatarExpUpCsReq clearItemCostList() {
@@ -94,7 +94,7 @@ public AvatarExpUpCsReq clearItemCostList() {
}
/**
- * optional .ItemCostList item_cost_list = 2;
+ * optional .ItemCostList item_cost_list = 7;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public ItemCostListOuterClass.ItemCostList getItemCostList() {
}
/**
- * optional .ItemCostList item_cost_list = 2;
+ * optional .ItemCostList item_cost_list = 7;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public ItemCostListOuterClass.ItemCostList getMutableItemCostList() {
}
/**
- * optional .ItemCostList item_cost_list = 2;
+ * optional .ItemCostList item_cost_list = 7;
* @param value the itemCostList to set
* @return this
*/
@@ -198,11 +198,11 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(baseAvatarId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 18);
+ output.writeRawByte((byte) 58);
output.writeMessageNoTag(itemCostList);
}
}
@@ -226,16 +226,16 @@ public AvatarExpUpCsReq mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 64: {
// baseAvatarId
baseAvatarId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 18) {
+ if (tag != 58) {
break;
}
}
- case 18: {
+ case 58: {
// 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 a9113e6bf..a1ce56759 100644
--- a/src/generated/main/emu/lunarcore/proto/AvatarExpUpScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/AvatarExpUpScRspOuterClass.java
@@ -20,12 +20,12 @@ public static final class AvatarExpUpScRsp extends ProtoMessageoptional uint32 retcode = 6;
+ * optional uint32 retcode = 12;
*/
private int retcode;
/**
- * repeated .PileItem return_item_list = 1;
+ * repeated .PileItem return_item_list = 4;
*/
private final RepeatedMessage returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory());
@@ -40,7 +40,7 @@ public static AvatarExpUpScRsp newInstance() {
}
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 12;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 12;
* @return this
*/
public AvatarExpUpScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public AvatarExpUpScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 12;
* @return the retcode
*/
public int getRetcode() {
@@ -66,7 +66,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 12;
* @param value the retcode to set
* @return this
*/
@@ -77,7 +77,7 @@ public AvatarExpUpScRsp setRetcode(final int value) {
}
/**
- * repeated .PileItem return_item_list = 1;
+ * repeated .PileItem return_item_list = 4;
* @return whether the returnItemList field is set
*/
public boolean hasReturnItemList() {
@@ -85,7 +85,7 @@ public boolean hasReturnItemList() {
}
/**
- * repeated .PileItem return_item_list = 1;
+ * repeated .PileItem return_item_list = 4;
* @return this
*/
public AvatarExpUpScRsp clearReturnItemList() {
@@ -95,7 +95,7 @@ public AvatarExpUpScRsp clearReturnItemList() {
}
/**
- * repeated .PileItem return_item_list = 1;
+ * repeated .PileItem return_item_list = 4;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public RepeatedMessage getReturnItemList() {
}
/**
- * repeated .PileItem return_item_list = 1;
+ * repeated .PileItem return_item_list = 4;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public RepeatedMessage getMutableReturnItemList() {
}
/**
- * repeated .PileItem return_item_list = 1;
+ * repeated .PileItem return_item_list = 4;
* @param value the returnItemList to add
* @return this
*/
@@ -134,7 +134,7 @@ public AvatarExpUpScRsp addReturnItemList(final PileItemOuterClass.PileItem valu
}
/**
- * repeated .PileItem return_item_list = 1;
+ * repeated .PileItem return_item_list = 4;
* @param values the returnItemList to add
* @return this
*/
@@ -210,12 +210,12 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < returnItemList.length(); i++) {
- output.writeRawByte((byte) 10);
+ output.writeRawByte((byte) 34);
output.writeMessageNoTag(returnItemList.get(i));
}
}
@@ -240,16 +240,16 @@ public AvatarExpUpScRsp mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 48: {
+ case 96: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 10) {
+ if (tag != 34) {
break;
}
}
- case 10: {
+ case 34: {
// 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 75f242647..e1ab2dd79 100644
--- a/src/generated/main/emu/lunarcore/proto/AvatarOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/AvatarOuterClass.java
@@ -26,49 +26,54 @@ public static final class Avatar extends ProtoMessage implements Cloneab
private long firstMetTimestamp;
/**
- * optional uint32 equipment_unique_id = 1;
+ * optional uint32 dressed_skin_id = 1;
*/
- private int equipmentUniqueId;
+ private int dressedSkinId;
/**
- * optional uint32 base_avatar_id = 2;
+ * optional uint32 promotion = 3;
*/
- private int baseAvatarId;
+ private int promotion;
/**
- * optional uint32 promotion = 5;
+ * optional uint32 base_avatar_id = 5;
*/
- private int promotion;
+ private int baseAvatarId;
/**
- * optional uint32 rank = 6;
+ * optional uint32 rank = 7;
*/
private int rank;
/**
- * optional uint32 level = 7;
+ * optional uint32 level = 9;
*/
private int level;
/**
- * optional uint32 exp = 14;
+ * optional uint32 exp = 11;
*/
private int exp;
+ /**
+ * optional uint32 equipment_unique_id = 12;
+ */
+ private int equipmentUniqueId;
+
/**
* repeated uint32 taken_rewards = 13;
*/
private final RepeatedInt takenRewards = RepeatedInt.newEmptyInstance();
/**
- * repeated .EquipRelic equip_relic_list = 8;
+ * repeated .AvatarSkillTree skilltree_list = 4;
*/
- private final RepeatedMessage equipRelicList = RepeatedMessage.newEmptyInstance(EquipRelicOuterClass.EquipRelic.getFactory());
+ private final RepeatedMessage skilltreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory());
/**
- * repeated .AvatarSkillTree skilltree_list = 12;
+ * repeated .EquipRelic equip_relic_list = 8;
*/
- private final RepeatedMessage skilltreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory());
+ private final RepeatedMessage equipRelicList = RepeatedMessage.newEmptyInstance(EquipRelicOuterClass.EquipRelic.getFactory());
private Avatar() {
}
@@ -118,118 +123,118 @@ public Avatar setFirstMetTimestamp(final long value) {
}
/**
- * optional uint32 equipment_unique_id = 1;
- * @return whether the equipmentUniqueId field is set
+ * optional uint32 dressed_skin_id = 1;
+ * @return whether the dressedSkinId field is set
*/
- public boolean hasEquipmentUniqueId() {
+ public boolean hasDressedSkinId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 equipment_unique_id = 1;
+ * optional uint32 dressed_skin_id = 1;
* @return this
*/
- public Avatar clearEquipmentUniqueId() {
+ public Avatar clearDressedSkinId() {
bitField0_ &= ~0x00000002;
- equipmentUniqueId = 0;
+ dressedSkinId = 0;
return this;
}
/**
- * optional uint32 equipment_unique_id = 1;
- * @return the equipmentUniqueId
+ * optional uint32 dressed_skin_id = 1;
+ * @return the dressedSkinId
*/
- public int getEquipmentUniqueId() {
- return equipmentUniqueId;
+ public int getDressedSkinId() {
+ return dressedSkinId;
}
/**
- * optional uint32 equipment_unique_id = 1;
- * @param value the equipmentUniqueId to set
+ * optional uint32 dressed_skin_id = 1;
+ * @param value the dressedSkinId to set
* @return this
*/
- public Avatar setEquipmentUniqueId(final int value) {
+ public Avatar setDressedSkinId(final int value) {
bitField0_ |= 0x00000002;
- equipmentUniqueId = value;
+ dressedSkinId = value;
return this;
}
/**
- * optional uint32 base_avatar_id = 2;
- * @return whether the baseAvatarId field is set
+ * optional uint32 promotion = 3;
+ * @return whether the promotion field is set
*/
- public boolean hasBaseAvatarId() {
+ public boolean hasPromotion() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 base_avatar_id = 2;
+ * optional uint32 promotion = 3;
* @return this
*/
- public Avatar clearBaseAvatarId() {
+ public Avatar clearPromotion() {
bitField0_ &= ~0x00000004;
- baseAvatarId = 0;
+ promotion = 0;
return this;
}
/**
- * optional uint32 base_avatar_id = 2;
- * @return the baseAvatarId
+ * optional uint32 promotion = 3;
+ * @return the promotion
*/
- public int getBaseAvatarId() {
- return baseAvatarId;
+ public int getPromotion() {
+ return promotion;
}
/**
- * optional uint32 base_avatar_id = 2;
- * @param value the baseAvatarId to set
+ * optional uint32 promotion = 3;
+ * @param value the promotion to set
* @return this
*/
- public Avatar setBaseAvatarId(final int value) {
+ public Avatar setPromotion(final int value) {
bitField0_ |= 0x00000004;
- baseAvatarId = value;
+ promotion = value;
return this;
}
/**
- * optional uint32 promotion = 5;
- * @return whether the promotion field is set
+ * optional uint32 base_avatar_id = 5;
+ * @return whether the baseAvatarId field is set
*/
- public boolean hasPromotion() {
+ public boolean hasBaseAvatarId() {
return (bitField0_ & 0x00000008) != 0;
}
/**
- * optional uint32 promotion = 5;
+ * optional uint32 base_avatar_id = 5;
* @return this
*/
- public Avatar clearPromotion() {
+ public Avatar clearBaseAvatarId() {
bitField0_ &= ~0x00000008;
- promotion = 0;
+ baseAvatarId = 0;
return this;
}
/**
- * optional uint32 promotion = 5;
- * @return the promotion
+ * optional uint32 base_avatar_id = 5;
+ * @return the baseAvatarId
*/
- public int getPromotion() {
- return promotion;
+ public int getBaseAvatarId() {
+ return baseAvatarId;
}
/**
- * optional uint32 promotion = 5;
- * @param value the promotion to set
+ * optional uint32 base_avatar_id = 5;
+ * @param value the baseAvatarId to set
* @return this
*/
- public Avatar setPromotion(final int value) {
+ public Avatar setBaseAvatarId(final int value) {
bitField0_ |= 0x00000008;
- promotion = value;
+ baseAvatarId = value;
return this;
}
/**
- * optional uint32 rank = 6;
+ * optional uint32 rank = 7;
* @return whether the rank field is set
*/
public boolean hasRank() {
@@ -237,7 +242,7 @@ public boolean hasRank() {
}
/**
- * optional uint32 rank = 6;
+ * optional uint32 rank = 7;
* @return this
*/
public Avatar clearRank() {
@@ -247,7 +252,7 @@ public Avatar clearRank() {
}
/**
- * optional uint32 rank = 6;
+ * optional uint32 rank = 7;
* @return the rank
*/
public int getRank() {
@@ -255,7 +260,7 @@ public int getRank() {
}
/**
- * optional uint32 rank = 6;
+ * optional uint32 rank = 7;
* @param value the rank to set
* @return this
*/
@@ -266,7 +271,7 @@ public Avatar setRank(final int value) {
}
/**
- * optional uint32 level = 7;
+ * optional uint32 level = 9;
* @return whether the level field is set
*/
public boolean hasLevel() {
@@ -274,7 +279,7 @@ public boolean hasLevel() {
}
/**
- * optional uint32 level = 7;
+ * optional uint32 level = 9;
* @return this
*/
public Avatar clearLevel() {
@@ -284,7 +289,7 @@ public Avatar clearLevel() {
}
/**
- * optional uint32 level = 7;
+ * optional uint32 level = 9;
* @return the level
*/
public int getLevel() {
@@ -292,7 +297,7 @@ public int getLevel() {
}
/**
- * optional uint32 level = 7;
+ * optional uint32 level = 9;
* @param value the level to set
* @return this
*/
@@ -303,7 +308,7 @@ public Avatar setLevel(final int value) {
}
/**
- * optional uint32 exp = 14;
+ * optional uint32 exp = 11;
* @return whether the exp field is set
*/
public boolean hasExp() {
@@ -311,7 +316,7 @@ public boolean hasExp() {
}
/**
- * optional uint32 exp = 14;
+ * optional uint32 exp = 11;
* @return this
*/
public Avatar clearExp() {
@@ -321,7 +326,7 @@ public Avatar clearExp() {
}
/**
- * optional uint32 exp = 14;
+ * optional uint32 exp = 11;
* @return the exp
*/
public int getExp() {
@@ -329,7 +334,7 @@ public int getExp() {
}
/**
- * optional uint32 exp = 14;
+ * optional uint32 exp = 11;
* @param value the exp to set
* @return this
*/
@@ -339,12 +344,49 @@ public Avatar setExp(final int value) {
return this;
}
+ /**
+ * optional uint32 equipment_unique_id = 12;
+ * @return whether the equipmentUniqueId field is set
+ */
+ public boolean hasEquipmentUniqueId() {
+ return (bitField0_ & 0x00000080) != 0;
+ }
+
+ /**
+ * optional uint32 equipment_unique_id = 12;
+ * @return this
+ */
+ public Avatar clearEquipmentUniqueId() {
+ bitField0_ &= ~0x00000080;
+ equipmentUniqueId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 equipment_unique_id = 12;
+ * @return the equipmentUniqueId
+ */
+ public int getEquipmentUniqueId() {
+ return equipmentUniqueId;
+ }
+
+ /**
+ * optional uint32 equipment_unique_id = 12;
+ * @param value the equipmentUniqueId to set
+ * @return this
+ */
+ public Avatar setEquipmentUniqueId(final int value) {
+ bitField0_ |= 0x00000080;
+ equipmentUniqueId = value;
+ return this;
+ }
+
/**
* repeated uint32 taken_rewards = 13;
* @return whether the takenRewards field is set
*/
public boolean hasTakenRewards() {
- return (bitField0_ & 0x00000080) != 0;
+ return (bitField0_ & 0x00000100) != 0;
}
/**
@@ -352,7 +394,7 @@ public boolean hasTakenRewards() {
* @return this
*/
public Avatar clearTakenRewards() {
- bitField0_ &= ~0x00000080;
+ bitField0_ &= ~0x00000100;
takenRewards.clear();
return this;
}
@@ -381,7 +423,7 @@ public RepeatedInt getTakenRewards() {
* @return internal storage object for modifications
*/
public RepeatedInt getMutableTakenRewards() {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000100;
return takenRewards;
}
@@ -391,7 +433,7 @@ public RepeatedInt getMutableTakenRewards() {
* @return this
*/
public Avatar addTakenRewards(final int value) {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000100;
takenRewards.add(value);
return this;
}
@@ -402,45 +444,45 @@ public Avatar addTakenRewards(final int value) {
* @return this
*/
public Avatar addAllTakenRewards(final int... values) {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000100;
takenRewards.addAll(values);
return this;
}
/**
- * repeated .EquipRelic equip_relic_list = 8;
- * @return whether the equipRelicList field is set
+ * repeated .AvatarSkillTree skilltree_list = 4;
+ * @return whether the skilltreeList field is set
*/
- public boolean hasEquipRelicList() {
- return (bitField0_ & 0x00000100) != 0;
+ public boolean hasSkilltreeList() {
+ return (bitField0_ & 0x00000200) != 0;
}
/**
- * repeated .EquipRelic equip_relic_list = 8;
+ * repeated .AvatarSkillTree skilltree_list = 4;
* @return this
*/
- public Avatar clearEquipRelicList() {
- bitField0_ &= ~0x00000100;
- equipRelicList.clear();
+ public Avatar clearSkilltreeList() {
+ bitField0_ &= ~0x00000200;
+ skilltreeList.clear();
return this;
}
/**
- * repeated .EquipRelic equip_relic_list = 8;
+ * repeated .AvatarSkillTree skilltree_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 #getMutableEquipRelicList()} if you want to modify it.
+ * Use {@link #getMutableSkilltreeList()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public RepeatedMessage getEquipRelicList() {
- return equipRelicList;
+ public RepeatedMessage getSkilltreeList() {
+ return skilltreeList;
}
/**
- * repeated .EquipRelic equip_relic_list = 8;
+ * repeated .AvatarSkillTree skilltree_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
@@ -448,67 +490,67 @@ public RepeatedMessage getEquipRelicList() {
*
* @return internal storage object for modifications
*/
- public RepeatedMessage getMutableEquipRelicList() {
- bitField0_ |= 0x00000100;
- return equipRelicList;
+ public RepeatedMessage getMutableSkilltreeList() {
+ bitField0_ |= 0x00000200;
+ return skilltreeList;
}
/**
- * repeated .EquipRelic equip_relic_list = 8;
- * @param value the equipRelicList to add
+ * repeated .AvatarSkillTree skilltree_list = 4;
+ * @param value the skilltreeList to add
* @return this
*/
- public Avatar addEquipRelicList(final EquipRelicOuterClass.EquipRelic value) {
- bitField0_ |= 0x00000100;
- equipRelicList.add(value);
+ public Avatar addSkilltreeList(final AvatarSkillTreeOuterClass.AvatarSkillTree value) {
+ bitField0_ |= 0x00000200;
+ skilltreeList.add(value);
return this;
}
/**
- * repeated .EquipRelic equip_relic_list = 8;
- * @param values the equipRelicList to add
+ * repeated .AvatarSkillTree skilltree_list = 4;
+ * @param values the skilltreeList to add
* @return this
*/
- public Avatar addAllEquipRelicList(final EquipRelicOuterClass.EquipRelic... values) {
- bitField0_ |= 0x00000100;
- equipRelicList.addAll(values);
+ public Avatar addAllSkilltreeList(final AvatarSkillTreeOuterClass.AvatarSkillTree... values) {
+ bitField0_ |= 0x00000200;
+ skilltreeList.addAll(values);
return this;
}
/**
- * repeated .AvatarSkillTree skilltree_list = 12;
- * @return whether the skilltreeList field is set
+ * repeated .EquipRelic equip_relic_list = 8;
+ * @return whether the equipRelicList field is set
*/
- public boolean hasSkilltreeList() {
- return (bitField0_ & 0x00000200) != 0;
+ public boolean hasEquipRelicList() {
+ return (bitField0_ & 0x00000400) != 0;
}
/**
- * repeated .AvatarSkillTree skilltree_list = 12;
+ * repeated .EquipRelic equip_relic_list = 8;
* @return this
*/
- public Avatar clearSkilltreeList() {
- bitField0_ &= ~0x00000200;
- skilltreeList.clear();
+ public Avatar clearEquipRelicList() {
+ bitField0_ &= ~0x00000400;
+ equipRelicList.clear();
return this;
}
/**
- * repeated .AvatarSkillTree skilltree_list = 12;
+ * repeated .EquipRelic equip_relic_list = 8;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
*
- * Use {@link #getMutableSkilltreeList()} if you want to modify it.
+ * Use {@link #getMutableEquipRelicList()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public RepeatedMessage getSkilltreeList() {
- return skilltreeList;
+ public RepeatedMessage getEquipRelicList() {
+ return equipRelicList;
}
/**
- * repeated .AvatarSkillTree skilltree_list = 12;
+ * repeated .EquipRelic equip_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
@@ -516,30 +558,30 @@ public RepeatedMessage getSkilltreeLi
*
* @return internal storage object for modifications
*/
- public RepeatedMessage getMutableSkilltreeList() {
- bitField0_ |= 0x00000200;
- return skilltreeList;
+ public RepeatedMessage getMutableEquipRelicList() {
+ bitField0_ |= 0x00000400;
+ return equipRelicList;
}
/**
- * repeated .AvatarSkillTree skilltree_list = 12;
- * @param value the skilltreeList to add
+ * repeated .EquipRelic equip_relic_list = 8;
+ * @param value the equipRelicList to add
* @return this
*/
- public Avatar addSkilltreeList(final AvatarSkillTreeOuterClass.AvatarSkillTree value) {
- bitField0_ |= 0x00000200;
- skilltreeList.add(value);
+ public Avatar addEquipRelicList(final EquipRelicOuterClass.EquipRelic value) {
+ bitField0_ |= 0x00000400;
+ equipRelicList.add(value);
return this;
}
/**
- * repeated .AvatarSkillTree skilltree_list = 12;
- * @param values the skilltreeList to add
+ * repeated .EquipRelic equip_relic_list = 8;
+ * @param values the equipRelicList to add
* @return this
*/
- public Avatar addAllSkilltreeList(final AvatarSkillTreeOuterClass.AvatarSkillTree... values) {
- bitField0_ |= 0x00000200;
- skilltreeList.addAll(values);
+ public Avatar addAllEquipRelicList(final EquipRelicOuterClass.EquipRelic... values) {
+ bitField0_ |= 0x00000400;
+ equipRelicList.addAll(values);
return this;
}
@@ -549,15 +591,16 @@ public Avatar copyFrom(final Avatar other) {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
firstMetTimestamp = other.firstMetTimestamp;
- equipmentUniqueId = other.equipmentUniqueId;
- baseAvatarId = other.baseAvatarId;
+ dressedSkinId = other.dressedSkinId;
promotion = other.promotion;
+ baseAvatarId = other.baseAvatarId;
rank = other.rank;
level = other.level;
exp = other.exp;
+ equipmentUniqueId = other.equipmentUniqueId;
takenRewards.copyFrom(other.takenRewards);
- equipRelicList.copyFrom(other.equipRelicList);
skilltreeList.copyFrom(other.skilltreeList);
+ equipRelicList.copyFrom(other.equipRelicList);
}
return this;
}
@@ -571,15 +614,15 @@ public Avatar mergeFrom(final Avatar other) {
if (other.hasFirstMetTimestamp()) {
setFirstMetTimestamp(other.firstMetTimestamp);
}
- if (other.hasEquipmentUniqueId()) {
- setEquipmentUniqueId(other.equipmentUniqueId);
- }
- if (other.hasBaseAvatarId()) {
- setBaseAvatarId(other.baseAvatarId);
+ if (other.hasDressedSkinId()) {
+ setDressedSkinId(other.dressedSkinId);
}
if (other.hasPromotion()) {
setPromotion(other.promotion);
}
+ if (other.hasBaseAvatarId()) {
+ setBaseAvatarId(other.baseAvatarId);
+ }
if (other.hasRank()) {
setRank(other.rank);
}
@@ -589,15 +632,18 @@ public Avatar mergeFrom(final Avatar other) {
if (other.hasExp()) {
setExp(other.exp);
}
+ if (other.hasEquipmentUniqueId()) {
+ setEquipmentUniqueId(other.equipmentUniqueId);
+ }
if (other.hasTakenRewards()) {
getMutableTakenRewards().addAll(other.takenRewards);
}
- if (other.hasEquipRelicList()) {
- getMutableEquipRelicList().addAll(other.equipRelicList);
- }
if (other.hasSkilltreeList()) {
getMutableSkilltreeList().addAll(other.skilltreeList);
}
+ if (other.hasEquipRelicList()) {
+ getMutableEquipRelicList().addAll(other.equipRelicList);
+ }
return this;
}
@@ -609,15 +655,16 @@ public Avatar clear() {
cachedSize = -1;
bitField0_ = 0;
firstMetTimestamp = 0L;
- equipmentUniqueId = 0;
- baseAvatarId = 0;
+ dressedSkinId = 0;
promotion = 0;
+ baseAvatarId = 0;
rank = 0;
level = 0;
exp = 0;
+ equipmentUniqueId = 0;
takenRewards.clear();
- equipRelicList.clear();
skilltreeList.clear();
+ equipRelicList.clear();
return this;
}
@@ -629,8 +676,8 @@ public Avatar clearQuick() {
cachedSize = -1;
bitField0_ = 0;
takenRewards.clear();
- equipRelicList.clearQuick();
skilltreeList.clearQuick();
+ equipRelicList.clearQuick();
return this;
}
@@ -645,15 +692,16 @@ public boolean equals(Object o) {
Avatar other = (Avatar) o;
return bitField0_ == other.bitField0_
&& (!hasFirstMetTimestamp() || firstMetTimestamp == other.firstMetTimestamp)
- && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId)
- && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
+ && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId)
&& (!hasPromotion() || promotion == other.promotion)
+ && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
&& (!hasRank() || rank == other.rank)
&& (!hasLevel() || level == other.level)
&& (!hasExp() || exp == other.exp)
+ && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId)
&& (!hasTakenRewards() || takenRewards.equals(other.takenRewards))
- && (!hasEquipRelicList() || equipRelicList.equals(other.equipRelicList))
- && (!hasSkilltreeList() || skilltreeList.equals(other.skilltreeList));
+ && (!hasSkilltreeList() || skilltreeList.equals(other.skilltreeList))
+ && (!hasEquipRelicList() || equipRelicList.equals(other.equipRelicList));
}
@Override
@@ -664,46 +712,50 @@ public void writeTo(final ProtoSink output) throws IOException {
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(equipmentUniqueId);
+ output.writeUInt32NoTag(dressedSkinId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(baseAvatarId);
+ output.writeRawByte((byte) 24);
+ output.writeUInt32NoTag(promotion);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeRawByte((byte) 40);
- output.writeUInt32NoTag(promotion);
+ output.writeUInt32NoTag(baseAvatarId);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(rank);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 72);
output.writeUInt32NoTag(level);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(exp);
}
if ((bitField0_ & 0x00000080) != 0) {
+ output.writeRawByte((byte) 96);
+ output.writeUInt32NoTag(equipmentUniqueId);
+ }
+ if ((bitField0_ & 0x00000100) != 0) {
for (int i = 0; i < takenRewards.length(); i++) {
output.writeRawByte((byte) 104);
output.writeUInt32NoTag(takenRewards.array()[i]);
}
}
- if ((bitField0_ & 0x00000100) != 0) {
- for (int i = 0; i < equipRelicList.length(); i++) {
- output.writeRawByte((byte) 66);
- output.writeMessageNoTag(equipRelicList.get(i));
- }
- }
if ((bitField0_ & 0x00000200) != 0) {
for (int i = 0; i < skilltreeList.length(); i++) {
- output.writeRawByte((byte) 98);
+ output.writeRawByte((byte) 34);
output.writeMessageNoTag(skilltreeList.get(i));
}
}
+ if ((bitField0_ & 0x00000400) != 0) {
+ for (int i = 0; i < equipRelicList.length(); i++) {
+ output.writeRawByte((byte) 66);
+ output.writeMessageNoTag(equipRelicList.get(i));
+ }
+ }
}
@Override
@@ -713,13 +765,13 @@ protected int computeSerializedSize() {
size += 1 + ProtoSink.computeUInt64SizeNoTag(firstMetTimestamp);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
}
if ((bitField0_ & 0x00000010) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(rank);
@@ -731,14 +783,17 @@ protected int computeSerializedSize() {
size += 1 + ProtoSink.computeUInt32SizeNoTag(exp);
}
if ((bitField0_ & 0x00000080) != 0) {
- size += (1 * takenRewards.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(takenRewards);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId);
}
if ((bitField0_ & 0x00000100) != 0) {
- size += (1 * equipRelicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipRelicList);
+ size += (1 * takenRewards.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(takenRewards);
}
if ((bitField0_ & 0x00000200) != 0) {
size += (1 * skilltreeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(skilltreeList);
}
+ if ((bitField0_ & 0x00000400) != 0) {
+ size += (1 * equipRelicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipRelicList);
+ }
return size;
}
@@ -759,17 +814,17 @@ public Avatar mergeFrom(final ProtoSource input) throws IOException {
}
}
case 8: {
- // equipmentUniqueId
- equipmentUniqueId = input.readUInt32();
+ // dressedSkinId
+ dressedSkinId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 16) {
+ if (tag != 24) {
break;
}
}
- case 16: {
- // baseAvatarId
- baseAvatarId = input.readUInt32();
+ case 24: {
+ // promotion
+ promotion = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 40) {
@@ -777,62 +832,71 @@ public Avatar mergeFrom(final ProtoSource input) throws IOException {
}
}
case 40: {
- // promotion
- promotion = input.readUInt32();
+ // baseAvatarId
+ baseAvatarId = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 48) {
+ if (tag != 56) {
break;
}
}
- case 48: {
+ case 56: {
// rank
rank = input.readUInt32();
bitField0_ |= 0x00000010;
tag = input.readTag();
- if (tag != 56) {
+ if (tag != 72) {
break;
}
}
- case 56: {
+ case 72: {
// level
level = input.readUInt32();
bitField0_ |= 0x00000020;
tag = input.readTag();
- if (tag != 112) {
+ if (tag != 88) {
break;
}
}
- case 112: {
+ case 88: {
// exp
exp = input.readUInt32();
bitField0_ |= 0x00000040;
tag = input.readTag();
- if (tag != 106) {
+ if (tag != 96) {
break;
}
}
- case 106: {
- // takenRewards [packed=true]
- input.readPackedUInt32(takenRewards, tag);
+ case 96: {
+ // equipmentUniqueId
+ equipmentUniqueId = input.readUInt32();
bitField0_ |= 0x00000080;
tag = input.readTag();
- if (tag != 66) {
+ if (tag != 106) {
break;
}
}
- case 66: {
- // equipRelicList
- tag = input.readRepeatedMessage(equipRelicList, tag);
+ case 106: {
+ // takenRewards [packed=true]
+ input.readPackedUInt32(takenRewards, tag);
bitField0_ |= 0x00000100;
- if (tag != 98) {
+ tag = input.readTag();
+ if (tag != 34) {
break;
}
}
- case 98: {
+ case 34: {
// skilltreeList
tag = input.readRepeatedMessage(skilltreeList, tag);
bitField0_ |= 0x00000200;
+ if (tag != 66) {
+ break;
+ }
+ }
+ case 66: {
+ // equipRelicList
+ tag = input.readRepeatedMessage(equipRelicList, tag);
+ bitField0_ |= 0x00000400;
if (tag != 0) {
break;
}
@@ -850,7 +914,7 @@ public Avatar mergeFrom(final ProtoSource input) throws IOException {
case 104: {
// takenRewards [packed=false]
tag = input.readRepeatedUInt32(takenRewards, tag);
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000100;
break;
}
}
@@ -864,13 +928,13 @@ public void writeTo(final JsonSink output) throws IOException {
output.writeUInt64(FieldNames.firstMetTimestamp, firstMetTimestamp);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId);
+ output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
+ output.writeUInt32(FieldNames.promotion, promotion);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.promotion, promotion);
+ output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
}
if ((bitField0_ & 0x00000010) != 0) {
output.writeUInt32(FieldNames.rank, rank);
@@ -882,14 +946,17 @@ public void writeTo(final JsonSink output) throws IOException {
output.writeUInt32(FieldNames.exp, exp);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRepeatedUInt32(FieldNames.takenRewards, takenRewards);
+ output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId);
}
if ((bitField0_ & 0x00000100) != 0) {
- output.writeRepeatedMessage(FieldNames.equipRelicList, equipRelicList);
+ output.writeRepeatedUInt32(FieldNames.takenRewards, takenRewards);
}
if ((bitField0_ & 0x00000200) != 0) {
output.writeRepeatedMessage(FieldNames.skilltreeList, skilltreeList);
}
+ if ((bitField0_ & 0x00000400) != 0) {
+ output.writeRepeatedMessage(FieldNames.equipRelicList, equipRelicList);
+ }
output.endObject();
}
@@ -912,11 +979,11 @@ public Avatar mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case -1867136902:
- case 760467160: {
- if (input.isAtField(FieldNames.equipmentUniqueId)) {
+ case -407000018:
+ case 2012697844: {
+ if (input.isAtField(FieldNames.dressedSkinId)) {
if (!input.trySkipNullValue()) {
- equipmentUniqueId = input.readUInt32();
+ dressedSkinId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -924,11 +991,10 @@ public Avatar mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 118022725:
- case -1756826157: {
- if (input.isAtField(FieldNames.baseAvatarId)) {
+ case -799212381: {
+ if (input.isAtField(FieldNames.promotion)) {
if (!input.trySkipNullValue()) {
- baseAvatarId = input.readUInt32();
+ promotion = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -936,10 +1002,11 @@ public Avatar mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case -799212381: {
- if (input.isAtField(FieldNames.promotion)) {
+ case 118022725:
+ case -1756826157: {
+ if (input.isAtField(FieldNames.baseAvatarId)) {
if (!input.trySkipNullValue()) {
- promotion = input.readUInt32();
+ baseAvatarId = input.readUInt32();
bitField0_ |= 0x00000008;
}
} else {
@@ -980,11 +1047,11 @@ public Avatar mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case -932367267:
- case 500229036: {
- if (input.isAtField(FieldNames.takenRewards)) {
+ case -1867136902:
+ case 760467160: {
+ if (input.isAtField(FieldNames.equipmentUniqueId)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedUInt32(takenRewards);
+ equipmentUniqueId = input.readUInt32();
bitField0_ |= 0x00000080;
}
} else {
@@ -992,11 +1059,11 @@ public Avatar mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 1578968161:
- case -795441831: {
- if (input.isAtField(FieldNames.equipRelicList)) {
+ case -932367267:
+ case 500229036: {
+ if (input.isAtField(FieldNames.takenRewards)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(equipRelicList);
+ input.readRepeatedUInt32(takenRewards);
bitField0_ |= 0x00000100;
}
} else {
@@ -1016,6 +1083,18 @@ public Avatar mergeFrom(final JsonSource input) throws IOException {
}
break;
}
+ case 1578968161:
+ case -795441831: {
+ if (input.isAtField(FieldNames.equipRelicList)) {
+ if (!input.trySkipNullValue()) {
+ input.readRepeatedMessage(equipRelicList);
+ bitField0_ |= 0x00000400;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
default: {
input.skipUnknownField();
break;
@@ -1070,23 +1149,25 @@ public Avatar create() {
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 baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
+ static final FieldName dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id");
static final FieldName promotion = FieldName.forField("promotion");
+ static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
+
static final FieldName rank = FieldName.forField("rank");
static final FieldName level = FieldName.forField("level");
static final FieldName exp = FieldName.forField("exp");
- static final FieldName takenRewards = FieldName.forField("takenRewards", "taken_rewards");
+ static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id");
- static final FieldName equipRelicList = FieldName.forField("equipRelicList", "equip_relic_list");
+ static final FieldName takenRewards = FieldName.forField("takenRewards", "taken_rewards");
static final FieldName skilltreeList = FieldName.forField("skilltreeList", "skilltree_list");
+
+ static final FieldName equipRelicList = FieldName.forField("equipRelicList", "equip_relic_list");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java b/src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java
index a24bb4693..138cc2713 100644
--- a/src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java
@@ -20,7 +20,7 @@ public static final class AvatarSync extends ProtoMessage implements
private static final long serialVersionUID = 0L;
/**
- * repeated .Avatar avatar_list = 10;
+ * repeated .Avatar avatar_list = 1;
*/
private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(AvatarOuterClass.Avatar.getFactory());
@@ -35,7 +35,7 @@ public static AvatarSync newInstance() {
}
/**
- * repeated .Avatar avatar_list = 10;
+ * repeated .Avatar avatar_list = 1;
* @return whether the avatarList field is set
*/
public boolean hasAvatarList() {
@@ -43,7 +43,7 @@ public boolean hasAvatarList() {
}
/**
- * repeated .Avatar avatar_list = 10;
+ * repeated .Avatar avatar_list = 1;
* @return this
*/
public AvatarSync clearAvatarList() {
@@ -53,7 +53,7 @@ public AvatarSync clearAvatarList() {
}
/**
- * repeated .Avatar avatar_list = 10;
+ * 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.
@@ -67,7 +67,7 @@ public RepeatedMessage getAvatarList() {
}
/**
- * repeated .Avatar avatar_list = 10;
+ * 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
@@ -81,7 +81,7 @@ public RepeatedMessage getMutableAvatarList() {
}
/**
- * repeated .Avatar avatar_list = 10;
+ * repeated .Avatar avatar_list = 1;
* @param value the avatarList to add
* @return this
*/
@@ -92,7 +92,7 @@ public AvatarSync addAvatarList(final AvatarOuterClass.Avatar value) {
}
/**
- * repeated .Avatar avatar_list = 10;
+ * repeated .Avatar avatar_list = 1;
* @param values the avatarList to add
* @return this
*/
@@ -163,7 +163,7 @@ public boolean equals(Object o) {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < avatarList.length(); i++) {
- output.writeRawByte((byte) 82);
+ output.writeRawByte((byte) 10);
output.writeMessageNoTag(avatarList.get(i));
}
}
@@ -185,7 +185,7 @@ public AvatarSync mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 82: {
+ case 10: {
// avatarList
tag = input.readRepeatedMessage(avatarList, tag);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/ClientTurnSnapshotOuterClass.java b/src/generated/main/emu/lunarcore/proto/BattleEventBattleInfoOuterClass.java
similarity index 71%
rename from src/generated/main/emu/lunarcore/proto/ClientTurnSnapshotOuterClass.java
rename to src/generated/main/emu/lunarcore/proto/BattleEventBattleInfoOuterClass.java
index 9d97d0e3b..3688ee778 100644
--- a/src/generated/main/emu/lunarcore/proto/ClientTurnSnapshotOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/BattleEventBattleInfoOuterClass.java
@@ -11,11 +11,11 @@
import us.hebi.quickbuf.ProtoSink;
import us.hebi.quickbuf.ProtoSource;
-public final class ClientTurnSnapshotOuterClass {
+public final class BattleEventBattleInfoOuterClass {
/**
- * Protobuf type {@code ClientTurnSnapshot}
+ * Protobuf type {@code BattleEventBattleInfo}
*/
- public static final class ClientTurnSnapshot extends ProtoMessage implements Cloneable {
+ public static final class BattleEventBattleInfo extends ProtoMessage implements Cloneable {
private static final long serialVersionUID = 0L;
/**
@@ -24,18 +24,18 @@ public static final class ClientTurnSnapshot extends ProtoMessageoptional .ClientTurnSnapshotStatus status = 2;
+ * optional .BattleEventInitedData status = 2;
*/
- private final ClientTurnSnapshotStatusOuterClass.ClientTurnSnapshotStatus status = ClientTurnSnapshotStatusOuterClass.ClientTurnSnapshotStatus.newInstance();
+ private final BattleEventInitedDataOuterClass.BattleEventInitedData status = BattleEventInitedDataOuterClass.BattleEventInitedData.newInstance();
- private ClientTurnSnapshot() {
+ private BattleEventBattleInfo() {
}
/**
- * @return a new empty instance of {@code ClientTurnSnapshot}
+ * @return a new empty instance of {@code BattleEventBattleInfo}
*/
- public static ClientTurnSnapshot newInstance() {
- return new ClientTurnSnapshot();
+ public static BattleEventBattleInfo newInstance() {
+ return new BattleEventBattleInfo();
}
/**
@@ -50,7 +50,7 @@ public boolean hasBattleEventId() {
* optional uint32 battle_event_id = 1;
* @return this
*/
- public ClientTurnSnapshot clearBattleEventId() {
+ public BattleEventBattleInfo clearBattleEventId() {
bitField0_ &= ~0x00000001;
battleEventId = 0;
return this;
@@ -69,14 +69,14 @@ public int getBattleEventId() {
* @param value the battleEventId to set
* @return this
*/
- public ClientTurnSnapshot setBattleEventId(final int value) {
+ public BattleEventBattleInfo setBattleEventId(final int value) {
bitField0_ |= 0x00000001;
battleEventId = value;
return this;
}
/**
- * optional .ClientTurnSnapshotStatus status = 2;
+ * optional .BattleEventInitedData status = 2;
* @return whether the status field is set
*/
public boolean hasStatus() {
@@ -84,17 +84,17 @@ public boolean hasStatus() {
}
/**
- * optional .ClientTurnSnapshotStatus status = 2;
+ * optional .BattleEventInitedData status = 2;
* @return this
*/
- public ClientTurnSnapshot clearStatus() {
+ public BattleEventBattleInfo clearStatus() {
bitField0_ &= ~0x00000002;
status.clear();
return this;
}
/**
- * optional .ClientTurnSnapshotStatus status = 2;
+ * optional .BattleEventInitedData status = 2;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -103,12 +103,12 @@ public ClientTurnSnapshot clearStatus() {
*
* @return internal storage object for reading
*/
- public ClientTurnSnapshotStatusOuterClass.ClientTurnSnapshotStatus getStatus() {
+ public BattleEventInitedDataOuterClass.BattleEventInitedData getStatus() {
return status;
}
/**
- * optional .ClientTurnSnapshotStatus status = 2;
+ * optional .BattleEventInitedData status = 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
@@ -116,25 +116,25 @@ public ClientTurnSnapshotStatusOuterClass.ClientTurnSnapshotStatus getStatus() {
*
* @return internal storage object for modifications
*/
- public ClientTurnSnapshotStatusOuterClass.ClientTurnSnapshotStatus getMutableStatus() {
+ public BattleEventInitedDataOuterClass.BattleEventInitedData getMutableStatus() {
bitField0_ |= 0x00000002;
return status;
}
/**
- * optional .ClientTurnSnapshotStatus status = 2;
+ * optional .BattleEventInitedData status = 2;
* @param value the status to set
* @return this
*/
- public ClientTurnSnapshot setStatus(
- final ClientTurnSnapshotStatusOuterClass.ClientTurnSnapshotStatus value) {
+ public BattleEventBattleInfo setStatus(
+ final BattleEventInitedDataOuterClass.BattleEventInitedData value) {
bitField0_ |= 0x00000002;
status.copyFrom(value);
return this;
}
@Override
- public ClientTurnSnapshot copyFrom(final ClientTurnSnapshot other) {
+ public BattleEventBattleInfo copyFrom(final BattleEventBattleInfo other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
@@ -145,7 +145,7 @@ public ClientTurnSnapshot copyFrom(final ClientTurnSnapshot other) {
}
@Override
- public ClientTurnSnapshot mergeFrom(final ClientTurnSnapshot other) {
+ public BattleEventBattleInfo mergeFrom(final BattleEventBattleInfo other) {
if (other.isEmpty()) {
return this;
}
@@ -160,7 +160,7 @@ public ClientTurnSnapshot mergeFrom(final ClientTurnSnapshot other) {
}
@Override
- public ClientTurnSnapshot clear() {
+ public BattleEventBattleInfo clear() {
if (isEmpty()) {
return this;
}
@@ -172,7 +172,7 @@ public ClientTurnSnapshot clear() {
}
@Override
- public ClientTurnSnapshot clearQuick() {
+ public BattleEventBattleInfo clearQuick() {
if (isEmpty()) {
return this;
}
@@ -187,10 +187,10 @@ public boolean equals(Object o) {
if (o == this) {
return true;
}
- if (!(o instanceof ClientTurnSnapshot)) {
+ if (!(o instanceof BattleEventBattleInfo)) {
return false;
}
- ClientTurnSnapshot other = (ClientTurnSnapshot) o;
+ BattleEventBattleInfo other = (BattleEventBattleInfo) o;
return bitField0_ == other.bitField0_
&& (!hasBattleEventId() || battleEventId == other.battleEventId)
&& (!hasStatus() || status.equals(other.status));
@@ -222,7 +222,7 @@ protected int computeSerializedSize() {
@Override
@SuppressWarnings("fallthrough")
- public ClientTurnSnapshot mergeFrom(final ProtoSource input) throws IOException {
+ public BattleEventBattleInfo mergeFrom(final ProtoSource input) throws IOException {
// Enabled Fall-Through Optimization (QuickBuffers)
int tag = input.readTag();
while (true) {
@@ -272,7 +272,7 @@ public void writeTo(final JsonSink output) throws IOException {
}
@Override
- public ClientTurnSnapshot mergeFrom(final JsonSource input) throws IOException {
+ public BattleEventBattleInfo mergeFrom(final JsonSource input) throws IOException {
if (!input.beginObject()) {
return this;
}
@@ -312,8 +312,8 @@ public ClientTurnSnapshot mergeFrom(final JsonSource input) throws IOException {
}
@Override
- public ClientTurnSnapshot clone() {
- return new ClientTurnSnapshot().copyFrom(this);
+ public BattleEventBattleInfo clone() {
+ return new BattleEventBattleInfo().copyFrom(this);
}
@Override
@@ -321,32 +321,32 @@ public boolean isEmpty() {
return ((bitField0_) == 0);
}
- public static ClientTurnSnapshot parseFrom(final byte[] data) throws
+ public static BattleEventBattleInfo parseFrom(final byte[] data) throws
InvalidProtocolBufferException {
- return ProtoMessage.mergeFrom(new ClientTurnSnapshot(), data).checkInitialized();
+ return ProtoMessage.mergeFrom(new BattleEventBattleInfo(), data).checkInitialized();
}
- public static ClientTurnSnapshot parseFrom(final ProtoSource input) throws IOException {
- return ProtoMessage.mergeFrom(new ClientTurnSnapshot(), input).checkInitialized();
+ public static BattleEventBattleInfo parseFrom(final ProtoSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new BattleEventBattleInfo(), input).checkInitialized();
}
- public static ClientTurnSnapshot parseFrom(final JsonSource input) throws IOException {
- return ProtoMessage.mergeFrom(new ClientTurnSnapshot(), input).checkInitialized();
+ public static BattleEventBattleInfo parseFrom(final JsonSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new BattleEventBattleInfo(), input).checkInitialized();
}
/**
- * @return factory for creating ClientTurnSnapshot messages
+ * @return factory for creating BattleEventBattleInfo messages
*/
- public static MessageFactory getFactory() {
- return ClientTurnSnapshotFactory.INSTANCE;
+ public static MessageFactory getFactory() {
+ return BattleEventBattleInfoFactory.INSTANCE;
}
- private enum ClientTurnSnapshotFactory implements MessageFactory {
+ private enum BattleEventBattleInfoFactory implements MessageFactory {
INSTANCE;
@Override
- public ClientTurnSnapshot create() {
- return ClientTurnSnapshot.newInstance();
+ public BattleEventBattleInfo create() {
+ return BattleEventBattleInfo.newInstance();
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ClientTurnSnapshotStatusOuterClass.java b/src/generated/main/emu/lunarcore/proto/BattleEventInitedDataOuterClass.java
similarity index 71%
rename from src/generated/main/emu/lunarcore/proto/ClientTurnSnapshotStatusOuterClass.java
rename to src/generated/main/emu/lunarcore/proto/BattleEventInitedDataOuterClass.java
index 6d9f8cb12..e52faca9e 100644
--- a/src/generated/main/emu/lunarcore/proto/ClientTurnSnapshotStatusOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/BattleEventInitedDataOuterClass.java
@@ -11,11 +11,11 @@
import us.hebi.quickbuf.ProtoSink;
import us.hebi.quickbuf.ProtoSource;
-public final class ClientTurnSnapshotStatusOuterClass {
+public final class BattleEventInitedDataOuterClass {
/**
- * Protobuf type {@code ClientTurnSnapshotStatus}
+ * Protobuf type {@code BattleEventInitedData}
*/
- public static final class ClientTurnSnapshotStatus extends ProtoMessage implements Cloneable {
+ public static final class BattleEventInitedData extends ProtoMessage implements Cloneable {
private static final long serialVersionUID = 0L;
/**
@@ -23,14 +23,14 @@ public static final class ClientTurnSnapshotStatus extends ProtoMessageoptional .SpBarInfo sp_bar = 2;
* @return this
*/
- public ClientTurnSnapshotStatus clearSpBar() {
+ public BattleEventInitedData clearSpBar() {
bitField0_ &= ~0x00000001;
spBar.clear();
return this;
@@ -84,14 +84,14 @@ public SpBarInfoOuterClass.SpBarInfo getMutableSpBar() {
* @param value the spBar to set
* @return this
*/
- public ClientTurnSnapshotStatus setSpBar(final SpBarInfoOuterClass.SpBarInfo value) {
+ public BattleEventInitedData setSpBar(final SpBarInfoOuterClass.SpBarInfo value) {
bitField0_ |= 0x00000001;
spBar.copyFrom(value);
return this;
}
@Override
- public ClientTurnSnapshotStatus copyFrom(final ClientTurnSnapshotStatus other) {
+ public BattleEventInitedData copyFrom(final BattleEventInitedData other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
@@ -101,7 +101,7 @@ public ClientTurnSnapshotStatus copyFrom(final ClientTurnSnapshotStatus other) {
}
@Override
- public ClientTurnSnapshotStatus mergeFrom(final ClientTurnSnapshotStatus other) {
+ public BattleEventInitedData mergeFrom(final BattleEventInitedData other) {
if (other.isEmpty()) {
return this;
}
@@ -113,7 +113,7 @@ public ClientTurnSnapshotStatus mergeFrom(final ClientTurnSnapshotStatus other)
}
@Override
- public ClientTurnSnapshotStatus clear() {
+ public BattleEventInitedData clear() {
if (isEmpty()) {
return this;
}
@@ -124,7 +124,7 @@ public ClientTurnSnapshotStatus clear() {
}
@Override
- public ClientTurnSnapshotStatus clearQuick() {
+ public BattleEventInitedData clearQuick() {
if (isEmpty()) {
return this;
}
@@ -139,10 +139,10 @@ public boolean equals(Object o) {
if (o == this) {
return true;
}
- if (!(o instanceof ClientTurnSnapshotStatus)) {
+ if (!(o instanceof BattleEventInitedData)) {
return false;
}
- ClientTurnSnapshotStatus other = (ClientTurnSnapshotStatus) o;
+ BattleEventInitedData other = (BattleEventInitedData) o;
return bitField0_ == other.bitField0_
&& (!hasSpBar() || spBar.equals(other.spBar));
}
@@ -166,7 +166,7 @@ protected int computeSerializedSize() {
@Override
@SuppressWarnings("fallthrough")
- public ClientTurnSnapshotStatus mergeFrom(final ProtoSource input) throws IOException {
+ public BattleEventInitedData mergeFrom(final ProtoSource input) throws IOException {
// Enabled Fall-Through Optimization (QuickBuffers)
int tag = input.readTag();
while (true) {
@@ -204,7 +204,7 @@ public void writeTo(final JsonSink output) throws IOException {
}
@Override
- public ClientTurnSnapshotStatus mergeFrom(final JsonSource input) throws IOException {
+ public BattleEventInitedData mergeFrom(final JsonSource input) throws IOException {
if (!input.beginObject()) {
return this;
}
@@ -233,8 +233,8 @@ public ClientTurnSnapshotStatus mergeFrom(final JsonSource input) throws IOExcep
}
@Override
- public ClientTurnSnapshotStatus clone() {
- return new ClientTurnSnapshotStatus().copyFrom(this);
+ public BattleEventInitedData clone() {
+ return new BattleEventInitedData().copyFrom(this);
}
@Override
@@ -242,32 +242,32 @@ public boolean isEmpty() {
return ((bitField0_) == 0);
}
- public static ClientTurnSnapshotStatus parseFrom(final byte[] data) throws
+ public static BattleEventInitedData parseFrom(final byte[] data) throws
InvalidProtocolBufferException {
- return ProtoMessage.mergeFrom(new ClientTurnSnapshotStatus(), data).checkInitialized();
+ return ProtoMessage.mergeFrom(new BattleEventInitedData(), data).checkInitialized();
}
- public static ClientTurnSnapshotStatus parseFrom(final ProtoSource input) throws IOException {
- return ProtoMessage.mergeFrom(new ClientTurnSnapshotStatus(), input).checkInitialized();
+ public static BattleEventInitedData parseFrom(final ProtoSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new BattleEventInitedData(), input).checkInitialized();
}
- public static ClientTurnSnapshotStatus parseFrom(final JsonSource input) throws IOException {
- return ProtoMessage.mergeFrom(new ClientTurnSnapshotStatus(), input).checkInitialized();
+ public static BattleEventInitedData parseFrom(final JsonSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new BattleEventInitedData(), input).checkInitialized();
}
/**
- * @return factory for creating ClientTurnSnapshotStatus messages
+ * @return factory for creating BattleEventInitedData messages
*/
- public static MessageFactory getFactory() {
- return ClientTurnSnapshotStatusFactory.INSTANCE;
+ public static MessageFactory getFactory() {
+ return BattleEventInitedDataFactory.INSTANCE;
}
- private enum ClientTurnSnapshotStatusFactory implements MessageFactory {
+ private enum BattleEventInitedDataFactory implements MessageFactory {
INSTANCE;
@Override
- public ClientTurnSnapshotStatus create() {
- return ClientTurnSnapshotStatus.newInstance();
+ public BattleEventInitedData create() {
+ return BattleEventInitedData.newInstance();
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java b/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java
index e94ac5085..e6459cb7d 100644
--- a/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java
@@ -21,12 +21,12 @@ public static final class BoardDataSync extends ProtoMessage impl
private static final long serialVersionUID = 0L;
/**
- * optional string signature = 5;
+ * optional string signature = 10;
*/
private final Utf8String signature = Utf8String.newEmptyInstance();
/**
- * repeated .HeadIcon unlocked_head_icon_list = 4;
+ * repeated .HeadIcon unlocked_head_icon_list = 9;
*/
private final RepeatedMessage unlockedHeadIconList = RepeatedMessage.newEmptyInstance(HeadIconOuterClass.HeadIcon.getFactory());
@@ -41,7 +41,7 @@ public static BoardDataSync newInstance() {
}
/**
- * optional string signature = 5;
+ * optional string signature = 10;
* @return whether the signature field is set
*/
public boolean hasSignature() {
@@ -49,7 +49,7 @@ public boolean hasSignature() {
}
/**
- * optional string signature = 5;
+ * optional string signature = 10;
* @return this
*/
public BoardDataSync clearSignature() {
@@ -59,7 +59,7 @@ public BoardDataSync clearSignature() {
}
/**
- * optional string signature = 5;
+ * optional string signature = 10;
* @return the signature
*/
public String getSignature() {
@@ -67,7 +67,7 @@ public String getSignature() {
}
/**
- * optional string signature = 5;
+ * optional string signature = 10;
* @return internal {@code Utf8String} representation of signature for reading
*/
public Utf8String getSignatureBytes() {
@@ -75,7 +75,7 @@ public Utf8String getSignatureBytes() {
}
/**
- * optional string signature = 5;
+ * optional string signature = 10;
* @return internal {@code Utf8String} representation of signature for modifications
*/
public Utf8String getMutableSignatureBytes() {
@@ -84,7 +84,7 @@ public Utf8String getMutableSignatureBytes() {
}
/**
- * optional string signature = 5;
+ * optional string signature = 10;
* @param value the signature to set
* @return this
*/
@@ -95,7 +95,7 @@ public BoardDataSync setSignature(final CharSequence value) {
}
/**
- * optional string signature = 5;
+ * optional string signature = 10;
* @param value the signature to set
* @return this
*/
@@ -106,7 +106,7 @@ public BoardDataSync setSignature(final Utf8String value) {
}
/**
- * repeated .HeadIcon unlocked_head_icon_list = 4;
+ * repeated .HeadIcon unlocked_head_icon_list = 9;
* @return whether the unlockedHeadIconList field is set
*/
public boolean hasUnlockedHeadIconList() {
@@ -114,7 +114,7 @@ public boolean hasUnlockedHeadIconList() {
}
/**
- * repeated .HeadIcon unlocked_head_icon_list = 4;
+ * repeated .HeadIcon unlocked_head_icon_list = 9;
* @return this
*/
public BoardDataSync clearUnlockedHeadIconList() {
@@ -124,7 +124,7 @@ public BoardDataSync clearUnlockedHeadIconList() {
}
/**
- * repeated .HeadIcon unlocked_head_icon_list = 4;
+ * repeated .HeadIcon unlocked_head_icon_list = 9;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -138,7 +138,7 @@ public RepeatedMessage getUnlockedHeadIconList() {
}
/**
- * repeated .HeadIcon unlocked_head_icon_list = 4;
+ * repeated .HeadIcon unlocked_head_icon_list = 9;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -152,7 +152,7 @@ public RepeatedMessage getMutableUnlockedHeadIconLi
}
/**
- * repeated .HeadIcon unlocked_head_icon_list = 4;
+ * repeated .HeadIcon unlocked_head_icon_list = 9;
* @param value the unlockedHeadIconList to add
* @return this
*/
@@ -163,7 +163,7 @@ public BoardDataSync addUnlockedHeadIconList(final HeadIconOuterClass.HeadIcon v
}
/**
- * repeated .HeadIcon unlocked_head_icon_list = 4;
+ * repeated .HeadIcon unlocked_head_icon_list = 9;
* @param values the unlockedHeadIconList to add
* @return this
*/
@@ -240,12 +240,12 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 42);
+ output.writeRawByte((byte) 82);
output.writeStringNoTag(signature);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < unlockedHeadIconList.length(); i++) {
- output.writeRawByte((byte) 34);
+ output.writeRawByte((byte) 74);
output.writeMessageNoTag(unlockedHeadIconList.get(i));
}
}
@@ -270,16 +270,16 @@ public BoardDataSync mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 42: {
+ case 82: {
// signature
input.readString(signature);
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 34) {
+ if (tag != 74) {
break;
}
}
- case 34: {
+ case 74: {
// unlockedHeadIconList
tag = input.readRepeatedMessage(unlockedHeadIconList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java
index c72a3e617..bdc8fbb6f 100644
--- a/src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java
@@ -22,37 +22,37 @@ public static final class BuffInfo extends ProtoMessage implements Clo
private static final long serialVersionUID = 0L;
/**
- * optional uint64 add_time_ms = 2;
+ * optional uint64 add_time_ms = 13;
*/
private long addTimeMs;
/**
- * optional float life_time = 3;
+ * optional float life_time = 12;
*/
private float lifeTime;
/**
- * optional uint32 base_avatar_id = 5;
+ * optional uint32 base_avatar_id = 1;
*/
private int baseAvatarId;
/**
- * optional uint32 count = 6;
+ * optional uint32 level = 6;
*/
- private int count;
+ private int level;
/**
- * optional uint32 buff_id = 14;
+ * optional uint32 count = 7;
*/
- private int buffId;
+ private int count;
/**
- * optional uint32 level = 15;
+ * optional uint32 buff_id = 15;
*/
- private int level;
+ private int buffId;
/**
- * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 7;
+ * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 10;
*/
private final RepeatedMessage dynamicValues = RepeatedMessage.newEmptyInstance(DynamicValuesEntry.getFactory());
@@ -67,7 +67,7 @@ public static BuffInfo newInstance() {
}
/**
- * optional uint64 add_time_ms = 2;
+ * optional uint64 add_time_ms = 13;
* @return whether the addTimeMs field is set
*/
public boolean hasAddTimeMs() {
@@ -75,7 +75,7 @@ public boolean hasAddTimeMs() {
}
/**
- * optional uint64 add_time_ms = 2;
+ * optional uint64 add_time_ms = 13;
* @return this
*/
public BuffInfo clearAddTimeMs() {
@@ -85,7 +85,7 @@ public BuffInfo clearAddTimeMs() {
}
/**
- * optional uint64 add_time_ms = 2;
+ * optional uint64 add_time_ms = 13;
* @return the addTimeMs
*/
public long getAddTimeMs() {
@@ -93,7 +93,7 @@ public long getAddTimeMs() {
}
/**
- * optional uint64 add_time_ms = 2;
+ * optional uint64 add_time_ms = 13;
* @param value the addTimeMs to set
* @return this
*/
@@ -104,7 +104,7 @@ public BuffInfo setAddTimeMs(final long value) {
}
/**
- * optional float life_time = 3;
+ * optional float life_time = 12;
* @return whether the lifeTime field is set
*/
public boolean hasLifeTime() {
@@ -112,7 +112,7 @@ public boolean hasLifeTime() {
}
/**
- * optional float life_time = 3;
+ * optional float life_time = 12;
* @return this
*/
public BuffInfo clearLifeTime() {
@@ -122,7 +122,7 @@ public BuffInfo clearLifeTime() {
}
/**
- * optional float life_time = 3;
+ * optional float life_time = 12;
* @return the lifeTime
*/
public float getLifeTime() {
@@ -130,7 +130,7 @@ public float getLifeTime() {
}
/**
- * optional float life_time = 3;
+ * optional float life_time = 12;
* @param value the lifeTime to set
* @return this
*/
@@ -141,7 +141,7 @@ public BuffInfo setLifeTime(final float value) {
}
/**
- * optional uint32 base_avatar_id = 5;
+ * optional uint32 base_avatar_id = 1;
* @return whether the baseAvatarId field is set
*/
public boolean hasBaseAvatarId() {
@@ -149,7 +149,7 @@ public boolean hasBaseAvatarId() {
}
/**
- * optional uint32 base_avatar_id = 5;
+ * optional uint32 base_avatar_id = 1;
* @return this
*/
public BuffInfo clearBaseAvatarId() {
@@ -159,7 +159,7 @@ public BuffInfo clearBaseAvatarId() {
}
/**
- * optional uint32 base_avatar_id = 5;
+ * optional uint32 base_avatar_id = 1;
* @return the baseAvatarId
*/
public int getBaseAvatarId() {
@@ -167,7 +167,7 @@ public int getBaseAvatarId() {
}
/**
- * optional uint32 base_avatar_id = 5;
+ * optional uint32 base_avatar_id = 1;
* @param value the baseAvatarId to set
* @return this
*/
@@ -178,118 +178,118 @@ public BuffInfo setBaseAvatarId(final int value) {
}
/**
- * optional uint32 count = 6;
- * @return whether the count field is set
+ * optional uint32 level = 6;
+ * @return whether the level field is set
*/
- public boolean hasCount() {
+ public boolean hasLevel() {
return (bitField0_ & 0x00000008) != 0;
}
/**
- * optional uint32 count = 6;
+ * optional uint32 level = 6;
* @return this
*/
- public BuffInfo clearCount() {
+ public BuffInfo clearLevel() {
bitField0_ &= ~0x00000008;
- count = 0;
+ level = 0;
return this;
}
/**
- * optional uint32 count = 6;
- * @return the count
+ * optional uint32 level = 6;
+ * @return the level
*/
- public int getCount() {
- return count;
+ public int getLevel() {
+ return level;
}
/**
- * optional uint32 count = 6;
- * @param value the count to set
+ * optional uint32 level = 6;
+ * @param value the level to set
* @return this
*/
- public BuffInfo setCount(final int value) {
+ public BuffInfo setLevel(final int value) {
bitField0_ |= 0x00000008;
- count = value;
+ level = value;
return this;
}
/**
- * optional uint32 buff_id = 14;
- * @return whether the buffId field is set
+ * optional uint32 count = 7;
+ * @return whether the count field is set
*/
- public boolean hasBuffId() {
+ public boolean hasCount() {
return (bitField0_ & 0x00000010) != 0;
}
/**
- * optional uint32 buff_id = 14;
+ * optional uint32 count = 7;
* @return this
*/
- public BuffInfo clearBuffId() {
+ public BuffInfo clearCount() {
bitField0_ &= ~0x00000010;
- buffId = 0;
+ count = 0;
return this;
}
/**
- * optional uint32 buff_id = 14;
- * @return the buffId
+ * optional uint32 count = 7;
+ * @return the count
*/
- public int getBuffId() {
- return buffId;
+ public int getCount() {
+ return count;
}
/**
- * optional uint32 buff_id = 14;
- * @param value the buffId to set
+ * optional uint32 count = 7;
+ * @param value the count to set
* @return this
*/
- public BuffInfo setBuffId(final int value) {
+ public BuffInfo setCount(final int value) {
bitField0_ |= 0x00000010;
- buffId = value;
+ count = value;
return this;
}
/**
- * optional uint32 level = 15;
- * @return whether the level field is set
+ * optional uint32 buff_id = 15;
+ * @return whether the buffId field is set
*/
- public boolean hasLevel() {
+ public boolean hasBuffId() {
return (bitField0_ & 0x00000020) != 0;
}
/**
- * optional uint32 level = 15;
+ * optional uint32 buff_id = 15;
* @return this
*/
- public BuffInfo clearLevel() {
+ public BuffInfo clearBuffId() {
bitField0_ &= ~0x00000020;
- level = 0;
+ buffId = 0;
return this;
}
/**
- * optional uint32 level = 15;
- * @return the level
+ * optional uint32 buff_id = 15;
+ * @return the buffId
*/
- public int getLevel() {
- return level;
+ public int getBuffId() {
+ return buffId;
}
/**
- * optional uint32 level = 15;
- * @param value the level to set
+ * optional uint32 buff_id = 15;
+ * @param value the buffId to set
* @return this
*/
- public BuffInfo setLevel(final int value) {
+ public BuffInfo setBuffId(final int value) {
bitField0_ |= 0x00000020;
- level = value;
+ buffId = value;
return this;
}
/**
- * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 7;
+ * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 10;
* @return whether the dynamicValues field is set
*/
public boolean hasDynamicValues() {
@@ -297,7 +297,7 @@ public boolean hasDynamicValues() {
}
/**
- * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 7;
+ * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 10;
* @return this
*/
public BuffInfo clearDynamicValues() {
@@ -307,7 +307,7 @@ public BuffInfo clearDynamicValues() {
}
/**
- * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 7;
+ * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 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.
@@ -321,7 +321,7 @@ public RepeatedMessage getDynamicValues() {
}
/**
- * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 7;
+ * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 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
@@ -335,7 +335,7 @@ public RepeatedMessage getMutableDynamicValues() {
}
/**
- * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 7;
+ * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 10;
* @param value the dynamicValues to add
* @return this
*/
@@ -346,7 +346,7 @@ public BuffInfo addDynamicValues(final DynamicValuesEntry value) {
}
/**
- * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 7;
+ * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 10;
* @param values the dynamicValues to add
* @return this
*/
@@ -364,9 +364,9 @@ public BuffInfo copyFrom(final BuffInfo other) {
addTimeMs = other.addTimeMs;
lifeTime = other.lifeTime;
baseAvatarId = other.baseAvatarId;
+ level = other.level;
count = other.count;
buffId = other.buffId;
- level = other.level;
dynamicValues.copyFrom(other.dynamicValues);
}
return this;
@@ -387,15 +387,15 @@ public BuffInfo mergeFrom(final BuffInfo other) {
if (other.hasBaseAvatarId()) {
setBaseAvatarId(other.baseAvatarId);
}
+ if (other.hasLevel()) {
+ setLevel(other.level);
+ }
if (other.hasCount()) {
setCount(other.count);
}
if (other.hasBuffId()) {
setBuffId(other.buffId);
}
- if (other.hasLevel()) {
- setLevel(other.level);
- }
if (other.hasDynamicValues()) {
getMutableDynamicValues().addAll(other.dynamicValues);
}
@@ -412,9 +412,9 @@ public BuffInfo clear() {
addTimeMs = 0L;
lifeTime = 0F;
baseAvatarId = 0;
+ level = 0;
count = 0;
buffId = 0;
- level = 0;
dynamicValues.clear();
return this;
}
@@ -443,41 +443,41 @@ public boolean equals(Object o) {
&& (!hasAddTimeMs() || addTimeMs == other.addTimeMs)
&& (!hasLifeTime() || ProtoUtil.isEqual(lifeTime, other.lifeTime))
&& (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
+ && (!hasLevel() || level == other.level)
&& (!hasCount() || count == other.count)
&& (!hasBuffId() || buffId == other.buffId)
- && (!hasLevel() || level == other.level)
&& (!hasDynamicValues() || dynamicValues.equals(other.dynamicValues));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 104);
output.writeUInt64NoTag(addTimeMs);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 29);
+ output.writeRawByte((byte) 101);
output.writeFloatNoTag(lifeTime);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(baseAvatarId);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeRawByte((byte) 48);
- output.writeUInt32NoTag(count);
+ output.writeUInt32NoTag(level);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 112);
- output.writeUInt32NoTag(buffId);
+ output.writeRawByte((byte) 56);
+ output.writeUInt32NoTag(count);
}
if ((bitField0_ & 0x00000020) != 0) {
output.writeRawByte((byte) 120);
- output.writeUInt32NoTag(level);
+ output.writeUInt32NoTag(buffId);
}
if ((bitField0_ & 0x00000040) != 0) {
for (int i = 0; i < dynamicValues.length(); i++) {
- output.writeRawByte((byte) 58);
+ output.writeRawByte((byte) 82);
output.writeMessageNoTag(dynamicValues.get(i));
}
}
@@ -496,13 +496,13 @@ protected int computeSerializedSize() {
size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(count);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(count);
}
if ((bitField0_ & 0x00000020) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId);
}
if ((bitField0_ & 0x00000040) != 0) {
size += (1 * dynamicValues.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dynamicValues);
@@ -517,25 +517,25 @@ public BuffInfo mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
+ case 104: {
// addTimeMs
addTimeMs = input.readUInt64();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 29) {
+ if (tag != 101) {
break;
}
}
- case 29: {
+ case 101: {
// lifeTime
lifeTime = input.readFloat();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 40) {
+ if (tag != 8) {
break;
}
}
- case 40: {
+ case 8: {
// baseAvatarId
baseAvatarId = input.readUInt32();
bitField0_ |= 0x00000004;
@@ -545,17 +545,17 @@ public BuffInfo mergeFrom(final ProtoSource input) throws IOException {
}
}
case 48: {
- // count
- count = input.readUInt32();
+ // level
+ level = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 112) {
+ if (tag != 56) {
break;
}
}
- case 112: {
- // buffId
- buffId = input.readUInt32();
+ case 56: {
+ // count
+ count = input.readUInt32();
bitField0_ |= 0x00000010;
tag = input.readTag();
if (tag != 120) {
@@ -563,15 +563,15 @@ public BuffInfo mergeFrom(final ProtoSource input) throws IOException {
}
}
case 120: {
- // level
- level = input.readUInt32();
+ // buffId
+ buffId = input.readUInt32();
bitField0_ |= 0x00000020;
tag = input.readTag();
- if (tag != 58) {
+ if (tag != 82) {
break;
}
}
- case 58: {
+ case 82: {
// dynamicValues
tag = input.readRepeatedMessage(dynamicValues, tag);
bitField0_ |= 0x00000040;
@@ -606,13 +606,13 @@ public void writeTo(final JsonSink output) throws IOException {
output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.count, count);
+ output.writeUInt32(FieldNames.level, level);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeUInt32(FieldNames.buffId, buffId);
+ output.writeUInt32(FieldNames.count, count);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeUInt32(FieldNames.level, level);
+ output.writeUInt32(FieldNames.buffId, buffId);
}
if ((bitField0_ & 0x00000040) != 0) {
output.writeRepeatedMessage(FieldNames.dynamicValues, dynamicValues);
@@ -663,10 +663,10 @@ public BuffInfo mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 94851343: {
- if (input.isAtField(FieldNames.count)) {
+ case 102865796: {
+ if (input.isAtField(FieldNames.level)) {
if (!input.trySkipNullValue()) {
- count = input.readUInt32();
+ level = input.readUInt32();
bitField0_ |= 0x00000008;
}
} else {
@@ -674,11 +674,10 @@ public BuffInfo mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case -1378119474:
- case 227990663: {
- if (input.isAtField(FieldNames.buffId)) {
+ case 94851343: {
+ if (input.isAtField(FieldNames.count)) {
if (!input.trySkipNullValue()) {
- buffId = input.readUInt32();
+ count = input.readUInt32();
bitField0_ |= 0x00000010;
}
} else {
@@ -686,10 +685,11 @@ public BuffInfo mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 102865796: {
- if (input.isAtField(FieldNames.level)) {
+ case -1378119474:
+ case 227990663: {
+ if (input.isAtField(FieldNames.buffId)) {
if (!input.trySkipNullValue()) {
- level = input.readUInt32();
+ buffId = input.readUInt32();
bitField0_ |= 0x00000020;
}
} else {
@@ -1121,12 +1121,12 @@ static class FieldNames {
static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
+ static final FieldName level = FieldName.forField("level");
+
static final FieldName count = FieldName.forField("count");
static final FieldName buffId = FieldName.forField("buffId", "buff_id");
- static final FieldName level = FieldName.forField("level");
-
static final FieldName dynamicValues = FieldName.forField("dynamicValues", "dynamic_values");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java
index 50bc19b92..10c026178 100644
--- a/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java
@@ -19,14 +19,14 @@ public static final class BuyGoodsCsReq extends ProtoMessage impl
private static final long serialVersionUID = 0L;
/**
- * optional uint32 item_id = 2;
+ * optional uint32 item_id = 5;
*/
private int itemId;
/**
- * optional uint32 shop_id = 8;
+ * optional uint32 goods_id = 7;
*/
- private int shopId;
+ private int goodsId;
/**
* optional uint32 goods_num = 9;
@@ -34,9 +34,9 @@ public static final class BuyGoodsCsReq extends ProtoMessage impl
private int goodsNum;
/**
- * optional uint32 goods_id = 12;
+ * optional uint32 shop_id = 12;
*/
- private int goodsId;
+ private int shopId;
private BuyGoodsCsReq() {
}
@@ -49,7 +49,7 @@ public static BuyGoodsCsReq newInstance() {
}
/**
- * optional uint32 item_id = 2;
+ * optional uint32 item_id = 5;
* @return whether the itemId field is set
*/
public boolean hasItemId() {
@@ -57,7 +57,7 @@ public boolean hasItemId() {
}
/**
- * optional uint32 item_id = 2;
+ * optional uint32 item_id = 5;
* @return this
*/
public BuyGoodsCsReq clearItemId() {
@@ -67,7 +67,7 @@ public BuyGoodsCsReq clearItemId() {
}
/**
- * optional uint32 item_id = 2;
+ * optional uint32 item_id = 5;
* @return the itemId
*/
public int getItemId() {
@@ -75,7 +75,7 @@ public int getItemId() {
}
/**
- * optional uint32 item_id = 2;
+ * optional uint32 item_id = 5;
* @param value the itemId to set
* @return this
*/
@@ -86,39 +86,39 @@ public BuyGoodsCsReq setItemId(final int value) {
}
/**
- * optional uint32 shop_id = 8;
- * @return whether the shopId field is set
+ * optional uint32 goods_id = 7;
+ * @return whether the goodsId field is set
*/
- public boolean hasShopId() {
+ public boolean hasGoodsId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 shop_id = 8;
+ * optional uint32 goods_id = 7;
* @return this
*/
- public BuyGoodsCsReq clearShopId() {
+ public BuyGoodsCsReq clearGoodsId() {
bitField0_ &= ~0x00000002;
- shopId = 0;
+ goodsId = 0;
return this;
}
/**
- * optional uint32 shop_id = 8;
- * @return the shopId
+ * optional uint32 goods_id = 7;
+ * @return the goodsId
*/
- public int getShopId() {
- return shopId;
+ public int getGoodsId() {
+ return goodsId;
}
/**
- * optional uint32 shop_id = 8;
- * @param value the shopId to set
+ * optional uint32 goods_id = 7;
+ * @param value the goodsId to set
* @return this
*/
- public BuyGoodsCsReq setShopId(final int value) {
+ public BuyGoodsCsReq setGoodsId(final int value) {
bitField0_ |= 0x00000002;
- shopId = value;
+ goodsId = value;
return this;
}
@@ -160,39 +160,39 @@ public BuyGoodsCsReq setGoodsNum(final int value) {
}
/**
- * optional uint32 goods_id = 12;
- * @return whether the goodsId field is set
+ * optional uint32 shop_id = 12;
+ * @return whether the shopId field is set
*/
- public boolean hasGoodsId() {
+ public boolean hasShopId() {
return (bitField0_ & 0x00000008) != 0;
}
/**
- * optional uint32 goods_id = 12;
+ * optional uint32 shop_id = 12;
* @return this
*/
- public BuyGoodsCsReq clearGoodsId() {
+ public BuyGoodsCsReq clearShopId() {
bitField0_ &= ~0x00000008;
- goodsId = 0;
+ shopId = 0;
return this;
}
/**
- * optional uint32 goods_id = 12;
- * @return the goodsId
+ * optional uint32 shop_id = 12;
+ * @return the shopId
*/
- public int getGoodsId() {
- return goodsId;
+ public int getShopId() {
+ return shopId;
}
/**
- * optional uint32 goods_id = 12;
- * @param value the goodsId to set
+ * optional uint32 shop_id = 12;
+ * @param value the shopId to set
* @return this
*/
- public BuyGoodsCsReq setGoodsId(final int value) {
+ public BuyGoodsCsReq setShopId(final int value) {
bitField0_ |= 0x00000008;
- goodsId = value;
+ shopId = value;
return this;
}
@@ -202,9 +202,9 @@ public BuyGoodsCsReq copyFrom(final BuyGoodsCsReq other) {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
itemId = other.itemId;
- shopId = other.shopId;
- goodsNum = other.goodsNum;
goodsId = other.goodsId;
+ goodsNum = other.goodsNum;
+ shopId = other.shopId;
}
return this;
}
@@ -218,14 +218,14 @@ public BuyGoodsCsReq mergeFrom(final BuyGoodsCsReq other) {
if (other.hasItemId()) {
setItemId(other.itemId);
}
- if (other.hasShopId()) {
- setShopId(other.shopId);
+ if (other.hasGoodsId()) {
+ setGoodsId(other.goodsId);
}
if (other.hasGoodsNum()) {
setGoodsNum(other.goodsNum);
}
- if (other.hasGoodsId()) {
- setGoodsId(other.goodsId);
+ if (other.hasShopId()) {
+ setShopId(other.shopId);
}
return this;
}
@@ -238,9 +238,9 @@ public BuyGoodsCsReq clear() {
cachedSize = -1;
bitField0_ = 0;
itemId = 0;
- shopId = 0;
- goodsNum = 0;
goodsId = 0;
+ goodsNum = 0;
+ shopId = 0;
return this;
}
@@ -265,20 +265,20 @@ public boolean equals(Object o) {
BuyGoodsCsReq other = (BuyGoodsCsReq) o;
return bitField0_ == other.bitField0_
&& (!hasItemId() || itemId == other.itemId)
- && (!hasShopId() || shopId == other.shopId)
+ && (!hasGoodsId() || goodsId == other.goodsId)
&& (!hasGoodsNum() || goodsNum == other.goodsNum)
- && (!hasGoodsId() || goodsId == other.goodsId);
+ && (!hasShopId() || shopId == other.shopId);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(itemId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 64);
- output.writeUInt32NoTag(shopId);
+ output.writeRawByte((byte) 56);
+ output.writeUInt32NoTag(goodsId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 72);
@@ -286,7 +286,7 @@ public void writeTo(final ProtoSink output) throws IOException {
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeRawByte((byte) 96);
- output.writeUInt32NoTag(goodsId);
+ output.writeUInt32NoTag(shopId);
}
}
@@ -297,13 +297,13 @@ protected int computeSerializedSize() {
size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsNum);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId);
}
return size;
}
@@ -315,18 +315,18 @@ public BuyGoodsCsReq mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
+ case 40: {
// itemId
itemId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 64) {
+ if (tag != 56) {
break;
}
}
- case 64: {
- // shopId
- shopId = input.readUInt32();
+ case 56: {
+ // goodsId
+ goodsId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 72) {
@@ -343,8 +343,8 @@ public BuyGoodsCsReq mergeFrom(final ProtoSource input) throws IOException {
}
}
case 96: {
- // goodsId
- goodsId = input.readUInt32();
+ // shopId
+ shopId = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
if (tag != 0) {
@@ -372,13 +372,13 @@ public void writeTo(final JsonSink output) throws IOException {
output.writeUInt32(FieldNames.itemId, itemId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.shopId, shopId);
+ output.writeUInt32(FieldNames.goodsId, goodsId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.goodsNum, goodsNum);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.goodsId, goodsId);
+ output.writeUInt32(FieldNames.shopId, shopId);
}
output.endObject();
}
@@ -402,11 +402,11 @@ public BuyGoodsCsReq mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case -903151951:
- case 2067081988: {
- if (input.isAtField(FieldNames.shopId)) {
+ case 207037201:
+ case 2123207332: {
+ if (input.isAtField(FieldNames.goodsId)) {
if (!input.trySkipNullValue()) {
- shopId = input.readUInt32();
+ goodsId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -426,11 +426,11 @@ public BuyGoodsCsReq mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 207037201:
- case 2123207332: {
- if (input.isAtField(FieldNames.goodsId)) {
+ case -903151951:
+ case 2067081988: {
+ if (input.isAtField(FieldNames.shopId)) {
if (!input.trySkipNullValue()) {
- goodsId = input.readUInt32();
+ shopId = input.readUInt32();
bitField0_ |= 0x00000008;
}
} else {
@@ -492,11 +492,11 @@ public BuyGoodsCsReq create() {
static class FieldNames {
static final FieldName itemId = FieldName.forField("itemId", "item_id");
- static final FieldName shopId = FieldName.forField("shopId", "shop_id");
+ static final FieldName goodsId = FieldName.forField("goodsId", "goods_id");
static final FieldName goodsNum = FieldName.forField("goodsNum", "goods_num");
- static final FieldName goodsId = FieldName.forField("goodsId", "goods_id");
+ static final FieldName shopId = FieldName.forField("shopId", "shop_id");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java
index 5edb52f1f..72773dc51 100644
--- a/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java
@@ -24,22 +24,22 @@ public static final class BuyGoodsScRsp extends ProtoMessage impl
private int goodsId;
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 5;
*/
private int retcode;
/**
- * optional uint32 goods_buy_times = 11;
+ * optional uint32 goods_buy_times = 10;
*/
private int goodsBuyTimes;
/**
- * optional uint32 shop_id = 15;
+ * optional uint32 shop_id = 14;
*/
private int shopId;
/**
- * optional .ItemList return_item_list = 5;
+ * optional .ItemList return_item_list = 9;
*/
private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance();
@@ -91,7 +91,7 @@ public BuyGoodsScRsp setGoodsId(final int value) {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 5;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -99,7 +99,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 5;
* @return this
*/
public BuyGoodsScRsp clearRetcode() {
@@ -109,7 +109,7 @@ public BuyGoodsScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 5;
* @return the retcode
*/
public int getRetcode() {
@@ -117,7 +117,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 5;
* @param value the retcode to set
* @return this
*/
@@ -128,7 +128,7 @@ public BuyGoodsScRsp setRetcode(final int value) {
}
/**
- * optional uint32 goods_buy_times = 11;
+ * optional uint32 goods_buy_times = 10;
* @return whether the goodsBuyTimes field is set
*/
public boolean hasGoodsBuyTimes() {
@@ -136,7 +136,7 @@ public boolean hasGoodsBuyTimes() {
}
/**
- * optional uint32 goods_buy_times = 11;
+ * optional uint32 goods_buy_times = 10;
* @return this
*/
public BuyGoodsScRsp clearGoodsBuyTimes() {
@@ -146,7 +146,7 @@ public BuyGoodsScRsp clearGoodsBuyTimes() {
}
/**
- * optional uint32 goods_buy_times = 11;
+ * optional uint32 goods_buy_times = 10;
* @return the goodsBuyTimes
*/
public int getGoodsBuyTimes() {
@@ -154,7 +154,7 @@ public int getGoodsBuyTimes() {
}
/**
- * optional uint32 goods_buy_times = 11;
+ * optional uint32 goods_buy_times = 10;
* @param value the goodsBuyTimes to set
* @return this
*/
@@ -165,7 +165,7 @@ public BuyGoodsScRsp setGoodsBuyTimes(final int value) {
}
/**
- * optional uint32 shop_id = 15;
+ * optional uint32 shop_id = 14;
* @return whether the shopId field is set
*/
public boolean hasShopId() {
@@ -173,7 +173,7 @@ public boolean hasShopId() {
}
/**
- * optional uint32 shop_id = 15;
+ * optional uint32 shop_id = 14;
* @return this
*/
public BuyGoodsScRsp clearShopId() {
@@ -183,7 +183,7 @@ public BuyGoodsScRsp clearShopId() {
}
/**
- * optional uint32 shop_id = 15;
+ * optional uint32 shop_id = 14;
* @return the shopId
*/
public int getShopId() {
@@ -191,7 +191,7 @@ public int getShopId() {
}
/**
- * optional uint32 shop_id = 15;
+ * optional uint32 shop_id = 14;
* @param value the shopId to set
* @return this
*/
@@ -202,7 +202,7 @@ public BuyGoodsScRsp setShopId(final int value) {
}
/**
- * optional .ItemList return_item_list = 5;
+ * optional .ItemList return_item_list = 9;
* @return whether the returnItemList field is set
*/
public boolean hasReturnItemList() {
@@ -210,7 +210,7 @@ public boolean hasReturnItemList() {
}
/**
- * optional .ItemList return_item_list = 5;
+ * optional .ItemList return_item_list = 9;
* @return this
*/
public BuyGoodsScRsp clearReturnItemList() {
@@ -220,7 +220,7 @@ public BuyGoodsScRsp clearReturnItemList() {
}
/**
- * optional .ItemList return_item_list = 5;
+ * optional .ItemList return_item_list = 9;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -234,7 +234,7 @@ public ItemListOuterClass.ItemList getReturnItemList() {
}
/**
- * optional .ItemList return_item_list = 5;
+ * optional .ItemList return_item_list = 9;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -248,7 +248,7 @@ public ItemListOuterClass.ItemList getMutableReturnItemList() {
}
/**
- * optional .ItemList return_item_list = 5;
+ * optional .ItemList return_item_list = 9;
* @param value the returnItemList to set
* @return this
*/
@@ -346,19 +346,19 @@ public void writeTo(final ProtoSink output) throws IOException {
output.writeUInt32NoTag(goodsId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(goodsBuyTimes);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 112);
output.writeUInt32NoTag(shopId);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 42);
+ output.writeRawByte((byte) 74);
output.writeMessageNoTag(returnItemList);
}
}
@@ -396,38 +396,38 @@ public BuyGoodsScRsp mergeFrom(final ProtoSource input) throws IOException {
goodsId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 24) {
+ if (tag != 40) {
break;
}
}
- case 24: {
+ case 40: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 88) {
+ if (tag != 80) {
break;
}
}
- case 88: {
+ case 80: {
// goodsBuyTimes
goodsBuyTimes = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 112) {
break;
}
}
- case 120: {
+ case 112: {
// shopId
shopId = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 42) {
+ if (tag != 74) {
break;
}
}
- case 42: {
+ case 74: {
// returnItemList
input.readMessage(returnItemList);
bitField0_ |= 0x00000010;
diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java
index 67d8c48c4..74499cb7c 100644
--- a/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java
@@ -19,22 +19,17 @@ public static final class ChallengeInfo extends ProtoMessage impl
private static final long serialVersionUID = 0L;
/**
- * optional uint32 challenge_id = 2;
+ * optional uint32 challenge_id = 1;
*/
private int challengeId;
/**
- * optional uint32 round_count = 10;
- */
- private int roundCount;
-
- /**
- * optional .ChallengeStatus status = 1;
+ * optional .ChallengeStatus status = 6;
*/
private int status;
/**
- * optional .ExtraLineupType extra_lineup_type = 13;
+ * optional .ExtraLineupType extra_lineup_type = 15;
*/
private int extraLineupType;
@@ -49,7 +44,7 @@ public static ChallengeInfo newInstance() {
}
/**
- * optional uint32 challenge_id = 2;
+ * optional uint32 challenge_id = 1;
* @return whether the challengeId field is set
*/
public boolean hasChallengeId() {
@@ -57,7 +52,7 @@ public boolean hasChallengeId() {
}
/**
- * optional uint32 challenge_id = 2;
+ * optional uint32 challenge_id = 1;
* @return this
*/
public ChallengeInfo clearChallengeId() {
@@ -67,7 +62,7 @@ public ChallengeInfo clearChallengeId() {
}
/**
- * optional uint32 challenge_id = 2;
+ * optional uint32 challenge_id = 1;
* @return the challengeId
*/
public int getChallengeId() {
@@ -75,7 +70,7 @@ public int getChallengeId() {
}
/**
- * optional uint32 challenge_id = 2;
+ * optional uint32 challenge_id = 1;
* @param value the challengeId to set
* @return this
*/
@@ -86,62 +81,25 @@ public ChallengeInfo setChallengeId(final int value) {
}
/**
- * optional uint32 round_count = 10;
- * @return whether the roundCount field is set
- */
- public boolean hasRoundCount() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 round_count = 10;
- * @return this
- */
- public ChallengeInfo clearRoundCount() {
- bitField0_ &= ~0x00000002;
- roundCount = 0;
- return this;
- }
-
- /**
- * optional uint32 round_count = 10;
- * @return the roundCount
- */
- public int getRoundCount() {
- return roundCount;
- }
-
- /**
- * optional uint32 round_count = 10;
- * @param value the roundCount to set
- * @return this
- */
- public ChallengeInfo setRoundCount(final int value) {
- bitField0_ |= 0x00000002;
- roundCount = value;
- return this;
- }
-
- /**
- * optional .ChallengeStatus status = 1;
+ * optional .ChallengeStatus status = 6;
* @return whether the status field is set
*/
public boolean hasStatus() {
- return (bitField0_ & 0x00000004) != 0;
+ return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional .ChallengeStatus status = 1;
+ * optional .ChallengeStatus status = 6;
* @return this
*/
public ChallengeInfo clearStatus() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
status = 0;
return this;
}
/**
- * optional .ChallengeStatus status = 1;
+ * optional .ChallengeStatus status = 6;
* @return the status
*/
public ChallengeStatusOuterClass.ChallengeStatus getStatus() {
@@ -168,42 +126,42 @@ public int getStatusValue() {
* @return this
*/
public ChallengeInfo setStatusValue(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
status = value;
return this;
}
/**
- * optional .ChallengeStatus status = 1;
+ * optional .ChallengeStatus status = 6;
* @param value the status to set
* @return this
*/
public ChallengeInfo setStatus(final ChallengeStatusOuterClass.ChallengeStatus value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
status = value.getNumber();
return this;
}
/**
- * optional .ExtraLineupType extra_lineup_type = 13;
+ * optional .ExtraLineupType extra_lineup_type = 15;
* @return whether the extraLineupType field is set
*/
public boolean hasExtraLineupType() {
- return (bitField0_ & 0x00000008) != 0;
+ return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional .ExtraLineupType extra_lineup_type = 13;
+ * optional .ExtraLineupType extra_lineup_type = 15;
* @return this
*/
public ChallengeInfo clearExtraLineupType() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000004;
extraLineupType = 0;
return this;
}
/**
- * optional .ExtraLineupType extra_lineup_type = 13;
+ * optional .ExtraLineupType extra_lineup_type = 15;
* @return the extraLineupType
*/
public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() {
@@ -230,18 +188,18 @@ public int getExtraLineupTypeValue() {
* @return this
*/
public ChallengeInfo setExtraLineupTypeValue(final int value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
extraLineupType = value;
return this;
}
/**
- * optional .ExtraLineupType extra_lineup_type = 13;
+ * optional .ExtraLineupType extra_lineup_type = 15;
* @param value the extraLineupType to set
* @return this
*/
public ChallengeInfo setExtraLineupType(final ExtraLineupTypeOuterClass.ExtraLineupType value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
extraLineupType = value.getNumber();
return this;
}
@@ -252,7 +210,6 @@ public ChallengeInfo copyFrom(final ChallengeInfo other) {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
challengeId = other.challengeId;
- roundCount = other.roundCount;
status = other.status;
extraLineupType = other.extraLineupType;
}
@@ -268,9 +225,6 @@ public ChallengeInfo mergeFrom(final ChallengeInfo other) {
if (other.hasChallengeId()) {
setChallengeId(other.challengeId);
}
- if (other.hasRoundCount()) {
- setRoundCount(other.roundCount);
- }
if (other.hasStatus()) {
setStatusValue(other.status);
}
@@ -288,7 +242,6 @@ public ChallengeInfo clear() {
cachedSize = -1;
bitField0_ = 0;
challengeId = 0;
- roundCount = 0;
status = 0;
extraLineupType = 0;
return this;
@@ -315,7 +268,6 @@ public boolean equals(Object o) {
ChallengeInfo other = (ChallengeInfo) o;
return bitField0_ == other.bitField0_
&& (!hasChallengeId() || challengeId == other.challengeId)
- && (!hasRoundCount() || roundCount == other.roundCount)
&& (!hasStatus() || status == other.status)
&& (!hasExtraLineupType() || extraLineupType == other.extraLineupType);
}
@@ -323,19 +275,15 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(challengeId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(roundCount);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 48);
output.writeEnumNoTag(status);
}
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 104);
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 120);
output.writeEnumNoTag(extraLineupType);
}
}
@@ -347,12 +295,9 @@ protected int computeSerializedSize() {
size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(roundCount);
- }
- if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeEnumSizeNoTag(status);
}
- if ((bitField0_ & 0x00000008) != 0) {
+ if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType);
}
return size;
@@ -365,42 +310,33 @@ public ChallengeInfo mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
+ case 8: {
// challengeId
challengeId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 80) {
- break;
- }
- }
- case 80: {
- // roundCount
- roundCount = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 8) {
+ if (tag != 48) {
break;
}
}
- case 8: {
+ case 48: {
// status
final int value = input.readInt32();
if (ChallengeStatusOuterClass.ChallengeStatus.forNumber(value) != null) {
status = value;
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
}
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 120) {
break;
}
}
- case 104: {
+ case 120: {
// extraLineupType
final int value = input.readInt32();
if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) {
extraLineupType = value;
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
}
tag = input.readTag();
if (tag != 0) {
@@ -428,12 +364,9 @@ public void writeTo(final JsonSink output) throws IOException {
output.writeUInt32(FieldNames.challengeId, challengeId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.roundCount, roundCount);
- }
- if ((bitField0_ & 0x00000004) != 0) {
output.writeEnum(FieldNames.status, status, ChallengeStatusOuterClass.ChallengeStatus.converter());
}
- if ((bitField0_ & 0x00000008) != 0) {
+ if ((bitField0_ & 0x00000004) != 0) {
output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter());
}
output.endObject();
@@ -458,25 +391,13 @@ public ChallengeInfo mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case -171935711:
- case -244677858: {
- if (input.isAtField(FieldNames.roundCount)) {
- if (!input.trySkipNullValue()) {
- roundCount = input.readUInt32();
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case -892481550: {
if (input.isAtField(FieldNames.status)) {
if (!input.trySkipNullValue()) {
final ChallengeStatusOuterClass.ChallengeStatus value = input.readEnum(ChallengeStatusOuterClass.ChallengeStatus.converter());
if (value != null) {
status = value.getNumber();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
} else {
input.skipUnknownEnumValue();
}
@@ -493,7 +414,7 @@ public ChallengeInfo mergeFrom(final JsonSource input) throws IOException {
final ExtraLineupTypeOuterClass.ExtraLineupType value = input.readEnum(ExtraLineupTypeOuterClass.ExtraLineupType.converter());
if (value != null) {
extraLineupType = value.getNumber();
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
} else {
input.skipUnknownEnumValue();
}
@@ -557,8 +478,6 @@ public ChallengeInfo create() {
static class FieldNames {
static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id");
- static final FieldName roundCount = FieldName.forField("roundCount", "round_count");
-
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 553f8c569..c9abd4f74 100644
--- a/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java
@@ -19,7 +19,7 @@ public static final class ChallengeLineupNotify extends ProtoMessageoptional .ExtraLineupType extra_lineup_type = 1;
+ * optional .ExtraLineupType extra_lineup_type = 13;
*/
private int extraLineupType;
@@ -34,7 +34,7 @@ public static ChallengeLineupNotify newInstance() {
}
/**
- * optional .ExtraLineupType extra_lineup_type = 1;
+ * optional .ExtraLineupType extra_lineup_type = 13;
* @return whether the extraLineupType field is set
*/
public boolean hasExtraLineupType() {
@@ -42,7 +42,7 @@ public boolean hasExtraLineupType() {
}
/**
- * optional .ExtraLineupType extra_lineup_type = 1;
+ * optional .ExtraLineupType extra_lineup_type = 13;
* @return this
*/
public ChallengeLineupNotify clearExtraLineupType() {
@@ -52,7 +52,7 @@ public ChallengeLineupNotify clearExtraLineupType() {
}
/**
- * optional .ExtraLineupType extra_lineup_type = 1;
+ * optional .ExtraLineupType extra_lineup_type = 13;
* @return the extraLineupType
*/
public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() {
@@ -85,7 +85,7 @@ public ChallengeLineupNotify setExtraLineupTypeValue(final int value) {
}
/**
- * optional .ExtraLineupType extra_lineup_type = 1;
+ * optional .ExtraLineupType extra_lineup_type = 13;
* @param value the extraLineupType to set
* @return this
*/
@@ -155,7 +155,7 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 104);
output.writeEnumNoTag(extraLineupType);
}
}
@@ -176,7 +176,7 @@ public ChallengeLineupNotify mergeFrom(final ProtoSource input) throws IOExcepti
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 104: {
// extraLineupType
final int value = input.readInt32();
if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) {
diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java
index f96901264..8b291cef3 100644
--- a/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java
@@ -19,19 +19,19 @@ public static final class Challenge extends ProtoMessage implements C
private static final long serialVersionUID = 0L;
/**
- * optional uint32 taken_reward = 10;
+ * optional uint32 stars = 10;
*/
- private int takenReward;
+ private int stars;
/**
- * optional uint32 stars = 11;
+ * optional uint32 challenge_id = 13;
*/
- private int stars;
+ private int challengeId;
/**
- * optional uint32 challenge_id = 14;
+ * optional uint32 taken_reward = 14;
*/
- private int challengeId;
+ private int takenReward;
private Challenge() {
}
@@ -44,113 +44,113 @@ public static Challenge newInstance() {
}
/**
- * optional uint32 taken_reward = 10;
- * @return whether the takenReward field is set
+ * optional uint32 stars = 10;
+ * @return whether the stars field is set
*/
- public boolean hasTakenReward() {
+ public boolean hasStars() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 taken_reward = 10;
+ * optional uint32 stars = 10;
* @return this
*/
- public Challenge clearTakenReward() {
+ public Challenge clearStars() {
bitField0_ &= ~0x00000001;
- takenReward = 0;
+ stars = 0;
return this;
}
/**
- * optional uint32 taken_reward = 10;
- * @return the takenReward
+ * optional uint32 stars = 10;
+ * @return the stars
*/
- public int getTakenReward() {
- return takenReward;
+ public int getStars() {
+ return stars;
}
/**
- * optional uint32 taken_reward = 10;
- * @param value the takenReward to set
+ * optional uint32 stars = 10;
+ * @param value the stars to set
* @return this
*/
- public Challenge setTakenReward(final int value) {
+ public Challenge setStars(final int value) {
bitField0_ |= 0x00000001;
- takenReward = value;
+ stars = value;
return this;
}
/**
- * optional uint32 stars = 11;
- * @return whether the stars field is set
+ * optional uint32 challenge_id = 13;
+ * @return whether the challengeId field is set
*/
- public boolean hasStars() {
+ public boolean hasChallengeId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 stars = 11;
+ * optional uint32 challenge_id = 13;
* @return this
*/
- public Challenge clearStars() {
+ public Challenge clearChallengeId() {
bitField0_ &= ~0x00000002;
- stars = 0;
+ challengeId = 0;
return this;
}
/**
- * optional uint32 stars = 11;
- * @return the stars
+ * optional uint32 challenge_id = 13;
+ * @return the challengeId
*/
- public int getStars() {
- return stars;
+ public int getChallengeId() {
+ return challengeId;
}
/**
- * optional uint32 stars = 11;
- * @param value the stars to set
+ * optional uint32 challenge_id = 13;
+ * @param value the challengeId to set
* @return this
*/
- public Challenge setStars(final int value) {
+ public Challenge setChallengeId(final int value) {
bitField0_ |= 0x00000002;
- stars = value;
+ challengeId = value;
return this;
}
/**
- * optional uint32 challenge_id = 14;
- * @return whether the challengeId field is set
+ * optional uint32 taken_reward = 14;
+ * @return whether the takenReward field is set
*/
- public boolean hasChallengeId() {
+ public boolean hasTakenReward() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 challenge_id = 14;
+ * optional uint32 taken_reward = 14;
* @return this
*/
- public Challenge clearChallengeId() {
+ public Challenge clearTakenReward() {
bitField0_ &= ~0x00000004;
- challengeId = 0;
+ takenReward = 0;
return this;
}
/**
- * optional uint32 challenge_id = 14;
- * @return the challengeId
+ * optional uint32 taken_reward = 14;
+ * @return the takenReward
*/
- public int getChallengeId() {
- return challengeId;
+ public int getTakenReward() {
+ return takenReward;
}
/**
- * optional uint32 challenge_id = 14;
- * @param value the challengeId to set
+ * optional uint32 taken_reward = 14;
+ * @param value the takenReward to set
* @return this
*/
- public Challenge setChallengeId(final int value) {
+ public Challenge setTakenReward(final int value) {
bitField0_ |= 0x00000004;
- challengeId = value;
+ takenReward = value;
return this;
}
@@ -159,9 +159,9 @@ public Challenge copyFrom(final Challenge other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- takenReward = other.takenReward;
stars = other.stars;
challengeId = other.challengeId;
+ takenReward = other.takenReward;
}
return this;
}
@@ -172,15 +172,15 @@ public Challenge mergeFrom(final Challenge other) {
return this;
}
cachedSize = -1;
- if (other.hasTakenReward()) {
- setTakenReward(other.takenReward);
- }
if (other.hasStars()) {
setStars(other.stars);
}
if (other.hasChallengeId()) {
setChallengeId(other.challengeId);
}
+ if (other.hasTakenReward()) {
+ setTakenReward(other.takenReward);
+ }
return this;
}
@@ -191,9 +191,9 @@ public Challenge clear() {
}
cachedSize = -1;
bitField0_ = 0;
- takenReward = 0;
stars = 0;
challengeId = 0;
+ takenReward = 0;
return this;
}
@@ -217,24 +217,24 @@ public boolean equals(Object o) {
}
Challenge other = (Challenge) o;
return bitField0_ == other.bitField0_
- && (!hasTakenReward() || takenReward == other.takenReward)
&& (!hasStars() || stars == other.stars)
- && (!hasChallengeId() || challengeId == other.challengeId);
+ && (!hasChallengeId() || challengeId == other.challengeId)
+ && (!hasTakenReward() || takenReward == other.takenReward);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(takenReward);
+ output.writeUInt32NoTag(stars);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 88);
- output.writeUInt32NoTag(stars);
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(challengeId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 112);
- output.writeUInt32NoTag(challengeId);
+ output.writeUInt32NoTag(takenReward);
}
}
@@ -242,13 +242,13 @@ public void writeTo(final ProtoSink output) throws IOException {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(takenReward);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(stars);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(stars);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(takenReward);
}
return size;
}
@@ -261,17 +261,17 @@ public Challenge mergeFrom(final ProtoSource input) throws IOException {
while (true) {
switch (tag) {
case 80: {
- // takenReward
- takenReward = input.readUInt32();
+ // stars
+ stars = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 88) {
+ if (tag != 104) {
break;
}
}
- case 88: {
- // stars
- stars = input.readUInt32();
+ case 104: {
+ // challengeId
+ challengeId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 112) {
@@ -279,8 +279,8 @@ public Challenge mergeFrom(final ProtoSource input) throws IOException {
}
}
case 112: {
- // challengeId
- challengeId = input.readUInt32();
+ // takenReward
+ takenReward = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 0) {
@@ -305,13 +305,13 @@ public Challenge mergeFrom(final ProtoSource input) throws IOException {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.takenReward, takenReward);
+ output.writeUInt32(FieldNames.stars, stars);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.stars, stars);
+ output.writeUInt32(FieldNames.challengeId, challengeId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.challengeId, challengeId);
+ output.writeUInt32(FieldNames.takenReward, takenReward);
}
output.endObject();
}
@@ -323,11 +323,10 @@ public Challenge mergeFrom(final JsonSource input) throws IOException {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 1216849622:
- case -1923526233: {
- if (input.isAtField(FieldNames.takenReward)) {
+ case 109757537: {
+ if (input.isAtField(FieldNames.stars)) {
if (!input.trySkipNullValue()) {
- takenReward = input.readUInt32();
+ stars = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -335,10 +334,11 @@ public Challenge mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 109757537: {
- if (input.isAtField(FieldNames.stars)) {
+ case -689112866:
+ case 112359031: {
+ if (input.isAtField(FieldNames.challengeId)) {
if (!input.trySkipNullValue()) {
- stars = input.readUInt32();
+ challengeId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -346,11 +346,11 @@ public Challenge mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case -689112866:
- case 112359031: {
- if (input.isAtField(FieldNames.challengeId)) {
+ case 1216849622:
+ case -1923526233: {
+ if (input.isAtField(FieldNames.takenReward)) {
if (!input.trySkipNullValue()) {
- challengeId = input.readUInt32();
+ takenReward = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -410,11 +410,11 @@ public Challenge create() {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName takenReward = FieldName.forField("takenReward", "taken_reward");
-
static final FieldName stars = FieldName.forField("stars");
static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id");
+
+ static final FieldName takenReward = FieldName.forField("takenReward", "taken_reward");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeRewardOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeRewardOuterClass.java
index fed1d8464..8c96470b8 100644
--- a/src/generated/main/emu/lunarcore/proto/ChallengeRewardOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChallengeRewardOuterClass.java
@@ -19,12 +19,12 @@ public static final class ChallengeReward extends ProtoMessage
private static final long serialVersionUID = 0L;
/**
- * optional uint64 taken_challenge_reward = 12;
+ * optional uint64 taken_challenge_reward = 10;
*/
private long takenChallengeReward;
/**
- * optional uint32 group_id = 6;
+ * optional uint32 group_id = 15;
*/
private int groupId;
@@ -39,7 +39,7 @@ public static ChallengeReward newInstance() {
}
/**
- * optional uint64 taken_challenge_reward = 12;
+ * optional uint64 taken_challenge_reward = 10;
* @return whether the takenChallengeReward field is set
*/
public boolean hasTakenChallengeReward() {
@@ -47,7 +47,7 @@ public boolean hasTakenChallengeReward() {
}
/**
- * optional uint64 taken_challenge_reward = 12;
+ * optional uint64 taken_challenge_reward = 10;
* @return this
*/
public ChallengeReward clearTakenChallengeReward() {
@@ -57,7 +57,7 @@ public ChallengeReward clearTakenChallengeReward() {
}
/**
- * optional uint64 taken_challenge_reward = 12;
+ * optional uint64 taken_challenge_reward = 10;
* @return the takenChallengeReward
*/
public long getTakenChallengeReward() {
@@ -65,7 +65,7 @@ public long getTakenChallengeReward() {
}
/**
- * optional uint64 taken_challenge_reward = 12;
+ * optional uint64 taken_challenge_reward = 10;
* @param value the takenChallengeReward to set
* @return this
*/
@@ -76,7 +76,7 @@ public ChallengeReward setTakenChallengeReward(final long value) {
}
/**
- * optional uint32 group_id = 6;
+ * optional uint32 group_id = 15;
* @return whether the groupId field is set
*/
public boolean hasGroupId() {
@@ -84,7 +84,7 @@ public boolean hasGroupId() {
}
/**
- * optional uint32 group_id = 6;
+ * optional uint32 group_id = 15;
* @return this
*/
public ChallengeReward clearGroupId() {
@@ -94,7 +94,7 @@ public ChallengeReward clearGroupId() {
}
/**
- * optional uint32 group_id = 6;
+ * optional uint32 group_id = 15;
* @return the groupId
*/
public int getGroupId() {
@@ -102,7 +102,7 @@ public int getGroupId() {
}
/**
- * optional uint32 group_id = 6;
+ * optional uint32 group_id = 15;
* @param value the groupId to set
* @return this
*/
@@ -177,11 +177,11 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 80);
output.writeUInt64NoTag(takenChallengeReward);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(groupId);
}
}
@@ -205,16 +205,16 @@ public ChallengeReward mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 96: {
+ case 80: {
// takenChallengeReward
takenChallengeReward = input.readUInt64();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 48) {
+ if (tag != 120) {
break;
}
}
- case 48: {
+ case 120: {
// groupId
groupId = input.readUInt32();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java
index 980abef1f..1ffab97dd 100644
--- a/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java
@@ -24,17 +24,17 @@ public static final class ChallengeSettleNotify extends ProtoMessageoptional uint32 stars = 13;
+ * optional uint32 stars = 15;
*/
private int stars;
/**
- * optional bool is_win = 5;
+ * optional bool is_win = 13;
*/
private boolean isWin;
/**
- * optional .ItemList reward = 3;
+ * optional .ItemList reward = 8;
*/
private final ItemListOuterClass.ItemList reward = ItemListOuterClass.ItemList.newInstance();
@@ -86,7 +86,7 @@ public ChallengeSettleNotify setChallengeId(final int value) {
}
/**
- * optional uint32 stars = 13;
+ * optional uint32 stars = 15;
* @return whether the stars field is set
*/
public boolean hasStars() {
@@ -94,7 +94,7 @@ public boolean hasStars() {
}
/**
- * optional uint32 stars = 13;
+ * optional uint32 stars = 15;
* @return this
*/
public ChallengeSettleNotify clearStars() {
@@ -104,7 +104,7 @@ public ChallengeSettleNotify clearStars() {
}
/**
- * optional uint32 stars = 13;
+ * optional uint32 stars = 15;
* @return the stars
*/
public int getStars() {
@@ -112,7 +112,7 @@ public int getStars() {
}
/**
- * optional uint32 stars = 13;
+ * optional uint32 stars = 15;
* @param value the stars to set
* @return this
*/
@@ -123,7 +123,7 @@ public ChallengeSettleNotify setStars(final int value) {
}
/**
- * optional bool is_win = 5;
+ * optional bool is_win = 13;
* @return whether the isWin field is set
*/
public boolean hasIsWin() {
@@ -131,7 +131,7 @@ public boolean hasIsWin() {
}
/**
- * optional bool is_win = 5;
+ * optional bool is_win = 13;
* @return this
*/
public ChallengeSettleNotify clearIsWin() {
@@ -141,7 +141,7 @@ public ChallengeSettleNotify clearIsWin() {
}
/**
- * optional bool is_win = 5;
+ * optional bool is_win = 13;
* @return the isWin
*/
public boolean getIsWin() {
@@ -149,7 +149,7 @@ public boolean getIsWin() {
}
/**
- * optional bool is_win = 5;
+ * optional bool is_win = 13;
* @param value the isWin to set
* @return this
*/
@@ -160,7 +160,7 @@ public ChallengeSettleNotify setIsWin(final boolean value) {
}
/**
- * optional .ItemList reward = 3;
+ * optional .ItemList reward = 8;
* @return whether the reward field is set
*/
public boolean hasReward() {
@@ -168,7 +168,7 @@ public boolean hasReward() {
}
/**
- * optional .ItemList reward = 3;
+ * optional .ItemList reward = 8;
* @return this
*/
public ChallengeSettleNotify clearReward() {
@@ -178,7 +178,7 @@ public ChallengeSettleNotify clearReward() {
}
/**
- * optional .ItemList reward = 3;
+ * optional .ItemList reward = 8;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -192,7 +192,7 @@ public ItemListOuterClass.ItemList getReward() {
}
/**
- * optional .ItemList reward = 3;
+ * optional .ItemList reward = 8;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -206,7 +206,7 @@ public ItemListOuterClass.ItemList getMutableReward() {
}
/**
- * optional .ItemList reward = 3;
+ * optional .ItemList reward = 8;
* @param value the reward to set
* @return this
*/
@@ -298,15 +298,15 @@ public void writeTo(final ProtoSink output) throws IOException {
output.writeUInt32NoTag(challengeId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(stars);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 104);
output.writeBoolNoTag(isWin);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 26);
+ output.writeRawByte((byte) 66);
output.writeMessageNoTag(reward);
}
}
@@ -341,29 +341,29 @@ public ChallengeSettleNotify mergeFrom(final ProtoSource input) throws IOExcepti
challengeId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 120) {
break;
}
}
- case 104: {
+ case 120: {
// stars
stars = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 40) {
+ if (tag != 104) {
break;
}
}
- case 40: {
+ case 104: {
// isWin
isWin = input.readBool();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 26) {
+ if (tag != 66) {
break;
}
}
- case 26: {
+ case 66: {
// 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 c8de65b79..29461558e 100644
--- a/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java
@@ -19,7 +19,7 @@ public static final class ChangeLineupLeaderCsReq extends ProtoMessageoptional uint32 slot = 7;
+ * optional uint32 slot = 10;
*/
private int slot;
@@ -34,7 +34,7 @@ public static ChangeLineupLeaderCsReq newInstance() {
}
/**
- * optional uint32 slot = 7;
+ * optional uint32 slot = 10;
* @return whether the slot field is set
*/
public boolean hasSlot() {
@@ -42,7 +42,7 @@ public boolean hasSlot() {
}
/**
- * optional uint32 slot = 7;
+ * optional uint32 slot = 10;
* @return this
*/
public ChangeLineupLeaderCsReq clearSlot() {
@@ -52,7 +52,7 @@ public ChangeLineupLeaderCsReq clearSlot() {
}
/**
- * optional uint32 slot = 7;
+ * optional uint32 slot = 10;
* @return the slot
*/
public int getSlot() {
@@ -60,7 +60,7 @@ public int getSlot() {
}
/**
- * optional uint32 slot = 7;
+ * optional uint32 slot = 10;
* @param value the slot to set
* @return this
*/
@@ -129,7 +129,7 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(slot);
}
}
@@ -150,7 +150,7 @@ public ChangeLineupLeaderCsReq mergeFrom(final ProtoSource input) throws IOExcep
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
+ case 80: {
// 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 b34a5c650..89a8cebfa 100644
--- a/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderScRspOuterClass.java
@@ -19,12 +19,12 @@ public static final class ChangeLineupLeaderScRsp extends ProtoMessageoptional uint32 slot = 3;
+ * optional uint32 slot = 1;
*/
private int slot;
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 15;
*/
private int retcode;
@@ -39,7 +39,7 @@ public static ChangeLineupLeaderScRsp newInstance() {
}
/**
- * optional uint32 slot = 3;
+ * optional uint32 slot = 1;
* @return whether the slot field is set
*/
public boolean hasSlot() {
@@ -47,7 +47,7 @@ public boolean hasSlot() {
}
/**
- * optional uint32 slot = 3;
+ * optional uint32 slot = 1;
* @return this
*/
public ChangeLineupLeaderScRsp clearSlot() {
@@ -57,7 +57,7 @@ public ChangeLineupLeaderScRsp clearSlot() {
}
/**
- * optional uint32 slot = 3;
+ * optional uint32 slot = 1;
* @return the slot
*/
public int getSlot() {
@@ -65,7 +65,7 @@ public int getSlot() {
}
/**
- * optional uint32 slot = 3;
+ * optional uint32 slot = 1;
* @param value the slot to set
* @return this
*/
@@ -76,7 +76,7 @@ public ChangeLineupLeaderScRsp setSlot(final int value) {
}
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 15;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -84,7 +84,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 15;
* @return this
*/
public ChangeLineupLeaderScRsp clearRetcode() {
@@ -94,7 +94,7 @@ public ChangeLineupLeaderScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 15;
* @return the retcode
*/
public int getRetcode() {
@@ -102,7 +102,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 15;
* @param value the retcode to set
* @return this
*/
@@ -177,11 +177,11 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(slot);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(retcode);
}
}
@@ -205,16 +205,16 @@ public ChangeLineupLeaderScRsp mergeFrom(final ProtoSource input) throws IOExcep
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
+ case 8: {
// slot
slot = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 48) {
+ if (tag != 120) {
break;
}
}
- case 48: {
+ case 120: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/ChatOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChatOuterClass.java
index 3ca0ebf1b..72492167f 100644
--- a/src/generated/main/emu/lunarcore/proto/ChatOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChatOuterClass.java
@@ -25,22 +25,22 @@ public static final class Chat extends ProtoMessage implements Cloneable {
private long sentTime;
/**
- * optional uint32 emote = 1;
+ * optional uint32 sender_uid = 1;
*/
- private int emote;
+ private int senderUid;
/**
- * optional uint32 sender_uid = 15;
+ * optional uint32 emote = 11;
*/
- private int senderUid;
+ private int emote;
/**
- * optional .MsgType msg_type = 4;
+ * optional .MsgType msg_type = 8;
*/
private int msgType;
/**
- * optional string text = 8;
+ * optional string text = 2;
*/
private final Utf8String text = Utf8String.newEmptyInstance();
@@ -92,81 +92,81 @@ public Chat setSentTime(final long value) {
}
/**
- * optional uint32 emote = 1;
- * @return whether the emote field is set
+ * optional uint32 sender_uid = 1;
+ * @return whether the senderUid field is set
*/
- public boolean hasEmote() {
+ public boolean hasSenderUid() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 emote = 1;
+ * optional uint32 sender_uid = 1;
* @return this
*/
- public Chat clearEmote() {
+ public Chat clearSenderUid() {
bitField0_ &= ~0x00000002;
- emote = 0;
+ senderUid = 0;
return this;
}
/**
- * optional uint32 emote = 1;
- * @return the emote
+ * optional uint32 sender_uid = 1;
+ * @return the senderUid
*/
- public int getEmote() {
- return emote;
+ public int getSenderUid() {
+ return senderUid;
}
/**
- * optional uint32 emote = 1;
- * @param value the emote to set
+ * optional uint32 sender_uid = 1;
+ * @param value the senderUid to set
* @return this
*/
- public Chat setEmote(final int value) {
+ public Chat setSenderUid(final int value) {
bitField0_ |= 0x00000002;
- emote = value;
+ senderUid = value;
return this;
}
/**
- * optional uint32 sender_uid = 15;
- * @return whether the senderUid field is set
+ * optional uint32 emote = 11;
+ * @return whether the emote field is set
*/
- public boolean hasSenderUid() {
+ public boolean hasEmote() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 sender_uid = 15;
+ * optional uint32 emote = 11;
* @return this
*/
- public Chat clearSenderUid() {
+ public Chat clearEmote() {
bitField0_ &= ~0x00000004;
- senderUid = 0;
+ emote = 0;
return this;
}
/**
- * optional uint32 sender_uid = 15;
- * @return the senderUid
+ * optional uint32 emote = 11;
+ * @return the emote
*/
- public int getSenderUid() {
- return senderUid;
+ public int getEmote() {
+ return emote;
}
/**
- * optional uint32 sender_uid = 15;
- * @param value the senderUid to set
+ * optional uint32 emote = 11;
+ * @param value the emote to set
* @return this
*/
- public Chat setSenderUid(final int value) {
+ public Chat setEmote(final int value) {
bitField0_ |= 0x00000004;
- senderUid = value;
+ emote = value;
return this;
}
/**
- * optional .MsgType msg_type = 4;
+ * optional .MsgType msg_type = 8;
* @return whether the msgType field is set
*/
public boolean hasMsgType() {
@@ -174,7 +174,7 @@ public boolean hasMsgType() {
}
/**
- * optional .MsgType msg_type = 4;
+ * optional .MsgType msg_type = 8;
* @return this
*/
public Chat clearMsgType() {
@@ -184,7 +184,7 @@ public Chat clearMsgType() {
}
/**
- * optional .MsgType msg_type = 4;
+ * optional .MsgType msg_type = 8;
* @return the msgType
*/
public MsgTypeOuterClass.MsgType getMsgType() {
@@ -217,7 +217,7 @@ public Chat setMsgTypeValue(final int value) {
}
/**
- * optional .MsgType msg_type = 4;
+ * optional .MsgType msg_type = 8;
* @param value the msgType to set
* @return this
*/
@@ -228,7 +228,7 @@ public Chat setMsgType(final MsgTypeOuterClass.MsgType value) {
}
/**
- * optional string text = 8;
+ * optional string text = 2;
* @return whether the text field is set
*/
public boolean hasText() {
@@ -236,7 +236,7 @@ public boolean hasText() {
}
/**
- * optional string text = 8;
+ * optional string text = 2;
* @return this
*/
public Chat clearText() {
@@ -246,7 +246,7 @@ public Chat clearText() {
}
/**
- * optional string text = 8;
+ * optional string text = 2;
* @return the text
*/
public String getText() {
@@ -254,7 +254,7 @@ public String getText() {
}
/**
- * optional string text = 8;
+ * optional string text = 2;
* @return internal {@code Utf8String} representation of text for reading
*/
public Utf8String getTextBytes() {
@@ -262,7 +262,7 @@ public Utf8String getTextBytes() {
}
/**
- * optional string text = 8;
+ * optional string text = 2;
* @return internal {@code Utf8String} representation of text for modifications
*/
public Utf8String getMutableTextBytes() {
@@ -271,7 +271,7 @@ public Utf8String getMutableTextBytes() {
}
/**
- * optional string text = 8;
+ * optional string text = 2;
* @param value the text to set
* @return this
*/
@@ -282,7 +282,7 @@ public Chat setText(final CharSequence value) {
}
/**
- * optional string text = 8;
+ * optional string text = 2;
* @param value the text to set
* @return this
*/
@@ -298,8 +298,8 @@ public Chat copyFrom(final Chat other) {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
sentTime = other.sentTime;
- emote = other.emote;
senderUid = other.senderUid;
+ emote = other.emote;
msgType = other.msgType;
text.copyFrom(other.text);
}
@@ -315,12 +315,12 @@ public Chat mergeFrom(final Chat other) {
if (other.hasSentTime()) {
setSentTime(other.sentTime);
}
- if (other.hasEmote()) {
- setEmote(other.emote);
- }
if (other.hasSenderUid()) {
setSenderUid(other.senderUid);
}
+ if (other.hasEmote()) {
+ setEmote(other.emote);
+ }
if (other.hasMsgType()) {
setMsgTypeValue(other.msgType);
}
@@ -338,8 +338,8 @@ public Chat clear() {
cachedSize = -1;
bitField0_ = 0;
sentTime = 0L;
- emote = 0;
senderUid = 0;
+ emote = 0;
msgType = 0;
text.clear();
return this;
@@ -367,8 +367,8 @@ public boolean equals(Object o) {
Chat other = (Chat) o;
return bitField0_ == other.bitField0_
&& (!hasSentTime() || sentTime == other.sentTime)
- && (!hasEmote() || emote == other.emote)
&& (!hasSenderUid() || senderUid == other.senderUid)
+ && (!hasEmote() || emote == other.emote)
&& (!hasMsgType() || msgType == other.msgType)
&& (!hasText() || text.equals(other.text));
}
@@ -381,18 +381,18 @@ public void writeTo(final ProtoSink output) throws IOException {
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(emote);
+ output.writeUInt32NoTag(senderUid);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 120);
- output.writeUInt32NoTag(senderUid);
+ output.writeRawByte((byte) 88);
+ output.writeUInt32NoTag(emote);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 64);
output.writeEnumNoTag(msgType);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 66);
+ output.writeRawByte((byte) 18);
output.writeStringNoTag(text);
}
}
@@ -404,10 +404,10 @@ protected int computeSerializedSize() {
size += 1 + ProtoSink.computeUInt64SizeNoTag(sentTime);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(emote);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(emote);
}
if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeEnumSizeNoTag(msgType);
@@ -435,24 +435,24 @@ public Chat mergeFrom(final ProtoSource input) throws IOException {
}
}
case 8: {
- // emote
- emote = input.readUInt32();
+ // senderUid
+ senderUid = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 88) {
break;
}
}
- case 120: {
- // senderUid
- senderUid = input.readUInt32();
+ case 88: {
+ // emote
+ emote = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 32) {
+ if (tag != 64) {
break;
}
}
- case 32: {
+ case 64: {
// msgType
final int value = input.readInt32();
if (MsgTypeOuterClass.MsgType.forNumber(value) != null) {
@@ -460,11 +460,11 @@ public Chat mergeFrom(final ProtoSource input) throws IOException {
bitField0_ |= 0x00000008;
}
tag = input.readTag();
- if (tag != 66) {
+ if (tag != 18) {
break;
}
}
- case 66: {
+ case 18: {
// text
input.readString(text);
bitField0_ |= 0x00000010;
@@ -494,10 +494,10 @@ public void writeTo(final JsonSink output) throws IOException {
output.writeUInt64(FieldNames.sentTime, sentTime);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.emote, emote);
+ output.writeUInt32(FieldNames.senderUid, senderUid);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.senderUid, senderUid);
+ output.writeUInt32(FieldNames.emote, emote);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeEnum(FieldNames.msgType, msgType, MsgTypeOuterClass.MsgType.converter());
@@ -527,10 +527,11 @@ public Chat mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 96633208: {
- if (input.isAtField(FieldNames.emote)) {
+ case 32180699:
+ case 997911366: {
+ if (input.isAtField(FieldNames.senderUid)) {
if (!input.trySkipNullValue()) {
- emote = input.readUInt32();
+ senderUid = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -538,11 +539,10 @@ public Chat mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 32180699:
- case 997911366: {
- if (input.isAtField(FieldNames.senderUid)) {
+ case 96633208: {
+ if (input.isAtField(FieldNames.emote)) {
if (!input.trySkipNullValue()) {
- senderUid = input.readUInt32();
+ emote = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -632,10 +632,10 @@ public Chat create() {
static class FieldNames {
static final FieldName sentTime = FieldName.forField("sentTime", "sent_time");
- static final FieldName emote = FieldName.forField("emote");
-
static final FieldName senderUid = FieldName.forField("senderUid", "sender_uid");
+ static final FieldName emote = FieldName.forField("emote");
+
static final FieldName msgType = FieldName.forField("msgType", "msg_type");
static final FieldName text = FieldName.forField("text");
diff --git a/src/generated/main/emu/lunarcore/proto/ClientDownloadDataScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/ClientDownloadDataScNotifyOuterClass.java
index 0e01e78d4..18115eca4 100644
--- a/src/generated/main/emu/lunarcore/proto/ClientDownloadDataScNotifyOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ClientDownloadDataScNotifyOuterClass.java
@@ -20,7 +20,7 @@ public static final class ClientDownloadDataScNotify extends ProtoMessageoptional .ClientDownloadDataScNotify.ClientDownloadData download_data = 5;
+ * optional .ClientDownloadDataScNotify.ClientDownloadData download_data = 6;
*/
private final ClientDownloadData downloadData = ClientDownloadData.newInstance();
@@ -35,7 +35,7 @@ public static ClientDownloadDataScNotify newInstance() {
}
/**
- * optional .ClientDownloadDataScNotify.ClientDownloadData download_data = 5;
+ * optional .ClientDownloadDataScNotify.ClientDownloadData download_data = 6;
* @return whether the downloadData field is set
*/
public boolean hasDownloadData() {
@@ -43,7 +43,7 @@ public boolean hasDownloadData() {
}
/**
- * optional .ClientDownloadDataScNotify.ClientDownloadData download_data = 5;
+ * optional .ClientDownloadDataScNotify.ClientDownloadData download_data = 6;
* @return this
*/
public ClientDownloadDataScNotify clearDownloadData() {
@@ -53,7 +53,7 @@ public ClientDownloadDataScNotify clearDownloadData() {
}
/**
- * optional .ClientDownloadDataScNotify.ClientDownloadData download_data = 5;
+ * optional .ClientDownloadDataScNotify.ClientDownloadData download_data = 6;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public ClientDownloadData getDownloadData() {
}
/**
- * optional .ClientDownloadDataScNotify.ClientDownloadData download_data = 5;
+ * optional .ClientDownloadDataScNotify.ClientDownloadData download_data = 6;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public ClientDownloadData getMutableDownloadData() {
}
/**
- * optional .ClientDownloadDataScNotify.ClientDownloadData download_data = 5;
+ * optional .ClientDownloadDataScNotify.ClientDownloadData download_data = 6;
* @param value the downloadData to set
* @return this
*/
@@ -151,7 +151,7 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 42);
+ output.writeRawByte((byte) 50);
output.writeMessageNoTag(downloadData);
}
}
@@ -172,7 +172,7 @@ public ClientDownloadDataScNotify mergeFrom(final ProtoSource input) throws IOEx
int tag = input.readTag();
while (true) {
switch (tag) {
- case 42: {
+ case 50: {
// downloadData
input.readMessage(downloadData);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java b/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java
index 5458b802f..66e9fe87a 100644
--- a/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java
@@ -21,52 +21,52 @@ public static final class ClientMail extends ProtoMessage implements
private static final long serialVersionUID = 0L;
/**
- * optional int64 time = 11;
+ * optional int64 expire_time = 3;
*/
- private long time;
+ private long expireTime;
/**
- * optional int64 expire_time = 12;
+ * optional int64 time = 4;
*/
- private long expireTime;
+ private long time;
/**
- * optional uint32 id = 7;
+ * optional uint32 id = 13;
*/
private int id;
/**
- * optional uint32 template_id = 8;
+ * optional uint32 template_id = 14;
*/
private int templateId;
/**
- * optional bool is_read = 15;
+ * optional bool is_read = 10;
*/
private boolean isRead;
/**
- * optional .ItemList attachment = 10;
+ * optional .ItemList attachment = 5;
*/
private final ItemListOuterClass.ItemList attachment = ItemListOuterClass.ItemList.newInstance();
/**
- * optional string sender = 2;
+ * optional string title = 8;
*/
- private final Utf8String sender = Utf8String.newEmptyInstance();
+ private final Utf8String title = Utf8String.newEmptyInstance();
/**
- * optional string content = 5;
+ * optional string content = 11;
*/
private final Utf8String content = Utf8String.newEmptyInstance();
/**
- * optional string title = 9;
+ * optional string sender = 15;
*/
- private final Utf8String title = Utf8String.newEmptyInstance();
+ private final Utf8String sender = Utf8String.newEmptyInstance();
/**
- * repeated string para_list = 14;
+ * repeated string para_list = 1;
*/
private final RepeatedString paraList = RepeatedString.newEmptyInstance();
@@ -81,81 +81,81 @@ public static ClientMail newInstance() {
}
/**
- * optional int64 time = 11;
- * @return whether the time field is set
+ * optional int64 expire_time = 3;
+ * @return whether the expireTime field is set
*/
- public boolean hasTime() {
+ public boolean hasExpireTime() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional int64 time = 11;
+ * optional int64 expire_time = 3;
* @return this
*/
- public ClientMail clearTime() {
+ public ClientMail clearExpireTime() {
bitField0_ &= ~0x00000001;
- time = 0L;
+ expireTime = 0L;
return this;
}
/**
- * optional int64 time = 11;
- * @return the time
+ * optional int64 expire_time = 3;
+ * @return the expireTime
*/
- public long getTime() {
- return time;
+ public long getExpireTime() {
+ return expireTime;
}
/**
- * optional int64 time = 11;
- * @param value the time to set
+ * optional int64 expire_time = 3;
+ * @param value the expireTime to set
* @return this
*/
- public ClientMail setTime(final long value) {
+ public ClientMail setExpireTime(final long value) {
bitField0_ |= 0x00000001;
- time = value;
+ expireTime = value;
return this;
}
/**
- * optional int64 expire_time = 12;
- * @return whether the expireTime field is set
+ * optional int64 time = 4;
+ * @return whether the time field is set
*/
- public boolean hasExpireTime() {
+ public boolean hasTime() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional int64 expire_time = 12;
+ * optional int64 time = 4;
* @return this
*/
- public ClientMail clearExpireTime() {
+ public ClientMail clearTime() {
bitField0_ &= ~0x00000002;
- expireTime = 0L;
+ time = 0L;
return this;
}
/**
- * optional int64 expire_time = 12;
- * @return the expireTime
+ * optional int64 time = 4;
+ * @return the time
*/
- public long getExpireTime() {
- return expireTime;
+ public long getTime() {
+ return time;
}
/**
- * optional int64 expire_time = 12;
- * @param value the expireTime to set
+ * optional int64 time = 4;
+ * @param value the time to set
* @return this
*/
- public ClientMail setExpireTime(final long value) {
+ public ClientMail setTime(final long value) {
bitField0_ |= 0x00000002;
- expireTime = value;
+ time = value;
return this;
}
/**
- * optional uint32 id = 7;
+ * optional uint32 id = 13;
* @return whether the id field is set
*/
public boolean hasId() {
@@ -163,7 +163,7 @@ public boolean hasId() {
}
/**
- * optional uint32 id = 7;
+ * optional uint32 id = 13;
* @return this
*/
public ClientMail clearId() {
@@ -173,7 +173,7 @@ public ClientMail clearId() {
}
/**
- * optional uint32 id = 7;
+ * optional uint32 id = 13;
* @return the id
*/
public int getId() {
@@ -181,7 +181,7 @@ public int getId() {
}
/**
- * optional uint32 id = 7;
+ * optional uint32 id = 13;
* @param value the id to set
* @return this
*/
@@ -192,7 +192,7 @@ public ClientMail setId(final int value) {
}
/**
- * optional uint32 template_id = 8;
+ * optional uint32 template_id = 14;
* @return whether the templateId field is set
*/
public boolean hasTemplateId() {
@@ -200,7 +200,7 @@ public boolean hasTemplateId() {
}
/**
- * optional uint32 template_id = 8;
+ * optional uint32 template_id = 14;
* @return this
*/
public ClientMail clearTemplateId() {
@@ -210,7 +210,7 @@ public ClientMail clearTemplateId() {
}
/**
- * optional uint32 template_id = 8;
+ * optional uint32 template_id = 14;
* @return the templateId
*/
public int getTemplateId() {
@@ -218,7 +218,7 @@ public int getTemplateId() {
}
/**
- * optional uint32 template_id = 8;
+ * optional uint32 template_id = 14;
* @param value the templateId to set
* @return this
*/
@@ -229,7 +229,7 @@ public ClientMail setTemplateId(final int value) {
}
/**
- * optional bool is_read = 15;
+ * optional bool is_read = 10;
* @return whether the isRead field is set
*/
public boolean hasIsRead() {
@@ -237,7 +237,7 @@ public boolean hasIsRead() {
}
/**
- * optional bool is_read = 15;
+ * optional bool is_read = 10;
* @return this
*/
public ClientMail clearIsRead() {
@@ -247,7 +247,7 @@ public ClientMail clearIsRead() {
}
/**
- * optional bool is_read = 15;
+ * optional bool is_read = 10;
* @return the isRead
*/
public boolean getIsRead() {
@@ -255,7 +255,7 @@ public boolean getIsRead() {
}
/**
- * optional bool is_read = 15;
+ * optional bool is_read = 10;
* @param value the isRead to set
* @return this
*/
@@ -266,7 +266,7 @@ public ClientMail setIsRead(final boolean value) {
}
/**
- * optional .ItemList attachment = 10;
+ * optional .ItemList attachment = 5;
* @return whether the attachment field is set
*/
public boolean hasAttachment() {
@@ -274,7 +274,7 @@ public boolean hasAttachment() {
}
/**
- * optional .ItemList attachment = 10;
+ * optional .ItemList attachment = 5;
* @return this
*/
public ClientMail clearAttachment() {
@@ -284,7 +284,7 @@ public ClientMail clearAttachment() {
}
/**
- * optional .ItemList attachment = 10;
+ * optional .ItemList attachment = 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.
@@ -298,7 +298,7 @@ public ItemListOuterClass.ItemList getAttachment() {
}
/**
- * optional .ItemList attachment = 10;
+ * optional .ItemList attachment = 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
@@ -312,7 +312,7 @@ public ItemListOuterClass.ItemList getMutableAttachment() {
}
/**
- * optional .ItemList attachment = 10;
+ * optional .ItemList attachment = 5;
* @param value the attachment to set
* @return this
*/
@@ -323,72 +323,72 @@ public ClientMail setAttachment(final ItemListOuterClass.ItemList value) {
}
/**
- * optional string sender = 2;
- * @return whether the sender field is set
+ * optional string title = 8;
+ * @return whether the title field is set
*/
- public boolean hasSender() {
+ public boolean hasTitle() {
return (bitField0_ & 0x00000040) != 0;
}
/**
- * optional string sender = 2;
+ * optional string title = 8;
* @return this
*/
- public ClientMail clearSender() {
+ public ClientMail clearTitle() {
bitField0_ &= ~0x00000040;
- sender.clear();
+ title.clear();
return this;
}
/**
- * optional string sender = 2;
- * @return the sender
+ * optional string title = 8;
+ * @return the title
*/
- public String getSender() {
- return sender.getString();
+ public String getTitle() {
+ return title.getString();
}
/**
- * optional string sender = 2;
- * @return internal {@code Utf8String} representation of sender for reading
+ * optional string title = 8;
+ * @return internal {@code Utf8String} representation of title for reading
*/
- public Utf8String getSenderBytes() {
- return this.sender;
+ public Utf8String getTitleBytes() {
+ return this.title;
}
/**
- * optional string sender = 2;
- * @return internal {@code Utf8String} representation of sender for modifications
+ * optional string title = 8;
+ * @return internal {@code Utf8String} representation of title for modifications
*/
- public Utf8String getMutableSenderBytes() {
+ public Utf8String getMutableTitleBytes() {
bitField0_ |= 0x00000040;
- return this.sender;
+ return this.title;
}
/**
- * optional string sender = 2;
- * @param value the sender to set
+ * optional string title = 8;
+ * @param value the title to set
* @return this
*/
- public ClientMail setSender(final CharSequence value) {
+ public ClientMail setTitle(final CharSequence value) {
bitField0_ |= 0x00000040;
- sender.copyFrom(value);
+ title.copyFrom(value);
return this;
}
/**
- * optional string sender = 2;
- * @param value the sender to set
+ * optional string title = 8;
+ * @param value the title to set
* @return this
*/
- public ClientMail setSender(final Utf8String value) {
+ public ClientMail setTitle(final Utf8String value) {
bitField0_ |= 0x00000040;
- sender.copyFrom(value);
+ title.copyFrom(value);
return this;
}
/**
- * optional string content = 5;
+ * optional string content = 11;
* @return whether the content field is set
*/
public boolean hasContent() {
@@ -396,7 +396,7 @@ public boolean hasContent() {
}
/**
- * optional string content = 5;
+ * optional string content = 11;
* @return this
*/
public ClientMail clearContent() {
@@ -406,7 +406,7 @@ public ClientMail clearContent() {
}
/**
- * optional string content = 5;
+ * optional string content = 11;
* @return the content
*/
public String getContent() {
@@ -414,7 +414,7 @@ public String getContent() {
}
/**
- * optional string content = 5;
+ * optional string content = 11;
* @return internal {@code Utf8String} representation of content for reading
*/
public Utf8String getContentBytes() {
@@ -422,7 +422,7 @@ public Utf8String getContentBytes() {
}
/**
- * optional string content = 5;
+ * optional string content = 11;
* @return internal {@code Utf8String} representation of content for modifications
*/
public Utf8String getMutableContentBytes() {
@@ -431,7 +431,7 @@ public Utf8String getMutableContentBytes() {
}
/**
- * optional string content = 5;
+ * optional string content = 11;
* @param value the content to set
* @return this
*/
@@ -442,7 +442,7 @@ public ClientMail setContent(final CharSequence value) {
}
/**
- * optional string content = 5;
+ * optional string content = 11;
* @param value the content to set
* @return this
*/
@@ -453,72 +453,72 @@ public ClientMail setContent(final Utf8String value) {
}
/**
- * optional string title = 9;
- * @return whether the title field is set
+ * optional string sender = 15;
+ * @return whether the sender field is set
*/
- public boolean hasTitle() {
+ public boolean hasSender() {
return (bitField0_ & 0x00000100) != 0;
}
/**
- * optional string title = 9;
+ * optional string sender = 15;
* @return this
*/
- public ClientMail clearTitle() {
+ public ClientMail clearSender() {
bitField0_ &= ~0x00000100;
- title.clear();
+ sender.clear();
return this;
}
/**
- * optional string title = 9;
- * @return the title
+ * optional string sender = 15;
+ * @return the sender
*/
- public String getTitle() {
- return title.getString();
+ public String getSender() {
+ return sender.getString();
}
/**
- * optional string title = 9;
- * @return internal {@code Utf8String} representation of title for reading
+ * optional string sender = 15;
+ * @return internal {@code Utf8String} representation of sender for reading
*/
- public Utf8String getTitleBytes() {
- return this.title;
+ public Utf8String getSenderBytes() {
+ return this.sender;
}
/**
- * optional string title = 9;
- * @return internal {@code Utf8String} representation of title for modifications
+ * optional string sender = 15;
+ * @return internal {@code Utf8String} representation of sender for modifications
*/
- public Utf8String getMutableTitleBytes() {
+ public Utf8String getMutableSenderBytes() {
bitField0_ |= 0x00000100;
- return this.title;
+ return this.sender;
}
/**
- * optional string title = 9;
- * @param value the title to set
+ * optional string sender = 15;
+ * @param value the sender to set
* @return this
*/
- public ClientMail setTitle(final CharSequence value) {
+ public ClientMail setSender(final CharSequence value) {
bitField0_ |= 0x00000100;
- title.copyFrom(value);
+ sender.copyFrom(value);
return this;
}
/**
- * optional string title = 9;
- * @param value the title to set
+ * optional string sender = 15;
+ * @param value the sender to set
* @return this
*/
- public ClientMail setTitle(final Utf8String value) {
+ public ClientMail setSender(final Utf8String value) {
bitField0_ |= 0x00000100;
- title.copyFrom(value);
+ sender.copyFrom(value);
return this;
}
/**
- * repeated string para_list = 14;
+ * repeated string para_list = 1;
* @return whether the paraList field is set
*/
public boolean hasParaList() {
@@ -526,7 +526,7 @@ public boolean hasParaList() {
}
/**
- * repeated string para_list = 14;
+ * repeated string para_list = 1;
* @return this
*/
public ClientMail clearParaList() {
@@ -536,7 +536,7 @@ public ClientMail clearParaList() {
}
/**
- * repeated string para_list = 14;
+ * repeated string para_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.
@@ -550,7 +550,7 @@ public RepeatedString getParaList() {
}
/**
- * repeated string para_list = 14;
+ * repeated string para_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
@@ -564,7 +564,7 @@ public RepeatedString getMutableParaList() {
}
/**
- * repeated string para_list = 14;
+ * repeated string para_list = 1;
* @param value the paraList to add
* @return this
*/
@@ -575,7 +575,7 @@ public ClientMail addParaList(final CharSequence value) {
}
/**
- * repeated string para_list = 14;
+ * repeated string para_list = 1;
* @param values the paraList to add
* @return this
*/
@@ -590,15 +590,15 @@ public ClientMail copyFrom(final ClientMail other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- time = other.time;
expireTime = other.expireTime;
+ time = other.time;
id = other.id;
templateId = other.templateId;
isRead = other.isRead;
attachment.copyFrom(other.attachment);
- sender.copyFrom(other.sender);
- content.copyFrom(other.content);
title.copyFrom(other.title);
+ content.copyFrom(other.content);
+ sender.copyFrom(other.sender);
paraList.copyFrom(other.paraList);
}
return this;
@@ -610,12 +610,12 @@ public ClientMail mergeFrom(final ClientMail other) {
return this;
}
cachedSize = -1;
- if (other.hasTime()) {
- setTime(other.time);
- }
if (other.hasExpireTime()) {
setExpireTime(other.expireTime);
}
+ if (other.hasTime()) {
+ setTime(other.time);
+ }
if (other.hasId()) {
setId(other.id);
}
@@ -628,14 +628,14 @@ public ClientMail mergeFrom(final ClientMail other) {
if (other.hasAttachment()) {
getMutableAttachment().mergeFrom(other.attachment);
}
- if (other.hasSender()) {
- getMutableSenderBytes().copyFrom(other.sender);
+ if (other.hasTitle()) {
+ getMutableTitleBytes().copyFrom(other.title);
}
if (other.hasContent()) {
getMutableContentBytes().copyFrom(other.content);
}
- if (other.hasTitle()) {
- getMutableTitleBytes().copyFrom(other.title);
+ if (other.hasSender()) {
+ getMutableSenderBytes().copyFrom(other.sender);
}
if (other.hasParaList()) {
getMutableParaList().addAll(other.paraList);
@@ -650,15 +650,15 @@ public ClientMail clear() {
}
cachedSize = -1;
bitField0_ = 0;
- time = 0L;
expireTime = 0L;
+ time = 0L;
id = 0;
templateId = 0;
isRead = false;
attachment.clear();
- sender.clear();
- content.clear();
title.clear();
+ content.clear();
+ sender.clear();
paraList.clear();
return this;
}
@@ -671,9 +671,9 @@ public ClientMail clearQuick() {
cachedSize = -1;
bitField0_ = 0;
attachment.clearQuick();
- sender.clear();
- content.clear();
title.clear();
+ content.clear();
+ sender.clear();
paraList.clear();
return this;
}
@@ -688,59 +688,59 @@ public boolean equals(Object o) {
}
ClientMail other = (ClientMail) o;
return bitField0_ == other.bitField0_
- && (!hasTime() || time == other.time)
&& (!hasExpireTime() || expireTime == other.expireTime)
+ && (!hasTime() || time == other.time)
&& (!hasId() || id == other.id)
&& (!hasTemplateId() || templateId == other.templateId)
&& (!hasIsRead() || isRead == other.isRead)
&& (!hasAttachment() || attachment.equals(other.attachment))
- && (!hasSender() || sender.equals(other.sender))
- && (!hasContent() || content.equals(other.content))
&& (!hasTitle() || title.equals(other.title))
+ && (!hasContent() || content.equals(other.content))
+ && (!hasSender() || sender.equals(other.sender))
&& (!hasParaList() || paraList.equals(other.paraList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 88);
- output.writeInt64NoTag(time);
+ output.writeRawByte((byte) 24);
+ output.writeInt64NoTag(expireTime);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 96);
- output.writeInt64NoTag(expireTime);
+ output.writeRawByte((byte) 32);
+ output.writeInt64NoTag(time);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 104);
output.writeUInt32NoTag(id);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 112);
output.writeUInt32NoTag(templateId);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 80);
output.writeBoolNoTag(isRead);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 82);
+ output.writeRawByte((byte) 42);
output.writeMessageNoTag(attachment);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawByte((byte) 18);
- output.writeStringNoTag(sender);
+ output.writeRawByte((byte) 66);
+ output.writeStringNoTag(title);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRawByte((byte) 42);
+ output.writeRawByte((byte) 90);
output.writeStringNoTag(content);
}
if ((bitField0_ & 0x00000100) != 0) {
- output.writeRawByte((byte) 74);
- output.writeStringNoTag(title);
+ output.writeRawByte((byte) 122);
+ output.writeStringNoTag(sender);
}
if ((bitField0_ & 0x00000200) != 0) {
for (int i = 0; i < paraList.length(); i++) {
- output.writeRawByte((byte) 114);
+ output.writeRawByte((byte) 10);
output.writeStringNoTag(paraList.get(i));
}
}
@@ -750,10 +750,10 @@ public void writeTo(final ProtoSink output) throws IOException {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeInt64SizeNoTag(time);
+ size += 1 + ProtoSink.computeInt64SizeNoTag(expireTime);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeInt64SizeNoTag(expireTime);
+ size += 1 + ProtoSink.computeInt64SizeNoTag(time);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(id);
@@ -768,13 +768,13 @@ protected int computeSerializedSize() {
size += 1 + ProtoSink.computeMessageSizeNoTag(attachment);
}
if ((bitField0_ & 0x00000040) != 0) {
- size += 1 + ProtoSink.computeStringSizeNoTag(sender);
+ size += 1 + ProtoSink.computeStringSizeNoTag(title);
}
if ((bitField0_ & 0x00000080) != 0) {
size += 1 + ProtoSink.computeStringSizeNoTag(content);
}
if ((bitField0_ & 0x00000100) != 0) {
- size += 1 + ProtoSink.computeStringSizeNoTag(title);
+ size += 1 + ProtoSink.computeStringSizeNoTag(sender);
}
if ((bitField0_ & 0x00000200) != 0) {
size += (1 * paraList.length()) + ProtoSink.computeRepeatedStringSizeNoTag(paraList);
@@ -789,88 +789,88 @@ public ClientMail mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 88: {
- // time
- time = input.readInt64();
+ case 24: {
+ // expireTime
+ expireTime = input.readInt64();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 32) {
break;
}
}
- case 96: {
- // expireTime
- expireTime = input.readInt64();
+ case 32: {
+ // time
+ time = input.readInt64();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 56) {
+ if (tag != 104) {
break;
}
}
- case 56: {
+ case 104: {
// id
id = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 64) {
+ if (tag != 112) {
break;
}
}
- case 64: {
+ case 112: {
// templateId
templateId = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 80) {
break;
}
}
- case 120: {
+ case 80: {
// isRead
isRead = input.readBool();
bitField0_ |= 0x00000010;
tag = input.readTag();
- if (tag != 82) {
+ if (tag != 42) {
break;
}
}
- case 82: {
+ case 42: {
// attachment
input.readMessage(attachment);
bitField0_ |= 0x00000020;
tag = input.readTag();
- if (tag != 18) {
+ if (tag != 66) {
break;
}
}
- case 18: {
- // sender
- input.readString(sender);
+ case 66: {
+ // title
+ input.readString(title);
bitField0_ |= 0x00000040;
tag = input.readTag();
- if (tag != 42) {
+ if (tag != 90) {
break;
}
}
- case 42: {
+ case 90: {
// content
input.readString(content);
bitField0_ |= 0x00000080;
tag = input.readTag();
- if (tag != 74) {
+ if (tag != 122) {
break;
}
}
- case 74: {
- // title
- input.readString(title);
+ case 122: {
+ // sender
+ input.readString(sender);
bitField0_ |= 0x00000100;
tag = input.readTag();
- if (tag != 114) {
+ if (tag != 10) {
break;
}
}
- case 114: {
+ case 10: {
// paraList
tag = input.readRepeatedString(paraList, tag);
bitField0_ |= 0x00000200;
@@ -896,10 +896,10 @@ public ClientMail mergeFrom(final ProtoSource input) throws IOException {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeInt64(FieldNames.time, time);
+ output.writeInt64(FieldNames.expireTime, expireTime);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeInt64(FieldNames.expireTime, expireTime);
+ output.writeInt64(FieldNames.time, time);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.id, id);
@@ -914,13 +914,13 @@ public void writeTo(final JsonSink output) throws IOException {
output.writeMessage(FieldNames.attachment, attachment);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeString(FieldNames.sender, sender);
+ output.writeString(FieldNames.title, title);
}
if ((bitField0_ & 0x00000080) != 0) {
output.writeString(FieldNames.content, content);
}
if ((bitField0_ & 0x00000100) != 0) {
- output.writeString(FieldNames.title, title);
+ output.writeString(FieldNames.sender, sender);
}
if ((bitField0_ & 0x00000200) != 0) {
output.writeRepeatedString(FieldNames.paraList, paraList);
@@ -935,10 +935,11 @@ public ClientMail mergeFrom(final JsonSource input) throws IOException {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 3560141: {
- if (input.isAtField(FieldNames.time)) {
+ case -834724724:
+ case -96179731: {
+ if (input.isAtField(FieldNames.expireTime)) {
if (!input.trySkipNullValue()) {
- time = input.readInt64();
+ expireTime = input.readInt64();
bitField0_ |= 0x00000001;
}
} else {
@@ -946,11 +947,10 @@ public ClientMail mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case -834724724:
- case -96179731: {
- if (input.isAtField(FieldNames.expireTime)) {
+ case 3560141: {
+ if (input.isAtField(FieldNames.time)) {
if (!input.trySkipNullValue()) {
- expireTime = input.readInt64();
+ time = input.readInt64();
bitField0_ |= 0x00000002;
}
} else {
@@ -1004,10 +1004,10 @@ public ClientMail mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case -905962955: {
- if (input.isAtField(FieldNames.sender)) {
+ case 110371416: {
+ if (input.isAtField(FieldNames.title)) {
if (!input.trySkipNullValue()) {
- input.readString(sender);
+ input.readString(title);
bitField0_ |= 0x00000040;
}
} else {
@@ -1026,10 +1026,10 @@ public ClientMail mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 110371416: {
- if (input.isAtField(FieldNames.title)) {
+ case -905962955: {
+ if (input.isAtField(FieldNames.sender)) {
if (!input.trySkipNullValue()) {
- input.readString(title);
+ input.readString(sender);
bitField0_ |= 0x00000100;
}
} else {
@@ -1101,10 +1101,10 @@ public ClientMail create() {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName time = FieldName.forField("time");
-
static final FieldName expireTime = FieldName.forField("expireTime", "expire_time");
+ static final FieldName time = FieldName.forField("time");
+
static final FieldName id = FieldName.forField("id");
static final FieldName templateId = FieldName.forField("templateId", "template_id");
@@ -1113,11 +1113,11 @@ static class FieldNames {
static final FieldName attachment = FieldName.forField("attachment");
- static final FieldName sender = FieldName.forField("sender");
+ static final FieldName title = FieldName.forField("title");
static final FieldName content = FieldName.forField("content");
- static final FieldName title = FieldName.forField("title");
+ static final FieldName sender = FieldName.forField("sender");
static final FieldName paraList = FieldName.forField("paraList", "para_list");
}
diff --git a/src/generated/main/emu/lunarcore/proto/ClientUploadDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/ClientUploadDataOuterClass.java
deleted file mode 100644
index dc30da7bf..000000000
--- a/src/generated/main/emu/lunarcore/proto/ClientUploadDataOuterClass.java
+++ /dev/null
@@ -1,398 +0,0 @@
-// Code generated by protocol buffer compiler. Do not edit!
-package emu.lunarcore.proto;
-
-import java.io.IOException;
-import us.hebi.quickbuf.FieldName;
-import us.hebi.quickbuf.InvalidProtocolBufferException;
-import us.hebi.quickbuf.JsonSink;
-import us.hebi.quickbuf.JsonSource;
-import us.hebi.quickbuf.MessageFactory;
-import us.hebi.quickbuf.ProtoMessage;
-import us.hebi.quickbuf.ProtoSink;
-import us.hebi.quickbuf.ProtoSource;
-import us.hebi.quickbuf.Utf8String;
-
-public final class ClientUploadDataOuterClass {
- /**
- * Protobuf type {@code ClientUploadData}
- */
- public static final class ClientUploadData extends ProtoMessage implements Cloneable {
- private static final long serialVersionUID = 0L;
-
- /**
- * optional string tag = 1;
- */
- private final Utf8String tag_ = Utf8String.newEmptyInstance();
-
- /**
- * optional string value = 2;
- */
- private final Utf8String value_ = Utf8String.newEmptyInstance();
-
- private ClientUploadData() {
- }
-
- /**
- * @return a new empty instance of {@code ClientUploadData}
- */
- public static ClientUploadData newInstance() {
- return new ClientUploadData();
- }
-
- /**
- * optional string tag = 1;
- * @return whether the tag_ field is set
- */
- public boolean hasTag() {
- return (bitField0_ & 0x00000001) != 0;
- }
-
- /**
- * optional string tag = 1;
- * @return this
- */
- public ClientUploadData clearTag() {
- bitField0_ &= ~0x00000001;
- tag_.clear();
- return this;
- }
-
- /**
- * optional string tag = 1;
- * @return the tag_
- */
- public String getTag() {
- return tag_.getString();
- }
-
- /**
- * optional string tag = 1;
- * @return internal {@code Utf8String} representation of tag_ for reading
- */
- public Utf8String getTagBytes() {
- return this.tag_;
- }
-
- /**
- * optional string tag = 1;
- * @return internal {@code Utf8String} representation of tag_ for modifications
- */
- public Utf8String getMutableTagBytes() {
- bitField0_ |= 0x00000001;
- return this.tag_;
- }
-
- /**
- * optional string tag = 1;
- * @param value the tag_ to set
- * @return this
- */
- public ClientUploadData setTag(final CharSequence value) {
- bitField0_ |= 0x00000001;
- tag_.copyFrom(value);
- return this;
- }
-
- /**
- * optional string tag = 1;
- * @param value the tag_ to set
- * @return this
- */
- public ClientUploadData setTag(final Utf8String value) {
- bitField0_ |= 0x00000001;
- tag_.copyFrom(value);
- return this;
- }
-
- /**
- * optional string value = 2;
- * @return whether the value_ field is set
- */
- public boolean hasValue() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional string value = 2;
- * @return this
- */
- public ClientUploadData clearValue() {
- bitField0_ &= ~0x00000002;
- value_.clear();
- return this;
- }
-
- /**
- * optional string value = 2;
- * @return the value_
- */
- public String getValue() {
- return value_.getString();
- }
-
- /**
- * optional string value = 2;
- * @return internal {@code Utf8String} representation of value_ for reading
- */
- public Utf8String getValueBytes() {
- return this.value_;
- }
-
- /**
- * optional string value = 2;
- * @return internal {@code Utf8String} representation of value_ for modifications
- */
- public Utf8String getMutableValueBytes() {
- bitField0_ |= 0x00000002;
- return this.value_;
- }
-
- /**
- * optional string value = 2;
- * @param value the value_ to set
- * @return this
- */
- public ClientUploadData setValue(final CharSequence value) {
- bitField0_ |= 0x00000002;
- value_.copyFrom(value);
- return this;
- }
-
- /**
- * optional string value = 2;
- * @param value the value_ to set
- * @return this
- */
- public ClientUploadData setValue(final Utf8String value) {
- bitField0_ |= 0x00000002;
- value_.copyFrom(value);
- return this;
- }
-
- @Override
- public ClientUploadData copyFrom(final ClientUploadData other) {
- cachedSize = other.cachedSize;
- if ((bitField0_ | other.bitField0_) != 0) {
- bitField0_ = other.bitField0_;
- tag_.copyFrom(other.tag_);
- value_.copyFrom(other.value_);
- }
- return this;
- }
-
- @Override
- public ClientUploadData mergeFrom(final ClientUploadData other) {
- if (other.isEmpty()) {
- return this;
- }
- cachedSize = -1;
- if (other.hasTag()) {
- getMutableTagBytes().copyFrom(other.tag_);
- }
- if (other.hasValue()) {
- getMutableValueBytes().copyFrom(other.value_);
- }
- return this;
- }
-
- @Override
- public ClientUploadData clear() {
- if (isEmpty()) {
- return this;
- }
- cachedSize = -1;
- bitField0_ = 0;
- tag_.clear();
- value_.clear();
- return this;
- }
-
- @Override
- public ClientUploadData clearQuick() {
- if (isEmpty()) {
- return this;
- }
- cachedSize = -1;
- bitField0_ = 0;
- tag_.clear();
- value_.clear();
- return this;
- }
-
- @Override
- public boolean equals(Object o) {
- if (o == this) {
- return true;
- }
- if (!(o instanceof ClientUploadData)) {
- return false;
- }
- ClientUploadData other = (ClientUploadData) o;
- return bitField0_ == other.bitField0_
- && (!hasTag() || tag_.equals(other.tag_))
- && (!hasValue() || value_.equals(other.value_));
- }
-
- @Override
- public void writeTo(final ProtoSink output) throws IOException {
- if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 10);
- output.writeStringNoTag(tag_);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 18);
- output.writeStringNoTag(value_);
- }
- }
-
- @Override
- protected int computeSerializedSize() {
- int size = 0;
- if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeStringSizeNoTag(tag_);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeStringSizeNoTag(value_);
- }
- return size;
- }
-
- @Override
- @SuppressWarnings("fallthrough")
- public ClientUploadData mergeFrom(final ProtoSource input) throws IOException {
- // Enabled Fall-Through Optimization (QuickBuffers)
- int tag = input.readTag();
- while (true) {
- switch (tag) {
- case 10: {
- // tag_
- input.readString(tag_);
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 18) {
- break;
- }
- }
- case 18: {
- // value_
- input.readString(value_);
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 0) {
- break;
- }
- }
- case 0: {
- return this;
- }
- default: {
- if (!input.skipField(tag)) {
- return this;
- }
- tag = input.readTag();
- break;
- }
- }
- }
- }
-
- @Override
- public void writeTo(final JsonSink output) throws IOException {
- output.beginObject();
- if ((bitField0_ & 0x00000001) != 0) {
- output.writeString(FieldNames.tag_, tag_);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeString(FieldNames.value_, value_);
- }
- output.endObject();
- }
-
- @Override
- public ClientUploadData mergeFrom(final JsonSource input) throws IOException {
- if (!input.beginObject()) {
- return this;
- }
- while (!input.isAtEnd()) {
- switch (input.readFieldHash()) {
- case 114586: {
- if (input.isAtField(FieldNames.tag_)) {
- if (!input.trySkipNullValue()) {
- input.readString(tag_);
- bitField0_ |= 0x00000001;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 111972721: {
- if (input.isAtField(FieldNames.value_)) {
- if (!input.trySkipNullValue()) {
- input.readString(value_);
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- default: {
- input.skipUnknownField();
- break;
- }
- }
- }
- input.endObject();
- return this;
- }
-
- @Override
- public ClientUploadData clone() {
- return new ClientUploadData().copyFrom(this);
- }
-
- @Override
- public boolean isEmpty() {
- return ((bitField0_) == 0);
- }
-
- public static ClientUploadData parseFrom(final byte[] data) throws
- InvalidProtocolBufferException {
- return ProtoMessage.mergeFrom(new ClientUploadData(), data).checkInitialized();
- }
-
- public static ClientUploadData parseFrom(final ProtoSource input) throws IOException {
- return ProtoMessage.mergeFrom(new ClientUploadData(), input).checkInitialized();
- }
-
- public static ClientUploadData parseFrom(final JsonSource input) throws IOException {
- return ProtoMessage.mergeFrom(new ClientUploadData(), input).checkInitialized();
- }
-
- /**
- * @return factory for creating ClientUploadData messages
- */
- public static MessageFactory getFactory() {
- return ClientUploadDataFactory.INSTANCE;
- }
-
- private enum ClientUploadDataFactory implements MessageFactory {
- INSTANCE;
-
- @Override
- public ClientUploadData create() {
- return ClientUploadData.newInstance();
- }
- }
-
- /**
- * Contains name constants used for serializing JSON
- */
- static class FieldNames {
- static final FieldName tag_ = FieldName.forField("tag");
-
- static final FieldName value_ = FieldName.forField("value");
- }
- }
-}
diff --git a/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java
index 08a7e5e1d..415e308c4 100644
--- a/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java
@@ -19,17 +19,17 @@ public static final class ComposeItemCsReq extends ProtoMessageoptional uint32 compose_id = 5;
+ * optional uint32 count = 12;
*/
- private int composeId;
+ private int count;
/**
- * optional uint32 count = 9;
+ * optional uint32 compose_id = 13;
*/
- private int count;
+ private int composeId;
/**
- * optional .ItemCostList compose_item_list = 6;
+ * optional .ItemCostList compose_item_list = 1;
*/
private final ItemCostListOuterClass.ItemCostList composeItemList = ItemCostListOuterClass.ItemCostList.newInstance();
@@ -44,81 +44,81 @@ public static ComposeItemCsReq newInstance() {
}
/**
- * optional uint32 compose_id = 5;
- * @return whether the composeId field is set
+ * optional uint32 count = 12;
+ * @return whether the count field is set
*/
- public boolean hasComposeId() {
+ public boolean hasCount() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 compose_id = 5;
+ * optional uint32 count = 12;
* @return this
*/
- public ComposeItemCsReq clearComposeId() {
+ public ComposeItemCsReq clearCount() {
bitField0_ &= ~0x00000001;
- composeId = 0;
+ count = 0;
return this;
}
/**
- * optional uint32 compose_id = 5;
- * @return the composeId
+ * optional uint32 count = 12;
+ * @return the count
*/
- public int getComposeId() {
- return composeId;
+ public int getCount() {
+ return count;
}
/**
- * optional uint32 compose_id = 5;
- * @param value the composeId to set
+ * optional uint32 count = 12;
+ * @param value the count to set
* @return this
*/
- public ComposeItemCsReq setComposeId(final int value) {
+ public ComposeItemCsReq setCount(final int value) {
bitField0_ |= 0x00000001;
- composeId = value;
+ count = value;
return this;
}
/**
- * optional uint32 count = 9;
- * @return whether the count field is set
+ * optional uint32 compose_id = 13;
+ * @return whether the composeId field is set
*/
- public boolean hasCount() {
+ public boolean hasComposeId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 count = 9;
+ * optional uint32 compose_id = 13;
* @return this
*/
- public ComposeItemCsReq clearCount() {
+ public ComposeItemCsReq clearComposeId() {
bitField0_ &= ~0x00000002;
- count = 0;
+ composeId = 0;
return this;
}
/**
- * optional uint32 count = 9;
- * @return the count
+ * optional uint32 compose_id = 13;
+ * @return the composeId
*/
- public int getCount() {
- return count;
+ public int getComposeId() {
+ return composeId;
}
/**
- * optional uint32 count = 9;
- * @param value the count to set
+ * optional uint32 compose_id = 13;
+ * @param value the composeId to set
* @return this
*/
- public ComposeItemCsReq setCount(final int value) {
+ public ComposeItemCsReq setComposeId(final int value) {
bitField0_ |= 0x00000002;
- count = value;
+ composeId = value;
return this;
}
/**
- * optional .ItemCostList compose_item_list = 6;
+ * optional .ItemCostList compose_item_list = 1;
* @return whether the composeItemList field is set
*/
public boolean hasComposeItemList() {
@@ -126,7 +126,7 @@ public boolean hasComposeItemList() {
}
/**
- * optional .ItemCostList compose_item_list = 6;
+ * optional .ItemCostList compose_item_list = 1;
* @return this
*/
public ComposeItemCsReq clearComposeItemList() {
@@ -136,7 +136,7 @@ public ComposeItemCsReq clearComposeItemList() {
}
/**
- * optional .ItemCostList compose_item_list = 6;
+ * optional .ItemCostList compose_item_list = 1;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -150,7 +150,7 @@ public ItemCostListOuterClass.ItemCostList getComposeItemList() {
}
/**
- * optional .ItemCostList compose_item_list = 6;
+ * optional .ItemCostList compose_item_list = 1;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -164,7 +164,7 @@ public ItemCostListOuterClass.ItemCostList getMutableComposeItemList() {
}
/**
- * optional .ItemCostList compose_item_list = 6;
+ * optional .ItemCostList compose_item_list = 1;
* @param value the composeItemList to set
* @return this
*/
@@ -179,8 +179,8 @@ public ComposeItemCsReq copyFrom(final ComposeItemCsReq other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- composeId = other.composeId;
count = other.count;
+ composeId = other.composeId;
composeItemList.copyFrom(other.composeItemList);
}
return this;
@@ -192,12 +192,12 @@ public ComposeItemCsReq mergeFrom(final ComposeItemCsReq other) {
return this;
}
cachedSize = -1;
- if (other.hasComposeId()) {
- setComposeId(other.composeId);
- }
if (other.hasCount()) {
setCount(other.count);
}
+ if (other.hasComposeId()) {
+ setComposeId(other.composeId);
+ }
if (other.hasComposeItemList()) {
getMutableComposeItemList().mergeFrom(other.composeItemList);
}
@@ -211,8 +211,8 @@ public ComposeItemCsReq clear() {
}
cachedSize = -1;
bitField0_ = 0;
- composeId = 0;
count = 0;
+ composeId = 0;
composeItemList.clear();
return this;
}
@@ -238,23 +238,23 @@ public boolean equals(Object o) {
}
ComposeItemCsReq other = (ComposeItemCsReq) o;
return bitField0_ == other.bitField0_
- && (!hasComposeId() || composeId == other.composeId)
&& (!hasCount() || count == other.count)
+ && (!hasComposeId() || composeId == other.composeId)
&& (!hasComposeItemList() || composeItemList.equals(other.composeItemList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
- output.writeUInt32NoTag(composeId);
+ output.writeRawByte((byte) 96);
+ output.writeUInt32NoTag(count);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 72);
- output.writeUInt32NoTag(count);
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(composeId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 50);
+ output.writeRawByte((byte) 10);
output.writeMessageNoTag(composeItemList);
}
}
@@ -263,10 +263,10 @@ public void writeTo(final ProtoSink output) throws IOException {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(count);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(count);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(composeItemList);
@@ -281,25 +281,25 @@ public ComposeItemCsReq mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
- // composeId
- composeId = input.readUInt32();
+ case 96: {
+ // count
+ count = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 72) {
+ if (tag != 104) {
break;
}
}
- case 72: {
- // count
- count = input.readUInt32();
+ case 104: {
+ // composeId
+ composeId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 50) {
+ if (tag != 10) {
break;
}
}
- case 50: {
+ case 10: {
// composeItemList
input.readMessage(composeItemList);
bitField0_ |= 0x00000004;
@@ -326,10 +326,10 @@ public ComposeItemCsReq mergeFrom(final ProtoSource input) throws IOException {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.composeId, composeId);
+ output.writeUInt32(FieldNames.count, count);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.count, count);
+ output.writeUInt32(FieldNames.composeId, composeId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeMessage(FieldNames.composeItemList, composeItemList);
@@ -344,11 +344,10 @@ public ComposeItemCsReq mergeFrom(final JsonSource input) throws IOException {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1399759283:
- case -442843416: {
- if (input.isAtField(FieldNames.composeId)) {
+ case 94851343: {
+ if (input.isAtField(FieldNames.count)) {
if (!input.trySkipNullValue()) {
- composeId = input.readUInt32();
+ count = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -356,10 +355,11 @@ public ComposeItemCsReq mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 94851343: {
- if (input.isAtField(FieldNames.count)) {
+ case -1399759283:
+ case -442843416: {
+ if (input.isAtField(FieldNames.composeId)) {
if (!input.trySkipNullValue()) {
- count = input.readUInt32();
+ composeId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -432,10 +432,10 @@ public ComposeItemCsReq create() {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName composeId = FieldName.forField("composeId", "compose_id");
-
static final FieldName count = FieldName.forField("count");
+ static final FieldName composeId = FieldName.forField("composeId", "compose_id");
+
static final FieldName composeItemList = FieldName.forField("composeItemList", "compose_item_list");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java
index d0c99f9b3..a5a40b1dd 100644
--- a/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java
@@ -19,22 +19,22 @@ public static final class ComposeItemScRsp extends ProtoMessageoptional uint32 count = 6;
+ * optional uint32 compose_id = 1;
*/
- private int count;
+ private int composeId;
/**
- * optional uint32 compose_id = 13;
+ * optional uint32 retcode = 5;
*/
- private int composeId;
+ private int retcode;
/**
- * optional uint32 retcode = 15;
+ * optional uint32 count = 9;
*/
- private int retcode;
+ private int count;
/**
- * optional .ItemList return_item_list = 1;
+ * optional .ItemList return_item_list = 3;
*/
private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance();
@@ -49,118 +49,118 @@ public static ComposeItemScRsp newInstance() {
}
/**
- * optional uint32 count = 6;
- * @return whether the count field is set
+ * optional uint32 compose_id = 1;
+ * @return whether the composeId field is set
*/
- public boolean hasCount() {
+ public boolean hasComposeId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 count = 6;
+ * optional uint32 compose_id = 1;
* @return this
*/
- public ComposeItemScRsp clearCount() {
+ public ComposeItemScRsp clearComposeId() {
bitField0_ &= ~0x00000001;
- count = 0;
+ composeId = 0;
return this;
}
/**
- * optional uint32 count = 6;
- * @return the count
+ * optional uint32 compose_id = 1;
+ * @return the composeId
*/
- public int getCount() {
- return count;
+ public int getComposeId() {
+ return composeId;
}
/**
- * optional uint32 count = 6;
- * @param value the count to set
+ * optional uint32 compose_id = 1;
+ * @param value the composeId to set
* @return this
*/
- public ComposeItemScRsp setCount(final int value) {
+ public ComposeItemScRsp setComposeId(final int value) {
bitField0_ |= 0x00000001;
- count = value;
+ composeId = value;
return this;
}
/**
- * optional uint32 compose_id = 13;
- * @return whether the composeId field is set
+ * optional uint32 retcode = 5;
+ * @return whether the retcode field is set
*/
- public boolean hasComposeId() {
+ public boolean hasRetcode() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 compose_id = 13;
+ * optional uint32 retcode = 5;
* @return this
*/
- public ComposeItemScRsp clearComposeId() {
+ public ComposeItemScRsp clearRetcode() {
bitField0_ &= ~0x00000002;
- composeId = 0;
+ retcode = 0;
return this;
}
/**
- * optional uint32 compose_id = 13;
- * @return the composeId
+ * optional uint32 retcode = 5;
+ * @return the retcode
*/
- public int getComposeId() {
- return composeId;
+ public int getRetcode() {
+ return retcode;
}
/**
- * optional uint32 compose_id = 13;
- * @param value the composeId to set
+ * optional uint32 retcode = 5;
+ * @param value the retcode to set
* @return this
*/
- public ComposeItemScRsp setComposeId(final int value) {
+ public ComposeItemScRsp setRetcode(final int value) {
bitField0_ |= 0x00000002;
- composeId = value;
+ retcode = value;
return this;
}
/**
- * optional uint32 retcode = 15;
- * @return whether the retcode field is set
+ * optional uint32 count = 9;
+ * @return whether the count field is set
*/
- public boolean hasRetcode() {
+ public boolean hasCount() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 count = 9;
* @return this
*/
- public ComposeItemScRsp clearRetcode() {
+ public ComposeItemScRsp clearCount() {
bitField0_ &= ~0x00000004;
- retcode = 0;
+ count = 0;
return this;
}
/**
- * optional uint32 retcode = 15;
- * @return the retcode
+ * optional uint32 count = 9;
+ * @return the count
*/
- public int getRetcode() {
- return retcode;
+ public int getCount() {
+ return count;
}
/**
- * optional uint32 retcode = 15;
- * @param value the retcode to set
+ * optional uint32 count = 9;
+ * @param value the count to set
* @return this
*/
- public ComposeItemScRsp setRetcode(final int value) {
+ public ComposeItemScRsp setCount(final int value) {
bitField0_ |= 0x00000004;
- retcode = value;
+ count = value;
return this;
}
/**
- * optional .ItemList return_item_list = 1;
+ * optional .ItemList return_item_list = 3;
* @return whether the returnItemList field is set
*/
public boolean hasReturnItemList() {
@@ -168,7 +168,7 @@ public boolean hasReturnItemList() {
}
/**
- * optional .ItemList return_item_list = 1;
+ * optional .ItemList return_item_list = 3;
* @return this
*/
public ComposeItemScRsp clearReturnItemList() {
@@ -178,7 +178,7 @@ public ComposeItemScRsp clearReturnItemList() {
}
/**
- * optional .ItemList return_item_list = 1;
+ * optional .ItemList return_item_list = 3;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -192,7 +192,7 @@ public ItemListOuterClass.ItemList getReturnItemList() {
}
/**
- * optional .ItemList return_item_list = 1;
+ * optional .ItemList return_item_list = 3;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -206,7 +206,7 @@ public ItemListOuterClass.ItemList getMutableReturnItemList() {
}
/**
- * optional .ItemList return_item_list = 1;
+ * optional .ItemList return_item_list = 3;
* @param value the returnItemList to set
* @return this
*/
@@ -221,9 +221,9 @@ public ComposeItemScRsp copyFrom(final ComposeItemScRsp other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- count = other.count;
composeId = other.composeId;
retcode = other.retcode;
+ count = other.count;
returnItemList.copyFrom(other.returnItemList);
}
return this;
@@ -235,15 +235,15 @@ public ComposeItemScRsp mergeFrom(final ComposeItemScRsp other) {
return this;
}
cachedSize = -1;
- if (other.hasCount()) {
- setCount(other.count);
- }
if (other.hasComposeId()) {
setComposeId(other.composeId);
}
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
+ if (other.hasCount()) {
+ setCount(other.count);
+ }
if (other.hasReturnItemList()) {
getMutableReturnItemList().mergeFrom(other.returnItemList);
}
@@ -257,9 +257,9 @@ public ComposeItemScRsp clear() {
}
cachedSize = -1;
bitField0_ = 0;
- count = 0;
composeId = 0;
retcode = 0;
+ count = 0;
returnItemList.clear();
return this;
}
@@ -285,28 +285,28 @@ public boolean equals(Object o) {
}
ComposeItemScRsp other = (ComposeItemScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasCount() || count == other.count)
&& (!hasComposeId() || composeId == other.composeId)
&& (!hasRetcode() || retcode == other.retcode)
+ && (!hasCount() || count == other.count)
&& (!hasReturnItemList() || returnItemList.equals(other.returnItemList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 48);
- output.writeUInt32NoTag(count);
+ output.writeRawByte((byte) 8);
+ output.writeUInt32NoTag(composeId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 104);
- output.writeUInt32NoTag(composeId);
+ output.writeRawByte((byte) 40);
+ output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 120);
- output.writeUInt32NoTag(retcode);
+ output.writeRawByte((byte) 72);
+ output.writeUInt32NoTag(count);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 10);
+ output.writeRawByte((byte) 26);
output.writeMessageNoTag(returnItemList);
}
}
@@ -315,13 +315,13 @@ public void writeTo(final ProtoSink output) throws IOException {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(count);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(count);
}
if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(returnItemList);
@@ -336,34 +336,34 @@ public ComposeItemScRsp mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 48: {
- // count
- count = input.readUInt32();
+ case 8: {
+ // composeId
+ composeId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 40) {
break;
}
}
- case 104: {
- // composeId
- composeId = input.readUInt32();
+ case 40: {
+ // retcode
+ retcode = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 72) {
break;
}
}
- case 120: {
- // retcode
- retcode = input.readUInt32();
+ case 72: {
+ // count
+ count = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 10) {
+ if (tag != 26) {
break;
}
}
- case 10: {
+ case 26: {
// returnItemList
input.readMessage(returnItemList);
bitField0_ |= 0x00000008;
@@ -390,13 +390,13 @@ public ComposeItemScRsp mergeFrom(final ProtoSource input) throws IOException {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.count, count);
+ output.writeUInt32(FieldNames.composeId, composeId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.composeId, composeId);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.count, count);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeMessage(FieldNames.returnItemList, returnItemList);
@@ -411,10 +411,11 @@ public ComposeItemScRsp mergeFrom(final JsonSource input) throws IOException {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 94851343: {
- if (input.isAtField(FieldNames.count)) {
+ case -1399759283:
+ case -442843416: {
+ if (input.isAtField(FieldNames.composeId)) {
if (!input.trySkipNullValue()) {
- count = input.readUInt32();
+ composeId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -422,11 +423,10 @@ public ComposeItemScRsp mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case -1399759283:
- case -442843416: {
- if (input.isAtField(FieldNames.composeId)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- composeId = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -434,10 +434,10 @@ public ComposeItemScRsp mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case 94851343: {
+ if (input.isAtField(FieldNames.count)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ count = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -510,12 +510,12 @@ public ComposeItemScRsp create() {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName count = FieldName.forField("count");
-
static final FieldName composeId = FieldName.forField("composeId", "compose_id");
static final FieldName retcode = FieldName.forField("retcode");
+ static final FieldName count = FieldName.forField("count");
+
static final FieldName returnItemList = FieldName.forField("returnItemList", "return_item_list");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicCsReqOuterClass.java
index 895439bfb..f3efc6bb7 100644
--- a/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicCsReqOuterClass.java
@@ -19,14 +19,14 @@ public static final class ComposeSelectedRelicCsReq extends ProtoMessageoptional uint32 compose_id = 5;
+ * optional uint32 compose_relic_id = 3;
*/
- private int composeId;
+ private int composeRelicId;
/**
- * optional uint32 compose_relic_id = 10;
+ * optional uint32 compose_id = 5;
*/
- private int composeRelicId;
+ private int composeId;
/**
* optional uint32 count = 11;
@@ -34,12 +34,12 @@ public static final class ComposeSelectedRelicCsReq extends ProtoMessageoptional uint32 main_affix_id = 12;
+ * optional uint32 main_affix_id = 13;
*/
private int mainAffixId;
/**
- * optional .ItemCostList compose_item_list = 4;
+ * optional .ItemCostList compose_item_list = 9;
*/
private final ItemCostListOuterClass.ItemCostList composeItemList = ItemCostListOuterClass.ItemCostList.newInstance();
@@ -54,76 +54,76 @@ public static ComposeSelectedRelicCsReq newInstance() {
}
/**
- * optional uint32 compose_id = 5;
- * @return whether the composeId field is set
+ * optional uint32 compose_relic_id = 3;
+ * @return whether the composeRelicId field is set
*/
- public boolean hasComposeId() {
+ public boolean hasComposeRelicId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 compose_id = 5;
+ * optional uint32 compose_relic_id = 3;
* @return this
*/
- public ComposeSelectedRelicCsReq clearComposeId() {
+ public ComposeSelectedRelicCsReq clearComposeRelicId() {
bitField0_ &= ~0x00000001;
- composeId = 0;
+ composeRelicId = 0;
return this;
}
/**
- * optional uint32 compose_id = 5;
- * @return the composeId
+ * optional uint32 compose_relic_id = 3;
+ * @return the composeRelicId
*/
- public int getComposeId() {
- return composeId;
+ public int getComposeRelicId() {
+ return composeRelicId;
}
/**
- * optional uint32 compose_id = 5;
- * @param value the composeId to set
+ * optional uint32 compose_relic_id = 3;
+ * @param value the composeRelicId to set
* @return this
*/
- public ComposeSelectedRelicCsReq setComposeId(final int value) {
+ public ComposeSelectedRelicCsReq setComposeRelicId(final int value) {
bitField0_ |= 0x00000001;
- composeId = value;
+ composeRelicId = value;
return this;
}
/**
- * optional uint32 compose_relic_id = 10;
- * @return whether the composeRelicId field is set
+ * optional uint32 compose_id = 5;
+ * @return whether the composeId field is set
*/
- public boolean hasComposeRelicId() {
+ public boolean hasComposeId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 compose_relic_id = 10;
+ * optional uint32 compose_id = 5;
* @return this
*/
- public ComposeSelectedRelicCsReq clearComposeRelicId() {
+ public ComposeSelectedRelicCsReq clearComposeId() {
bitField0_ &= ~0x00000002;
- composeRelicId = 0;
+ composeId = 0;
return this;
}
/**
- * optional uint32 compose_relic_id = 10;
- * @return the composeRelicId
+ * optional uint32 compose_id = 5;
+ * @return the composeId
*/
- public int getComposeRelicId() {
- return composeRelicId;
+ public int getComposeId() {
+ return composeId;
}
/**
- * optional uint32 compose_relic_id = 10;
- * @param value the composeRelicId to set
+ * optional uint32 compose_id = 5;
+ * @param value the composeId to set
* @return this
*/
- public ComposeSelectedRelicCsReq setComposeRelicId(final int value) {
+ public ComposeSelectedRelicCsReq setComposeId(final int value) {
bitField0_ |= 0x00000002;
- composeRelicId = value;
+ composeId = value;
return this;
}
@@ -165,7 +165,7 @@ public ComposeSelectedRelicCsReq setCount(final int value) {
}
/**
- * optional uint32 main_affix_id = 12;
+ * optional uint32 main_affix_id = 13;
* @return whether the mainAffixId field is set
*/
public boolean hasMainAffixId() {
@@ -173,7 +173,7 @@ public boolean hasMainAffixId() {
}
/**
- * optional uint32 main_affix_id = 12;
+ * optional uint32 main_affix_id = 13;
* @return this
*/
public ComposeSelectedRelicCsReq clearMainAffixId() {
@@ -183,7 +183,7 @@ public ComposeSelectedRelicCsReq clearMainAffixId() {
}
/**
- * optional uint32 main_affix_id = 12;
+ * optional uint32 main_affix_id = 13;
* @return the mainAffixId
*/
public int getMainAffixId() {
@@ -191,7 +191,7 @@ public int getMainAffixId() {
}
/**
- * optional uint32 main_affix_id = 12;
+ * optional uint32 main_affix_id = 13;
* @param value the mainAffixId to set
* @return this
*/
@@ -202,7 +202,7 @@ public ComposeSelectedRelicCsReq setMainAffixId(final int value) {
}
/**
- * optional .ItemCostList compose_item_list = 4;
+ * optional .ItemCostList compose_item_list = 9;
* @return whether the composeItemList field is set
*/
public boolean hasComposeItemList() {
@@ -210,7 +210,7 @@ public boolean hasComposeItemList() {
}
/**
- * optional .ItemCostList compose_item_list = 4;
+ * optional .ItemCostList compose_item_list = 9;
* @return this
*/
public ComposeSelectedRelicCsReq clearComposeItemList() {
@@ -220,7 +220,7 @@ public ComposeSelectedRelicCsReq clearComposeItemList() {
}
/**
- * optional .ItemCostList compose_item_list = 4;
+ * optional .ItemCostList compose_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.
@@ -234,7 +234,7 @@ public ItemCostListOuterClass.ItemCostList getComposeItemList() {
}
/**
- * optional .ItemCostList compose_item_list = 4;
+ * optional .ItemCostList compose_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
@@ -248,7 +248,7 @@ public ItemCostListOuterClass.ItemCostList getMutableComposeItemList() {
}
/**
- * optional .ItemCostList compose_item_list = 4;
+ * optional .ItemCostList compose_item_list = 9;
* @param value the composeItemList to set
* @return this
*/
@@ -264,8 +264,8 @@ public ComposeSelectedRelicCsReq copyFrom(final ComposeSelectedRelicCsReq other)
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- composeId = other.composeId;
composeRelicId = other.composeRelicId;
+ composeId = other.composeId;
count = other.count;
mainAffixId = other.mainAffixId;
composeItemList.copyFrom(other.composeItemList);
@@ -279,12 +279,12 @@ public ComposeSelectedRelicCsReq mergeFrom(final ComposeSelectedRelicCsReq other
return this;
}
cachedSize = -1;
- if (other.hasComposeId()) {
- setComposeId(other.composeId);
- }
if (other.hasComposeRelicId()) {
setComposeRelicId(other.composeRelicId);
}
+ if (other.hasComposeId()) {
+ setComposeId(other.composeId);
+ }
if (other.hasCount()) {
setCount(other.count);
}
@@ -304,8 +304,8 @@ public ComposeSelectedRelicCsReq clear() {
}
cachedSize = -1;
bitField0_ = 0;
- composeId = 0;
composeRelicId = 0;
+ composeId = 0;
count = 0;
mainAffixId = 0;
composeItemList.clear();
@@ -333,8 +333,8 @@ public boolean equals(Object o) {
}
ComposeSelectedRelicCsReq other = (ComposeSelectedRelicCsReq) o;
return bitField0_ == other.bitField0_
- && (!hasComposeId() || composeId == other.composeId)
&& (!hasComposeRelicId() || composeRelicId == other.composeRelicId)
+ && (!hasComposeId() || composeId == other.composeId)
&& (!hasCount() || count == other.count)
&& (!hasMainAffixId() || mainAffixId == other.mainAffixId)
&& (!hasComposeItemList() || composeItemList.equals(other.composeItemList));
@@ -343,23 +343,23 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
- output.writeUInt32NoTag(composeId);
+ output.writeRawByte((byte) 24);
+ output.writeUInt32NoTag(composeRelicId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(composeRelicId);
+ output.writeRawByte((byte) 40);
+ output.writeUInt32NoTag(composeId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 88);
output.writeUInt32NoTag(count);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 104);
output.writeUInt32NoTag(mainAffixId);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 34);
+ output.writeRawByte((byte) 74);
output.writeMessageNoTag(composeItemList);
}
}
@@ -368,10 +368,10 @@ public void writeTo(final ProtoSink output) throws IOException {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(composeRelicId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(composeRelicId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(count);
@@ -392,18 +392,18 @@ public ComposeSelectedRelicCsReq mergeFrom(final ProtoSource input) throws IOExc
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
- // composeId
- composeId = input.readUInt32();
+ case 24: {
+ // composeRelicId
+ composeRelicId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 80) {
+ if (tag != 40) {
break;
}
}
- case 80: {
- // composeRelicId
- composeRelicId = input.readUInt32();
+ case 40: {
+ // composeId
+ composeId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 88) {
@@ -415,20 +415,20 @@ public ComposeSelectedRelicCsReq mergeFrom(final ProtoSource input) throws IOExc
count = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 104) {
break;
}
}
- case 96: {
+ case 104: {
// mainAffixId
mainAffixId = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 34) {
+ if (tag != 74) {
break;
}
}
- case 34: {
+ case 74: {
// composeItemList
input.readMessage(composeItemList);
bitField0_ |= 0x00000010;
@@ -455,10 +455,10 @@ public ComposeSelectedRelicCsReq mergeFrom(final ProtoSource input) throws IOExc
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.composeId, composeId);
+ output.writeUInt32(FieldNames.composeRelicId, composeRelicId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.composeRelicId, composeRelicId);
+ output.writeUInt32(FieldNames.composeId, composeId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.count, count);
@@ -479,11 +479,11 @@ public ComposeSelectedRelicCsReq mergeFrom(final JsonSource input) throws IOExce
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1399759283:
- case -442843416: {
- if (input.isAtField(FieldNames.composeId)) {
+ case 1424923132:
+ case 885799284: {
+ if (input.isAtField(FieldNames.composeRelicId)) {
if (!input.trySkipNullValue()) {
- composeId = input.readUInt32();
+ composeRelicId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -491,11 +491,11 @@ public ComposeSelectedRelicCsReq mergeFrom(final JsonSource input) throws IOExce
}
break;
}
- case 1424923132:
- case 885799284: {
- if (input.isAtField(FieldNames.composeRelicId)) {
+ case -1399759283:
+ case -442843416: {
+ if (input.isAtField(FieldNames.composeId)) {
if (!input.trySkipNullValue()) {
- composeRelicId = input.readUInt32();
+ composeId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -591,10 +591,10 @@ public ComposeSelectedRelicCsReq create() {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName composeId = FieldName.forField("composeId", "compose_id");
-
static final FieldName composeRelicId = FieldName.forField("composeRelicId", "compose_relic_id");
+ static final FieldName composeId = FieldName.forField("composeId", "compose_id");
+
static final FieldName count = FieldName.forField("count");
static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id");
diff --git a/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicScRspOuterClass.java
index 7d6b3160b..f8cc52f55 100644
--- a/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicScRspOuterClass.java
@@ -19,17 +19,17 @@ public static final class ComposeSelectedRelicScRsp extends ProtoMessageoptional uint32 compose_id = 8;
+ * optional uint32 retcode = 1;
*/
- private int composeId;
+ private int retcode;
/**
- * optional uint32 retcode = 10;
+ * optional uint32 compose_id = 8;
*/
- private int retcode;
+ private int composeId;
/**
- * optional .ItemList return_item_list = 15;
+ * optional .ItemList return_item_list = 2;
*/
private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance();
@@ -44,81 +44,81 @@ public static ComposeSelectedRelicScRsp newInstance() {
}
/**
- * optional uint32 compose_id = 8;
- * @return whether the composeId field is set
+ * optional uint32 retcode = 1;
+ * @return whether the retcode field is set
*/
- public boolean hasComposeId() {
+ public boolean hasRetcode() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 compose_id = 8;
+ * optional uint32 retcode = 1;
* @return this
*/
- public ComposeSelectedRelicScRsp clearComposeId() {
+ public ComposeSelectedRelicScRsp clearRetcode() {
bitField0_ &= ~0x00000001;
- composeId = 0;
+ retcode = 0;
return this;
}
/**
- * optional uint32 compose_id = 8;
- * @return the composeId
+ * optional uint32 retcode = 1;
+ * @return the retcode
*/
- public int getComposeId() {
- return composeId;
+ public int getRetcode() {
+ return retcode;
}
/**
- * optional uint32 compose_id = 8;
- * @param value the composeId to set
+ * optional uint32 retcode = 1;
+ * @param value the retcode to set
* @return this
*/
- public ComposeSelectedRelicScRsp setComposeId(final int value) {
+ public ComposeSelectedRelicScRsp setRetcode(final int value) {
bitField0_ |= 0x00000001;
- composeId = value;
+ retcode = value;
return this;
}
/**
- * optional uint32 retcode = 10;
- * @return whether the retcode field is set
+ * optional uint32 compose_id = 8;
+ * @return whether the composeId field is set
*/
- public boolean hasRetcode() {
+ public boolean hasComposeId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 retcode = 10;
+ * optional uint32 compose_id = 8;
* @return this
*/
- public ComposeSelectedRelicScRsp clearRetcode() {
+ public ComposeSelectedRelicScRsp clearComposeId() {
bitField0_ &= ~0x00000002;
- retcode = 0;
+ composeId = 0;
return this;
}
/**
- * optional uint32 retcode = 10;
- * @return the retcode
+ * optional uint32 compose_id = 8;
+ * @return the composeId
*/
- public int getRetcode() {
- return retcode;
+ public int getComposeId() {
+ return composeId;
}
/**
- * optional uint32 retcode = 10;
- * @param value the retcode to set
+ * optional uint32 compose_id = 8;
+ * @param value the composeId to set
* @return this
*/
- public ComposeSelectedRelicScRsp setRetcode(final int value) {
+ public ComposeSelectedRelicScRsp setComposeId(final int value) {
bitField0_ |= 0x00000002;
- retcode = value;
+ composeId = value;
return this;
}
/**
- * optional .ItemList return_item_list = 15;
+ * optional .ItemList return_item_list = 2;
* @return whether the returnItemList field is set
*/
public boolean hasReturnItemList() {
@@ -126,7 +126,7 @@ public boolean hasReturnItemList() {
}
/**
- * optional .ItemList return_item_list = 15;
+ * optional .ItemList return_item_list = 2;
* @return this
*/
public ComposeSelectedRelicScRsp clearReturnItemList() {
@@ -136,7 +136,7 @@ public ComposeSelectedRelicScRsp clearReturnItemList() {
}
/**
- * optional .ItemList return_item_list = 15;
+ * optional .ItemList 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.
@@ -150,7 +150,7 @@ public ItemListOuterClass.ItemList getReturnItemList() {
}
/**
- * optional .ItemList return_item_list = 15;
+ * optional .ItemList 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
@@ -164,7 +164,7 @@ public ItemListOuterClass.ItemList getMutableReturnItemList() {
}
/**
- * optional .ItemList return_item_list = 15;
+ * optional .ItemList return_item_list = 2;
* @param value the returnItemList to set
* @return this
*/
@@ -179,8 +179,8 @@ public ComposeSelectedRelicScRsp copyFrom(final ComposeSelectedRelicScRsp other)
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- composeId = other.composeId;
retcode = other.retcode;
+ composeId = other.composeId;
returnItemList.copyFrom(other.returnItemList);
}
return this;
@@ -192,12 +192,12 @@ public ComposeSelectedRelicScRsp mergeFrom(final ComposeSelectedRelicScRsp other
return this;
}
cachedSize = -1;
- if (other.hasComposeId()) {
- setComposeId(other.composeId);
- }
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
+ if (other.hasComposeId()) {
+ setComposeId(other.composeId);
+ }
if (other.hasReturnItemList()) {
getMutableReturnItemList().mergeFrom(other.returnItemList);
}
@@ -211,8 +211,8 @@ public ComposeSelectedRelicScRsp clear() {
}
cachedSize = -1;
bitField0_ = 0;
- composeId = 0;
retcode = 0;
+ composeId = 0;
returnItemList.clear();
return this;
}
@@ -238,23 +238,23 @@ public boolean equals(Object o) {
}
ComposeSelectedRelicScRsp other = (ComposeSelectedRelicScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasComposeId() || composeId == other.composeId)
&& (!hasRetcode() || retcode == other.retcode)
+ && (!hasComposeId() || composeId == other.composeId)
&& (!hasReturnItemList() || returnItemList.equals(other.returnItemList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 64);
- output.writeUInt32NoTag(composeId);
+ output.writeRawByte((byte) 8);
+ output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(retcode);
+ output.writeRawByte((byte) 64);
+ output.writeUInt32NoTag(composeId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 122);
+ output.writeRawByte((byte) 18);
output.writeMessageNoTag(returnItemList);
}
}
@@ -263,10 +263,10 @@ public void writeTo(final ProtoSink output) throws IOException {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(returnItemList);
@@ -281,25 +281,25 @@ public ComposeSelectedRelicScRsp mergeFrom(final ProtoSource input) throws IOExc
int tag = input.readTag();
while (true) {
switch (tag) {
- case 64: {
- // composeId
- composeId = input.readUInt32();
+ case 8: {
+ // retcode
+ retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 80) {
+ if (tag != 64) {
break;
}
}
- case 80: {
- // retcode
- retcode = input.readUInt32();
+ case 64: {
+ // composeId
+ composeId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 122) {
+ if (tag != 18) {
break;
}
}
- case 122: {
+ case 18: {
// returnItemList
input.readMessage(returnItemList);
bitField0_ |= 0x00000004;
@@ -326,10 +326,10 @@ public ComposeSelectedRelicScRsp mergeFrom(final ProtoSource input) throws IOExc
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.composeId, composeId);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.composeId, composeId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeMessage(FieldNames.returnItemList, returnItemList);
@@ -344,11 +344,10 @@ public ComposeSelectedRelicScRsp mergeFrom(final JsonSource input) throws IOExce
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1399759283:
- case -442843416: {
- if (input.isAtField(FieldNames.composeId)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- composeId = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -356,10 +355,11 @@ public ComposeSelectedRelicScRsp mergeFrom(final JsonSource input) throws IOExce
}
break;
}
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case -1399759283:
+ case -442843416: {
+ if (input.isAtField(FieldNames.composeId)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ composeId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -432,10 +432,10 @@ public ComposeSelectedRelicScRsp create() {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName composeId = FieldName.forField("composeId", "compose_id");
-
static final FieldName retcode = FieldName.forField("retcode");
+ static final FieldName composeId = FieldName.forField("composeId", "compose_id");
+
static final FieldName returnItemList = FieldName.forField("returnItemList", "return_item_list");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/DelMailScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DelMailScRspOuterClass.java
index eb3df7fd5..e9cb96269 100644
--- a/src/generated/main/emu/lunarcore/proto/DelMailScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/DelMailScRspOuterClass.java
@@ -20,12 +20,12 @@ public static final class DelMailScRsp extends ProtoMessage implem
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 7;
*/
private int retcode;
/**
- * repeated uint32 id_list = 10;
+ * repeated uint32 id_list = 5;
*/
private final RepeatedInt idList = RepeatedInt.newEmptyInstance();
@@ -40,7 +40,7 @@ public static DelMailScRsp newInstance() {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 7;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 7;
* @return this
*/
public DelMailScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public DelMailScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 7;
* @return the retcode
*/
public int getRetcode() {
@@ -66,7 +66,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 7;
* @param value the retcode to set
* @return this
*/
@@ -77,7 +77,7 @@ public DelMailScRsp setRetcode(final int value) {
}
/**
- * repeated uint32 id_list = 10;
+ * repeated uint32 id_list = 5;
* @return whether the idList field is set
*/
public boolean hasIdList() {
@@ -85,7 +85,7 @@ public boolean hasIdList() {
}
/**
- * repeated uint32 id_list = 10;
+ * repeated uint32 id_list = 5;
* @return this
*/
public DelMailScRsp clearIdList() {
@@ -95,7 +95,7 @@ public DelMailScRsp clearIdList() {
}
/**
- * repeated uint32 id_list = 10;
+ * repeated uint32 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.
@@ -109,7 +109,7 @@ public RepeatedInt getIdList() {
}
/**
- * repeated uint32 id_list = 10;
+ * repeated uint32 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
@@ -123,7 +123,7 @@ public RepeatedInt getMutableIdList() {
}
/**
- * repeated uint32 id_list = 10;
+ * repeated uint32 id_list = 5;
* @param value the idList to add
* @return this
*/
@@ -134,7 +134,7 @@ public DelMailScRsp addIdList(final int value) {
}
/**
- * repeated uint32 id_list = 10;
+ * repeated uint32 id_list = 5;
* @param values the idList to add
* @return this
*/
@@ -210,12 +210,12 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < idList.length(); i++) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(idList.array()[i]);
}
}
@@ -240,16 +240,16 @@ public DelMailScRsp mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 96: {
+ case 56: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 82) {
+ if (tag != 42) {
break;
}
}
- case 82: {
+ case 42: {
// idList [packed=true]
input.readPackedUInt32(idList, tag);
bitField0_ |= 0x00000002;
@@ -268,7 +268,7 @@ public DelMailScRsp mergeFrom(final ProtoSource input) throws IOException {
tag = input.readTag();
break;
}
- case 80: {
+ case 40: {
// idList [packed=false]
tag = input.readRepeatedUInt32(idList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java
new file mode 100644
index 000000000..9293a52b5
--- /dev/null
+++ b/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java
@@ -0,0 +1,339 @@
+// Code generated by protocol buffer compiler. Do not edit!
+package emu.lunarcore.proto;
+
+import java.io.IOException;
+import us.hebi.quickbuf.FieldName;
+import us.hebi.quickbuf.InvalidProtocolBufferException;
+import us.hebi.quickbuf.JsonSink;
+import us.hebi.quickbuf.JsonSource;
+import us.hebi.quickbuf.MessageFactory;
+import us.hebi.quickbuf.ProtoMessage;
+import us.hebi.quickbuf.ProtoSink;
+import us.hebi.quickbuf.ProtoSource;
+
+public final class DisplayAvatarOuterClass {
+ /**
+ * Protobuf type {@code DisplayAvatar}
+ */
+ public static final class DisplayAvatar extends ProtoMessage implements Cloneable {
+ private static final long serialVersionUID = 0L;
+
+ /**
+ * optional uint32 avatar_id = 8;
+ */
+ private int avatarId;
+
+ /**
+ * optional uint32 pos = 13;
+ */
+ private int pos;
+
+ private DisplayAvatar() {
+ }
+
+ /**
+ * @return a new empty instance of {@code DisplayAvatar}
+ */
+ public static DisplayAvatar newInstance() {
+ return new DisplayAvatar();
+ }
+
+ /**
+ * optional uint32 avatar_id = 8;
+ * @return whether the avatarId field is set
+ */
+ public boolean hasAvatarId() {
+ return (bitField0_ & 0x00000001) != 0;
+ }
+
+ /**
+ * optional uint32 avatar_id = 8;
+ * @return this
+ */
+ public DisplayAvatar clearAvatarId() {
+ bitField0_ &= ~0x00000001;
+ avatarId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 avatar_id = 8;
+ * @return the avatarId
+ */
+ public int getAvatarId() {
+ return avatarId;
+ }
+
+ /**
+ * optional uint32 avatar_id = 8;
+ * @param value the avatarId to set
+ * @return this
+ */
+ public DisplayAvatar setAvatarId(final int value) {
+ bitField0_ |= 0x00000001;
+ avatarId = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 pos = 13;
+ * @return whether the pos field is set
+ */
+ public boolean hasPos() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 pos = 13;
+ * @return this
+ */
+ public DisplayAvatar clearPos() {
+ bitField0_ &= ~0x00000002;
+ pos = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 pos = 13;
+ * @return the pos
+ */
+ public int getPos() {
+ return pos;
+ }
+
+ /**
+ * optional uint32 pos = 13;
+ * @param value the pos to set
+ * @return this
+ */
+ public DisplayAvatar setPos(final int value) {
+ bitField0_ |= 0x00000002;
+ pos = value;
+ return this;
+ }
+
+ @Override
+ public DisplayAvatar copyFrom(final DisplayAvatar other) {
+ cachedSize = other.cachedSize;
+ if ((bitField0_ | other.bitField0_) != 0) {
+ bitField0_ = other.bitField0_;
+ avatarId = other.avatarId;
+ pos = other.pos;
+ }
+ return this;
+ }
+
+ @Override
+ public DisplayAvatar mergeFrom(final DisplayAvatar other) {
+ if (other.isEmpty()) {
+ return this;
+ }
+ cachedSize = -1;
+ if (other.hasAvatarId()) {
+ setAvatarId(other.avatarId);
+ }
+ if (other.hasPos()) {
+ setPos(other.pos);
+ }
+ return this;
+ }
+
+ @Override
+ public DisplayAvatar clear() {
+ if (isEmpty()) {
+ return this;
+ }
+ cachedSize = -1;
+ bitField0_ = 0;
+ avatarId = 0;
+ pos = 0;
+ return this;
+ }
+
+ @Override
+ public DisplayAvatar clearQuick() {
+ if (isEmpty()) {
+ return this;
+ }
+ cachedSize = -1;
+ bitField0_ = 0;
+ return this;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ }
+ if (!(o instanceof DisplayAvatar)) {
+ return false;
+ }
+ DisplayAvatar other = (DisplayAvatar) o;
+ return bitField0_ == other.bitField0_
+ && (!hasAvatarId() || avatarId == other.avatarId)
+ && (!hasPos() || pos == other.pos);
+ }
+
+ @Override
+ public void writeTo(final ProtoSink output) throws IOException {
+ if ((bitField0_ & 0x00000001) != 0) {
+ output.writeRawByte((byte) 64);
+ output.writeUInt32NoTag(avatarId);
+ }
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(pos);
+ }
+ }
+
+ @Override
+ protected int computeSerializedSize() {
+ int size = 0;
+ if ((bitField0_ & 0x00000001) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId);
+ }
+ if ((bitField0_ & 0x00000002) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(pos);
+ }
+ return size;
+ }
+
+ @Override
+ @SuppressWarnings("fallthrough")
+ public DisplayAvatar mergeFrom(final ProtoSource input) throws IOException {
+ // Enabled Fall-Through Optimization (QuickBuffers)
+ int tag = input.readTag();
+ while (true) {
+ switch (tag) {
+ case 64: {
+ // avatarId
+ avatarId = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 104) {
+ break;
+ }
+ }
+ case 104: {
+ // pos
+ pos = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 0) {
+ break;
+ }
+ }
+ case 0: {
+ return this;
+ }
+ default: {
+ if (!input.skipField(tag)) {
+ return this;
+ }
+ tag = input.readTag();
+ break;
+ }
+ }
+ }
+ }
+
+ @Override
+ public void writeTo(final JsonSink output) throws IOException {
+ output.beginObject();
+ if ((bitField0_ & 0x00000001) != 0) {
+ output.writeUInt32(FieldNames.avatarId, avatarId);
+ }
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeUInt32(FieldNames.pos, pos);
+ }
+ output.endObject();
+ }
+
+ @Override
+ public DisplayAvatar mergeFrom(final JsonSource input) throws IOException {
+ if (!input.beginObject()) {
+ return this;
+ }
+ while (!input.isAtEnd()) {
+ switch (input.readFieldHash()) {
+ case 1787287636:
+ case -428636735: {
+ if (input.isAtField(FieldNames.avatarId)) {
+ if (!input.trySkipNullValue()) {
+ avatarId = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 111188: {
+ if (input.isAtField(FieldNames.pos)) {
+ if (!input.trySkipNullValue()) {
+ pos = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ default: {
+ input.skipUnknownField();
+ break;
+ }
+ }
+ }
+ input.endObject();
+ return this;
+ }
+
+ @Override
+ public DisplayAvatar clone() {
+ return new DisplayAvatar().copyFrom(this);
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return ((bitField0_) == 0);
+ }
+
+ public static DisplayAvatar parseFrom(final byte[] data) throws InvalidProtocolBufferException {
+ return ProtoMessage.mergeFrom(new DisplayAvatar(), data).checkInitialized();
+ }
+
+ public static DisplayAvatar parseFrom(final ProtoSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new DisplayAvatar(), input).checkInitialized();
+ }
+
+ public static DisplayAvatar parseFrom(final JsonSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new DisplayAvatar(), input).checkInitialized();
+ }
+
+ /**
+ * @return factory for creating DisplayAvatar messages
+ */
+ public static MessageFactory getFactory() {
+ return DisplayAvatarFactory.INSTANCE;
+ }
+
+ private enum DisplayAvatarFactory implements MessageFactory {
+ INSTANCE;
+
+ @Override
+ public DisplayAvatar create() {
+ return DisplayAvatar.newInstance();
+ }
+ }
+
+ /**
+ * Contains name constants used for serializing JSON
+ */
+ static class FieldNames {
+ static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id");
+
+ static final FieldName pos = FieldName.forField("pos");
+ }
+ }
+}
diff --git a/src/generated/main/emu/lunarcore/proto/DisplayAvatarVecOuterClass.java b/src/generated/main/emu/lunarcore/proto/DisplayAvatarVecOuterClass.java
new file mode 100644
index 000000000..d41f09dcf
--- /dev/null
+++ b/src/generated/main/emu/lunarcore/proto/DisplayAvatarVecOuterClass.java
@@ -0,0 +1,377 @@
+// Code generated by protocol buffer compiler. Do not edit!
+package emu.lunarcore.proto;
+
+import java.io.IOException;
+import us.hebi.quickbuf.FieldName;
+import us.hebi.quickbuf.InvalidProtocolBufferException;
+import us.hebi.quickbuf.JsonSink;
+import us.hebi.quickbuf.JsonSource;
+import us.hebi.quickbuf.MessageFactory;
+import us.hebi.quickbuf.ProtoMessage;
+import us.hebi.quickbuf.ProtoSink;
+import us.hebi.quickbuf.ProtoSource;
+import us.hebi.quickbuf.RepeatedMessage;
+
+public final class DisplayAvatarVecOuterClass {
+ /**
+ * Protobuf type {@code DisplayAvatarVec}
+ */
+ public static final class DisplayAvatarVec extends ProtoMessage implements Cloneable {
+ private static final long serialVersionUID = 0L;
+
+ /**
+ * optional bool is_display = 7;
+ */
+ private boolean isDisplay;
+
+ /**
+ * repeated .DisplayAvatar display_avatar_list = 14;
+ */
+ private final RepeatedMessage displayAvatarList = RepeatedMessage.newEmptyInstance(DisplayAvatarOuterClass.DisplayAvatar.getFactory());
+
+ private DisplayAvatarVec() {
+ }
+
+ /**
+ * @return a new empty instance of {@code DisplayAvatarVec}
+ */
+ public static DisplayAvatarVec newInstance() {
+ return new DisplayAvatarVec();
+ }
+
+ /**
+ * optional bool is_display = 7;
+ * @return whether the isDisplay field is set
+ */
+ public boolean hasIsDisplay() {
+ return (bitField0_ & 0x00000001) != 0;
+ }
+
+ /**
+ * optional bool is_display = 7;
+ * @return this
+ */
+ public DisplayAvatarVec clearIsDisplay() {
+ bitField0_ &= ~0x00000001;
+ isDisplay = false;
+ return this;
+ }
+
+ /**
+ * optional bool is_display = 7;
+ * @return the isDisplay
+ */
+ public boolean getIsDisplay() {
+ return isDisplay;
+ }
+
+ /**
+ * optional bool is_display = 7;
+ * @param value the isDisplay to set
+ * @return this
+ */
+ public DisplayAvatarVec setIsDisplay(final boolean value) {
+ bitField0_ |= 0x00000001;
+ isDisplay = value;
+ return this;
+ }
+
+ /**
+ * repeated .DisplayAvatar display_avatar_list = 14;
+ * @return whether the displayAvatarList field is set
+ */
+ public boolean hasDisplayAvatarList() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * repeated .DisplayAvatar display_avatar_list = 14;
+ * @return this
+ */
+ public DisplayAvatarVec clearDisplayAvatarList() {
+ bitField0_ &= ~0x00000002;
+ displayAvatarList.clear();
+ return this;
+ }
+
+ /**
+ * repeated .DisplayAvatar display_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.
+ *
+ * Use {@link #getMutableDisplayAvatarList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedMessage getDisplayAvatarList() {
+ return displayAvatarList;
+ }
+
+ /**
+ * repeated .DisplayAvatar display_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
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedMessage getMutableDisplayAvatarList() {
+ bitField0_ |= 0x00000002;
+ return displayAvatarList;
+ }
+
+ /**
+ * repeated .DisplayAvatar display_avatar_list = 14;
+ * @param value the displayAvatarList to add
+ * @return this
+ */
+ public DisplayAvatarVec addDisplayAvatarList(
+ final DisplayAvatarOuterClass.DisplayAvatar value) {
+ bitField0_ |= 0x00000002;
+ displayAvatarList.add(value);
+ return this;
+ }
+
+ /**
+ * repeated .DisplayAvatar display_avatar_list = 14;
+ * @param values the displayAvatarList to add
+ * @return this
+ */
+ public DisplayAvatarVec addAllDisplayAvatarList(
+ final DisplayAvatarOuterClass.DisplayAvatar... values) {
+ bitField0_ |= 0x00000002;
+ displayAvatarList.addAll(values);
+ return this;
+ }
+
+ @Override
+ public DisplayAvatarVec copyFrom(final DisplayAvatarVec other) {
+ cachedSize = other.cachedSize;
+ if ((bitField0_ | other.bitField0_) != 0) {
+ bitField0_ = other.bitField0_;
+ isDisplay = other.isDisplay;
+ displayAvatarList.copyFrom(other.displayAvatarList);
+ }
+ return this;
+ }
+
+ @Override
+ public DisplayAvatarVec mergeFrom(final DisplayAvatarVec other) {
+ if (other.isEmpty()) {
+ return this;
+ }
+ cachedSize = -1;
+ if (other.hasIsDisplay()) {
+ setIsDisplay(other.isDisplay);
+ }
+ if (other.hasDisplayAvatarList()) {
+ getMutableDisplayAvatarList().addAll(other.displayAvatarList);
+ }
+ return this;
+ }
+
+ @Override
+ public DisplayAvatarVec clear() {
+ if (isEmpty()) {
+ return this;
+ }
+ cachedSize = -1;
+ bitField0_ = 0;
+ isDisplay = false;
+ displayAvatarList.clear();
+ return this;
+ }
+
+ @Override
+ public DisplayAvatarVec clearQuick() {
+ if (isEmpty()) {
+ return this;
+ }
+ cachedSize = -1;
+ bitField0_ = 0;
+ displayAvatarList.clearQuick();
+ return this;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ }
+ if (!(o instanceof DisplayAvatarVec)) {
+ return false;
+ }
+ DisplayAvatarVec other = (DisplayAvatarVec) o;
+ return bitField0_ == other.bitField0_
+ && (!hasIsDisplay() || isDisplay == other.isDisplay)
+ && (!hasDisplayAvatarList() || displayAvatarList.equals(other.displayAvatarList));
+ }
+
+ @Override
+ public void writeTo(final ProtoSink output) throws IOException {
+ if ((bitField0_ & 0x00000001) != 0) {
+ output.writeRawByte((byte) 56);
+ output.writeBoolNoTag(isDisplay);
+ }
+ if ((bitField0_ & 0x00000002) != 0) {
+ for (int i = 0; i < displayAvatarList.length(); i++) {
+ output.writeRawByte((byte) 114);
+ output.writeMessageNoTag(displayAvatarList.get(i));
+ }
+ }
+ }
+
+ @Override
+ protected int computeSerializedSize() {
+ int size = 0;
+ if ((bitField0_ & 0x00000001) != 0) {
+ size += 2;
+ }
+ if ((bitField0_ & 0x00000002) != 0) {
+ size += (1 * displayAvatarList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(displayAvatarList);
+ }
+ return size;
+ }
+
+ @Override
+ @SuppressWarnings("fallthrough")
+ public DisplayAvatarVec mergeFrom(final ProtoSource input) throws IOException {
+ // Enabled Fall-Through Optimization (QuickBuffers)
+ int tag = input.readTag();
+ while (true) {
+ switch (tag) {
+ case 56: {
+ // isDisplay
+ isDisplay = input.readBool();
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 114) {
+ break;
+ }
+ }
+ case 114: {
+ // displayAvatarList
+ tag = input.readRepeatedMessage(displayAvatarList, tag);
+ bitField0_ |= 0x00000002;
+ if (tag != 0) {
+ break;
+ }
+ }
+ case 0: {
+ return this;
+ }
+ default: {
+ if (!input.skipField(tag)) {
+ return this;
+ }
+ tag = input.readTag();
+ break;
+ }
+ }
+ }
+ }
+
+ @Override
+ public void writeTo(final JsonSink output) throws IOException {
+ output.beginObject();
+ if ((bitField0_ & 0x00000001) != 0) {
+ output.writeBool(FieldNames.isDisplay, isDisplay);
+ }
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRepeatedMessage(FieldNames.displayAvatarList, displayAvatarList);
+ }
+ output.endObject();
+ }
+
+ @Override
+ public DisplayAvatarVec mergeFrom(final JsonSource input) throws IOException {
+ if (!input.beginObject()) {
+ return this;
+ }
+ while (!input.isAtEnd()) {
+ switch (input.readFieldHash()) {
+ case 1091985464:
+ case -1122893139: {
+ if (input.isAtField(FieldNames.isDisplay)) {
+ if (!input.trySkipNullValue()) {
+ isDisplay = input.readBool();
+ bitField0_ |= 0x00000001;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 2117925881:
+ case 245562311: {
+ if (input.isAtField(FieldNames.displayAvatarList)) {
+ if (!input.trySkipNullValue()) {
+ input.readRepeatedMessage(displayAvatarList);
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ default: {
+ input.skipUnknownField();
+ break;
+ }
+ }
+ }
+ input.endObject();
+ return this;
+ }
+
+ @Override
+ public DisplayAvatarVec clone() {
+ return new DisplayAvatarVec().copyFrom(this);
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return ((bitField0_) == 0);
+ }
+
+ public static DisplayAvatarVec parseFrom(final byte[] data) throws
+ InvalidProtocolBufferException {
+ return ProtoMessage.mergeFrom(new DisplayAvatarVec(), data).checkInitialized();
+ }
+
+ public static DisplayAvatarVec parseFrom(final ProtoSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new DisplayAvatarVec(), input).checkInitialized();
+ }
+
+ public static DisplayAvatarVec parseFrom(final JsonSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new DisplayAvatarVec(), input).checkInitialized();
+ }
+
+ /**
+ * @return factory for creating DisplayAvatarVec messages
+ */
+ public static MessageFactory getFactory() {
+ return DisplayAvatarVecFactory.INSTANCE;
+ }
+
+ private enum DisplayAvatarVecFactory implements MessageFactory {
+ INSTANCE;
+
+ @Override
+ public DisplayAvatarVec create() {
+ return DisplayAvatarVec.newInstance();
+ }
+ }
+
+ /**
+ * Contains name constants used for serializing JSON
+ */
+ static class FieldNames {
+ static final FieldName isDisplay = FieldName.forField("isDisplay", "is_display");
+
+ static final FieldName displayAvatarList = FieldName.forField("displayAvatarList", "display_avatar_list");
+ }
+ }
+}
diff --git a/src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java
index 496ff5ff0..ca6ad8026 100644
--- a/src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java
@@ -19,7 +19,12 @@ public static final class DoGachaCsReq extends ProtoMessage implem
private static final long serialVersionUID = 0L;
/**
- * optional uint32 gacha_id = 3;
+ * optional uint32 gacha_num = 1;
+ */
+ private int gachaNum;
+
+ /**
+ * optional uint32 gacha_id = 9;
*/
private int gachaId;
@@ -29,15 +34,10 @@ public static final class DoGachaCsReq extends ProtoMessage implem
private int simulateMagic;
/**
- * optional uint32 gacha_random = 13;
+ * optional uint32 gacha_random = 15;
*/
private int gachaRandom;
- /**
- * optional uint32 gacha_num = 14;
- */
- private int gachaNum;
-
private DoGachaCsReq() {
}
@@ -49,25 +49,62 @@ public static DoGachaCsReq newInstance() {
}
/**
- * optional uint32 gacha_id = 3;
+ * optional uint32 gacha_num = 1;
+ * @return whether the gachaNum field is set
+ */
+ public boolean hasGachaNum() {
+ return (bitField0_ & 0x00000001) != 0;
+ }
+
+ /**
+ * optional uint32 gacha_num = 1;
+ * @return this
+ */
+ public DoGachaCsReq clearGachaNum() {
+ bitField0_ &= ~0x00000001;
+ gachaNum = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 gacha_num = 1;
+ * @return the gachaNum
+ */
+ public int getGachaNum() {
+ return gachaNum;
+ }
+
+ /**
+ * optional uint32 gacha_num = 1;
+ * @param value the gachaNum to set
+ * @return this
+ */
+ public DoGachaCsReq setGachaNum(final int value) {
+ bitField0_ |= 0x00000001;
+ gachaNum = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 gacha_id = 9;
* @return whether the gachaId field is set
*/
public boolean hasGachaId() {
- return (bitField0_ & 0x00000001) != 0;
+ return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 gacha_id = 3;
+ * optional uint32 gacha_id = 9;
* @return this
*/
public DoGachaCsReq clearGachaId() {
- bitField0_ &= ~0x00000001;
+ bitField0_ &= ~0x00000002;
gachaId = 0;
return this;
}
/**
- * optional uint32 gacha_id = 3;
+ * optional uint32 gacha_id = 9;
* @return the gachaId
*/
public int getGachaId() {
@@ -75,12 +112,12 @@ public int getGachaId() {
}
/**
- * optional uint32 gacha_id = 3;
+ * optional uint32 gacha_id = 9;
* @param value the gachaId to set
* @return this
*/
public DoGachaCsReq setGachaId(final int value) {
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
gachaId = value;
return this;
}
@@ -90,7 +127,7 @@ public DoGachaCsReq setGachaId(final int value) {
* @return whether the simulateMagic field is set
*/
public boolean hasSimulateMagic() {
- return (bitField0_ & 0x00000002) != 0;
+ return (bitField0_ & 0x00000004) != 0;
}
/**
@@ -98,7 +135,7 @@ public boolean hasSimulateMagic() {
* @return this
*/
public DoGachaCsReq clearSimulateMagic() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000004;
simulateMagic = 0;
return this;
}
@@ -117,31 +154,31 @@ public int getSimulateMagic() {
* @return this
*/
public DoGachaCsReq setSimulateMagic(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
simulateMagic = value;
return this;
}
/**
- * optional uint32 gacha_random = 13;
+ * optional uint32 gacha_random = 15;
* @return whether the gachaRandom field is set
*/
public boolean hasGachaRandom() {
- return (bitField0_ & 0x00000004) != 0;
+ return (bitField0_ & 0x00000008) != 0;
}
/**
- * optional uint32 gacha_random = 13;
+ * optional uint32 gacha_random = 15;
* @return this
*/
public DoGachaCsReq clearGachaRandom() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000008;
gachaRandom = 0;
return this;
}
/**
- * optional uint32 gacha_random = 13;
+ * optional uint32 gacha_random = 15;
* @return the gachaRandom
*/
public int getGachaRandom() {
@@ -149,50 +186,13 @@ public int getGachaRandom() {
}
/**
- * optional uint32 gacha_random = 13;
+ * optional uint32 gacha_random = 15;
* @param value the gachaRandom to set
* @return this
*/
public DoGachaCsReq setGachaRandom(final int value) {
- bitField0_ |= 0x00000004;
- gachaRandom = value;
- return this;
- }
-
- /**
- * optional uint32 gacha_num = 14;
- * @return whether the gachaNum field is set
- */
- public boolean hasGachaNum() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional uint32 gacha_num = 14;
- * @return this
- */
- public DoGachaCsReq clearGachaNum() {
- bitField0_ &= ~0x00000008;
- gachaNum = 0;
- return this;
- }
-
- /**
- * optional uint32 gacha_num = 14;
- * @return the gachaNum
- */
- public int getGachaNum() {
- return gachaNum;
- }
-
- /**
- * optional uint32 gacha_num = 14;
- * @param value the gachaNum to set
- * @return this
- */
- public DoGachaCsReq setGachaNum(final int value) {
bitField0_ |= 0x00000008;
- gachaNum = value;
+ gachaRandom = value;
return this;
}
@@ -201,10 +201,10 @@ public DoGachaCsReq copyFrom(final DoGachaCsReq other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
+ gachaNum = other.gachaNum;
gachaId = other.gachaId;
simulateMagic = other.simulateMagic;
gachaRandom = other.gachaRandom;
- gachaNum = other.gachaNum;
}
return this;
}
@@ -215,6 +215,9 @@ public DoGachaCsReq mergeFrom(final DoGachaCsReq other) {
return this;
}
cachedSize = -1;
+ if (other.hasGachaNum()) {
+ setGachaNum(other.gachaNum);
+ }
if (other.hasGachaId()) {
setGachaId(other.gachaId);
}
@@ -224,9 +227,6 @@ public DoGachaCsReq mergeFrom(final DoGachaCsReq other) {
if (other.hasGachaRandom()) {
setGachaRandom(other.gachaRandom);
}
- if (other.hasGachaNum()) {
- setGachaNum(other.gachaNum);
- }
return this;
}
@@ -237,10 +237,10 @@ public DoGachaCsReq clear() {
}
cachedSize = -1;
bitField0_ = 0;
+ gachaNum = 0;
gachaId = 0;
simulateMagic = 0;
gachaRandom = 0;
- gachaNum = 0;
return this;
}
@@ -264,29 +264,29 @@ public boolean equals(Object o) {
}
DoGachaCsReq other = (DoGachaCsReq) o;
return bitField0_ == other.bitField0_
+ && (!hasGachaNum() || gachaNum == other.gachaNum)
&& (!hasGachaId() || gachaId == other.gachaId)
&& (!hasSimulateMagic() || simulateMagic == other.simulateMagic)
- && (!hasGachaRandom() || gachaRandom == other.gachaRandom)
- && (!hasGachaNum() || gachaNum == other.gachaNum);
+ && (!hasGachaRandom() || gachaRandom == other.gachaRandom);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(gachaId);
+ output.writeRawByte((byte) 8);
+ output.writeUInt32NoTag(gachaNum);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(simulateMagic);
+ output.writeRawByte((byte) 72);
+ output.writeUInt32NoTag(gachaId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 104);
- output.writeUInt32NoTag(gachaRandom);
+ output.writeRawByte((byte) 80);
+ output.writeUInt32NoTag(simulateMagic);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 112);
- output.writeUInt32NoTag(gachaNum);
+ output.writeRawByte((byte) 120);
+ output.writeUInt32NoTag(gachaRandom);
}
}
@@ -294,16 +294,16 @@ public void writeTo(final ProtoSink output) throws IOException {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(simulateMagic);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(simulateMagic);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom);
}
return size;
}
@@ -315,10 +315,19 @@ public DoGachaCsReq mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
+ case 8: {
+ // gachaNum
+ gachaNum = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 72) {
+ break;
+ }
+ }
+ case 72: {
// gachaId
gachaId = input.readUInt32();
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 80) {
break;
@@ -327,24 +336,15 @@ public DoGachaCsReq mergeFrom(final ProtoSource input) throws IOException {
case 80: {
// simulateMagic
simulateMagic = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 120) {
break;
}
}
- case 104: {
+ case 120: {
// gachaRandom
gachaRandom = input.readUInt32();
- bitField0_ |= 0x00000004;
- tag = input.readTag();
- if (tag != 112) {
- break;
- }
- }
- case 112: {
- // gachaNum
- gachaNum = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
if (tag != 0) {
@@ -369,16 +369,16 @@ public DoGachaCsReq mergeFrom(final ProtoSource input) throws IOException {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.gachaId, gachaId);
+ output.writeUInt32(FieldNames.gachaNum, gachaNum);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.simulateMagic, simulateMagic);
+ output.writeUInt32(FieldNames.gachaId, gachaId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.gachaRandom, gachaRandom);
+ output.writeUInt32(FieldNames.simulateMagic, simulateMagic);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.gachaNum, gachaNum);
+ output.writeUInt32(FieldNames.gachaRandom, gachaRandom);
}
output.endObject();
}
@@ -390,12 +390,24 @@ public DoGachaCsReq mergeFrom(final JsonSource input) throws IOException {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
+ case -2052317532:
+ case 803166025: {
+ if (input.isAtField(FieldNames.gachaNum)) {
+ if (!input.trySkipNullValue()) {
+ gachaNum = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case -204751299:
case -2052301576: {
if (input.isAtField(FieldNames.gachaId)) {
if (!input.trySkipNullValue()) {
gachaId = input.readUInt32();
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
}
} else {
input.skipUnknownField();
@@ -407,7 +419,7 @@ public DoGachaCsReq mergeFrom(final JsonSource input) throws IOException {
if (input.isAtField(FieldNames.simulateMagic)) {
if (!input.trySkipNullValue()) {
simulateMagic = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
}
} else {
input.skipUnknownField();
@@ -419,18 +431,6 @@ public DoGachaCsReq mergeFrom(final JsonSource input) throws IOException {
if (input.isAtField(FieldNames.gachaRandom)) {
if (!input.trySkipNullValue()) {
gachaRandom = input.readUInt32();
- bitField0_ |= 0x00000004;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case -2052317532:
- case 803166025: {
- if (input.isAtField(FieldNames.gachaNum)) {
- if (!input.trySkipNullValue()) {
- gachaNum = input.readUInt32();
bitField0_ |= 0x00000008;
}
} else {
@@ -490,13 +490,13 @@ public DoGachaCsReq create() {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
+ static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num");
+
static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id");
static final FieldName simulateMagic = FieldName.forField("simulateMagic", "simulate_magic");
static final FieldName gachaRandom = FieldName.forField("gachaRandom", "gacha_random");
-
- static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java
index 478814758..a79e7e1fd 100644
--- a/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java
@@ -20,27 +20,27 @@ public static final class DoGachaScRsp extends ProtoMessage implem
private static final long serialVersionUID = 0L;
/**
- * optional uint32 gacha_id = 3;
+ * optional uint32 gacha_id = 4;
*/
private int gachaId;
/**
- * optional uint32 ceiling_num = 5;
+ * optional uint32 gacha_num = 5;
*/
- private int ceilingNum;
+ private int gachaNum;
/**
- * optional uint32 gacha_num = 11;
+ * optional uint32 ceiling_num = 13;
*/
- private int gachaNum;
+ private int ceilingNum;
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 14;
*/
private int retcode;
/**
- * repeated .GachaItem gacha_item_list = 9;
+ * repeated .GachaItem gacha_item_list = 7;
*/
private final RepeatedMessage gachaItemList = RepeatedMessage.newEmptyInstance(GachaItemOuterClass.GachaItem.getFactory());
@@ -55,7 +55,7 @@ public static DoGachaScRsp newInstance() {
}
/**
- * optional uint32 gacha_id = 3;
+ * optional uint32 gacha_id = 4;
* @return whether the gachaId field is set
*/
public boolean hasGachaId() {
@@ -63,7 +63,7 @@ public boolean hasGachaId() {
}
/**
- * optional uint32 gacha_id = 3;
+ * optional uint32 gacha_id = 4;
* @return this
*/
public DoGachaScRsp clearGachaId() {
@@ -73,7 +73,7 @@ public DoGachaScRsp clearGachaId() {
}
/**
- * optional uint32 gacha_id = 3;
+ * optional uint32 gacha_id = 4;
* @return the gachaId
*/
public int getGachaId() {
@@ -81,7 +81,7 @@ public int getGachaId() {
}
/**
- * optional uint32 gacha_id = 3;
+ * optional uint32 gacha_id = 4;
* @param value the gachaId to set
* @return this
*/
@@ -92,81 +92,81 @@ public DoGachaScRsp setGachaId(final int value) {
}
/**
- * optional uint32 ceiling_num = 5;
- * @return whether the ceilingNum field is set
+ * optional uint32 gacha_num = 5;
+ * @return whether the gachaNum field is set
*/
- public boolean hasCeilingNum() {
+ public boolean hasGachaNum() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 ceiling_num = 5;
+ * optional uint32 gacha_num = 5;
* @return this
*/
- public DoGachaScRsp clearCeilingNum() {
+ public DoGachaScRsp clearGachaNum() {
bitField0_ &= ~0x00000002;
- ceilingNum = 0;
+ gachaNum = 0;
return this;
}
/**
- * optional uint32 ceiling_num = 5;
- * @return the ceilingNum
+ * optional uint32 gacha_num = 5;
+ * @return the gachaNum
*/
- public int getCeilingNum() {
- return ceilingNum;
+ public int getGachaNum() {
+ return gachaNum;
}
/**
- * optional uint32 ceiling_num = 5;
- * @param value the ceilingNum to set
+ * optional uint32 gacha_num = 5;
+ * @param value the gachaNum to set
* @return this
*/
- public DoGachaScRsp setCeilingNum(final int value) {
+ public DoGachaScRsp setGachaNum(final int value) {
bitField0_ |= 0x00000002;
- ceilingNum = value;
+ gachaNum = value;
return this;
}
/**
- * optional uint32 gacha_num = 11;
- * @return whether the gachaNum field is set
+ * optional uint32 ceiling_num = 13;
+ * @return whether the ceilingNum field is set
*/
- public boolean hasGachaNum() {
+ public boolean hasCeilingNum() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 gacha_num = 11;
+ * optional uint32 ceiling_num = 13;
* @return this
*/
- public DoGachaScRsp clearGachaNum() {
+ public DoGachaScRsp clearCeilingNum() {
bitField0_ &= ~0x00000004;
- gachaNum = 0;
+ ceilingNum = 0;
return this;
}
/**
- * optional uint32 gacha_num = 11;
- * @return the gachaNum
+ * optional uint32 ceiling_num = 13;
+ * @return the ceilingNum
*/
- public int getGachaNum() {
- return gachaNum;
+ public int getCeilingNum() {
+ return ceilingNum;
}
/**
- * optional uint32 gacha_num = 11;
- * @param value the gachaNum to set
+ * optional uint32 ceiling_num = 13;
+ * @param value the ceilingNum to set
* @return this
*/
- public DoGachaScRsp setGachaNum(final int value) {
+ public DoGachaScRsp setCeilingNum(final int value) {
bitField0_ |= 0x00000004;
- gachaNum = value;
+ ceilingNum = value;
return this;
}
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 14;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -174,7 +174,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 14;
* @return this
*/
public DoGachaScRsp clearRetcode() {
@@ -184,7 +184,7 @@ public DoGachaScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 14;
* @return the retcode
*/
public int getRetcode() {
@@ -192,7 +192,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 14;
* @param value the retcode to set
* @return this
*/
@@ -203,7 +203,7 @@ public DoGachaScRsp setRetcode(final int value) {
}
/**
- * repeated .GachaItem gacha_item_list = 9;
+ * repeated .GachaItem gacha_item_list = 7;
* @return whether the gachaItemList field is set
*/
public boolean hasGachaItemList() {
@@ -211,7 +211,7 @@ public boolean hasGachaItemList() {
}
/**
- * repeated .GachaItem gacha_item_list = 9;
+ * repeated .GachaItem gacha_item_list = 7;
* @return this
*/
public DoGachaScRsp clearGachaItemList() {
@@ -221,7 +221,7 @@ public DoGachaScRsp clearGachaItemList() {
}
/**
- * repeated .GachaItem gacha_item_list = 9;
+ * repeated .GachaItem gacha_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.
@@ -235,7 +235,7 @@ public RepeatedMessage getGachaItemList() {
}
/**
- * repeated .GachaItem gacha_item_list = 9;
+ * repeated .GachaItem gacha_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
@@ -249,7 +249,7 @@ public RepeatedMessage getMutableGachaItemList()
}
/**
- * repeated .GachaItem gacha_item_list = 9;
+ * repeated .GachaItem gacha_item_list = 7;
* @param value the gachaItemList to add
* @return this
*/
@@ -260,7 +260,7 @@ public DoGachaScRsp addGachaItemList(final GachaItemOuterClass.GachaItem value)
}
/**
- * repeated .GachaItem gacha_item_list = 9;
+ * repeated .GachaItem gacha_item_list = 7;
* @param values the gachaItemList to add
* @return this
*/
@@ -276,8 +276,8 @@ public DoGachaScRsp copyFrom(final DoGachaScRsp other) {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
gachaId = other.gachaId;
- ceilingNum = other.ceilingNum;
gachaNum = other.gachaNum;
+ ceilingNum = other.ceilingNum;
retcode = other.retcode;
gachaItemList.copyFrom(other.gachaItemList);
}
@@ -293,12 +293,12 @@ public DoGachaScRsp mergeFrom(final DoGachaScRsp other) {
if (other.hasGachaId()) {
setGachaId(other.gachaId);
}
- if (other.hasCeilingNum()) {
- setCeilingNum(other.ceilingNum);
- }
if (other.hasGachaNum()) {
setGachaNum(other.gachaNum);
}
+ if (other.hasCeilingNum()) {
+ setCeilingNum(other.ceilingNum);
+ }
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
@@ -316,8 +316,8 @@ public DoGachaScRsp clear() {
cachedSize = -1;
bitField0_ = 0;
gachaId = 0;
- ceilingNum = 0;
gachaNum = 0;
+ ceilingNum = 0;
retcode = 0;
gachaItemList.clear();
return this;
@@ -345,8 +345,8 @@ public boolean equals(Object o) {
DoGachaScRsp other = (DoGachaScRsp) o;
return bitField0_ == other.bitField0_
&& (!hasGachaId() || gachaId == other.gachaId)
- && (!hasCeilingNum() || ceilingNum == other.ceilingNum)
&& (!hasGachaNum() || gachaNum == other.gachaNum)
+ && (!hasCeilingNum() || ceilingNum == other.ceilingNum)
&& (!hasRetcode() || retcode == other.retcode)
&& (!hasGachaItemList() || gachaItemList.equals(other.gachaItemList));
}
@@ -354,24 +354,24 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(gachaId);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 40);
- output.writeUInt32NoTag(ceilingNum);
+ output.writeUInt32NoTag(gachaNum);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 88);
- output.writeUInt32NoTag(gachaNum);
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(ceilingNum);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 112);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000010) != 0) {
for (int i = 0; i < gachaItemList.length(); i++) {
- output.writeRawByte((byte) 74);
+ output.writeRawByte((byte) 58);
output.writeMessageNoTag(gachaItemList.get(i));
}
}
@@ -384,10 +384,10 @@ protected int computeSerializedSize() {
size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(ceilingNum);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(ceilingNum);
}
if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
@@ -405,7 +405,7 @@ public DoGachaScRsp mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
+ case 32: {
// gachaId
gachaId = input.readUInt32();
bitField0_ |= 0x00000001;
@@ -415,33 +415,33 @@ public DoGachaScRsp mergeFrom(final ProtoSource input) throws IOException {
}
}
case 40: {
- // ceilingNum
- ceilingNum = input.readUInt32();
+ // gachaNum
+ gachaNum = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 88) {
+ if (tag != 104) {
break;
}
}
- case 88: {
- // gachaNum
- gachaNum = input.readUInt32();
+ case 104: {
+ // ceilingNum
+ ceilingNum = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 112) {
break;
}
}
- case 104: {
+ case 112: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 74) {
+ if (tag != 58) {
break;
}
}
- case 74: {
+ case 58: {
// gachaItemList
tag = input.readRepeatedMessage(gachaItemList, tag);
bitField0_ |= 0x00000010;
@@ -470,10 +470,10 @@ public void writeTo(final JsonSink output) throws IOException {
output.writeUInt32(FieldNames.gachaId, gachaId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.ceilingNum, ceilingNum);
+ output.writeUInt32(FieldNames.gachaNum, gachaNum);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.gachaNum, gachaNum);
+ output.writeUInt32(FieldNames.ceilingNum, ceilingNum);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeUInt32(FieldNames.retcode, retcode);
@@ -503,11 +503,11 @@ public DoGachaScRsp mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case -1655838327:
- case 209119492: {
- if (input.isAtField(FieldNames.ceilingNum)) {
+ case -2052317532:
+ case 803166025: {
+ if (input.isAtField(FieldNames.gachaNum)) {
if (!input.trySkipNullValue()) {
- ceilingNum = input.readUInt32();
+ gachaNum = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -515,11 +515,11 @@ public DoGachaScRsp mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case -2052317532:
- case 803166025: {
- if (input.isAtField(FieldNames.gachaNum)) {
+ case -1655838327:
+ case 209119492: {
+ if (input.isAtField(FieldNames.ceilingNum)) {
if (!input.trySkipNullValue()) {
- gachaNum = input.readUInt32();
+ ceilingNum = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -604,10 +604,10 @@ public DoGachaScRsp create() {
static class FieldNames {
static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id");
- static final FieldName ceilingNum = FieldName.forField("ceilingNum", "ceiling_num");
-
static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num");
+ static final FieldName ceilingNum = FieldName.forField("ceilingNum", "ceiling_num");
+
static final FieldName retcode = FieldName.forField("retcode");
static final FieldName gachaItemList = FieldName.forField("gachaItemList", "gacha_item_list");
diff --git a/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java
index 8dbc96122..3c3ae596e 100644
--- a/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java
@@ -19,14 +19,14 @@ public static final class DressAvatarCsReq extends ProtoMessageoptional uint32 equipment_unique_id = 2;
+ * optional uint32 base_avatar_id = 2;
*/
- private int equipmentUniqueId;
+ private int baseAvatarId;
/**
- * optional uint32 base_avatar_id = 9;
+ * optional uint32 equipment_unique_id = 4;
*/
- private int baseAvatarId;
+ private int equipmentUniqueId;
private DressAvatarCsReq() {
}
@@ -39,76 +39,76 @@ public static DressAvatarCsReq newInstance() {
}
/**
- * optional uint32 equipment_unique_id = 2;
- * @return whether the equipmentUniqueId field is set
+ * optional uint32 base_avatar_id = 2;
+ * @return whether the baseAvatarId field is set
*/
- public boolean hasEquipmentUniqueId() {
+ public boolean hasBaseAvatarId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 equipment_unique_id = 2;
+ * optional uint32 base_avatar_id = 2;
* @return this
*/
- public DressAvatarCsReq clearEquipmentUniqueId() {
+ public DressAvatarCsReq clearBaseAvatarId() {
bitField0_ &= ~0x00000001;
- equipmentUniqueId = 0;
+ baseAvatarId = 0;
return this;
}
/**
- * optional uint32 equipment_unique_id = 2;
- * @return the equipmentUniqueId
+ * optional uint32 base_avatar_id = 2;
+ * @return the baseAvatarId
*/
- public int getEquipmentUniqueId() {
- return equipmentUniqueId;
+ public int getBaseAvatarId() {
+ return baseAvatarId;
}
/**
- * optional uint32 equipment_unique_id = 2;
- * @param value the equipmentUniqueId to set
+ * optional uint32 base_avatar_id = 2;
+ * @param value the baseAvatarId to set
* @return this
*/
- public DressAvatarCsReq setEquipmentUniqueId(final int value) {
+ public DressAvatarCsReq setBaseAvatarId(final int value) {
bitField0_ |= 0x00000001;
- equipmentUniqueId = value;
+ baseAvatarId = value;
return this;
}
/**
- * optional uint32 base_avatar_id = 9;
- * @return whether the baseAvatarId field is set
+ * optional uint32 equipment_unique_id = 4;
+ * @return whether the equipmentUniqueId field is set
*/
- public boolean hasBaseAvatarId() {
+ public boolean hasEquipmentUniqueId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 base_avatar_id = 9;
+ * optional uint32 equipment_unique_id = 4;
* @return this
*/
- public DressAvatarCsReq clearBaseAvatarId() {
+ public DressAvatarCsReq clearEquipmentUniqueId() {
bitField0_ &= ~0x00000002;
- baseAvatarId = 0;
+ equipmentUniqueId = 0;
return this;
}
/**
- * optional uint32 base_avatar_id = 9;
- * @return the baseAvatarId
+ * optional uint32 equipment_unique_id = 4;
+ * @return the equipmentUniqueId
*/
- public int getBaseAvatarId() {
- return baseAvatarId;
+ public int getEquipmentUniqueId() {
+ return equipmentUniqueId;
}
/**
- * optional uint32 base_avatar_id = 9;
- * @param value the baseAvatarId to set
+ * optional uint32 equipment_unique_id = 4;
+ * @param value the equipmentUniqueId to set
* @return this
*/
- public DressAvatarCsReq setBaseAvatarId(final int value) {
+ public DressAvatarCsReq setEquipmentUniqueId(final int value) {
bitField0_ |= 0x00000002;
- baseAvatarId = value;
+ equipmentUniqueId = value;
return this;
}
@@ -117,8 +117,8 @@ public DressAvatarCsReq copyFrom(final DressAvatarCsReq other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- equipmentUniqueId = other.equipmentUniqueId;
baseAvatarId = other.baseAvatarId;
+ equipmentUniqueId = other.equipmentUniqueId;
}
return this;
}
@@ -129,12 +129,12 @@ public DressAvatarCsReq mergeFrom(final DressAvatarCsReq other) {
return this;
}
cachedSize = -1;
- if (other.hasEquipmentUniqueId()) {
- setEquipmentUniqueId(other.equipmentUniqueId);
- }
if (other.hasBaseAvatarId()) {
setBaseAvatarId(other.baseAvatarId);
}
+ if (other.hasEquipmentUniqueId()) {
+ setEquipmentUniqueId(other.equipmentUniqueId);
+ }
return this;
}
@@ -145,8 +145,8 @@ public DressAvatarCsReq clear() {
}
cachedSize = -1;
bitField0_ = 0;
- equipmentUniqueId = 0;
baseAvatarId = 0;
+ equipmentUniqueId = 0;
return this;
}
@@ -170,19 +170,19 @@ public boolean equals(Object o) {
}
DressAvatarCsReq other = (DressAvatarCsReq) o;
return bitField0_ == other.bitField0_
- && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId)
- && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId);
+ && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
+ && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(equipmentUniqueId);
+ output.writeUInt32NoTag(baseAvatarId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 72);
- output.writeUInt32NoTag(baseAvatarId);
+ output.writeRawByte((byte) 32);
+ output.writeUInt32NoTag(equipmentUniqueId);
}
}
@@ -190,10 +190,10 @@ public void writeTo(final ProtoSink output) throws IOException {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId);
}
return size;
}
@@ -206,17 +206,17 @@ public DressAvatarCsReq mergeFrom(final ProtoSource input) throws IOException {
while (true) {
switch (tag) {
case 16: {
- // equipmentUniqueId
- equipmentUniqueId = input.readUInt32();
+ // baseAvatarId
+ baseAvatarId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 72) {
+ if (tag != 32) {
break;
}
}
- case 72: {
- // baseAvatarId
- baseAvatarId = input.readUInt32();
+ case 32: {
+ // equipmentUniqueId
+ equipmentUniqueId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
@@ -241,10 +241,10 @@ public DressAvatarCsReq mergeFrom(final ProtoSource input) throws IOException {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId);
+ output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
+ output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId);
}
output.endObject();
}
@@ -256,11 +256,11 @@ public DressAvatarCsReq mergeFrom(final JsonSource input) throws IOException {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1867136902:
- case 760467160: {
- if (input.isAtField(FieldNames.equipmentUniqueId)) {
+ case 118022725:
+ case -1756826157: {
+ if (input.isAtField(FieldNames.baseAvatarId)) {
if (!input.trySkipNullValue()) {
- equipmentUniqueId = input.readUInt32();
+ baseAvatarId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -268,11 +268,11 @@ public DressAvatarCsReq mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 118022725:
- case -1756826157: {
- if (input.isAtField(FieldNames.baseAvatarId)) {
+ case -1867136902:
+ case 760467160: {
+ if (input.isAtField(FieldNames.equipmentUniqueId)) {
if (!input.trySkipNullValue()) {
- baseAvatarId = input.readUInt32();
+ equipmentUniqueId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -333,9 +333,9 @@ public DressAvatarCsReq create() {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id");
-
static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
+
+ static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java
index dde576b91..12122ecab 100644
--- a/src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java
@@ -20,12 +20,12 @@ public static final class DressRelicAvatarCsReq extends ProtoMessageoptional uint32 base_avatar_id = 13;
+ * optional uint32 base_avatar_id = 5;
*/
private int baseAvatarId;
/**
- * repeated .RelicParam param_list = 11;
+ * repeated .RelicParam param_list = 15;
*/
private final RepeatedMessage paramList = RepeatedMessage.newEmptyInstance(RelicParamOuterClass.RelicParam.getFactory());
@@ -40,7 +40,7 @@ public static DressRelicAvatarCsReq newInstance() {
}
/**
- * optional uint32 base_avatar_id = 13;
+ * optional uint32 base_avatar_id = 5;
* @return whether the baseAvatarId field is set
*/
public boolean hasBaseAvatarId() {
@@ -48,7 +48,7 @@ public boolean hasBaseAvatarId() {
}
/**
- * optional uint32 base_avatar_id = 13;
+ * optional uint32 base_avatar_id = 5;
* @return this
*/
public DressRelicAvatarCsReq clearBaseAvatarId() {
@@ -58,7 +58,7 @@ public DressRelicAvatarCsReq clearBaseAvatarId() {
}
/**
- * optional uint32 base_avatar_id = 13;
+ * optional uint32 base_avatar_id = 5;
* @return the baseAvatarId
*/
public int getBaseAvatarId() {
@@ -66,7 +66,7 @@ public int getBaseAvatarId() {
}
/**
- * optional uint32 base_avatar_id = 13;
+ * optional uint32 base_avatar_id = 5;
* @param value the baseAvatarId to set
* @return this
*/
@@ -77,7 +77,7 @@ public DressRelicAvatarCsReq setBaseAvatarId(final int value) {
}
/**
- * repeated .RelicParam param_list = 11;
+ * repeated .RelicParam param_list = 15;
* @return whether the paramList field is set
*/
public boolean hasParamList() {
@@ -85,7 +85,7 @@ public boolean hasParamList() {
}
/**
- * repeated .RelicParam param_list = 11;
+ * repeated .RelicParam param_list = 15;
* @return this
*/
public DressRelicAvatarCsReq clearParamList() {
@@ -95,7 +95,7 @@ public DressRelicAvatarCsReq clearParamList() {
}
/**
- * repeated .RelicParam param_list = 11;
+ * repeated .RelicParam param_list = 15;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public RepeatedMessage getParamList() {
}
/**
- * repeated .RelicParam param_list = 11;
+ * repeated .RelicParam param_list = 15;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public RepeatedMessage getMutableParamList() {
}
/**
- * repeated .RelicParam param_list = 11;
+ * repeated .RelicParam param_list = 15;
* @param value the paramList to add
* @return this
*/
@@ -134,7 +134,7 @@ public DressRelicAvatarCsReq addParamList(final RelicParamOuterClass.RelicParam
}
/**
- * repeated .RelicParam param_list = 11;
+ * repeated .RelicParam param_list = 15;
* @param values the paramList to add
* @return this
*/
@@ -210,12 +210,12 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(baseAvatarId);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < paramList.length(); i++) {
- output.writeRawByte((byte) 90);
+ output.writeRawByte((byte) 122);
output.writeMessageNoTag(paramList.get(i));
}
}
@@ -240,16 +240,16 @@ public DressRelicAvatarCsReq mergeFrom(final ProtoSource input) throws IOExcepti
int tag = input.readTag();
while (true) {
switch (tag) {
- case 104: {
+ case 40: {
// baseAvatarId
baseAvatarId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 90) {
+ if (tag != 122) {
break;
}
}
- case 90: {
+ case 122: {
// paramList
tag = input.readRepeatedMessage(paramList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/EnableRogueTalentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnableRogueTalentCsReqOuterClass.java
index cca2b5ce2..a40668d50 100644
--- a/src/generated/main/emu/lunarcore/proto/EnableRogueTalentCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EnableRogueTalentCsReqOuterClass.java
@@ -19,7 +19,7 @@ public static final class EnableRogueTalentCsReq extends ProtoMessageoptional uint32 talent_id = 10;
+ * optional uint32 talent_id = 13;
*/
private int talentId;
@@ -34,7 +34,7 @@ public static EnableRogueTalentCsReq newInstance() {
}
/**
- * optional uint32 talent_id = 10;
+ * optional uint32 talent_id = 13;
* @return whether the talentId field is set
*/
public boolean hasTalentId() {
@@ -42,7 +42,7 @@ public boolean hasTalentId() {
}
/**
- * optional uint32 talent_id = 10;
+ * optional uint32 talent_id = 13;
* @return this
*/
public EnableRogueTalentCsReq clearTalentId() {
@@ -52,7 +52,7 @@ public EnableRogueTalentCsReq clearTalentId() {
}
/**
- * optional uint32 talent_id = 10;
+ * optional uint32 talent_id = 13;
* @return the talentId
*/
public int getTalentId() {
@@ -60,7 +60,7 @@ public int getTalentId() {
}
/**
- * optional uint32 talent_id = 10;
+ * optional uint32 talent_id = 13;
* @param value the talentId to set
* @return this
*/
@@ -129,7 +129,7 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 104);
output.writeUInt32NoTag(talentId);
}
}
@@ -150,7 +150,7 @@ public EnableRogueTalentCsReq mergeFrom(final ProtoSource input) throws IOExcept
int tag = input.readTag();
while (true) {
switch (tag) {
- case 80: {
+ case 104: {
// talentId
talentId = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/EnableRogueTalentScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnableRogueTalentScRspOuterClass.java
index c3aaf8706..a8492305c 100644
--- a/src/generated/main/emu/lunarcore/proto/EnableRogueTalentScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EnableRogueTalentScRspOuterClass.java
@@ -19,12 +19,12 @@ public static final class EnableRogueTalentScRsp extends ProtoMessageoptional uint32 retcode = 8;
+ * optional uint32 retcode = 14;
*/
private int retcode;
/**
- * optional .RogueTalentInfo talent_info = 7;
+ * optional .RogueTalentInfo talent_info = 1;
*/
private final RogueTalentInfoOuterClass.RogueTalentInfo talentInfo = RogueTalentInfoOuterClass.RogueTalentInfo.newInstance();
@@ -39,7 +39,7 @@ public static EnableRogueTalentScRsp newInstance() {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 14;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -47,7 +47,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 14;
* @return this
*/
public EnableRogueTalentScRsp clearRetcode() {
@@ -57,7 +57,7 @@ public EnableRogueTalentScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 14;
* @return the retcode
*/
public int getRetcode() {
@@ -65,7 +65,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 14;
* @param value the retcode to set
* @return this
*/
@@ -76,7 +76,7 @@ public EnableRogueTalentScRsp setRetcode(final int value) {
}
/**
- * optional .RogueTalentInfo talent_info = 7;
+ * optional .RogueTalentInfo talent_info = 1;
* @return whether the talentInfo field is set
*/
public boolean hasTalentInfo() {
@@ -84,7 +84,7 @@ public boolean hasTalentInfo() {
}
/**
- * optional .RogueTalentInfo talent_info = 7;
+ * optional .RogueTalentInfo talent_info = 1;
* @return this
*/
public EnableRogueTalentScRsp clearTalentInfo() {
@@ -94,7 +94,7 @@ public EnableRogueTalentScRsp clearTalentInfo() {
}
/**
- * optional .RogueTalentInfo talent_info = 7;
+ * optional .RogueTalentInfo talent_info = 1;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public RogueTalentInfoOuterClass.RogueTalentInfo getTalentInfo() {
}
/**
- * optional .RogueTalentInfo talent_info = 7;
+ * optional .RogueTalentInfo talent_info = 1;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public RogueTalentInfoOuterClass.RogueTalentInfo getMutableTalentInfo() {
}
/**
- * optional .RogueTalentInfo talent_info = 7;
+ * optional .RogueTalentInfo talent_info = 1;
* @param value the talentInfo to set
* @return this
*/
@@ -199,11 +199,11 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 112);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 58);
+ output.writeRawByte((byte) 10);
output.writeMessageNoTag(talentInfo);
}
}
@@ -227,16 +227,16 @@ public EnableRogueTalentScRsp mergeFrom(final ProtoSource input) throws IOExcept
int tag = input.readTag();
while (true) {
switch (tag) {
- case 64: {
+ case 112: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 58) {
+ if (tag != 10) {
break;
}
}
- case 58: {
+ case 10: {
// talentInfo
input.readMessage(talentInfo);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java
index bc450ed93..c25e7e703 100644
--- a/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java
@@ -24,7 +24,7 @@ public static final class EnterSceneByServerScNotify extends ProtoMessageoptional .SceneInfo scene = 6;
+ * optional .SceneInfo scene = 4;
*/
private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance();
@@ -107,7 +107,7 @@ public EnterSceneByServerScNotify setReason(
}
/**
- * optional .SceneInfo scene = 6;
+ * optional .SceneInfo scene = 4;
* @return whether the scene field is set
*/
public boolean hasScene() {
@@ -115,7 +115,7 @@ public boolean hasScene() {
}
/**
- * optional .SceneInfo scene = 6;
+ * optional .SceneInfo scene = 4;
* @return this
*/
public EnterSceneByServerScNotify clearScene() {
@@ -125,7 +125,7 @@ public EnterSceneByServerScNotify clearScene() {
}
/**
- * optional .SceneInfo scene = 6;
+ * optional .SceneInfo scene = 4;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -139,7 +139,7 @@ public SceneInfoOuterClass.SceneInfo getScene() {
}
/**
- * optional .SceneInfo scene = 6;
+ * optional .SceneInfo scene = 4;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -153,7 +153,7 @@ public SceneInfoOuterClass.SceneInfo getMutableScene() {
}
/**
- * optional .SceneInfo scene = 6;
+ * optional .SceneInfo scene = 4;
* @param value the scene to set
* @return this
*/
@@ -297,7 +297,7 @@ public void writeTo(final ProtoSink output) throws IOException {
output.writeEnumNoTag(reason);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 50);
+ output.writeRawByte((byte) 34);
output.writeMessageNoTag(scene);
}
if ((bitField0_ & 0x00000004) != 0) {
@@ -336,11 +336,11 @@ public EnterSceneByServerScNotify mergeFrom(final ProtoSource input) throws IOEx
bitField0_ |= 0x00000001;
}
tag = input.readTag();
- if (tag != 50) {
+ if (tag != 34) {
break;
}
}
- case 50: {
+ case 34: {
// scene
input.readMessage(scene);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java
index 38118f734..30428eb08 100644
--- a/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java
@@ -19,12 +19,12 @@ public static final class EnterSceneCsReq extends ProtoMessage
private static final long serialVersionUID = 0L;
/**
- * optional uint32 teleport_id = 1;
+ * optional uint32 teleport_id = 2;
*/
private int teleportId;
/**
- * optional uint32 entry_id = 6;
+ * optional uint32 entry_id = 14;
*/
private int entryId;
@@ -39,7 +39,7 @@ public static EnterSceneCsReq newInstance() {
}
/**
- * optional uint32 teleport_id = 1;
+ * optional uint32 teleport_id = 2;
* @return whether the teleportId field is set
*/
public boolean hasTeleportId() {
@@ -47,7 +47,7 @@ public boolean hasTeleportId() {
}
/**
- * optional uint32 teleport_id = 1;
+ * optional uint32 teleport_id = 2;
* @return this
*/
public EnterSceneCsReq clearTeleportId() {
@@ -57,7 +57,7 @@ public EnterSceneCsReq clearTeleportId() {
}
/**
- * optional uint32 teleport_id = 1;
+ * optional uint32 teleport_id = 2;
* @return the teleportId
*/
public int getTeleportId() {
@@ -65,7 +65,7 @@ public int getTeleportId() {
}
/**
- * optional uint32 teleport_id = 1;
+ * optional uint32 teleport_id = 2;
* @param value the teleportId to set
* @return this
*/
@@ -76,7 +76,7 @@ public EnterSceneCsReq setTeleportId(final int value) {
}
/**
- * optional uint32 entry_id = 6;
+ * optional uint32 entry_id = 14;
* @return whether the entryId field is set
*/
public boolean hasEntryId() {
@@ -84,7 +84,7 @@ public boolean hasEntryId() {
}
/**
- * optional uint32 entry_id = 6;
+ * optional uint32 entry_id = 14;
* @return this
*/
public EnterSceneCsReq clearEntryId() {
@@ -94,7 +94,7 @@ public EnterSceneCsReq clearEntryId() {
}
/**
- * optional uint32 entry_id = 6;
+ * optional uint32 entry_id = 14;
* @return the entryId
*/
public int getEntryId() {
@@ -102,7 +102,7 @@ public int getEntryId() {
}
/**
- * optional uint32 entry_id = 6;
+ * optional uint32 entry_id = 14;
* @param value the entryId to set
* @return this
*/
@@ -177,11 +177,11 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(teleportId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 112);
output.writeUInt32NoTag(entryId);
}
}
@@ -205,16 +205,16 @@ public EnterSceneCsReq mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 16: {
// teleportId
teleportId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 48) {
+ if (tag != 112) {
break;
}
}
- case 48: {
+ case 112: {
// entryId
entryId = input.readUInt32();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java
index 6c7f30823..edaf76ec7 100644
--- a/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java
@@ -19,14 +19,14 @@ public static final class EnteredSceneInfo extends ProtoMessageoptional uint32 floor_id = 2;
+ * optional uint32 plane_id = 1;
*/
- private int floorId;
+ private int planeId;
/**
- * optional uint32 plane_id = 6;
+ * optional uint32 floor_id = 6;
*/
- private int planeId;
+ private int floorId;
private EnteredSceneInfo() {
}
@@ -39,76 +39,76 @@ public static EnteredSceneInfo newInstance() {
}
/**
- * optional uint32 floor_id = 2;
- * @return whether the floorId field is set
+ * optional uint32 plane_id = 1;
+ * @return whether the planeId field is set
*/
- public boolean hasFloorId() {
+ public boolean hasPlaneId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 floor_id = 2;
+ * optional uint32 plane_id = 1;
* @return this
*/
- public EnteredSceneInfo clearFloorId() {
+ public EnteredSceneInfo clearPlaneId() {
bitField0_ &= ~0x00000001;
- floorId = 0;
+ planeId = 0;
return this;
}
/**
- * optional uint32 floor_id = 2;
- * @return the floorId
+ * optional uint32 plane_id = 1;
+ * @return the planeId
*/
- public int getFloorId() {
- return floorId;
+ public int getPlaneId() {
+ return planeId;
}
/**
- * optional uint32 floor_id = 2;
- * @param value the floorId to set
+ * optional uint32 plane_id = 1;
+ * @param value the planeId to set
* @return this
*/
- public EnteredSceneInfo setFloorId(final int value) {
+ public EnteredSceneInfo setPlaneId(final int value) {
bitField0_ |= 0x00000001;
- floorId = value;
+ planeId = value;
return this;
}
/**
- * optional uint32 plane_id = 6;
- * @return whether the planeId field is set
+ * optional uint32 floor_id = 6;
+ * @return whether the floorId field is set
*/
- public boolean hasPlaneId() {
+ public boolean hasFloorId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 plane_id = 6;
+ * optional uint32 floor_id = 6;
* @return this
*/
- public EnteredSceneInfo clearPlaneId() {
+ public EnteredSceneInfo clearFloorId() {
bitField0_ &= ~0x00000002;
- planeId = 0;
+ floorId = 0;
return this;
}
/**
- * optional uint32 plane_id = 6;
- * @return the planeId
+ * optional uint32 floor_id = 6;
+ * @return the floorId
*/
- public int getPlaneId() {
- return planeId;
+ public int getFloorId() {
+ return floorId;
}
/**
- * optional uint32 plane_id = 6;
- * @param value the planeId to set
+ * optional uint32 floor_id = 6;
+ * @param value the floorId to set
* @return this
*/
- public EnteredSceneInfo setPlaneId(final int value) {
+ public EnteredSceneInfo setFloorId(final int value) {
bitField0_ |= 0x00000002;
- planeId = value;
+ floorId = value;
return this;
}
@@ -117,8 +117,8 @@ public EnteredSceneInfo copyFrom(final EnteredSceneInfo other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- floorId = other.floorId;
planeId = other.planeId;
+ floorId = other.floorId;
}
return this;
}
@@ -129,12 +129,12 @@ public EnteredSceneInfo mergeFrom(final EnteredSceneInfo other) {
return this;
}
cachedSize = -1;
- if (other.hasFloorId()) {
- setFloorId(other.floorId);
- }
if (other.hasPlaneId()) {
setPlaneId(other.planeId);
}
+ if (other.hasFloorId()) {
+ setFloorId(other.floorId);
+ }
return this;
}
@@ -145,8 +145,8 @@ public EnteredSceneInfo clear() {
}
cachedSize = -1;
bitField0_ = 0;
- floorId = 0;
planeId = 0;
+ floorId = 0;
return this;
}
@@ -170,19 +170,19 @@ public boolean equals(Object o) {
}
EnteredSceneInfo other = (EnteredSceneInfo) o;
return bitField0_ == other.bitField0_
- && (!hasFloorId() || floorId == other.floorId)
- && (!hasPlaneId() || planeId == other.planeId);
+ && (!hasPlaneId() || planeId == other.planeId)
+ && (!hasFloorId() || floorId == other.floorId);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(floorId);
+ output.writeRawByte((byte) 8);
+ output.writeUInt32NoTag(planeId);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 48);
- output.writeUInt32NoTag(planeId);
+ output.writeUInt32NoTag(floorId);
}
}
@@ -190,10 +190,10 @@ public void writeTo(final ProtoSink output) throws IOException {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(floorId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(floorId);
}
return size;
}
@@ -205,9 +205,9 @@ public EnteredSceneInfo mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
- // floorId
- floorId = input.readUInt32();
+ case 8: {
+ // planeId
+ planeId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
if (tag != 48) {
@@ -215,8 +215,8 @@ public EnteredSceneInfo mergeFrom(final ProtoSource input) throws IOException {
}
}
case 48: {
- // planeId
- planeId = input.readUInt32();
+ // floorId
+ floorId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
@@ -241,10 +241,10 @@ public EnteredSceneInfo mergeFrom(final ProtoSource input) throws IOException {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.floorId, floorId);
+ output.writeUInt32(FieldNames.planeId, planeId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.planeId, planeId);
+ output.writeUInt32(FieldNames.floorId, floorId);
}
output.endObject();
}
@@ -256,11 +256,11 @@ public EnteredSceneInfo mergeFrom(final JsonSource input) throws IOException {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -766027193:
- case 2022982190: {
- if (input.isAtField(FieldNames.floorId)) {
+ case -493896553:
+ case 1869097438: {
+ if (input.isAtField(FieldNames.planeId)) {
if (!input.trySkipNullValue()) {
- floorId = input.readUInt32();
+ planeId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -268,11 +268,11 @@ public EnteredSceneInfo mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case -493896553:
- case 1869097438: {
- if (input.isAtField(FieldNames.planeId)) {
+ case -766027193:
+ case 2022982190: {
+ if (input.isAtField(FieldNames.floorId)) {
if (!input.trySkipNullValue()) {
- planeId = input.readUInt32();
+ floorId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -333,9 +333,9 @@ public EnteredSceneInfo create() {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName floorId = FieldName.forField("floorId", "floor_id");
-
static final FieldName planeId = FieldName.forField("planeId", "plane_id");
+
+ static final FieldName floorId = FieldName.forField("floorId", "floor_id");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java
index 948c1f2c2..4b85880d1 100644
--- a/src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java
@@ -19,17 +19,17 @@ public static final class EntityBuffChangeInfo extends ProtoMessageoptional uint32 remove_buff_id = 5;
+ * optional uint32 remove_buff_id = 4;
*/
private int removeBuffId;
/**
- * optional uint32 entity_id = 8;
+ * optional uint32 entity_id = 9;
*/
private int entityId;
/**
- * optional .BuffInfo add_buff_info = 4;
+ * optional .BuffInfo add_buff_info = 12;
*/
private final BuffInfoOuterClass.BuffInfo addBuffInfo = BuffInfoOuterClass.BuffInfo.newInstance();
@@ -43,32 +43,8 @@ public static EntityBuffChangeInfo newInstance() {
return new EntityBuffChangeInfo();
}
- public boolean hasInfo() {
- return (((bitField0_ & 0x00000003)) != 0);
- }
-
- public EntityBuffChangeInfo clearInfo() {
- if (hasInfo()) {
- clearRemoveBuffId();
- clearAddBuffInfo();
- }
- return this;
- }
-
- private void clearInfoOtherRemoveBuffId() {
- if ((((bitField0_ & 0x00000002)) != 0)) {
- clearAddBuffInfo();
- }
- }
-
- private void clearInfoOtherAddBuffInfo() {
- if ((((bitField0_ & 0x00000001)) != 0)) {
- clearRemoveBuffId();
- }
- }
-
/**
- * optional uint32 remove_buff_id = 5;
+ * optional uint32 remove_buff_id = 4;
* @return whether the removeBuffId field is set
*/
public boolean hasRemoveBuffId() {
@@ -76,7 +52,7 @@ public boolean hasRemoveBuffId() {
}
/**
- * optional uint32 remove_buff_id = 5;
+ * optional uint32 remove_buff_id = 4;
* @return this
*/
public EntityBuffChangeInfo clearRemoveBuffId() {
@@ -86,7 +62,7 @@ public EntityBuffChangeInfo clearRemoveBuffId() {
}
/**
- * optional uint32 remove_buff_id = 5;
+ * optional uint32 remove_buff_id = 4;
* @return the removeBuffId
*/
public int getRemoveBuffId() {
@@ -94,37 +70,36 @@ public int getRemoveBuffId() {
}
/**
- * optional uint32 remove_buff_id = 5;
+ * optional uint32 remove_buff_id = 4;
* @param value the removeBuffId to set
* @return this
*/
public EntityBuffChangeInfo setRemoveBuffId(final int value) {
- clearInfoOtherRemoveBuffId();
bitField0_ |= 0x00000001;
removeBuffId = value;
return this;
}
/**
- * optional uint32 entity_id = 8;
+ * optional uint32 entity_id = 9;
* @return whether the entityId field is set
*/
public boolean hasEntityId() {
- return (bitField0_ & 0x00000004) != 0;
+ return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 entity_id = 8;
+ * optional uint32 entity_id = 9;
* @return this
*/
public EntityBuffChangeInfo clearEntityId() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
entityId = 0;
return this;
}
/**
- * optional uint32 entity_id = 8;
+ * optional uint32 entity_id = 9;
* @return the entityId
*/
public int getEntityId() {
@@ -132,36 +107,36 @@ public int getEntityId() {
}
/**
- * optional uint32 entity_id = 8;
+ * optional uint32 entity_id = 9;
* @param value the entityId to set
* @return this
*/
public EntityBuffChangeInfo setEntityId(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
entityId = value;
return this;
}
/**
- * optional .BuffInfo add_buff_info = 4;
+ * optional .BuffInfo add_buff_info = 12;
* @return whether the addBuffInfo field is set
*/
public boolean hasAddBuffInfo() {
- return (bitField0_ & 0x00000002) != 0;
+ return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional .BuffInfo add_buff_info = 4;
+ * optional .BuffInfo add_buff_info = 12;
* @return this
*/
public EntityBuffChangeInfo clearAddBuffInfo() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000004;
addBuffInfo.clear();
return this;
}
/**
- * optional .BuffInfo add_buff_info = 4;
+ * optional .BuffInfo add_buff_info = 12;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -175,7 +150,7 @@ public BuffInfoOuterClass.BuffInfo getAddBuffInfo() {
}
/**
- * optional .BuffInfo add_buff_info = 4;
+ * optional .BuffInfo add_buff_info = 12;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -184,19 +159,17 @@ public BuffInfoOuterClass.BuffInfo getAddBuffInfo() {
* @return internal storage object for modifications
*/
public BuffInfoOuterClass.BuffInfo getMutableAddBuffInfo() {
- clearInfoOtherAddBuffInfo();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
return addBuffInfo;
}
/**
- * optional .BuffInfo add_buff_info = 4;
+ * optional .BuffInfo add_buff_info = 12;
* @param value the addBuffInfo to set
* @return this
*/
public EntityBuffChangeInfo setAddBuffInfo(final BuffInfoOuterClass.BuffInfo value) {
- clearInfoOtherAddBuffInfo();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
addBuffInfo.copyFrom(value);
return this;
}
@@ -273,15 +246,15 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(removeBuffId);
}
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 64);
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 72);
output.writeUInt32NoTag(entityId);
}
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 34);
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 98);
output.writeMessageNoTag(addBuffInfo);
}
}
@@ -292,10 +265,10 @@ protected int computeSerializedSize() {
if ((bitField0_ & 0x00000001) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(removeBuffId);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId);
}
- if ((bitField0_ & 0x00000002) != 0) {
+ if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(addBuffInfo);
}
return size;
@@ -308,30 +281,28 @@ public EntityBuffChangeInfo mergeFrom(final ProtoSource input) throws IOExceptio
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
+ case 32: {
// removeBuffId
- clearInfoOtherRemoveBuffId();
removeBuffId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 64) {
+ if (tag != 72) {
break;
}
}
- case 64: {
+ case 72: {
// entityId
entityId = input.readUInt32();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 34) {
+ if (tag != 98) {
break;
}
}
- case 34: {
+ case 98: {
// addBuffInfo
- clearInfoOtherAddBuffInfo();
input.readMessage(addBuffInfo);
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 0) {
break;
@@ -357,10 +328,10 @@ public void writeTo(final JsonSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
output.writeUInt32(FieldNames.removeBuffId, removeBuffId);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.entityId, entityId);
}
- if ((bitField0_ & 0x00000002) != 0) {
+ if ((bitField0_ & 0x00000004) != 0) {
output.writeMessage(FieldNames.addBuffInfo, addBuffInfo);
}
output.endObject();
@@ -377,7 +348,6 @@ public EntityBuffChangeInfo mergeFrom(final JsonSource input) throws IOException
case 927119308: {
if (input.isAtField(FieldNames.removeBuffId)) {
if (!input.trySkipNullValue()) {
- clearInfoOtherRemoveBuffId();
removeBuffId = input.readUInt32();
bitField0_ |= 0x00000001;
}
@@ -391,7 +361,7 @@ public EntityBuffChangeInfo mergeFrom(final JsonSource input) throws IOException
if (input.isAtField(FieldNames.entityId)) {
if (!input.trySkipNullValue()) {
entityId = input.readUInt32();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
}
} else {
input.skipUnknownField();
@@ -402,9 +372,8 @@ public EntityBuffChangeInfo mergeFrom(final JsonSource input) throws IOException
case 888334076: {
if (input.isAtField(FieldNames.addBuffInfo)) {
if (!input.trySkipNullValue()) {
- clearInfoOtherAddBuffInfo();
input.readMessage(addBuffInfo);
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
}
} else {
input.skipUnknownField();
diff --git a/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java b/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java
index 903781611..590b796ce 100644
--- a/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java
@@ -19,17 +19,17 @@ public static final class EntityMotion extends ProtoMessage implem
private static final long serialVersionUID = 0L;
/**
- * optional uint32 entity_id = 1;
+ * optional uint32 map_layer = 13;
*/
- private int entityId;
+ private int mapLayer;
/**
- * optional uint32 map_layer = 3;
+ * optional uint32 entity_id = 14;
*/
- private int mapLayer;
+ private int entityId;
/**
- * optional .MotionInfo motion = 14;
+ * optional .MotionInfo motion = 11;
*/
private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance();
@@ -44,81 +44,81 @@ public static EntityMotion newInstance() {
}
/**
- * optional uint32 entity_id = 1;
- * @return whether the entityId field is set
+ * optional uint32 map_layer = 13;
+ * @return whether the mapLayer field is set
*/
- public boolean hasEntityId() {
+ public boolean hasMapLayer() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 entity_id = 1;
+ * optional uint32 map_layer = 13;
* @return this
*/
- public EntityMotion clearEntityId() {
+ public EntityMotion clearMapLayer() {
bitField0_ &= ~0x00000001;
- entityId = 0;
+ mapLayer = 0;
return this;
}
/**
- * optional uint32 entity_id = 1;
- * @return the entityId
+ * optional uint32 map_layer = 13;
+ * @return the mapLayer
*/
- public int getEntityId() {
- return entityId;
+ public int getMapLayer() {
+ return mapLayer;
}
/**
- * optional uint32 entity_id = 1;
- * @param value the entityId to set
+ * optional uint32 map_layer = 13;
+ * @param value the mapLayer to set
* @return this
*/
- public EntityMotion setEntityId(final int value) {
+ public EntityMotion setMapLayer(final int value) {
bitField0_ |= 0x00000001;
- entityId = value;
+ mapLayer = value;
return this;
}
/**
- * optional uint32 map_layer = 3;
- * @return whether the mapLayer field is set
+ * optional uint32 entity_id = 14;
+ * @return whether the entityId field is set
*/
- public boolean hasMapLayer() {
+ public boolean hasEntityId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 map_layer = 3;
+ * optional uint32 entity_id = 14;
* @return this
*/
- public EntityMotion clearMapLayer() {
+ public EntityMotion clearEntityId() {
bitField0_ &= ~0x00000002;
- mapLayer = 0;
+ entityId = 0;
return this;
}
/**
- * optional uint32 map_layer = 3;
- * @return the mapLayer
+ * optional uint32 entity_id = 14;
+ * @return the entityId
*/
- public int getMapLayer() {
- return mapLayer;
+ public int getEntityId() {
+ return entityId;
}
/**
- * optional uint32 map_layer = 3;
- * @param value the mapLayer to set
+ * optional uint32 entity_id = 14;
+ * @param value the entityId to set
* @return this
*/
- public EntityMotion setMapLayer(final int value) {
+ public EntityMotion setEntityId(final int value) {
bitField0_ |= 0x00000002;
- mapLayer = value;
+ entityId = value;
return this;
}
/**
- * optional .MotionInfo motion = 14;
+ * optional .MotionInfo motion = 11;
* @return whether the motion field is set
*/
public boolean hasMotion() {
@@ -126,7 +126,7 @@ public boolean hasMotion() {
}
/**
- * optional .MotionInfo motion = 14;
+ * optional .MotionInfo motion = 11;
* @return this
*/
public EntityMotion clearMotion() {
@@ -136,7 +136,7 @@ public EntityMotion clearMotion() {
}
/**
- * optional .MotionInfo motion = 14;
+ * optional .MotionInfo motion = 11;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -150,7 +150,7 @@ public MotionInfoOuterClass.MotionInfo getMotion() {
}
/**
- * optional .MotionInfo motion = 14;
+ * optional .MotionInfo motion = 11;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -164,7 +164,7 @@ public MotionInfoOuterClass.MotionInfo getMutableMotion() {
}
/**
- * optional .MotionInfo motion = 14;
+ * optional .MotionInfo motion = 11;
* @param value the motion to set
* @return this
*/
@@ -179,8 +179,8 @@ public EntityMotion copyFrom(final EntityMotion other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- entityId = other.entityId;
mapLayer = other.mapLayer;
+ entityId = other.entityId;
motion.copyFrom(other.motion);
}
return this;
@@ -192,12 +192,12 @@ public EntityMotion mergeFrom(final EntityMotion other) {
return this;
}
cachedSize = -1;
- if (other.hasEntityId()) {
- setEntityId(other.entityId);
- }
if (other.hasMapLayer()) {
setMapLayer(other.mapLayer);
}
+ if (other.hasEntityId()) {
+ setEntityId(other.entityId);
+ }
if (other.hasMotion()) {
getMutableMotion().mergeFrom(other.motion);
}
@@ -211,8 +211,8 @@ public EntityMotion clear() {
}
cachedSize = -1;
bitField0_ = 0;
- entityId = 0;
mapLayer = 0;
+ entityId = 0;
motion.clear();
return this;
}
@@ -238,23 +238,23 @@ public boolean equals(Object o) {
}
EntityMotion other = (EntityMotion) o;
return bitField0_ == other.bitField0_
- && (!hasEntityId() || entityId == other.entityId)
&& (!hasMapLayer() || mapLayer == other.mapLayer)
+ && (!hasEntityId() || entityId == other.entityId)
&& (!hasMotion() || motion.equals(other.motion));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(entityId);
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(mapLayer);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(mapLayer);
+ output.writeRawByte((byte) 112);
+ output.writeUInt32NoTag(entityId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 114);
+ output.writeRawByte((byte) 90);
output.writeMessageNoTag(motion);
}
}
@@ -263,10 +263,10 @@ public void writeTo(final ProtoSink output) throws IOException {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(mapLayer);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(mapLayer);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(motion);
@@ -281,25 +281,25 @@ public EntityMotion mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
- // entityId
- entityId = input.readUInt32();
+ case 104: {
+ // mapLayer
+ mapLayer = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 24) {
+ if (tag != 112) {
break;
}
}
- case 24: {
- // mapLayer
- mapLayer = input.readUInt32();
+ case 112: {
+ // entityId
+ entityId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 114) {
+ if (tag != 90) {
break;
}
}
- case 114: {
+ case 90: {
// motion
input.readMessage(motion);
bitField0_ |= 0x00000004;
@@ -326,10 +326,10 @@ public EntityMotion mergeFrom(final ProtoSource input) throws IOException {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.entityId, entityId);
+ output.writeUInt32(FieldNames.mapLayer, mapLayer);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.mapLayer, mapLayer);
+ output.writeUInt32(FieldNames.entityId, entityId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeMessage(FieldNames.motion, motion);
@@ -344,11 +344,11 @@ public EntityMotion mergeFrom(final JsonSource input) throws IOException {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -2102099874:
- case -740565257: {
- if (input.isAtField(FieldNames.entityId)) {
+ case 160971093:
+ case 1248553134: {
+ if (input.isAtField(FieldNames.mapLayer)) {
if (!input.trySkipNullValue()) {
- entityId = input.readUInt32();
+ mapLayer = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -356,11 +356,11 @@ public EntityMotion mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 160971093:
- case 1248553134: {
- if (input.isAtField(FieldNames.mapLayer)) {
+ case -2102099874:
+ case -740565257: {
+ if (input.isAtField(FieldNames.entityId)) {
if (!input.trySkipNullValue()) {
- mapLayer = input.readUInt32();
+ entityId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -431,10 +431,10 @@ public EntityMotion create() {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName entityId = FieldName.forField("entityId", "entity_id");
-
static final FieldName mapLayer = FieldName.forField("mapLayer", "map_layer");
+ static final FieldName entityId = FieldName.forField("entityId", "entity_id");
+
static final FieldName motion = FieldName.forField("motion");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/EquipRelicOuterClass.java b/src/generated/main/emu/lunarcore/proto/EquipRelicOuterClass.java
index d44ac8423..1eba528d2 100644
--- a/src/generated/main/emu/lunarcore/proto/EquipRelicOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EquipRelicOuterClass.java
@@ -19,14 +19,14 @@ public static final class EquipRelic extends ProtoMessage implements
private static final long serialVersionUID = 0L;
/**
- * optional uint32 relic_unique_id = 4;
+ * optional uint32 slot = 4;
*/
- private int relicUniqueId;
+ private int slot;
/**
- * optional uint32 slot = 12;
+ * optional uint32 relic_unique_id = 15;
*/
- private int slot;
+ private int relicUniqueId;
private EquipRelic() {
}
@@ -39,76 +39,76 @@ public static EquipRelic newInstance() {
}
/**
- * optional uint32 relic_unique_id = 4;
- * @return whether the relicUniqueId field is set
+ * optional uint32 slot = 4;
+ * @return whether the slot field is set
*/
- public boolean hasRelicUniqueId() {
+ public boolean hasSlot() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 relic_unique_id = 4;
+ * optional uint32 slot = 4;
* @return this
*/
- public EquipRelic clearRelicUniqueId() {
+ public EquipRelic clearSlot() {
bitField0_ &= ~0x00000001;
- relicUniqueId = 0;
+ slot = 0;
return this;
}
/**
- * optional uint32 relic_unique_id = 4;
- * @return the relicUniqueId
+ * optional uint32 slot = 4;
+ * @return the slot
*/
- public int getRelicUniqueId() {
- return relicUniqueId;
+ public int getSlot() {
+ return slot;
}
/**
- * optional uint32 relic_unique_id = 4;
- * @param value the relicUniqueId to set
+ * optional uint32 slot = 4;
+ * @param value the slot to set
* @return this
*/
- public EquipRelic setRelicUniqueId(final int value) {
+ public EquipRelic setSlot(final int value) {
bitField0_ |= 0x00000001;
- relicUniqueId = value;
+ slot = value;
return this;
}
/**
- * optional uint32 slot = 12;
- * @return whether the slot field is set
+ * optional uint32 relic_unique_id = 15;
+ * @return whether the relicUniqueId field is set
*/
- public boolean hasSlot() {
+ public boolean hasRelicUniqueId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 slot = 12;
+ * optional uint32 relic_unique_id = 15;
* @return this
*/
- public EquipRelic clearSlot() {
+ public EquipRelic clearRelicUniqueId() {
bitField0_ &= ~0x00000002;
- slot = 0;
+ relicUniqueId = 0;
return this;
}
/**
- * optional uint32 slot = 12;
- * @return the slot
+ * optional uint32 relic_unique_id = 15;
+ * @return the relicUniqueId
*/
- public int getSlot() {
- return slot;
+ public int getRelicUniqueId() {
+ return relicUniqueId;
}
/**
- * optional uint32 slot = 12;
- * @param value the slot to set
+ * optional uint32 relic_unique_id = 15;
+ * @param value the relicUniqueId to set
* @return this
*/
- public EquipRelic setSlot(final int value) {
+ public EquipRelic setRelicUniqueId(final int value) {
bitField0_ |= 0x00000002;
- slot = value;
+ relicUniqueId = value;
return this;
}
@@ -117,8 +117,8 @@ public EquipRelic copyFrom(final EquipRelic other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- relicUniqueId = other.relicUniqueId;
slot = other.slot;
+ relicUniqueId = other.relicUniqueId;
}
return this;
}
@@ -129,12 +129,12 @@ public EquipRelic mergeFrom(final EquipRelic other) {
return this;
}
cachedSize = -1;
- if (other.hasRelicUniqueId()) {
- setRelicUniqueId(other.relicUniqueId);
- }
if (other.hasSlot()) {
setSlot(other.slot);
}
+ if (other.hasRelicUniqueId()) {
+ setRelicUniqueId(other.relicUniqueId);
+ }
return this;
}
@@ -145,8 +145,8 @@ public EquipRelic clear() {
}
cachedSize = -1;
bitField0_ = 0;
- relicUniqueId = 0;
slot = 0;
+ relicUniqueId = 0;
return this;
}
@@ -170,19 +170,19 @@ public boolean equals(Object o) {
}
EquipRelic other = (EquipRelic) o;
return bitField0_ == other.bitField0_
- && (!hasRelicUniqueId() || relicUniqueId == other.relicUniqueId)
- && (!hasSlot() || slot == other.slot);
+ && (!hasSlot() || slot == other.slot)
+ && (!hasRelicUniqueId() || relicUniqueId == other.relicUniqueId);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(relicUniqueId);
+ output.writeUInt32NoTag(slot);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 96);
- output.writeUInt32NoTag(slot);
+ output.writeRawByte((byte) 120);
+ output.writeUInt32NoTag(relicUniqueId);
}
}
@@ -190,10 +190,10 @@ public void writeTo(final ProtoSink output) throws IOException {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(relicUniqueId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(slot);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(slot);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(relicUniqueId);
}
return size;
}
@@ -206,17 +206,17 @@ public EquipRelic mergeFrom(final ProtoSource input) throws IOException {
while (true) {
switch (tag) {
case 32: {
- // relicUniqueId
- relicUniqueId = input.readUInt32();
+ // slot
+ slot = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 120) {
break;
}
}
- case 96: {
- // slot
- slot = input.readUInt32();
+ case 120: {
+ // relicUniqueId
+ relicUniqueId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
@@ -241,10 +241,10 @@ public EquipRelic mergeFrom(final ProtoSource input) throws IOException {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.relicUniqueId, relicUniqueId);
+ output.writeUInt32(FieldNames.slot, slot);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.slot, slot);
+ output.writeUInt32(FieldNames.relicUniqueId, relicUniqueId);
}
output.endObject();
}
@@ -256,11 +256,10 @@ public EquipRelic mergeFrom(final JsonSource input) throws IOException {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1966200481:
- case 49648253: {
- if (input.isAtField(FieldNames.relicUniqueId)) {
+ case 3533310: {
+ if (input.isAtField(FieldNames.slot)) {
if (!input.trySkipNullValue()) {
- relicUniqueId = input.readUInt32();
+ slot = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -268,10 +267,11 @@ public EquipRelic mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 3533310: {
- if (input.isAtField(FieldNames.slot)) {
+ case -1966200481:
+ case 49648253: {
+ if (input.isAtField(FieldNames.relicUniqueId)) {
if (!input.trySkipNullValue()) {
- slot = input.readUInt32();
+ relicUniqueId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -331,9 +331,9 @@ public EquipRelic create() {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName relicUniqueId = FieldName.forField("relicUniqueId", "relic_unique_id");
-
static final FieldName slot = FieldName.forField("slot");
+
+ static final FieldName relicUniqueId = FieldName.forField("relicUniqueId", "relic_unique_id");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java b/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java
index aeb11d96e..6cf75a5da 100644
--- a/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java
@@ -19,42 +19,42 @@ public static final class Equipment extends ProtoMessage implements C
private static final long serialVersionUID = 0L;
/**
- * optional uint32 unique_id = 1;
+ * optional uint32 rank = 1;
*/
- private int uniqueId;
+ private int rank;
/**
- * optional uint32 base_avatar_id = 2;
+ * optional uint32 exp = 2;
*/
- private int baseAvatarId;
+ private int exp;
/**
- * optional uint32 promotion = 3;
+ * optional uint32 base_avatar_id = 7;
*/
- private int promotion;
+ private int baseAvatarId;
/**
- * optional uint32 tid = 4;
+ * optional uint32 promotion = 8;
*/
- private int tid;
+ private int promotion;
/**
- * optional uint32 level = 12;
+ * optional uint32 unique_id = 12;
*/
- private int level;
+ private int uniqueId;
/**
- * optional uint32 rank = 13;
+ * optional uint32 tid = 14;
*/
- private int rank;
+ private int tid;
/**
- * optional uint32 exp = 14;
+ * optional uint32 level = 15;
*/
- private int exp;
+ private int level;
/**
- * optional bool is_protected = 10;
+ * optional bool is_protected = 3;
*/
private boolean isProtected;
@@ -69,266 +69,266 @@ public static Equipment newInstance() {
}
/**
- * optional uint32 unique_id = 1;
- * @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 = 1;
+ * optional uint32 rank = 1;
* @return this
*/
- public Equipment clearUniqueId() {
+ public Equipment clearRank() {
bitField0_ &= ~0x00000001;
- uniqueId = 0;
+ rank = 0;
return this;
}
/**
- * optional uint32 unique_id = 1;
- * @return the uniqueId
+ * optional uint32 rank = 1;
+ * @return the rank
*/
- public int getUniqueId() {
- return uniqueId;
+ public int getRank() {
+ return rank;
}
/**
- * optional uint32 unique_id = 1;
- * @param value the uniqueId to set
+ * optional uint32 rank = 1;
+ * @param value the rank to set
* @return this
*/
- public Equipment setUniqueId(final int value) {
+ public Equipment setRank(final int value) {
bitField0_ |= 0x00000001;
- uniqueId = value;
+ rank = value;
return this;
}
/**
- * optional uint32 base_avatar_id = 2;
- * @return whether the baseAvatarId field is set
+ * optional uint32 exp = 2;
+ * @return whether the exp field is set
*/
- public boolean hasBaseAvatarId() {
+ public boolean hasExp() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 base_avatar_id = 2;
+ * optional uint32 exp = 2;
* @return this
*/
- public Equipment clearBaseAvatarId() {
+ public Equipment clearExp() {
bitField0_ &= ~0x00000002;
- baseAvatarId = 0;
+ exp = 0;
return this;
}
/**
- * optional uint32 base_avatar_id = 2;
- * @return the baseAvatarId
+ * optional uint32 exp = 2;
+ * @return the exp
*/
- public int getBaseAvatarId() {
- return baseAvatarId;
+ public int getExp() {
+ return exp;
}
/**
- * optional uint32 base_avatar_id = 2;
- * @param value the baseAvatarId to set
+ * optional uint32 exp = 2;
+ * @param value the exp to set
* @return this
*/
- public Equipment setBaseAvatarId(final int value) {
+ public Equipment setExp(final int value) {
bitField0_ |= 0x00000002;
- baseAvatarId = value;
+ exp = value;
return this;
}
/**
- * optional uint32 promotion = 3;
- * @return whether the promotion field is set
+ * optional uint32 base_avatar_id = 7;
+ * @return whether the baseAvatarId field is set
*/
- public boolean hasPromotion() {
+ public boolean hasBaseAvatarId() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 promotion = 3;
+ * optional uint32 base_avatar_id = 7;
* @return this
*/
- public Equipment clearPromotion() {
+ public Equipment clearBaseAvatarId() {
bitField0_ &= ~0x00000004;
- promotion = 0;
+ baseAvatarId = 0;
return this;
}
/**
- * optional uint32 promotion = 3;
- * @return the promotion
+ * optional uint32 base_avatar_id = 7;
+ * @return the baseAvatarId
*/
- public int getPromotion() {
- return promotion;
+ public int getBaseAvatarId() {
+ return baseAvatarId;
}
/**
- * optional uint32 promotion = 3;
- * @param value the promotion to set
+ * optional uint32 base_avatar_id = 7;
+ * @param value the baseAvatarId to set
* @return this
*/
- public Equipment setPromotion(final int value) {
+ public Equipment setBaseAvatarId(final int value) {
bitField0_ |= 0x00000004;
- promotion = value;
+ baseAvatarId = value;
return this;
}
/**
- * optional uint32 tid = 4;
- * @return whether the tid field is set
+ * optional uint32 promotion = 8;
+ * @return whether the promotion field is set
*/
- public boolean hasTid() {
+ public boolean hasPromotion() {
return (bitField0_ & 0x00000008) != 0;
}
/**
- * optional uint32 tid = 4;
+ * optional uint32 promotion = 8;
* @return this
*/
- public Equipment clearTid() {
+ public Equipment clearPromotion() {
bitField0_ &= ~0x00000008;
- tid = 0;
+ promotion = 0;
return this;
}
/**
- * optional uint32 tid = 4;
- * @return the tid
+ * optional uint32 promotion = 8;
+ * @return the promotion
*/
- public int getTid() {
- return tid;
+ public int getPromotion() {
+ return promotion;
}
/**
- * optional uint32 tid = 4;
- * @param value the tid to set
+ * optional uint32 promotion = 8;
+ * @param value the promotion to set
* @return this
*/
- public Equipment setTid(final int value) {
+ public Equipment setPromotion(final int value) {
bitField0_ |= 0x00000008;
- tid = value;
+ promotion = value;
return this;
}
/**
- * optional uint32 level = 12;
- * @return whether the level field is set
+ * optional uint32 unique_id = 12;
+ * @return whether the uniqueId field is set
*/
- public boolean hasLevel() {
+ public boolean hasUniqueId() {
return (bitField0_ & 0x00000010) != 0;
}
/**
- * optional uint32 level = 12;
+ * optional uint32 unique_id = 12;
* @return this
*/
- public Equipment clearLevel() {
+ public Equipment clearUniqueId() {
bitField0_ &= ~0x00000010;
- level = 0;
+ uniqueId = 0;
return this;
}
/**
- * optional uint32 level = 12;
- * @return the level
+ * optional uint32 unique_id = 12;
+ * @return the uniqueId
*/
- public int getLevel() {
- return level;
+ public int getUniqueId() {
+ return uniqueId;
}
/**
- * optional uint32 level = 12;
- * @param value the level to set
+ * optional uint32 unique_id = 12;
+ * @param value the uniqueId to set
* @return this
*/
- public Equipment setLevel(final int value) {
+ public Equipment setUniqueId(final int value) {
bitField0_ |= 0x00000010;
- level = value;
+ uniqueId = value;
return this;
}
/**
- * optional uint32 rank = 13;
- * @return whether the rank field is set
+ * optional uint32 tid = 14;
+ * @return whether the tid field is set
*/
- public boolean hasRank() {
+ public boolean hasTid() {
return (bitField0_ & 0x00000020) != 0;
}
/**
- * optional uint32 rank = 13;
+ * optional uint32 tid = 14;
* @return this
*/
- public Equipment clearRank() {
+ public Equipment clearTid() {
bitField0_ &= ~0x00000020;
- rank = 0;
+ tid = 0;
return this;
}
/**
- * optional uint32 rank = 13;
- * @return the rank
+ * optional uint32 tid = 14;
+ * @return the tid
*/
- public int getRank() {
- return rank;
+ public int getTid() {
+ return tid;
}
/**
- * optional uint32 rank = 13;
- * @param value the rank to set
+ * optional uint32 tid = 14;
+ * @param value the tid to set
* @return this
*/
- public Equipment setRank(final int value) {
+ public Equipment setTid(final int value) {
bitField0_ |= 0x00000020;
- rank = value;
+ tid = value;
return this;
}
/**
- * optional uint32 exp = 14;
- * @return whether the exp field is set
+ * optional uint32 level = 15;
+ * @return whether the level field is set
*/
- public boolean hasExp() {
+ public boolean hasLevel() {
return (bitField0_ & 0x00000040) != 0;
}
/**
- * optional uint32 exp = 14;
+ * optional uint32 level = 15;
* @return this
*/
- public Equipment clearExp() {
+ public Equipment clearLevel() {
bitField0_ &= ~0x00000040;
- exp = 0;
+ level = 0;
return this;
}
/**
- * optional uint32 exp = 14;
- * @return the exp
+ * optional uint32 level = 15;
+ * @return the level
*/
- public int getExp() {
- return exp;
+ public int getLevel() {
+ return level;
}
/**
- * optional uint32 exp = 14;
- * @param value the exp to set
+ * optional uint32 level = 15;
+ * @param value the level to set
* @return this
*/
- public Equipment setExp(final int value) {
+ public Equipment setLevel(final int value) {
bitField0_ |= 0x00000040;
- exp = value;
+ level = value;
return this;
}
/**
- * optional bool is_protected = 10;
+ * optional bool is_protected = 3;
* @return whether the isProtected field is set
*/
public boolean hasIsProtected() {
@@ -336,7 +336,7 @@ public boolean hasIsProtected() {
}
/**
- * optional bool is_protected = 10;
+ * optional bool is_protected = 3;
* @return this
*/
public Equipment clearIsProtected() {
@@ -346,7 +346,7 @@ public Equipment clearIsProtected() {
}
/**
- * optional bool is_protected = 10;
+ * optional bool is_protected = 3;
* @return the isProtected
*/
public boolean getIsProtected() {
@@ -354,7 +354,7 @@ public boolean getIsProtected() {
}
/**
- * optional bool is_protected = 10;
+ * optional bool is_protected = 3;
* @param value the isProtected to set
* @return this
*/
@@ -369,13 +369,13 @@ public Equipment copyFrom(final Equipment other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- uniqueId = other.uniqueId;
+ rank = other.rank;
+ exp = other.exp;
baseAvatarId = other.baseAvatarId;
promotion = other.promotion;
+ uniqueId = other.uniqueId;
tid = other.tid;
level = other.level;
- rank = other.rank;
- exp = other.exp;
isProtected = other.isProtected;
}
return this;
@@ -387,8 +387,11 @@ public Equipment mergeFrom(final Equipment other) {
return this;
}
cachedSize = -1;
- if (other.hasUniqueId()) {
- setUniqueId(other.uniqueId);
+ if (other.hasRank()) {
+ setRank(other.rank);
+ }
+ if (other.hasExp()) {
+ setExp(other.exp);
}
if (other.hasBaseAvatarId()) {
setBaseAvatarId(other.baseAvatarId);
@@ -396,18 +399,15 @@ public Equipment mergeFrom(final Equipment other) {
if (other.hasPromotion()) {
setPromotion(other.promotion);
}
+ if (other.hasUniqueId()) {
+ setUniqueId(other.uniqueId);
+ }
if (other.hasTid()) {
setTid(other.tid);
}
if (other.hasLevel()) {
setLevel(other.level);
}
- if (other.hasRank()) {
- setRank(other.rank);
- }
- if (other.hasExp()) {
- setExp(other.exp);
- }
if (other.hasIsProtected()) {
setIsProtected(other.isProtected);
}
@@ -421,13 +421,13 @@ public Equipment clear() {
}
cachedSize = -1;
bitField0_ = 0;
- uniqueId = 0;
+ rank = 0;
+ exp = 0;
baseAvatarId = 0;
promotion = 0;
+ uniqueId = 0;
tid = 0;
level = 0;
- rank = 0;
- exp = 0;
isProtected = false;
return this;
}
@@ -452,13 +452,13 @@ public boolean equals(Object o) {
}
Equipment other = (Equipment) o;
return bitField0_ == other.bitField0_
- && (!hasUniqueId() || uniqueId == other.uniqueId)
+ && (!hasRank() || rank == other.rank)
+ && (!hasExp() || exp == other.exp)
&& (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
&& (!hasPromotion() || promotion == other.promotion)
+ && (!hasUniqueId() || uniqueId == other.uniqueId)
&& (!hasTid() || tid == other.tid)
&& (!hasLevel() || level == other.level)
- && (!hasRank() || rank == other.rank)
- && (!hasExp() || exp == other.exp)
&& (!hasIsProtected() || isProtected == other.isProtected);
}
@@ -466,34 +466,34 @@ public boolean equals(Object o) {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(uniqueId);
+ output.writeUInt32NoTag(rank);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(baseAvatarId);
+ output.writeUInt32NoTag(exp);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(promotion);
+ output.writeRawByte((byte) 56);
+ output.writeUInt32NoTag(baseAvatarId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(tid);
+ output.writeRawByte((byte) 64);
+ output.writeUInt32NoTag(promotion);
}
if ((bitField0_ & 0x00000010) != 0) {
output.writeRawByte((byte) 96);
- output.writeUInt32NoTag(level);
+ output.writeUInt32NoTag(uniqueId);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 104);
- output.writeUInt32NoTag(rank);
+ output.writeRawByte((byte) 112);
+ output.writeUInt32NoTag(tid);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawByte((byte) 112);
- output.writeUInt32NoTag(exp);
+ output.writeRawByte((byte) 120);
+ output.writeUInt32NoTag(level);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 24);
output.writeBoolNoTag(isProtected);
}
}
@@ -502,25 +502,25 @@ public void writeTo(final ProtoSink output) throws IOException {
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(baseAvatarId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(exp);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(tid);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId);
}
if ((bitField0_ & 0x00000020) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(rank);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(tid);
}
if ((bitField0_ & 0x00000040) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(exp);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
}
if ((bitField0_ & 0x00000080) != 0) {
size += 2;
@@ -536,8 +536,8 @@ public Equipment mergeFrom(final ProtoSource input) throws IOException {
while (true) {
switch (tag) {
case 8: {
- // uniqueId
- uniqueId = input.readUInt32();
+ // rank
+ rank = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
if (tag != 16) {
@@ -545,26 +545,26 @@ public Equipment mergeFrom(final ProtoSource input) throws IOException {
}
}
case 16: {
- // baseAvatarId
- baseAvatarId = input.readUInt32();
+ // exp
+ exp = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 24) {
+ if (tag != 56) {
break;
}
}
- case 24: {
- // promotion
- promotion = input.readUInt32();
+ case 56: {
+ // baseAvatarId
+ baseAvatarId = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 32) {
+ if (tag != 64) {
break;
}
}
- case 32: {
- // tid
- tid = input.readUInt32();
+ case 64: {
+ // promotion
+ promotion = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
if (tag != 96) {
@@ -572,33 +572,33 @@ public Equipment mergeFrom(final ProtoSource input) throws IOException {
}
}
case 96: {
- // level
- level = input.readUInt32();
+ // uniqueId
+ uniqueId = input.readUInt32();
bitField0_ |= 0x00000010;
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 112) {
break;
}
}
- case 104: {
- // rank
- rank = input.readUInt32();
+ case 112: {
+ // tid
+ tid = input.readUInt32();
bitField0_ |= 0x00000020;
tag = input.readTag();
- if (tag != 112) {
+ if (tag != 120) {
break;
}
}
- case 112: {
- // exp
- exp = input.readUInt32();
+ case 120: {
+ // level
+ level = input.readUInt32();
bitField0_ |= 0x00000040;
tag = input.readTag();
- if (tag != 80) {
+ if (tag != 24) {
break;
}
}
- case 80: {
+ case 24: {
// isProtected
isProtected = input.readBool();
bitField0_ |= 0x00000080;
@@ -625,25 +625,25 @@ public Equipment mergeFrom(final ProtoSource input) throws IOException {
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.baseAvatarId, baseAvatarId);
+ output.writeUInt32(FieldNames.exp, exp);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.promotion, promotion);
+ output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.tid, tid);
+ output.writeUInt32(FieldNames.promotion, promotion);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeUInt32(FieldNames.level, level);
+ output.writeUInt32(FieldNames.uniqueId, uniqueId);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeUInt32(FieldNames.rank, rank);
+ output.writeUInt32(FieldNames.tid, tid);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeUInt32(FieldNames.exp, exp);
+ output.writeUInt32(FieldNames.level, level);
}
if ((bitField0_ & 0x00000080) != 0) {
output.writeBool(FieldNames.isProtected, isProtected);
@@ -658,11 +658,10 @@ public Equipment mergeFrom(final JsonSource input) throws IOException {
}
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 {
@@ -670,11 +669,10 @@ public Equipment mergeFrom(final JsonSource input) throws IOException {
}
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_ |= 0x00000002;
}
} else {
@@ -682,10 +680,11 @@ public Equipment mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case -799212381: {
- if (input.isAtField(FieldNames.promotion)) {
+ case 118022725:
+ case -1756826157: {
+ if (input.isAtField(FieldNames.baseAvatarId)) {
if (!input.trySkipNullValue()) {
- promotion = input.readUInt32();
+ baseAvatarId = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -693,10 +692,10 @@ public Equipment mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 114831: {
- if (input.isAtField(FieldNames.tid)) {
+ case -799212381: {
+ if (input.isAtField(FieldNames.promotion)) {
if (!input.trySkipNullValue()) {
- tid = input.readUInt32();
+ promotion = input.readUInt32();
bitField0_ |= 0x00000008;
}
} else {
@@ -704,10 +703,11 @@ public Equipment mergeFrom(final JsonSource input) throws IOException {
}
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 {
@@ -715,10 +715,10 @@ public Equipment mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 3492908: {
- if (input.isAtField(FieldNames.rank)) {
+ case 114831: {
+ if (input.isAtField(FieldNames.tid)) {
if (!input.trySkipNullValue()) {
- rank = input.readUInt32();
+ tid = input.readUInt32();
bitField0_ |= 0x00000020;
}
} else {
@@ -726,10 +726,10 @@ public Equipment mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 100893: {
- if (input.isAtField(FieldNames.exp)) {
+ case 102865796: {
+ if (input.isAtField(FieldNames.level)) {
if (!input.trySkipNullValue()) {
- exp = input.readUInt32();
+ level = input.readUInt32();
bitField0_ |= 0x00000040;
}
} else {
@@ -801,20 +801,20 @@ public Equipment create() {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id");
+ static final FieldName rank = FieldName.forField("rank");
+
+ static final FieldName exp = FieldName.forField("exp");
static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
static final FieldName promotion = FieldName.forField("promotion");
+ static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id");
+
static final FieldName tid = FieldName.forField("tid");
static final FieldName level = FieldName.forField("level");
- static final FieldName rank = FieldName.forField("rank");
-
- static final FieldName exp = FieldName.forField("exp");
-
static final FieldName isProtected = FieldName.forField("isProtected", "is_protected");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java
index f2e012117..4c43fb264 100644
--- a/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java
@@ -19,14 +19,14 @@ public static final class ExchangeGachaCeilingCsReq extends ProtoMessageoptional uint32 gacha_type = 10;
+ * optional uint32 avatar_id = 6;
*/
- private int gachaType;
+ private int avatarId;
/**
- * optional uint32 avatar_id = 12;
+ * optional uint32 gacha_type = 8;
*/
- private int avatarId;
+ private int gachaType;
private ExchangeGachaCeilingCsReq() {
}
@@ -39,76 +39,76 @@ public static ExchangeGachaCeilingCsReq newInstance() {
}
/**
- * optional uint32 gacha_type = 10;
- * @return whether the gachaType field is set
+ * optional uint32 avatar_id = 6;
+ * @return whether the avatarId field is set
*/
- public boolean hasGachaType() {
+ public boolean hasAvatarId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 gacha_type = 10;
+ * optional uint32 avatar_id = 6;
* @return this
*/
- public ExchangeGachaCeilingCsReq clearGachaType() {
+ public ExchangeGachaCeilingCsReq clearAvatarId() {
bitField0_ &= ~0x00000001;
- gachaType = 0;
+ avatarId = 0;
return this;
}
/**
- * optional uint32 gacha_type = 10;
- * @return the gachaType
+ * optional uint32 avatar_id = 6;
+ * @return the avatarId
*/
- public int getGachaType() {
- return gachaType;
+ public int getAvatarId() {
+ return avatarId;
}
/**
- * optional uint32 gacha_type = 10;
- * @param value the gachaType to set
+ * optional uint32 avatar_id = 6;
+ * @param value the avatarId to set
* @return this
*/
- public ExchangeGachaCeilingCsReq setGachaType(final int value) {
+ public ExchangeGachaCeilingCsReq setAvatarId(final int value) {
bitField0_ |= 0x00000001;
- gachaType = value;
+ avatarId = value;
return this;
}
/**
- * optional uint32 avatar_id = 12;
- * @return whether the avatarId field is set
+ * optional uint32 gacha_type = 8;
+ * @return whether the gachaType field is set
*/
- public boolean hasAvatarId() {
+ public boolean hasGachaType() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 avatar_id = 12;
+ * optional uint32 gacha_type = 8;
* @return this
*/
- public ExchangeGachaCeilingCsReq clearAvatarId() {
+ public ExchangeGachaCeilingCsReq clearGachaType() {
bitField0_ &= ~0x00000002;
- avatarId = 0;
+ gachaType = 0;
return this;
}
/**
- * optional uint32 avatar_id = 12;
- * @return the avatarId
+ * optional uint32 gacha_type = 8;
+ * @return the gachaType
*/
- public int getAvatarId() {
- return avatarId;
+ public int getGachaType() {
+ return gachaType;
}
/**
- * optional uint32 avatar_id = 12;
- * @param value the avatarId to set
+ * optional uint32 gacha_type = 8;
+ * @param value the gachaType to set
* @return this
*/
- public ExchangeGachaCeilingCsReq setAvatarId(final int value) {
+ public ExchangeGachaCeilingCsReq setGachaType(final int value) {
bitField0_ |= 0x00000002;
- avatarId = value;
+ gachaType = value;
return this;
}
@@ -117,8 +117,8 @@ public ExchangeGachaCeilingCsReq copyFrom(final ExchangeGachaCeilingCsReq other)
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- gachaType = other.gachaType;
avatarId = other.avatarId;
+ gachaType = other.gachaType;
}
return this;
}
@@ -129,12 +129,12 @@ public ExchangeGachaCeilingCsReq mergeFrom(final ExchangeGachaCeilingCsReq other
return this;
}
cachedSize = -1;
- if (other.hasGachaType()) {
- setGachaType(other.gachaType);
- }
if (other.hasAvatarId()) {
setAvatarId(other.avatarId);
}
+ if (other.hasGachaType()) {
+ setGachaType(other.gachaType);
+ }
return this;
}
@@ -145,8 +145,8 @@ public ExchangeGachaCeilingCsReq clear() {
}
cachedSize = -1;
bitField0_ = 0;
- gachaType = 0;
avatarId = 0;
+ gachaType = 0;
return this;
}
@@ -170,19 +170,19 @@ public boolean equals(Object o) {
}
ExchangeGachaCeilingCsReq other = (ExchangeGachaCeilingCsReq) o;
return bitField0_ == other.bitField0_
- && (!hasGachaType() || gachaType == other.gachaType)
- && (!hasAvatarId() || avatarId == other.avatarId);
+ && (!hasAvatarId() || avatarId == other.avatarId)
+ && (!hasGachaType() || gachaType == other.gachaType);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(gachaType);
+ output.writeRawByte((byte) 48);
+ output.writeUInt32NoTag(avatarId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 96);
- output.writeUInt32NoTag(avatarId);
+ output.writeRawByte((byte) 64);
+ output.writeUInt32NoTag(gachaType);
}
}
@@ -190,10 +190,10 @@ public void writeTo(final ProtoSink output) throws IOException {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaType);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaType);
}
return size;
}
@@ -205,18 +205,18 @@ public ExchangeGachaCeilingCsReq mergeFrom(final ProtoSource input) throws IOExc
int tag = input.readTag();
while (true) {
switch (tag) {
- case 80: {
- // gachaType
- gachaType = input.readUInt32();
+ case 48: {
+ // avatarId
+ avatarId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 64) {
break;
}
}
- case 96: {
- // avatarId
- avatarId = input.readUInt32();
+ case 64: {
+ // gachaType
+ gachaType = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
@@ -241,10 +241,10 @@ public ExchangeGachaCeilingCsReq mergeFrom(final ProtoSource input) throws IOExc
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.gachaType, gachaType);
+ output.writeUInt32(FieldNames.avatarId, avatarId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.avatarId, avatarId);
+ output.writeUInt32(FieldNames.gachaType, gachaType);
}
output.endObject();
}
@@ -256,11 +256,11 @@ public ExchangeGachaCeilingCsReq mergeFrom(final JsonSource input) throws IOExce
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 802848732:
- case -871474217: {
- if (input.isAtField(FieldNames.gachaType)) {
+ case 1787287636:
+ case -428636735: {
+ if (input.isAtField(FieldNames.avatarId)) {
if (!input.trySkipNullValue()) {
- gachaType = input.readUInt32();
+ avatarId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -268,11 +268,11 @@ public ExchangeGachaCeilingCsReq mergeFrom(final JsonSource input) throws IOExce
}
break;
}
- case 1787287636:
- case -428636735: {
- if (input.isAtField(FieldNames.avatarId)) {
+ case 802848732:
+ case -871474217: {
+ if (input.isAtField(FieldNames.gachaType)) {
if (!input.trySkipNullValue()) {
- avatarId = input.readUInt32();
+ gachaType = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -333,9 +333,9 @@ public ExchangeGachaCeilingCsReq create() {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName gachaType = FieldName.forField("gachaType", "gacha_type");
-
static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id");
+
+ static final FieldName gachaType = FieldName.forField("gachaType", "gacha_type");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingScRspOuterClass.java
index 74d7d58fd..f77eb6fab 100644
--- a/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingScRspOuterClass.java
@@ -19,29 +19,29 @@ public static final class ExchangeGachaCeilingScRsp extends ProtoMessageoptional uint32 avatar_id = 5;
+ * optional uint32 avatar_id = 6;
*/
private int avatarId;
/**
- * optional uint32 retcode = 9;
+ * optional uint32 retcode = 12;
*/
private int retcode;
/**
- * optional uint32 gacha_type = 12;
+ * optional uint32 gacha_type = 14;
*/
private int gachaType;
/**
- * optional .ItemList transfer_item_list = 2;
+ * optional .GachaCeiling gacha_ceiling = 5;
*/
- private final ItemListOuterClass.ItemList transferItemList = ItemListOuterClass.ItemList.newInstance();
+ private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance();
/**
- * optional .GachaCeiling gacha_ceiling = 7;
+ * optional .ItemList transfer_item_list = 7;
*/
- private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance();
+ private final ItemListOuterClass.ItemList transferItemList = ItemListOuterClass.ItemList.newInstance();
private ExchangeGachaCeilingScRsp() {
}
@@ -54,7 +54,7 @@ public static ExchangeGachaCeilingScRsp newInstance() {
}
/**
- * optional uint32 avatar_id = 5;
+ * optional uint32 avatar_id = 6;
* @return whether the avatarId field is set
*/
public boolean hasAvatarId() {
@@ -62,7 +62,7 @@ public boolean hasAvatarId() {
}
/**
- * optional uint32 avatar_id = 5;
+ * optional uint32 avatar_id = 6;
* @return this
*/
public ExchangeGachaCeilingScRsp clearAvatarId() {
@@ -72,7 +72,7 @@ public ExchangeGachaCeilingScRsp clearAvatarId() {
}
/**
- * optional uint32 avatar_id = 5;
+ * optional uint32 avatar_id = 6;
* @return the avatarId
*/
public int getAvatarId() {
@@ -80,7 +80,7 @@ public int getAvatarId() {
}
/**
- * optional uint32 avatar_id = 5;
+ * optional uint32 avatar_id = 6;
* @param value the avatarId to set
* @return this
*/
@@ -91,7 +91,7 @@ public ExchangeGachaCeilingScRsp setAvatarId(final int value) {
}
/**
- * optional uint32 retcode = 9;
+ * optional uint32 retcode = 12;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -99,7 +99,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 9;
+ * optional uint32 retcode = 12;
* @return this
*/
public ExchangeGachaCeilingScRsp clearRetcode() {
@@ -109,7 +109,7 @@ public ExchangeGachaCeilingScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 9;
+ * optional uint32 retcode = 12;
* @return the retcode
*/
public int getRetcode() {
@@ -117,7 +117,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 9;
+ * optional uint32 retcode = 12;
* @param value the retcode to set
* @return this
*/
@@ -128,7 +128,7 @@ public ExchangeGachaCeilingScRsp setRetcode(final int value) {
}
/**
- * optional uint32 gacha_type = 12;
+ * optional uint32 gacha_type = 14;
* @return whether the gachaType field is set
*/
public boolean hasGachaType() {
@@ -136,7 +136,7 @@ public boolean hasGachaType() {
}
/**
- * optional uint32 gacha_type = 12;
+ * optional uint32 gacha_type = 14;
* @return this
*/
public ExchangeGachaCeilingScRsp clearGachaType() {
@@ -146,7 +146,7 @@ public ExchangeGachaCeilingScRsp clearGachaType() {
}
/**
- * optional uint32 gacha_type = 12;
+ * optional uint32 gacha_type = 14;
* @return the gachaType
*/
public int getGachaType() {
@@ -154,7 +154,7 @@ public int getGachaType() {
}
/**
- * optional uint32 gacha_type = 12;
+ * optional uint32 gacha_type = 14;
* @param value the gachaType to set
* @return this
*/
@@ -165,39 +165,39 @@ public ExchangeGachaCeilingScRsp setGachaType(final int value) {
}
/**
- * optional .ItemList transfer_item_list = 2;
- * @return whether the transferItemList field is set
+ * optional .GachaCeiling gacha_ceiling = 5;
+ * @return whether the gachaCeiling field is set
*/
- public boolean hasTransferItemList() {
+ public boolean hasGachaCeiling() {
return (bitField0_ & 0x00000008) != 0;
}
/**
- * optional .ItemList transfer_item_list = 2;
+ * optional .GachaCeiling gacha_ceiling = 5;
* @return this
*/
- public ExchangeGachaCeilingScRsp clearTransferItemList() {
+ public ExchangeGachaCeilingScRsp clearGachaCeiling() {
bitField0_ &= ~0x00000008;
- transferItemList.clear();
+ gachaCeiling.clear();
return this;
}
/**
- * optional .ItemList transfer_item_list = 2;
+ * optional .GachaCeiling gacha_ceiling = 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 #getMutableTransferItemList()} if you want to modify it.
+ * Use {@link #getMutableGachaCeiling()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public ItemListOuterClass.ItemList getTransferItemList() {
- return transferItemList;
+ public GachaCeilingOuterClass.GachaCeiling getGachaCeiling() {
+ return gachaCeiling;
}
/**
- * optional .ItemList transfer_item_list = 2;
+ * optional .GachaCeiling gacha_ceiling = 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
@@ -205,56 +205,57 @@ public ItemListOuterClass.ItemList getTransferItemList() {
*
* @return internal storage object for modifications
*/
- public ItemListOuterClass.ItemList getMutableTransferItemList() {
+ public GachaCeilingOuterClass.GachaCeiling getMutableGachaCeiling() {
bitField0_ |= 0x00000008;
- return transferItemList;
+ return gachaCeiling;
}
/**
- * optional .ItemList transfer_item_list = 2;
- * @param value the transferItemList to set
+ * optional .GachaCeiling gacha_ceiling = 5;
+ * @param value the gachaCeiling to set
* @return this
*/
- public ExchangeGachaCeilingScRsp setTransferItemList(final ItemListOuterClass.ItemList value) {
+ public ExchangeGachaCeilingScRsp setGachaCeiling(
+ final GachaCeilingOuterClass.GachaCeiling value) {
bitField0_ |= 0x00000008;
- transferItemList.copyFrom(value);
+ gachaCeiling.copyFrom(value);
return this;
}
/**
- * optional .GachaCeiling gacha_ceiling = 7;
- * @return whether the gachaCeiling field is set
+ * optional .ItemList transfer_item_list = 7;
+ * @return whether the transferItemList field is set
*/
- public boolean hasGachaCeiling() {
+ public boolean hasTransferItemList() {
return (bitField0_ & 0x00000010) != 0;
}
/**
- * optional .GachaCeiling gacha_ceiling = 7;
+ * optional .ItemList transfer_item_list = 7;
* @return this
*/
- public ExchangeGachaCeilingScRsp clearGachaCeiling() {
+ public ExchangeGachaCeilingScRsp clearTransferItemList() {
bitField0_ &= ~0x00000010;
- gachaCeiling.clear();
+ transferItemList.clear();
return this;
}
/**
- * optional .GachaCeiling gacha_ceiling = 7;
+ * optional .ItemList transfer_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.
*
- * Use {@link #getMutableGachaCeiling()} if you want to modify it.
+ * Use {@link #getMutableTransferItemList()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public GachaCeilingOuterClass.GachaCeiling getGachaCeiling() {
- return gachaCeiling;
+ public ItemListOuterClass.ItemList getTransferItemList() {
+ return transferItemList;
}
/**
- * optional .GachaCeiling gacha_ceiling = 7;
+ * optional .ItemList transfer_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
@@ -262,20 +263,19 @@ public GachaCeilingOuterClass.GachaCeiling getGachaCeiling() {
*
* @return internal storage object for modifications
*/
- public GachaCeilingOuterClass.GachaCeiling getMutableGachaCeiling() {
+ public ItemListOuterClass.ItemList getMutableTransferItemList() {
bitField0_ |= 0x00000010;
- return gachaCeiling;
+ return transferItemList;
}
/**
- * optional .GachaCeiling gacha_ceiling = 7;
- * @param value the gachaCeiling to set
+ * optional .ItemList transfer_item_list = 7;
+ * @param value the transferItemList to set
* @return this
*/
- public ExchangeGachaCeilingScRsp setGachaCeiling(
- final GachaCeilingOuterClass.GachaCeiling value) {
+ public ExchangeGachaCeilingScRsp setTransferItemList(final ItemListOuterClass.ItemList value) {
bitField0_ |= 0x00000010;
- gachaCeiling.copyFrom(value);
+ transferItemList.copyFrom(value);
return this;
}
@@ -287,8 +287,8 @@ public ExchangeGachaCeilingScRsp copyFrom(final ExchangeGachaCeilingScRsp other)
avatarId = other.avatarId;
retcode = other.retcode;
gachaType = other.gachaType;
- transferItemList.copyFrom(other.transferItemList);
gachaCeiling.copyFrom(other.gachaCeiling);
+ transferItemList.copyFrom(other.transferItemList);
}
return this;
}
@@ -308,12 +308,12 @@ public ExchangeGachaCeilingScRsp mergeFrom(final ExchangeGachaCeilingScRsp other
if (other.hasGachaType()) {
setGachaType(other.gachaType);
}
- if (other.hasTransferItemList()) {
- getMutableTransferItemList().mergeFrom(other.transferItemList);
- }
if (other.hasGachaCeiling()) {
getMutableGachaCeiling().mergeFrom(other.gachaCeiling);
}
+ if (other.hasTransferItemList()) {
+ getMutableTransferItemList().mergeFrom(other.transferItemList);
+ }
return this;
}
@@ -327,8 +327,8 @@ public ExchangeGachaCeilingScRsp clear() {
avatarId = 0;
retcode = 0;
gachaType = 0;
- transferItemList.clear();
gachaCeiling.clear();
+ transferItemList.clear();
return this;
}
@@ -339,8 +339,8 @@ public ExchangeGachaCeilingScRsp clearQuick() {
}
cachedSize = -1;
bitField0_ = 0;
- transferItemList.clearQuick();
gachaCeiling.clearQuick();
+ transferItemList.clearQuick();
return this;
}
@@ -357,31 +357,31 @@ public boolean equals(Object o) {
&& (!hasAvatarId() || avatarId == other.avatarId)
&& (!hasRetcode() || retcode == other.retcode)
&& (!hasGachaType() || gachaType == other.gachaType)
- && (!hasTransferItemList() || transferItemList.equals(other.transferItemList))
- && (!hasGachaCeiling() || gachaCeiling.equals(other.gachaCeiling));
+ && (!hasGachaCeiling() || gachaCeiling.equals(other.gachaCeiling))
+ && (!hasTransferItemList() || transferItemList.equals(other.transferItemList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(avatarId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 112);
output.writeUInt32NoTag(gachaType);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 18);
- output.writeMessageNoTag(transferItemList);
+ output.writeRawByte((byte) 42);
+ output.writeMessageNoTag(gachaCeiling);
}
if ((bitField0_ & 0x00000010) != 0) {
output.writeRawByte((byte) 58);
- output.writeMessageNoTag(gachaCeiling);
+ output.writeMessageNoTag(transferItemList);
}
}
@@ -398,10 +398,10 @@ protected int computeSerializedSize() {
size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaType);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(transferItemList);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(gachaCeiling);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(gachaCeiling);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(transferItemList);
}
return size;
}
@@ -413,36 +413,36 @@ public ExchangeGachaCeilingScRsp mergeFrom(final ProtoSource input) throws IOExc
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
+ case 48: {
// avatarId
avatarId = 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 != 96) {
+ if (tag != 112) {
break;
}
}
- case 96: {
+ case 112: {
// gachaType
gachaType = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 18) {
+ if (tag != 42) {
break;
}
}
- case 18: {
- // transferItemList
- input.readMessage(transferItemList);
+ case 42: {
+ // gachaCeiling
+ input.readMessage(gachaCeiling);
bitField0_ |= 0x00000008;
tag = input.readTag();
if (tag != 58) {
@@ -450,8 +450,8 @@ public ExchangeGachaCeilingScRsp mergeFrom(final ProtoSource input) throws IOExc
}
}
case 58: {
- // gachaCeiling
- input.readMessage(gachaCeiling);
+ // transferItemList
+ input.readMessage(transferItemList);
bitField0_ |= 0x00000010;
tag = input.readTag();
if (tag != 0) {
@@ -485,10 +485,10 @@ public void writeTo(final JsonSink output) throws IOException {
output.writeUInt32(FieldNames.gachaType, gachaType);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeMessage(FieldNames.transferItemList, transferItemList);
+ output.writeMessage(FieldNames.gachaCeiling, gachaCeiling);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeMessage(FieldNames.gachaCeiling, gachaCeiling);
+ output.writeMessage(FieldNames.transferItemList, transferItemList);
}
output.endObject();
}
@@ -535,11 +535,11 @@ public ExchangeGachaCeilingScRsp mergeFrom(final JsonSource input) throws IOExce
}
break;
}
- case -997597348:
- case 263056118: {
- if (input.isAtField(FieldNames.transferItemList)) {
+ case 507275483:
+ case -1792489728: {
+ if (input.isAtField(FieldNames.gachaCeiling)) {
if (!input.trySkipNullValue()) {
- input.readMessage(transferItemList);
+ input.readMessage(gachaCeiling);
bitField0_ |= 0x00000008;
}
} else {
@@ -547,11 +547,11 @@ public ExchangeGachaCeilingScRsp mergeFrom(final JsonSource input) throws IOExce
}
break;
}
- case 507275483:
- case -1792489728: {
- if (input.isAtField(FieldNames.gachaCeiling)) {
+ case -997597348:
+ case 263056118: {
+ if (input.isAtField(FieldNames.transferItemList)) {
if (!input.trySkipNullValue()) {
- input.readMessage(gachaCeiling);
+ input.readMessage(transferItemList);
bitField0_ |= 0x00000010;
}
} else {
@@ -618,9 +618,9 @@ static class FieldNames {
static final FieldName gachaType = FieldName.forField("gachaType", "gacha_type");
- static final FieldName transferItemList = FieldName.forField("transferItemList", "transfer_item_list");
-
static final FieldName gachaCeiling = FieldName.forField("gachaCeiling", "gacha_ceiling");
+
+ static final FieldName transferItemList = FieldName.forField("transferItemList", "transfer_item_list");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ExchangeHcoinCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinCsReqOuterClass.java
index bc11a3cf9..783af0e82 100644
--- a/src/generated/main/emu/lunarcore/proto/ExchangeHcoinCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinCsReqOuterClass.java
@@ -19,7 +19,7 @@ public static final class ExchangeHcoinCsReq extends ProtoMessageoptional uint32 num = 1;
+ * optional uint32 num = 11;
*/
private int num;
@@ -34,7 +34,7 @@ public static ExchangeHcoinCsReq newInstance() {
}
/**
- * optional uint32 num = 1;
+ * optional uint32 num = 11;
* @return whether the num field is set
*/
public boolean hasNum() {
@@ -42,7 +42,7 @@ public boolean hasNum() {
}
/**
- * optional uint32 num = 1;
+ * optional uint32 num = 11;
* @return this
*/
public ExchangeHcoinCsReq clearNum() {
@@ -52,7 +52,7 @@ public ExchangeHcoinCsReq clearNum() {
}
/**
- * optional uint32 num = 1;
+ * optional uint32 num = 11;
* @return the num
*/
public int getNum() {
@@ -60,7 +60,7 @@ public int getNum() {
}
/**
- * optional uint32 num = 1;
+ * optional uint32 num = 11;
* @param value the num to set
* @return this
*/
@@ -129,7 +129,7 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(num);
}
}
@@ -150,7 +150,7 @@ public ExchangeHcoinCsReq mergeFrom(final ProtoSource input) throws IOException
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 88: {
// num
num = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java
index 09475b84d..a95b3a270 100644
--- a/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java
@@ -19,12 +19,12 @@ public static final class ExchangeHcoinScRsp extends ProtoMessageoptional uint32 retcode = 11;
+ * optional uint32 retcode = 7;
*/
private int retcode;
/**
- * optional uint32 num = 15;
+ * optional uint32 num = 9;
*/
private int num;
@@ -39,7 +39,7 @@ public static ExchangeHcoinScRsp newInstance() {
}
/**
- * optional uint32 retcode = 11;
+ * optional uint32 retcode = 7;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -47,7 +47,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 11;
+ * optional uint32 retcode = 7;
* @return this
*/
public ExchangeHcoinScRsp clearRetcode() {
@@ -57,7 +57,7 @@ public ExchangeHcoinScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 11;
+ * optional uint32 retcode = 7;
* @return the retcode
*/
public int getRetcode() {
@@ -65,7 +65,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 11;
+ * optional uint32 retcode = 7;
* @param value the retcode to set
* @return this
*/
@@ -76,7 +76,7 @@ public ExchangeHcoinScRsp setRetcode(final int value) {
}
/**
- * optional uint32 num = 15;
+ * optional uint32 num = 9;
* @return whether the num field is set
*/
public boolean hasNum() {
@@ -84,7 +84,7 @@ public boolean hasNum() {
}
/**
- * optional uint32 num = 15;
+ * optional uint32 num = 9;
* @return this
*/
public ExchangeHcoinScRsp clearNum() {
@@ -94,7 +94,7 @@ public ExchangeHcoinScRsp clearNum() {
}
/**
- * optional uint32 num = 15;
+ * optional uint32 num = 9;
* @return the num
*/
public int getNum() {
@@ -102,7 +102,7 @@ public int getNum() {
}
/**
- * optional uint32 num = 15;
+ * optional uint32 num = 9;
* @param value the num to set
* @return this
*/
@@ -177,11 +177,11 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 72);
output.writeUInt32NoTag(num);
}
}
@@ -205,16 +205,16 @@ public ExchangeHcoinScRsp mergeFrom(final ProtoSource input) throws IOException
int tag = input.readTag();
while (true) {
switch (tag) {
- case 88: {
+ case 56: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 72) {
break;
}
}
- case 120: {
+ case 72: {
// num
num = input.readUInt32();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentCsReqOuterClass.java
index 432adc002..4978ca037 100644
--- a/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentCsReqOuterClass.java
@@ -19,12 +19,12 @@ public static final class ExpUpEquipmentCsReq extends ProtoMessageoptional uint32 equipment_unique_id = 11;
+ * optional uint32 equipment_unique_id = 10;
*/
private int equipmentUniqueId;
/**
- * optional .ItemCostList item_cost_list = 6;
+ * optional .ItemCostList item_cost_list = 3;
*/
private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance();
@@ -39,7 +39,7 @@ public static ExpUpEquipmentCsReq newInstance() {
}
/**
- * optional uint32 equipment_unique_id = 11;
+ * optional uint32 equipment_unique_id = 10;
* @return whether the equipmentUniqueId field is set
*/
public boolean hasEquipmentUniqueId() {
@@ -47,7 +47,7 @@ public boolean hasEquipmentUniqueId() {
}
/**
- * optional uint32 equipment_unique_id = 11;
+ * optional uint32 equipment_unique_id = 10;
* @return this
*/
public ExpUpEquipmentCsReq clearEquipmentUniqueId() {
@@ -57,7 +57,7 @@ public ExpUpEquipmentCsReq clearEquipmentUniqueId() {
}
/**
- * optional uint32 equipment_unique_id = 11;
+ * optional uint32 equipment_unique_id = 10;
* @return the equipmentUniqueId
*/
public int getEquipmentUniqueId() {
@@ -65,7 +65,7 @@ public int getEquipmentUniqueId() {
}
/**
- * optional uint32 equipment_unique_id = 11;
+ * optional uint32 equipment_unique_id = 10;
* @param value the equipmentUniqueId to set
* @return this
*/
@@ -76,7 +76,7 @@ public ExpUpEquipmentCsReq setEquipmentUniqueId(final int value) {
}
/**
- * optional .ItemCostList item_cost_list = 6;
+ * optional .ItemCostList item_cost_list = 3;
* @return whether the itemCostList field is set
*/
public boolean hasItemCostList() {
@@ -84,7 +84,7 @@ public boolean hasItemCostList() {
}
/**
- * optional .ItemCostList item_cost_list = 6;
+ * optional .ItemCostList item_cost_list = 3;
* @return this
*/
public ExpUpEquipmentCsReq clearItemCostList() {
@@ -94,7 +94,7 @@ public ExpUpEquipmentCsReq clearItemCostList() {
}
/**
- * optional .ItemCostList item_cost_list = 6;
+ * optional .ItemCostList item_cost_list = 3;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public ItemCostListOuterClass.ItemCostList getItemCostList() {
}
/**
- * optional .ItemCostList item_cost_list = 6;
+ * optional .ItemCostList item_cost_list = 3;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public ItemCostListOuterClass.ItemCostList getMutableItemCostList() {
}
/**
- * optional .ItemCostList item_cost_list = 6;
+ * optional .ItemCostList item_cost_list = 3;
* @param value the itemCostList to set
* @return this
*/
@@ -198,11 +198,11 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(equipmentUniqueId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 50);
+ output.writeRawByte((byte) 26);
output.writeMessageNoTag(itemCostList);
}
}
@@ -226,16 +226,16 @@ public ExpUpEquipmentCsReq mergeFrom(final ProtoSource input) throws IOException
int tag = input.readTag();
while (true) {
switch (tag) {
- case 88: {
+ case 80: {
// equipmentUniqueId
equipmentUniqueId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 50) {
+ if (tag != 26) {
break;
}
}
- case 50: {
+ case 26: {
// 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 254e7dad0..7b4881d71 100644
--- a/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentScRspOuterClass.java
@@ -20,12 +20,12 @@ public static final class ExpUpEquipmentScRsp extends ProtoMessageoptional uint32 retcode = 15;
+ * optional uint32 retcode = 10;
*/
private int retcode;
/**
- * repeated .PileItem return_item_list = 2;
+ * repeated .PileItem return_item_list = 6;
*/
private final RepeatedMessage returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory());
@@ -40,7 +40,7 @@ public static ExpUpEquipmentScRsp newInstance() {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 10;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 10;
* @return this
*/
public ExpUpEquipmentScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public ExpUpEquipmentScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 10;
* @return the retcode
*/
public int getRetcode() {
@@ -66,7 +66,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 10;
* @param value the retcode to set
* @return this
*/
@@ -77,7 +77,7 @@ public ExpUpEquipmentScRsp setRetcode(final int value) {
}
/**
- * repeated .PileItem return_item_list = 2;
+ * repeated .PileItem return_item_list = 6;
* @return whether the returnItemList field is set
*/
public boolean hasReturnItemList() {
@@ -85,7 +85,7 @@ public boolean hasReturnItemList() {
}
/**
- * repeated .PileItem return_item_list = 2;
+ * repeated .PileItem return_item_list = 6;
* @return this
*/
public ExpUpEquipmentScRsp clearReturnItemList() {
@@ -95,7 +95,7 @@ public ExpUpEquipmentScRsp clearReturnItemList() {
}
/**
- * repeated .PileItem return_item_list = 2;
+ * repeated .PileItem return_item_list = 6;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public RepeatedMessage getReturnItemList() {
}
/**
- * repeated .PileItem return_item_list = 2;
+ * repeated .PileItem return_item_list = 6;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public RepeatedMessage getMutableReturnItemList() {
}
/**
- * repeated .PileItem return_item_list = 2;
+ * repeated .PileItem return_item_list = 6;
* @param value the returnItemList to add
* @return this
*/
@@ -134,7 +134,7 @@ public ExpUpEquipmentScRsp addReturnItemList(final PileItemOuterClass.PileItem v
}
/**
- * repeated .PileItem return_item_list = 2;
+ * repeated .PileItem return_item_list = 6;
* @param values the returnItemList to add
* @return this
*/
@@ -210,12 +210,12 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < returnItemList.length(); i++) {
- output.writeRawByte((byte) 18);
+ output.writeRawByte((byte) 50);
output.writeMessageNoTag(returnItemList.get(i));
}
}
@@ -240,16 +240,16 @@ public ExpUpEquipmentScRsp mergeFrom(final ProtoSource input) throws IOException
int tag = input.readTag();
while (true) {
switch (tag) {
- case 120: {
+ case 80: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 18) {
+ if (tag != 50) {
break;
}
}
- case 18: {
+ case 50: {
// 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 fdf6f730f..7dcc7dbce 100644
--- a/src/generated/main/emu/lunarcore/proto/ExpUpRelicCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ExpUpRelicCsReqOuterClass.java
@@ -19,12 +19,12 @@ public static final class ExpUpRelicCsReq extends ProtoMessage
private static final long serialVersionUID = 0L;
/**
- * optional uint32 relic_unique_id = 14;
+ * optional uint32 relic_unique_id = 8;
*/
private int relicUniqueId;
/**
- * optional .ItemCostList item_cost_list = 12;
+ * optional .ItemCostList item_cost_list = 13;
*/
private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance();
@@ -39,7 +39,7 @@ public static ExpUpRelicCsReq newInstance() {
}
/**
- * optional uint32 relic_unique_id = 14;
+ * optional uint32 relic_unique_id = 8;
* @return whether the relicUniqueId field is set
*/
public boolean hasRelicUniqueId() {
@@ -47,7 +47,7 @@ public boolean hasRelicUniqueId() {
}
/**
- * optional uint32 relic_unique_id = 14;
+ * optional uint32 relic_unique_id = 8;
* @return this
*/
public ExpUpRelicCsReq clearRelicUniqueId() {
@@ -57,7 +57,7 @@ public ExpUpRelicCsReq clearRelicUniqueId() {
}
/**
- * optional uint32 relic_unique_id = 14;
+ * optional uint32 relic_unique_id = 8;
* @return the relicUniqueId
*/
public int getRelicUniqueId() {
@@ -65,7 +65,7 @@ public int getRelicUniqueId() {
}
/**
- * optional uint32 relic_unique_id = 14;
+ * optional uint32 relic_unique_id = 8;
* @param value the relicUniqueId to set
* @return this
*/
@@ -76,7 +76,7 @@ public ExpUpRelicCsReq setRelicUniqueId(final int value) {
}
/**
- * optional .ItemCostList item_cost_list = 12;
+ * optional .ItemCostList item_cost_list = 13;
* @return whether the itemCostList field is set
*/
public boolean hasItemCostList() {
@@ -84,7 +84,7 @@ public boolean hasItemCostList() {
}
/**
- * optional .ItemCostList item_cost_list = 12;
+ * optional .ItemCostList item_cost_list = 13;
* @return this
*/
public ExpUpRelicCsReq clearItemCostList() {
@@ -94,7 +94,7 @@ public ExpUpRelicCsReq clearItemCostList() {
}
/**
- * optional .ItemCostList item_cost_list = 12;
+ * optional .ItemCostList item_cost_list = 13;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public ItemCostListOuterClass.ItemCostList getItemCostList() {
}
/**
- * optional .ItemCostList item_cost_list = 12;
+ * optional .ItemCostList item_cost_list = 13;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public ItemCostListOuterClass.ItemCostList getMutableItemCostList() {
}
/**
- * optional .ItemCostList item_cost_list = 12;
+ * optional .ItemCostList item_cost_list = 13;
* @param value the itemCostList to set
* @return this
*/
@@ -198,11 +198,11 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(relicUniqueId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 98);
+ output.writeRawByte((byte) 106);
output.writeMessageNoTag(itemCostList);
}
}
@@ -226,16 +226,16 @@ public ExpUpRelicCsReq mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 112: {
+ case 64: {
// relicUniqueId
relicUniqueId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 98) {
+ if (tag != 106) {
break;
}
}
- case 98: {
+ case 106: {
// itemCostList
input.readMessage(itemCostList);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/ExpUpRelicScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExpUpRelicScRspOuterClass.java
index 998efbc39..1127dd79f 100644
--- a/src/generated/main/emu/lunarcore/proto/ExpUpRelicScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ExpUpRelicScRspOuterClass.java
@@ -20,12 +20,12 @@ public static final class ExpUpRelicScRsp extends ProtoMessage
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 10;
*/
private int retcode;
/**
- * repeated .PileItem return_item_list = 14;
+ * repeated .PileItem return_item_list = 6;
*/
private final RepeatedMessage returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory());
@@ -40,7 +40,7 @@ public static ExpUpRelicScRsp newInstance() {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 10;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 10;
* @return this
*/
public ExpUpRelicScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public ExpUpRelicScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 10;
* @return the retcode
*/
public int getRetcode() {
@@ -66,7 +66,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 10;
* @param value the retcode to set
* @return this
*/
@@ -77,7 +77,7 @@ public ExpUpRelicScRsp setRetcode(final int value) {
}
/**
- * repeated .PileItem return_item_list = 14;
+ * repeated .PileItem return_item_list = 6;
* @return whether the returnItemList field is set
*/
public boolean hasReturnItemList() {
@@ -85,7 +85,7 @@ public boolean hasReturnItemList() {
}
/**
- * repeated .PileItem return_item_list = 14;
+ * repeated .PileItem return_item_list = 6;
* @return this
*/
public ExpUpRelicScRsp clearReturnItemList() {
@@ -95,7 +95,7 @@ public ExpUpRelicScRsp clearReturnItemList() {
}
/**
- * repeated .PileItem return_item_list = 14;
+ * repeated .PileItem return_item_list = 6;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public RepeatedMessage getReturnItemList() {
}
/**
- * repeated .PileItem return_item_list = 14;
+ * repeated .PileItem return_item_list = 6;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public RepeatedMessage getMutableReturnItemList() {
}
/**
- * repeated .PileItem return_item_list = 14;
+ * repeated .PileItem return_item_list = 6;
* @param value the returnItemList to add
* @return this
*/
@@ -134,7 +134,7 @@ public ExpUpRelicScRsp addReturnItemList(final PileItemOuterClass.PileItem value
}
/**
- * repeated .PileItem return_item_list = 14;
+ * repeated .PileItem return_item_list = 6;
* @param values the returnItemList to add
* @return this
*/
@@ -210,12 +210,12 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < returnItemList.length(); i++) {
- output.writeRawByte((byte) 114);
+ output.writeRawByte((byte) 50);
output.writeMessageNoTag(returnItemList.get(i));
}
}
@@ -240,16 +240,16 @@ public ExpUpRelicScRsp mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 64: {
+ case 80: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 114) {
+ if (tag != 50) {
break;
}
}
- case 114: {
+ case 50: {
// returnItemList
tag = input.readRepeatedMessage(returnItemList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/ExtraLineupTypeOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExtraLineupTypeOuterClass.java
index 8d70a320d..68baee893 100644
--- a/src/generated/main/emu/lunarcore/proto/ExtraLineupTypeOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ExtraLineupTypeOuterClass.java
@@ -67,7 +67,12 @@ public enum ExtraLineupType implements ProtoEnum {
/**
* LINEUP_CHESS_ROGUE = 12;
*/
- LINEUP_CHESS_ROGUE("LINEUP_CHESS_ROGUE", 12);
+ LINEUP_CHESS_ROGUE("LINEUP_CHESS_ROGUE", 12),
+
+ /**
+ * LINEUP_HELIOBUS = 13;
+ */
+ LINEUP_HELIOBUS("LINEUP_HELIOBUS", 13);
/**
* LINEUP_NONE = 0;
@@ -129,6 +134,11 @@ public enum ExtraLineupType implements ProtoEnum {
*/
public static final int LINEUP_CHESS_ROGUE_VALUE = 12;
+ /**
+ * LINEUP_HELIOBUS = 13;
+ */
+ public static final int LINEUP_HELIOBUS_VALUE = 13;
+
private final String name;
private final int number;
@@ -182,7 +192,7 @@ public static ExtraLineupType forNumberOr(int number, ExtraLineupType other) {
enum ExtraLineupTypeConverter implements ProtoEnum.EnumConverter {
INSTANCE;
- private static final ExtraLineupType[] lookup = new ExtraLineupType[13];
+ private static final ExtraLineupType[] lookup = new ExtraLineupType[14];
static {
lookup[0] = LINEUP_NONE;
@@ -197,6 +207,7 @@ enum ExtraLineupTypeConverter implements ProtoEnum.EnumConverter implements Cloneable {
+ public static final class FriendApplyInfo extends ProtoMessage implements Cloneable {
private static final long serialVersionUID = 0L;
/**
- * optional int64 JKBMJGNPCNN = 12;
- */
- private long jKBMJGNPCNN;
-
- /**
- * optional .SimpleInfo simple_info = 10;
+ * optional .SimpleInfo simple_info = 4;
*/
private final SimpleInfoOuterClass.SimpleInfo simpleInfo = SimpleInfoOuterClass.SimpleInfo.newInstance();
- private FriendApplyListInfo() {
- }
-
- /**
- * @return a new empty instance of {@code FriendApplyListInfo}
- */
- public static FriendApplyListInfo newInstance() {
- return new FriendApplyListInfo();
+ private FriendApplyInfo() {
}
/**
- * optional int64 JKBMJGNPCNN = 12;
- * @return whether the jKBMJGNPCNN field is set
- */
- public boolean hasJKBMJGNPCNN() {
- return (bitField0_ & 0x00000001) != 0;
- }
-
- /**
- * optional int64 JKBMJGNPCNN = 12;
- * @return this
+ * @return a new empty instance of {@code FriendApplyInfo}
*/
- public FriendApplyListInfo clearJKBMJGNPCNN() {
- bitField0_ &= ~0x00000001;
- jKBMJGNPCNN = 0L;
- return this;
- }
-
- /**
- * optional int64 JKBMJGNPCNN = 12;
- * @return the jKBMJGNPCNN
- */
- public long getJKBMJGNPCNN() {
- return jKBMJGNPCNN;
- }
-
- /**
- * optional int64 JKBMJGNPCNN = 12;
- * @param value the jKBMJGNPCNN to set
- * @return this
- */
- public FriendApplyListInfo setJKBMJGNPCNN(final long value) {
- bitField0_ |= 0x00000001;
- jKBMJGNPCNN = value;
- return this;
+ public static FriendApplyInfo newInstance() {
+ return new FriendApplyInfo();
}
/**
- * optional .SimpleInfo simple_info = 10;
+ * optional .SimpleInfo simple_info = 4;
* @return whether the simpleInfo field is set
*/
public boolean hasSimpleInfo() {
- return (bitField0_ & 0x00000002) != 0;
+ return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional .SimpleInfo simple_info = 10;
+ * optional .SimpleInfo simple_info = 4;
* @return this
*/
- public FriendApplyListInfo clearSimpleInfo() {
- bitField0_ &= ~0x00000002;
+ public FriendApplyInfo clearSimpleInfo() {
+ bitField0_ &= ~0x00000001;
simpleInfo.clear();
return this;
}
/**
- * optional .SimpleInfo simple_info = 10;
+ * optional .SimpleInfo simple_info = 4;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +66,7 @@ public SimpleInfoOuterClass.SimpleInfo getSimpleInfo() {
}
/**
- * optional .SimpleInfo simple_info = 10;
+ * optional .SimpleInfo simple_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
@@ -117,41 +75,37 @@ public SimpleInfoOuterClass.SimpleInfo getSimpleInfo() {
* @return internal storage object for modifications
*/
public SimpleInfoOuterClass.SimpleInfo getMutableSimpleInfo() {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
return simpleInfo;
}
/**
- * optional .SimpleInfo simple_info = 10;
+ * optional .SimpleInfo simple_info = 4;
* @param value the simpleInfo to set
* @return this
*/
- public FriendApplyListInfo setSimpleInfo(final SimpleInfoOuterClass.SimpleInfo value) {
- bitField0_ |= 0x00000002;
+ public FriendApplyInfo setSimpleInfo(final SimpleInfoOuterClass.SimpleInfo value) {
+ bitField0_ |= 0x00000001;
simpleInfo.copyFrom(value);
return this;
}
@Override
- public FriendApplyListInfo copyFrom(final FriendApplyListInfo other) {
+ public FriendApplyInfo copyFrom(final FriendApplyInfo other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- jKBMJGNPCNN = other.jKBMJGNPCNN;
simpleInfo.copyFrom(other.simpleInfo);
}
return this;
}
@Override
- public FriendApplyListInfo mergeFrom(final FriendApplyListInfo other) {
+ public FriendApplyInfo mergeFrom(final FriendApplyInfo other) {
if (other.isEmpty()) {
return this;
}
cachedSize = -1;
- if (other.hasJKBMJGNPCNN()) {
- setJKBMJGNPCNN(other.jKBMJGNPCNN);
- }
if (other.hasSimpleInfo()) {
getMutableSimpleInfo().mergeFrom(other.simpleInfo);
}
@@ -159,19 +113,18 @@ public FriendApplyListInfo mergeFrom(final FriendApplyListInfo other) {
}
@Override
- public FriendApplyListInfo clear() {
+ public FriendApplyInfo clear() {
if (isEmpty()) {
return this;
}
cachedSize = -1;
bitField0_ = 0;
- jKBMJGNPCNN = 0L;
simpleInfo.clear();
return this;
}
@Override
- public FriendApplyListInfo clearQuick() {
+ public FriendApplyInfo clearQuick() {
if (isEmpty()) {
return this;
}
@@ -186,23 +139,18 @@ public boolean equals(Object o) {
if (o == this) {
return true;
}
- if (!(o instanceof FriendApplyListInfo)) {
+ if (!(o instanceof FriendApplyInfo)) {
return false;
}
- FriendApplyListInfo other = (FriendApplyListInfo) o;
+ FriendApplyInfo other = (FriendApplyInfo) o;
return bitField0_ == other.bitField0_
- && (!hasJKBMJGNPCNN() || jKBMJGNPCNN == other.jKBMJGNPCNN)
&& (!hasSimpleInfo() || simpleInfo.equals(other.simpleInfo));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 96);
- output.writeInt64NoTag(jKBMJGNPCNN);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 82);
+ output.writeRawByte((byte) 34);
output.writeMessageNoTag(simpleInfo);
}
}
@@ -211,9 +159,6 @@ public void writeTo(final ProtoSink output) throws IOException {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeInt64SizeNoTag(jKBMJGNPCNN);
- }
- if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(simpleInfo);
}
return size;
@@ -221,24 +166,15 @@ protected int computeSerializedSize() {
@Override
@SuppressWarnings("fallthrough")
- public FriendApplyListInfo mergeFrom(final ProtoSource input) throws IOException {
+ public FriendApplyInfo mergeFrom(final ProtoSource input) throws IOException {
// Enabled Fall-Through Optimization (QuickBuffers)
int tag = input.readTag();
while (true) {
switch (tag) {
- case 96: {
- // jKBMJGNPCNN
- jKBMJGNPCNN = input.readInt64();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 82) {
- break;
- }
- }
- case 82: {
+ case 34: {
// simpleInfo
input.readMessage(simpleInfo);
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
if (tag != 0) {
break;
@@ -262,38 +198,24 @@ public FriendApplyListInfo mergeFrom(final ProtoSource input) throws IOException
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeInt64(FieldNames.jKBMJGNPCNN, jKBMJGNPCNN);
- }
- if ((bitField0_ & 0x00000002) != 0) {
output.writeMessage(FieldNames.simpleInfo, simpleInfo);
}
output.endObject();
}
@Override
- public FriendApplyListInfo mergeFrom(final JsonSource input) throws IOException {
+ public FriendApplyInfo mergeFrom(final JsonSource input) throws IOException {
if (!input.beginObject()) {
return this;
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -601575848: {
- if (input.isAtField(FieldNames.jKBMJGNPCNN)) {
- if (!input.trySkipNullValue()) {
- jKBMJGNPCNN = input.readInt64();
- bitField0_ |= 0x00000001;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case -1431903872:
case -1419171045: {
if (input.isAtField(FieldNames.simpleInfo)) {
if (!input.trySkipNullValue()) {
input.readMessage(simpleInfo);
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
}
} else {
input.skipUnknownField();
@@ -311,8 +233,8 @@ public FriendApplyListInfo mergeFrom(final JsonSource input) throws IOException
}
@Override
- public FriendApplyListInfo clone() {
- return new FriendApplyListInfo().copyFrom(this);
+ public FriendApplyInfo clone() {
+ return new FriendApplyInfo().copyFrom(this);
}
@Override
@@ -320,32 +242,32 @@ public boolean isEmpty() {
return ((bitField0_) == 0);
}
- public static FriendApplyListInfo parseFrom(final byte[] data) throws
+ public static FriendApplyInfo parseFrom(final byte[] data) throws
InvalidProtocolBufferException {
- return ProtoMessage.mergeFrom(new FriendApplyListInfo(), data).checkInitialized();
+ return ProtoMessage.mergeFrom(new FriendApplyInfo(), data).checkInitialized();
}
- public static FriendApplyListInfo parseFrom(final ProtoSource input) throws IOException {
- return ProtoMessage.mergeFrom(new FriendApplyListInfo(), input).checkInitialized();
+ public static FriendApplyInfo parseFrom(final ProtoSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new FriendApplyInfo(), input).checkInitialized();
}
- public static FriendApplyListInfo parseFrom(final JsonSource input) throws IOException {
- return ProtoMessage.mergeFrom(new FriendApplyListInfo(), input).checkInitialized();
+ public static FriendApplyInfo parseFrom(final JsonSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new FriendApplyInfo(), input).checkInitialized();
}
/**
- * @return factory for creating FriendApplyListInfo messages
+ * @return factory for creating FriendApplyInfo messages
*/
- public static MessageFactory getFactory() {
- return FriendApplyListInfoFactory.INSTANCE;
+ public static MessageFactory getFactory() {
+ return FriendApplyInfoFactory.INSTANCE;
}
- private enum FriendApplyListInfoFactory implements MessageFactory {
+ private enum FriendApplyInfoFactory implements MessageFactory {
INSTANCE;
@Override
- public FriendApplyListInfo create() {
- return FriendApplyListInfo.newInstance();
+ public FriendApplyInfo create() {
+ return FriendApplyInfo.newInstance();
}
}
@@ -353,8 +275,6 @@ public FriendApplyListInfo create() {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName jKBMJGNPCNN = FieldName.forField("JKBMJGNPCNN");
-
static final FieldName simpleInfo = FieldName.forField("simpleInfo", "simple_info");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java
index a5df7ca47..36f8146da 100644
--- a/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java
@@ -19,7 +19,7 @@ public static final class FriendListInfo extends ProtoMessage im
private static final long serialVersionUID = 0L;
/**
- * optional .SimpleInfo simple_info = 14;
+ * optional .SimpleInfo simple_info = 7;
*/
private final SimpleInfoOuterClass.SimpleInfo simpleInfo = SimpleInfoOuterClass.SimpleInfo.newInstance();
@@ -34,7 +34,7 @@ public static FriendListInfo newInstance() {
}
/**
- * optional .SimpleInfo simple_info = 14;
+ * optional .SimpleInfo simple_info = 7;
* @return whether the simpleInfo field is set
*/
public boolean hasSimpleInfo() {
@@ -42,7 +42,7 @@ public boolean hasSimpleInfo() {
}
/**
- * optional .SimpleInfo simple_info = 14;
+ * optional .SimpleInfo simple_info = 7;
* @return this
*/
public FriendListInfo clearSimpleInfo() {
@@ -52,7 +52,7 @@ public FriendListInfo clearSimpleInfo() {
}
/**
- * optional .SimpleInfo simple_info = 14;
+ * optional .SimpleInfo simple_info = 7;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -66,7 +66,7 @@ public SimpleInfoOuterClass.SimpleInfo getSimpleInfo() {
}
/**
- * optional .SimpleInfo simple_info = 14;
+ * optional .SimpleInfo simple_info = 7;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -80,7 +80,7 @@ public SimpleInfoOuterClass.SimpleInfo getMutableSimpleInfo() {
}
/**
- * optional .SimpleInfo simple_info = 14;
+ * optional .SimpleInfo simple_info = 7;
* @param value the simpleInfo to set
* @return this
*/
@@ -150,7 +150,7 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 114);
+ output.writeRawByte((byte) 58);
output.writeMessageNoTag(simpleInfo);
}
}
@@ -171,7 +171,7 @@ public FriendListInfo mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 114: {
+ case 58: {
// simpleInfo
input.readMessage(simpleInfo);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/FriendRecommendInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FriendRecommendInfoOuterClass.java
index 4afec1c8e..97b22f60f 100644
--- a/src/generated/main/emu/lunarcore/proto/FriendRecommendInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/FriendRecommendInfoOuterClass.java
@@ -19,7 +19,7 @@ public static final class FriendRecommendInfo extends ProtoMessageoptional .SimpleInfo simple_info = 11;
+ * optional .SimpleInfo simple_info = 1;
*/
private final SimpleInfoOuterClass.SimpleInfo simpleInfo = SimpleInfoOuterClass.SimpleInfo.newInstance();
@@ -34,7 +34,7 @@ public static FriendRecommendInfo newInstance() {
}
/**
- * optional .SimpleInfo simple_info = 11;
+ * optional .SimpleInfo simple_info = 1;
* @return whether the simpleInfo field is set
*/
public boolean hasSimpleInfo() {
@@ -42,7 +42,7 @@ public boolean hasSimpleInfo() {
}
/**
- * optional .SimpleInfo simple_info = 11;
+ * optional .SimpleInfo simple_info = 1;
* @return this
*/
public FriendRecommendInfo clearSimpleInfo() {
@@ -52,7 +52,7 @@ public FriendRecommendInfo clearSimpleInfo() {
}
/**
- * optional .SimpleInfo simple_info = 11;
+ * optional .SimpleInfo simple_info = 1;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -66,7 +66,7 @@ public SimpleInfoOuterClass.SimpleInfo getSimpleInfo() {
}
/**
- * optional .SimpleInfo simple_info = 11;
+ * optional .SimpleInfo simple_info = 1;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -80,7 +80,7 @@ public SimpleInfoOuterClass.SimpleInfo getMutableSimpleInfo() {
}
/**
- * optional .SimpleInfo simple_info = 11;
+ * optional .SimpleInfo simple_info = 1;
* @param value the simpleInfo to set
* @return this
*/
@@ -150,7 +150,7 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 90);
+ output.writeRawByte((byte) 10);
output.writeMessageNoTag(simpleInfo);
}
}
@@ -171,7 +171,7 @@ public FriendRecommendInfo mergeFrom(final ProtoSource input) throws IOException
int tag = input.readTag();
while (true) {
switch (tag) {
- case 90: {
+ case 10: {
// simpleInfo
input.readMessage(simpleInfo);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/GachaCeilingAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/GachaCeilingAvatarOuterClass.java
index f970ef770..1c107fe59 100644
--- a/src/generated/main/emu/lunarcore/proto/GachaCeilingAvatarOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GachaCeilingAvatarOuterClass.java
@@ -19,12 +19,12 @@ public static final class GachaCeilingAvatar extends ProtoMessageoptional uint32 avatar_id = 10;
+ * optional uint32 avatar_id = 2;
*/
private int avatarId;
/**
- * optional uint32 repeated_cnt = 11;
+ * optional uint32 repeated_cnt = 12;
*/
private int repeatedCnt;
@@ -39,7 +39,7 @@ public static GachaCeilingAvatar newInstance() {
}
/**
- * optional uint32 avatar_id = 10;
+ * optional uint32 avatar_id = 2;
* @return whether the avatarId field is set
*/
public boolean hasAvatarId() {
@@ -47,7 +47,7 @@ public boolean hasAvatarId() {
}
/**
- * optional uint32 avatar_id = 10;
+ * optional uint32 avatar_id = 2;
* @return this
*/
public GachaCeilingAvatar clearAvatarId() {
@@ -57,7 +57,7 @@ public GachaCeilingAvatar clearAvatarId() {
}
/**
- * optional uint32 avatar_id = 10;
+ * optional uint32 avatar_id = 2;
* @return the avatarId
*/
public int getAvatarId() {
@@ -65,7 +65,7 @@ public int getAvatarId() {
}
/**
- * optional uint32 avatar_id = 10;
+ * optional uint32 avatar_id = 2;
* @param value the avatarId to set
* @return this
*/
@@ -76,7 +76,7 @@ public GachaCeilingAvatar setAvatarId(final int value) {
}
/**
- * optional uint32 repeated_cnt = 11;
+ * optional uint32 repeated_cnt = 12;
* @return whether the repeatedCnt field is set
*/
public boolean hasRepeatedCnt() {
@@ -84,7 +84,7 @@ public boolean hasRepeatedCnt() {
}
/**
- * optional uint32 repeated_cnt = 11;
+ * optional uint32 repeated_cnt = 12;
* @return this
*/
public GachaCeilingAvatar clearRepeatedCnt() {
@@ -94,7 +94,7 @@ public GachaCeilingAvatar clearRepeatedCnt() {
}
/**
- * optional uint32 repeated_cnt = 11;
+ * optional uint32 repeated_cnt = 12;
* @return the repeatedCnt
*/
public int getRepeatedCnt() {
@@ -102,7 +102,7 @@ public int getRepeatedCnt() {
}
/**
- * optional uint32 repeated_cnt = 11;
+ * optional uint32 repeated_cnt = 12;
* @param value the repeatedCnt to set
* @return this
*/
@@ -177,11 +177,11 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(avatarId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(repeatedCnt);
}
}
@@ -205,16 +205,16 @@ public GachaCeilingAvatar mergeFrom(final ProtoSource input) throws IOException
int tag = input.readTag();
while (true) {
switch (tag) {
- case 80: {
+ case 16: {
// avatarId
avatarId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 88) {
+ if (tag != 96) {
break;
}
}
- case 88: {
+ case 96: {
// repeatedCnt
repeatedCnt = input.readUInt32();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GachaCeilingOuterClass.java b/src/generated/main/emu/lunarcore/proto/GachaCeilingOuterClass.java
index 59930b6a1..7fad7737b 100644
--- a/src/generated/main/emu/lunarcore/proto/GachaCeilingOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GachaCeilingOuterClass.java
@@ -20,17 +20,17 @@ public static final class GachaCeiling extends ProtoMessage implem
private static final long serialVersionUID = 0L;
/**
- * optional uint32 ceiling_num = 14;
+ * optional uint32 ceiling_num = 12;
*/
private int ceilingNum;
/**
- * optional bool is_claimed = 9;
+ * optional bool is_claimed = 5;
*/
private boolean isClaimed;
/**
- * repeated .GachaCeilingAvatar avatar_list = 15;
+ * repeated .GachaCeilingAvatar avatar_list = 1;
*/
private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(GachaCeilingAvatarOuterClass.GachaCeilingAvatar.getFactory());
@@ -45,7 +45,7 @@ public static GachaCeiling newInstance() {
}
/**
- * optional uint32 ceiling_num = 14;
+ * optional uint32 ceiling_num = 12;
* @return whether the ceilingNum field is set
*/
public boolean hasCeilingNum() {
@@ -53,7 +53,7 @@ public boolean hasCeilingNum() {
}
/**
- * optional uint32 ceiling_num = 14;
+ * optional uint32 ceiling_num = 12;
* @return this
*/
public GachaCeiling clearCeilingNum() {
@@ -63,7 +63,7 @@ public GachaCeiling clearCeilingNum() {
}
/**
- * optional uint32 ceiling_num = 14;
+ * optional uint32 ceiling_num = 12;
* @return the ceilingNum
*/
public int getCeilingNum() {
@@ -71,7 +71,7 @@ public int getCeilingNum() {
}
/**
- * optional uint32 ceiling_num = 14;
+ * optional uint32 ceiling_num = 12;
* @param value the ceilingNum to set
* @return this
*/
@@ -82,7 +82,7 @@ public GachaCeiling setCeilingNum(final int value) {
}
/**
- * optional bool is_claimed = 9;
+ * optional bool is_claimed = 5;
* @return whether the isClaimed field is set
*/
public boolean hasIsClaimed() {
@@ -90,7 +90,7 @@ public boolean hasIsClaimed() {
}
/**
- * optional bool is_claimed = 9;
+ * optional bool is_claimed = 5;
* @return this
*/
public GachaCeiling clearIsClaimed() {
@@ -100,7 +100,7 @@ public GachaCeiling clearIsClaimed() {
}
/**
- * optional bool is_claimed = 9;
+ * optional bool is_claimed = 5;
* @return the isClaimed
*/
public boolean getIsClaimed() {
@@ -108,7 +108,7 @@ public boolean getIsClaimed() {
}
/**
- * optional bool is_claimed = 9;
+ * optional bool is_claimed = 5;
* @param value the isClaimed to set
* @return this
*/
@@ -119,7 +119,7 @@ public GachaCeiling setIsClaimed(final boolean value) {
}
/**
- * repeated .GachaCeilingAvatar avatar_list = 15;
+ * repeated .GachaCeilingAvatar avatar_list = 1;
* @return whether the avatarList field is set
*/
public boolean hasAvatarList() {
@@ -127,7 +127,7 @@ public boolean hasAvatarList() {
}
/**
- * repeated .GachaCeilingAvatar avatar_list = 15;
+ * repeated .GachaCeilingAvatar avatar_list = 1;
* @return this
*/
public GachaCeiling clearAvatarList() {
@@ -137,7 +137,7 @@ public GachaCeiling clearAvatarList() {
}
/**
- * repeated .GachaCeilingAvatar avatar_list = 15;
+ * repeated .GachaCeilingAvatar 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 RepeatedMessage getAvata
}
/**
- * repeated .GachaCeilingAvatar avatar_list = 15;
+ * repeated .GachaCeilingAvatar 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 RepeatedMessage getMutab
}
/**
- * repeated .GachaCeilingAvatar avatar_list = 15;
+ * repeated .GachaCeilingAvatar avatar_list = 1;
* @param value the avatarList to add
* @return this
*/
@@ -176,7 +176,7 @@ public GachaCeiling addAvatarList(final GachaCeilingAvatarOuterClass.GachaCeilin
}
/**
- * repeated .GachaCeilingAvatar avatar_list = 15;
+ * repeated .GachaCeilingAvatar avatar_list = 1;
* @param values the avatarList to add
* @return this
*/
@@ -259,16 +259,16 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(ceilingNum);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 40);
output.writeBoolNoTag(isClaimed);
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < avatarList.length(); i++) {
- output.writeRawByte((byte) 122);
+ output.writeRawByte((byte) 10);
output.writeMessageNoTag(avatarList.get(i));
}
}
@@ -296,25 +296,25 @@ public GachaCeiling mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 112: {
+ case 96: {
// ceilingNum
ceilingNum = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 72) {
+ if (tag != 40) {
break;
}
}
- case 72: {
+ case 40: {
// isClaimed
isClaimed = input.readBool();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 122) {
+ if (tag != 10) {
break;
}
}
- case 122: {
+ case 10: {
// avatarList
tag = input.readRepeatedMessage(avatarList, tag);
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java
index 15dcb9751..cbafb9f79 100644
--- a/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java
@@ -21,27 +21,27 @@ public static final class GachaInfo extends ProtoMessage implements C
private static final long serialVersionUID = 0L;
/**
- * optional int64 begin_time = 9;
+ * optional int64 begin_time = 5;
*/
private long beginTime;
/**
- * optional int64 end_time = 10;
+ * optional int64 end_time = 15;
*/
private long endTime;
/**
- * optional uint32 gacha_id = 2;
+ * optional uint32 gacha_id = 3;
*/
private int gachaId;
/**
- * optional .GachaCeiling gacha_ceiling = 4;
+ * optional .GachaCeiling gacha_ceiling = 1;
*/
private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance();
/**
- * optional string history_url = 1;
+ * optional string history_url = 13;
*/
private final Utf8String historyUrl = Utf8String.newEmptyInstance();
@@ -51,12 +51,12 @@ public static final class GachaInfo extends ProtoMessage implements C
private final Utf8String detailUrl = Utf8String.newEmptyInstance();
/**
- * repeated uint32 up_info = 3;
+ * repeated uint32 up_info = 6;
*/
private final RepeatedInt upInfo = RepeatedInt.newEmptyInstance();
/**
- * repeated uint32 featured = 5;
+ * repeated uint32 featured = 9;
*/
private final RepeatedInt featured = RepeatedInt.newEmptyInstance();
@@ -71,7 +71,7 @@ public static GachaInfo newInstance() {
}
/**
- * optional int64 begin_time = 9;
+ * optional int64 begin_time = 5;
* @return whether the beginTime field is set
*/
public boolean hasBeginTime() {
@@ -79,7 +79,7 @@ public boolean hasBeginTime() {
}
/**
- * optional int64 begin_time = 9;
+ * optional int64 begin_time = 5;
* @return this
*/
public GachaInfo clearBeginTime() {
@@ -89,7 +89,7 @@ public GachaInfo clearBeginTime() {
}
/**
- * optional int64 begin_time = 9;
+ * optional int64 begin_time = 5;
* @return the beginTime
*/
public long getBeginTime() {
@@ -97,7 +97,7 @@ public long getBeginTime() {
}
/**
- * optional int64 begin_time = 9;
+ * optional int64 begin_time = 5;
* @param value the beginTime to set
* @return this
*/
@@ -108,7 +108,7 @@ public GachaInfo setBeginTime(final long value) {
}
/**
- * optional int64 end_time = 10;
+ * optional int64 end_time = 15;
* @return whether the endTime field is set
*/
public boolean hasEndTime() {
@@ -116,7 +116,7 @@ public boolean hasEndTime() {
}
/**
- * optional int64 end_time = 10;
+ * optional int64 end_time = 15;
* @return this
*/
public GachaInfo clearEndTime() {
@@ -126,7 +126,7 @@ public GachaInfo clearEndTime() {
}
/**
- * optional int64 end_time = 10;
+ * optional int64 end_time = 15;
* @return the endTime
*/
public long getEndTime() {
@@ -134,7 +134,7 @@ public long getEndTime() {
}
/**
- * optional int64 end_time = 10;
+ * optional int64 end_time = 15;
* @param value the endTime to set
* @return this
*/
@@ -145,7 +145,7 @@ public GachaInfo setEndTime(final long value) {
}
/**
- * optional uint32 gacha_id = 2;
+ * optional uint32 gacha_id = 3;
* @return whether the gachaId field is set
*/
public boolean hasGachaId() {
@@ -153,7 +153,7 @@ public boolean hasGachaId() {
}
/**
- * optional uint32 gacha_id = 2;
+ * optional uint32 gacha_id = 3;
* @return this
*/
public GachaInfo clearGachaId() {
@@ -163,7 +163,7 @@ public GachaInfo clearGachaId() {
}
/**
- * optional uint32 gacha_id = 2;
+ * optional uint32 gacha_id = 3;
* @return the gachaId
*/
public int getGachaId() {
@@ -171,7 +171,7 @@ public int getGachaId() {
}
/**
- * optional uint32 gacha_id = 2;
+ * optional uint32 gacha_id = 3;
* @param value the gachaId to set
* @return this
*/
@@ -182,7 +182,7 @@ public GachaInfo setGachaId(final int value) {
}
/**
- * optional .GachaCeiling gacha_ceiling = 4;
+ * optional .GachaCeiling gacha_ceiling = 1;
* @return whether the gachaCeiling field is set
*/
public boolean hasGachaCeiling() {
@@ -190,7 +190,7 @@ public boolean hasGachaCeiling() {
}
/**
- * optional .GachaCeiling gacha_ceiling = 4;
+ * optional .GachaCeiling gacha_ceiling = 1;
* @return this
*/
public GachaInfo clearGachaCeiling() {
@@ -200,7 +200,7 @@ public GachaInfo clearGachaCeiling() {
}
/**
- * optional .GachaCeiling gacha_ceiling = 4;
+ * optional .GachaCeiling gacha_ceiling = 1;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -214,7 +214,7 @@ public GachaCeilingOuterClass.GachaCeiling getGachaCeiling() {
}
/**
- * optional .GachaCeiling gacha_ceiling = 4;
+ * optional .GachaCeiling gacha_ceiling = 1;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -228,7 +228,7 @@ public GachaCeilingOuterClass.GachaCeiling getMutableGachaCeiling() {
}
/**
- * optional .GachaCeiling gacha_ceiling = 4;
+ * optional .GachaCeiling gacha_ceiling = 1;
* @param value the gachaCeiling to set
* @return this
*/
@@ -239,7 +239,7 @@ public GachaInfo setGachaCeiling(final GachaCeilingOuterClass.GachaCeiling value
}
/**
- * optional string history_url = 1;
+ * optional string history_url = 13;
* @return whether the historyUrl field is set
*/
public boolean hasHistoryUrl() {
@@ -247,7 +247,7 @@ public boolean hasHistoryUrl() {
}
/**
- * optional string history_url = 1;
+ * optional string history_url = 13;
* @return this
*/
public GachaInfo clearHistoryUrl() {
@@ -257,7 +257,7 @@ public GachaInfo clearHistoryUrl() {
}
/**
- * optional string history_url = 1;
+ * optional string history_url = 13;
* @return the historyUrl
*/
public String getHistoryUrl() {
@@ -265,7 +265,7 @@ public String getHistoryUrl() {
}
/**
- * optional string history_url = 1;
+ * optional string history_url = 13;
* @return internal {@code Utf8String} representation of historyUrl for reading
*/
public Utf8String getHistoryUrlBytes() {
@@ -273,7 +273,7 @@ public Utf8String getHistoryUrlBytes() {
}
/**
- * optional string history_url = 1;
+ * optional string history_url = 13;
* @return internal {@code Utf8String} representation of historyUrl for modifications
*/
public Utf8String getMutableHistoryUrlBytes() {
@@ -282,7 +282,7 @@ public Utf8String getMutableHistoryUrlBytes() {
}
/**
- * optional string history_url = 1;
+ * optional string history_url = 13;
* @param value the historyUrl to set
* @return this
*/
@@ -293,7 +293,7 @@ public GachaInfo setHistoryUrl(final CharSequence value) {
}
/**
- * optional string history_url = 1;
+ * optional string history_url = 13;
* @param value the historyUrl to set
* @return this
*/
@@ -369,7 +369,7 @@ public GachaInfo setDetailUrl(final Utf8String value) {
}
/**
- * repeated uint32 up_info = 3;
+ * repeated uint32 up_info = 6;
* @return whether the upInfo field is set
*/
public boolean hasUpInfo() {
@@ -377,7 +377,7 @@ public boolean hasUpInfo() {
}
/**
- * repeated uint32 up_info = 3;
+ * repeated uint32 up_info = 6;
* @return this
*/
public GachaInfo clearUpInfo() {
@@ -387,7 +387,7 @@ public GachaInfo clearUpInfo() {
}
/**
- * repeated uint32 up_info = 3;
+ * repeated uint32 up_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.
@@ -401,7 +401,7 @@ public RepeatedInt getUpInfo() {
}
/**
- * repeated uint32 up_info = 3;
+ * repeated uint32 up_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
@@ -415,7 +415,7 @@ public RepeatedInt getMutableUpInfo() {
}
/**
- * repeated uint32 up_info = 3;
+ * repeated uint32 up_info = 6;
* @param value the upInfo to add
* @return this
*/
@@ -426,7 +426,7 @@ public GachaInfo addUpInfo(final int value) {
}
/**
- * repeated uint32 up_info = 3;
+ * repeated uint32 up_info = 6;
* @param values the upInfo to add
* @return this
*/
@@ -437,7 +437,7 @@ public GachaInfo addAllUpInfo(final int... values) {
}
/**
- * repeated uint32 featured = 5;
+ * repeated uint32 featured = 9;
* @return whether the featured field is set
*/
public boolean hasFeatured() {
@@ -445,7 +445,7 @@ public boolean hasFeatured() {
}
/**
- * repeated uint32 featured = 5;
+ * repeated uint32 featured = 9;
* @return this
*/
public GachaInfo clearFeatured() {
@@ -455,7 +455,7 @@ public GachaInfo clearFeatured() {
}
/**
- * repeated uint32 featured = 5;
+ * repeated uint32 featured = 9;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -469,7 +469,7 @@ public RepeatedInt getFeatured() {
}
/**
- * repeated uint32 featured = 5;
+ * repeated uint32 featured = 9;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -483,7 +483,7 @@ public RepeatedInt getMutableFeatured() {
}
/**
- * repeated uint32 featured = 5;
+ * repeated uint32 featured = 9;
* @param value the featured to add
* @return this
*/
@@ -494,7 +494,7 @@ public GachaInfo addFeatured(final int value) {
}
/**
- * repeated uint32 featured = 5;
+ * repeated uint32 featured = 9;
* @param values the featured to add
* @return this
*/
@@ -610,23 +610,23 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 40);
output.writeInt64NoTag(beginTime);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 120);
output.writeInt64NoTag(endTime);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(gachaId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 34);
+ output.writeRawByte((byte) 10);
output.writeMessageNoTag(gachaCeiling);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 10);
+ output.writeRawByte((byte) 106);
output.writeStringNoTag(historyUrl);
}
if ((bitField0_ & 0x00000020) != 0) {
@@ -635,13 +635,13 @@ public void writeTo(final ProtoSink output) throws IOException {
}
if ((bitField0_ & 0x00000040) != 0) {
for (int i = 0; i < upInfo.length(); i++) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(upInfo.array()[i]);
}
}
if ((bitField0_ & 0x00000080) != 0) {
for (int i = 0; i < featured.length(); i++) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 72);
output.writeUInt32NoTag(featured.array()[i]);
}
}
@@ -684,43 +684,43 @@ public GachaInfo mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 72: {
+ case 40: {
// beginTime
beginTime = input.readInt64();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 80) {
+ if (tag != 120) {
break;
}
}
- case 80: {
+ case 120: {
// endTime
endTime = input.readInt64();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 16) {
+ if (tag != 24) {
break;
}
}
- case 16: {
+ case 24: {
// gachaId
gachaId = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 34) {
+ if (tag != 10) {
break;
}
}
- case 34: {
+ case 10: {
// gachaCeiling
input.readMessage(gachaCeiling);
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 10) {
+ if (tag != 106) {
break;
}
}
- case 10: {
+ case 106: {
// historyUrl
input.readString(historyUrl);
bitField0_ |= 0x00000010;
@@ -734,20 +734,20 @@ public GachaInfo mergeFrom(final ProtoSource input) throws IOException {
input.readString(detailUrl);
bitField0_ |= 0x00000020;
tag = input.readTag();
- if (tag != 26) {
+ if (tag != 50) {
break;
}
}
- case 26: {
+ case 50: {
// upInfo [packed=true]
input.readPackedUInt32(upInfo, tag);
bitField0_ |= 0x00000040;
tag = input.readTag();
- if (tag != 42) {
+ if (tag != 74) {
break;
}
}
- case 42: {
+ case 74: {
// featured [packed=true]
input.readPackedUInt32(featured, tag);
bitField0_ |= 0x00000080;
@@ -766,13 +766,13 @@ public GachaInfo mergeFrom(final ProtoSource input) throws IOException {
tag = input.readTag();
break;
}
- case 24: {
+ case 48: {
// upInfo [packed=false]
tag = input.readRepeatedUInt32(upInfo, tag);
bitField0_ |= 0x00000040;
break;
}
- case 40: {
+ case 72: {
// featured [packed=false]
tag = input.readRepeatedUInt32(featured, tag);
bitField0_ |= 0x00000080;
diff --git a/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java b/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java
index 503cfc50b..a26346351 100644
--- a/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java
@@ -19,22 +19,22 @@ public static final class GachaItem extends ProtoMessage implements C
private static final long serialVersionUID = 0L;
/**
- * optional bool is_new = 15;
+ * optional bool is_new = 8;
*/
private boolean isNew;
/**
- * optional .Item gacha_item = 2;
+ * optional .Item gacha_item = 1;
*/
private final ItemOuterClass.Item gachaItem = ItemOuterClass.Item.newInstance();
/**
- * optional .ItemList token_item = 4;
+ * optional .ItemList token_item = 9;
*/
private final ItemListOuterClass.ItemList tokenItem = ItemListOuterClass.ItemList.newInstance();
/**
- * optional .ItemList transfer_item_list = 13;
+ * optional .ItemList transfer_item_list = 12;
*/
private final ItemListOuterClass.ItemList transferItemList = ItemListOuterClass.ItemList.newInstance();
@@ -49,7 +49,7 @@ public static GachaItem newInstance() {
}
/**
- * optional bool is_new = 15;
+ * optional bool is_new = 8;
* @return whether the isNew field is set
*/
public boolean hasIsNew() {
@@ -57,7 +57,7 @@ public boolean hasIsNew() {
}
/**
- * optional bool is_new = 15;
+ * optional bool is_new = 8;
* @return this
*/
public GachaItem clearIsNew() {
@@ -67,7 +67,7 @@ public GachaItem clearIsNew() {
}
/**
- * optional bool is_new = 15;
+ * optional bool is_new = 8;
* @return the isNew
*/
public boolean getIsNew() {
@@ -75,7 +75,7 @@ public boolean getIsNew() {
}
/**
- * optional bool is_new = 15;
+ * optional bool is_new = 8;
* @param value the isNew to set
* @return this
*/
@@ -86,7 +86,7 @@ public GachaItem setIsNew(final boolean value) {
}
/**
- * optional .Item gacha_item = 2;
+ * optional .Item gacha_item = 1;
* @return whether the gachaItem field is set
*/
public boolean hasGachaItem() {
@@ -94,7 +94,7 @@ public boolean hasGachaItem() {
}
/**
- * optional .Item gacha_item = 2;
+ * optional .Item gacha_item = 1;
* @return this
*/
public GachaItem clearGachaItem() {
@@ -104,7 +104,7 @@ public GachaItem clearGachaItem() {
}
/**
- * optional .Item gacha_item = 2;
+ * optional .Item gacha_item = 1;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -118,7 +118,7 @@ public ItemOuterClass.Item getGachaItem() {
}
/**
- * optional .Item gacha_item = 2;
+ * optional .Item gacha_item = 1;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -132,7 +132,7 @@ public ItemOuterClass.Item getMutableGachaItem() {
}
/**
- * optional .Item gacha_item = 2;
+ * optional .Item gacha_item = 1;
* @param value the gachaItem to set
* @return this
*/
@@ -143,7 +143,7 @@ public GachaItem setGachaItem(final ItemOuterClass.Item value) {
}
/**
- * optional .ItemList token_item = 4;
+ * optional .ItemList token_item = 9;
* @return whether the tokenItem field is set
*/
public boolean hasTokenItem() {
@@ -151,7 +151,7 @@ public boolean hasTokenItem() {
}
/**
- * optional .ItemList token_item = 4;
+ * optional .ItemList token_item = 9;
* @return this
*/
public GachaItem clearTokenItem() {
@@ -161,7 +161,7 @@ public GachaItem clearTokenItem() {
}
/**
- * optional .ItemList token_item = 4;
+ * optional .ItemList token_item = 9;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -175,7 +175,7 @@ public ItemListOuterClass.ItemList getTokenItem() {
}
/**
- * optional .ItemList token_item = 4;
+ * optional .ItemList token_item = 9;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -189,7 +189,7 @@ public ItemListOuterClass.ItemList getMutableTokenItem() {
}
/**
- * optional .ItemList token_item = 4;
+ * optional .ItemList token_item = 9;
* @param value the tokenItem to set
* @return this
*/
@@ -200,7 +200,7 @@ public GachaItem setTokenItem(final ItemListOuterClass.ItemList value) {
}
/**
- * optional .ItemList transfer_item_list = 13;
+ * optional .ItemList transfer_item_list = 12;
* @return whether the transferItemList field is set
*/
public boolean hasTransferItemList() {
@@ -208,7 +208,7 @@ public boolean hasTransferItemList() {
}
/**
- * optional .ItemList transfer_item_list = 13;
+ * optional .ItemList transfer_item_list = 12;
* @return this
*/
public GachaItem clearTransferItemList() {
@@ -218,7 +218,7 @@ public GachaItem clearTransferItemList() {
}
/**
- * optional .ItemList transfer_item_list = 13;
+ * optional .ItemList transfer_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.
@@ -232,7 +232,7 @@ public ItemListOuterClass.ItemList getTransferItemList() {
}
/**
- * optional .ItemList transfer_item_list = 13;
+ * optional .ItemList transfer_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
@@ -246,7 +246,7 @@ public ItemListOuterClass.ItemList getMutableTransferItemList() {
}
/**
- * optional .ItemList transfer_item_list = 13;
+ * optional .ItemList transfer_item_list = 12;
* @param value the transferItemList to set
* @return this
*/
@@ -336,19 +336,19 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 64);
output.writeBoolNoTag(isNew);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 18);
+ output.writeRawByte((byte) 10);
output.writeMessageNoTag(gachaItem);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 34);
+ output.writeRawByte((byte) 74);
output.writeMessageNoTag(tokenItem);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 106);
+ output.writeRawByte((byte) 98);
output.writeMessageNoTag(transferItemList);
}
}
@@ -378,34 +378,34 @@ public GachaItem mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 120: {
+ case 64: {
// isNew
isNew = input.readBool();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 18) {
+ if (tag != 10) {
break;
}
}
- case 18: {
+ case 10: {
// gachaItem
input.readMessage(gachaItem);
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 34) {
+ if (tag != 74) {
break;
}
}
- case 34: {
+ case 74: {
// tokenItem
input.readMessage(tokenItem);
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 106) {
+ if (tag != 98) {
break;
}
}
- case 106: {
+ case 98: {
// transferItemList
input.readMessage(transferItemList);
bitField0_ |= 0x00000008;
diff --git a/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java b/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java
index 014bf750a..d3be56433 100644
--- a/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java
@@ -20,98 +20,85 @@ public static final class Gateserver extends ProtoMessage implements
private static final long serialVersionUID = 0L;
/**
- * optional uint32 port = 7;
+ * optional uint32 port = 15;
*/
private int port;
/**
- * optional bool unk1 = 9;
+ * optional bool unk1 = 5;
*/
private boolean unk1;
/**
- * optional bool unk2 = 12;
+ * optional bool unk2 = 9;
*/
private boolean unk2;
/**
- * optional bool unk5 = 678;
+ * optional bool unk3 = 170;
*/
- private boolean unk5;
+ private boolean unk3;
/**
- * optional bool unk3 = 1461;
+ * optional bool unk4 = 1397;
*/
- private boolean unk3;
+ private boolean unk4;
/**
- * optional bool unk6 = 1727;
+ * optional bool unk5 = 1649;
*/
- private boolean unk6;
+ private boolean unk5;
/**
- * optional bool unk4 = 1764;
+ * optional string msg = 1;
*/
- private boolean unk4;
+ private final Utf8String msg = Utf8String.newEmptyInstance();
/**
- * optional string region_name = 2;
+ * optional string ip = 3;
+ */
+ private final Utf8String ip = Utf8String.newEmptyInstance();
+
+ /**
+ * optional string region_name = 4;
*/
private final Utf8String regionName = Utf8String.newEmptyInstance();
/**
- * optional string lua_url = 5;
+ * optional string lua_url = 10;
*/
private final Utf8String luaUrl = Utf8String.newEmptyInstance();
/**
- * optional string ex_resource_url = 8;
+ * optional string ex_resource_url = 12;
*/
private final Utf8String exResourceUrl = Utf8String.newEmptyInstance();
/**
- * optional string asset_bundle_url = 11;
+ * optional string asset_bundle_url = 14;
*/
private final Utf8String assetBundleUrl = Utf8String.newEmptyInstance();
/**
- * optional string ip = 13;
+ * optional string ifix_version = 20;
*/
- private final Utf8String ip = Utf8String.newEmptyInstance();
+ private final Utf8String ifixVersion = Utf8String.newEmptyInstance();
/**
- * optional string ifix_url = 1088;
+ * optional string ifix_url = 98;
*/
private final Utf8String ifixUrl = Utf8String.newEmptyInstance();
/**
- * optional string client_secret_key = 1200;
+ * optional string client_secret_key = 239;
*/
private final Utf8String clientSecretKey = Utf8String.newEmptyInstance();
/**
- *
- * lua versionf
- *
- *
- * optional string mdk_res_version = 1213;
+ * optional string mdk_res_version = 1506;
*/
private final Utf8String mdkResVersion = Utf8String.newEmptyInstance();
- /**
- *
- * ifix version
- *
- *
- * optional string ifix_version = 1268;
- */
- private final Utf8String ifixVersion = Utf8String.newEmptyInstance();
-
- /**
- * optional string msg = 1550;
- */
- private final Utf8String msg = Utf8String.newEmptyInstance();
-
private Gateserver() {
}
@@ -123,7 +110,7 @@ public static Gateserver newInstance() {
}
/**
- * optional uint32 port = 7;
+ * optional uint32 port = 15;
* @return whether the port field is set
*/
public boolean hasPort() {
@@ -131,7 +118,7 @@ public boolean hasPort() {
}
/**
- * optional uint32 port = 7;
+ * optional uint32 port = 15;
* @return this
*/
public Gateserver clearPort() {
@@ -141,7 +128,7 @@ public Gateserver clearPort() {
}
/**
- * optional uint32 port = 7;
+ * optional uint32 port = 15;
* @return the port
*/
public int getPort() {
@@ -149,7 +136,7 @@ public int getPort() {
}
/**
- * optional uint32 port = 7;
+ * optional uint32 port = 15;
* @param value the port to set
* @return this
*/
@@ -160,7 +147,7 @@ public Gateserver setPort(final int value) {
}
/**
- * optional bool unk1 = 9;
+ * optional bool unk1 = 5;
* @return whether the unk1 field is set
*/
public boolean hasUnk1() {
@@ -168,7 +155,7 @@ public boolean hasUnk1() {
}
/**
- * optional bool unk1 = 9;
+ * optional bool unk1 = 5;
* @return this
*/
public Gateserver clearUnk1() {
@@ -178,7 +165,7 @@ public Gateserver clearUnk1() {
}
/**
- * optional bool unk1 = 9;
+ * optional bool unk1 = 5;
* @return the unk1
*/
public boolean getUnk1() {
@@ -186,7 +173,7 @@ public boolean getUnk1() {
}
/**
- * optional bool unk1 = 9;
+ * optional bool unk1 = 5;
* @param value the unk1 to set
* @return this
*/
@@ -197,7 +184,7 @@ public Gateserver setUnk1(final boolean value) {
}
/**
- * optional bool unk2 = 12;
+ * optional bool unk2 = 9;
* @return whether the unk2 field is set
*/
public boolean hasUnk2() {
@@ -205,7 +192,7 @@ public boolean hasUnk2() {
}
/**
- * optional bool unk2 = 12;
+ * optional bool unk2 = 9;
* @return this
*/
public Gateserver clearUnk2() {
@@ -215,7 +202,7 @@ public Gateserver clearUnk2() {
}
/**
- * optional bool unk2 = 12;
+ * optional bool unk2 = 9;
* @return the unk2
*/
public boolean getUnk2() {
@@ -223,7 +210,7 @@ public boolean getUnk2() {
}
/**
- * optional bool unk2 = 12;
+ * optional bool unk2 = 9;
* @param value the unk2 to set
* @return this
*/
@@ -234,173 +221,266 @@ public Gateserver setUnk2(final boolean value) {
}
/**
- * optional bool unk5 = 678;
- * @return whether the unk5 field is set
+ * optional bool unk3 = 170;
+ * @return whether the unk3 field is set
*/
- public boolean hasUnk5() {
+ public boolean hasUnk3() {
return (bitField0_ & 0x00000008) != 0;
}
/**
- * optional bool unk5 = 678;
+ * optional bool unk3 = 170;
* @return this
*/
- public Gateserver clearUnk5() {
+ public Gateserver clearUnk3() {
bitField0_ &= ~0x00000008;
- unk5 = false;
+ unk3 = false;
return this;
}
/**
- * optional bool unk5 = 678;
- * @return the unk5
+ * optional bool unk3 = 170;
+ * @return the unk3
*/
- public boolean getUnk5() {
- return unk5;
+ public boolean getUnk3() {
+ return unk3;
}
/**
- * optional bool unk5 = 678;
- * @param value the unk5 to set
+ * optional bool unk3 = 170;
+ * @param value the unk3 to set
* @return this
*/
- public Gateserver setUnk5(final boolean value) {
+ public Gateserver setUnk3(final boolean value) {
bitField0_ |= 0x00000008;
- unk5 = value;
+ unk3 = value;
return this;
}
/**
- * optional bool unk3 = 1461;
- * @return whether the unk3 field is set
+ * optional bool unk4 = 1397;
+ * @return whether the unk4 field is set
*/
- public boolean hasUnk3() {
+ public boolean hasUnk4() {
return (bitField0_ & 0x00000010) != 0;
}
/**
- * optional bool unk3 = 1461;
+ * optional bool unk4 = 1397;
* @return this
*/
- public Gateserver clearUnk3() {
+ public Gateserver clearUnk4() {
bitField0_ &= ~0x00000010;
- unk3 = false;
+ unk4 = false;
return this;
}
/**
- * optional bool unk3 = 1461;
- * @return the unk3
+ * optional bool unk4 = 1397;
+ * @return the unk4
*/
- public boolean getUnk3() {
- return unk3;
+ public boolean getUnk4() {
+ return unk4;
}
/**
- * optional bool unk3 = 1461;
- * @param value the unk3 to set
+ * optional bool unk4 = 1397;
+ * @param value the unk4 to set
* @return this
*/
- public Gateserver setUnk3(final boolean value) {
+ public Gateserver setUnk4(final boolean value) {
bitField0_ |= 0x00000010;
- unk3 = value;
+ unk4 = value;
return this;
}
/**
- * optional bool unk6 = 1727;
- * @return whether the unk6 field is set
+ * optional bool unk5 = 1649;
+ * @return whether the unk5 field is set
*/
- public boolean hasUnk6() {
+ public boolean hasUnk5() {
return (bitField0_ & 0x00000020) != 0;
}
/**
- * optional bool unk6 = 1727;
+ * optional bool unk5 = 1649;
* @return this
*/
- public Gateserver clearUnk6() {
+ public Gateserver clearUnk5() {
bitField0_ &= ~0x00000020;
- unk6 = false;
+ unk5 = false;
return this;
}
/**
- * optional bool unk6 = 1727;
- * @return the unk6
+ * optional bool unk5 = 1649;
+ * @return the unk5
*/
- public boolean getUnk6() {
- return unk6;
+ public boolean getUnk5() {
+ return unk5;
}
/**
- * optional bool unk6 = 1727;
- * @param value the unk6 to set
+ * optional bool unk5 = 1649;
+ * @param value the unk5 to set
* @return this
*/
- public Gateserver setUnk6(final boolean value) {
+ public Gateserver setUnk5(final boolean value) {
bitField0_ |= 0x00000020;
- unk6 = value;
+ unk5 = value;
return this;
}
/**
- * optional bool unk4 = 1764;
- * @return whether the unk4 field is set
+ * optional string msg = 1;
+ * @return whether the msg field is set
*/
- public boolean hasUnk4() {
+ public boolean hasMsg() {
return (bitField0_ & 0x00000040) != 0;
}
/**
- * optional bool unk4 = 1764;
+ * optional string msg = 1;
* @return this
*/
- public Gateserver clearUnk4() {
+ public Gateserver clearMsg() {
bitField0_ &= ~0x00000040;
- unk4 = false;
+ msg.clear();
return this;
}
/**
- * optional bool unk4 = 1764;
- * @return the unk4
+ * optional string msg = 1;
+ * @return the msg
*/
- public boolean getUnk4() {
- return unk4;
+ public String getMsg() {
+ return msg.getString();
}
/**
- * optional bool unk4 = 1764;
- * @param value the unk4 to set
+ * optional string msg = 1;
+ * @return internal {@code Utf8String} representation of msg for reading
+ */
+ public Utf8String getMsgBytes() {
+ return this.msg;
+ }
+
+ /**
+ * optional string msg = 1;
+ * @return internal {@code Utf8String} representation of msg for modifications
+ */
+ public Utf8String getMutableMsgBytes() {
+ bitField0_ |= 0x00000040;
+ return this.msg;
+ }
+
+ /**
+ * optional string msg = 1;
+ * @param value the msg to set
* @return this
*/
- public Gateserver setUnk4(final boolean value) {
+ public Gateserver setMsg(final CharSequence value) {
bitField0_ |= 0x00000040;
- unk4 = value;
+ msg.copyFrom(value);
return this;
}
/**
- * optional string region_name = 2;
+ * optional string msg = 1;
+ * @param value the msg to set
+ * @return this
+ */
+ public Gateserver setMsg(final Utf8String value) {
+ bitField0_ |= 0x00000040;
+ msg.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional string ip = 3;
+ * @return whether the ip field is set
+ */
+ public boolean hasIp() {
+ return (bitField0_ & 0x00000080) != 0;
+ }
+
+ /**
+ * optional string ip = 3;
+ * @return this
+ */
+ public Gateserver clearIp() {
+ bitField0_ &= ~0x00000080;
+ ip.clear();
+ return this;
+ }
+
+ /**
+ * optional string ip = 3;
+ * @return the ip
+ */
+ public String getIp() {
+ return ip.getString();
+ }
+
+ /**
+ * optional string ip = 3;
+ * @return internal {@code Utf8String} representation of ip for reading
+ */
+ public Utf8String getIpBytes() {
+ return this.ip;
+ }
+
+ /**
+ * optional string ip = 3;
+ * @return internal {@code Utf8String} representation of ip for modifications
+ */
+ public Utf8String getMutableIpBytes() {
+ bitField0_ |= 0x00000080;
+ return this.ip;
+ }
+
+ /**
+ * optional string ip = 3;
+ * @param value the ip to set
+ * @return this
+ */
+ public Gateserver setIp(final CharSequence value) {
+ bitField0_ |= 0x00000080;
+ ip.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional string ip = 3;
+ * @param value the ip to set
+ * @return this
+ */
+ public Gateserver setIp(final Utf8String value) {
+ bitField0_ |= 0x00000080;
+ ip.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional string region_name = 4;
* @return whether the regionName field is set
*/
public boolean hasRegionName() {
- return (bitField0_ & 0x00000080) != 0;
+ return (bitField0_ & 0x00000100) != 0;
}
/**
- * optional string region_name = 2;
+ * optional string region_name = 4;
* @return this
*/
public Gateserver clearRegionName() {
- bitField0_ &= ~0x00000080;
+ bitField0_ &= ~0x00000100;
regionName.clear();
return this;
}
/**
- * optional string region_name = 2;
+ * optional string region_name = 4;
* @return the regionName
*/
public String getRegionName() {
@@ -408,7 +488,7 @@ public String getRegionName() {
}
/**
- * optional string region_name = 2;
+ * optional string region_name = 4;
* @return internal {@code Utf8String} representation of regionName for reading
*/
public Utf8String getRegionNameBytes() {
@@ -416,56 +496,56 @@ public Utf8String getRegionNameBytes() {
}
/**
- * optional string region_name = 2;
+ * optional string region_name = 4;
* @return internal {@code Utf8String} representation of regionName for modifications
*/
public Utf8String getMutableRegionNameBytes() {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000100;
return this.regionName;
}
/**
- * optional string region_name = 2;
+ * optional string region_name = 4;
* @param value the regionName to set
* @return this
*/
public Gateserver setRegionName(final CharSequence value) {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000100;
regionName.copyFrom(value);
return this;
}
/**
- * optional string region_name = 2;
+ * optional string region_name = 4;
* @param value the regionName to set
* @return this
*/
public Gateserver setRegionName(final Utf8String value) {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000100;
regionName.copyFrom(value);
return this;
}
/**
- * optional string lua_url = 5;
+ * optional string lua_url = 10;
* @return whether the luaUrl field is set
*/
public boolean hasLuaUrl() {
- return (bitField0_ & 0x00000100) != 0;
+ return (bitField0_ & 0x00000200) != 0;
}
/**
- * optional string lua_url = 5;
+ * optional string lua_url = 10;
* @return this
*/
public Gateserver clearLuaUrl() {
- bitField0_ &= ~0x00000100;
+ bitField0_ &= ~0x00000200;
luaUrl.clear();
return this;
}
/**
- * optional string lua_url = 5;
+ * optional string lua_url = 10;
* @return the luaUrl
*/
public String getLuaUrl() {
@@ -473,7 +553,7 @@ public String getLuaUrl() {
}
/**
- * optional string lua_url = 5;
+ * optional string lua_url = 10;
* @return internal {@code Utf8String} representation of luaUrl for reading
*/
public Utf8String getLuaUrlBytes() {
@@ -481,56 +561,56 @@ public Utf8String getLuaUrlBytes() {
}
/**
- * optional string lua_url = 5;
+ * optional string lua_url = 10;
* @return internal {@code Utf8String} representation of luaUrl for modifications
*/
public Utf8String getMutableLuaUrlBytes() {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000200;
return this.luaUrl;
}
/**
- * optional string lua_url = 5;
+ * optional string lua_url = 10;
* @param value the luaUrl to set
* @return this
*/
public Gateserver setLuaUrl(final CharSequence value) {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000200;
luaUrl.copyFrom(value);
return this;
}
/**
- * optional string lua_url = 5;
+ * optional string lua_url = 10;
* @param value the luaUrl to set
* @return this
*/
public Gateserver setLuaUrl(final Utf8String value) {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000200;
luaUrl.copyFrom(value);
return this;
}
/**
- * optional string ex_resource_url = 8;
+ * optional string ex_resource_url = 12;
* @return whether the exResourceUrl field is set
*/
public boolean hasExResourceUrl() {
- return (bitField0_ & 0x00000200) != 0;
+ return (bitField0_ & 0x00000400) != 0;
}
/**
- * optional string ex_resource_url = 8;
+ * optional string ex_resource_url = 12;
* @return this
*/
public Gateserver clearExResourceUrl() {
- bitField0_ &= ~0x00000200;
+ bitField0_ &= ~0x00000400;
exResourceUrl.clear();
return this;
}
/**
- * optional string ex_resource_url = 8;
+ * optional string ex_resource_url = 12;
* @return the exResourceUrl
*/
public String getExResourceUrl() {
@@ -538,7 +618,7 @@ public String getExResourceUrl() {
}
/**
- * optional string ex_resource_url = 8;
+ * optional string ex_resource_url = 12;
* @return internal {@code Utf8String} representation of exResourceUrl for reading
*/
public Utf8String getExResourceUrlBytes() {
@@ -546,56 +626,56 @@ public Utf8String getExResourceUrlBytes() {
}
/**
- * optional string ex_resource_url = 8;
+ * optional string ex_resource_url = 12;
* @return internal {@code Utf8String} representation of exResourceUrl for modifications
*/
public Utf8String getMutableExResourceUrlBytes() {
- bitField0_ |= 0x00000200;
+ bitField0_ |= 0x00000400;
return this.exResourceUrl;
}
/**
- * optional string ex_resource_url = 8;
+ * optional string ex_resource_url = 12;
* @param value the exResourceUrl to set
* @return this
*/
public Gateserver setExResourceUrl(final CharSequence value) {
- bitField0_ |= 0x00000200;
+ bitField0_ |= 0x00000400;
exResourceUrl.copyFrom(value);
return this;
}
/**
- * optional string ex_resource_url = 8;
+ * optional string ex_resource_url = 12;
* @param value the exResourceUrl to set
* @return this
*/
public Gateserver setExResourceUrl(final Utf8String value) {
- bitField0_ |= 0x00000200;
+ bitField0_ |= 0x00000400;
exResourceUrl.copyFrom(value);
return this;
}
/**
- * optional string asset_bundle_url = 11;
+ * optional string asset_bundle_url = 14;
* @return whether the assetBundleUrl field is set
*/
public boolean hasAssetBundleUrl() {
- return (bitField0_ & 0x00000400) != 0;
+ return (bitField0_ & 0x00000800) != 0;
}
/**
- * optional string asset_bundle_url = 11;
+ * optional string asset_bundle_url = 14;
* @return this
*/
public Gateserver clearAssetBundleUrl() {
- bitField0_ &= ~0x00000400;
+ bitField0_ &= ~0x00000800;
assetBundleUrl.clear();
return this;
}
/**
- * optional string asset_bundle_url = 11;
+ * optional string asset_bundle_url = 14;
* @return the assetBundleUrl
*/
public String getAssetBundleUrl() {
@@ -603,7 +683,7 @@ public String getAssetBundleUrl() {
}
/**
- * optional string asset_bundle_url = 11;
+ * optional string asset_bundle_url = 14;
* @return internal {@code Utf8String} representation of assetBundleUrl for reading
*/
public Utf8String getAssetBundleUrlBytes() {
@@ -611,121 +691,121 @@ public Utf8String getAssetBundleUrlBytes() {
}
/**
- * optional string asset_bundle_url = 11;
+ * optional string asset_bundle_url = 14;
* @return internal {@code Utf8String} representation of assetBundleUrl for modifications
*/
public Utf8String getMutableAssetBundleUrlBytes() {
- bitField0_ |= 0x00000400;
+ bitField0_ |= 0x00000800;
return this.assetBundleUrl;
}
/**
- * optional string asset_bundle_url = 11;
+ * optional string asset_bundle_url = 14;
* @param value the assetBundleUrl to set
* @return this
*/
public Gateserver setAssetBundleUrl(final CharSequence value) {
- bitField0_ |= 0x00000400;
+ bitField0_ |= 0x00000800;
assetBundleUrl.copyFrom(value);
return this;
}
/**
- * optional string asset_bundle_url = 11;
+ * optional string asset_bundle_url = 14;
* @param value the assetBundleUrl to set
* @return this
*/
public Gateserver setAssetBundleUrl(final Utf8String value) {
- bitField0_ |= 0x00000400;
+ bitField0_ |= 0x00000800;
assetBundleUrl.copyFrom(value);
return this;
}
/**
- * optional string ip = 13;
- * @return whether the ip field is set
+ * optional string ifix_version = 20;
+ * @return whether the ifixVersion field is set
*/
- public boolean hasIp() {
- return (bitField0_ & 0x00000800) != 0;
+ public boolean hasIfixVersion() {
+ return (bitField0_ & 0x00001000) != 0;
}
/**
- * optional string ip = 13;
+ * optional string ifix_version = 20;
* @return this
*/
- public Gateserver clearIp() {
- bitField0_ &= ~0x00000800;
- ip.clear();
+ public Gateserver clearIfixVersion() {
+ bitField0_ &= ~0x00001000;
+ ifixVersion.clear();
return this;
}
/**
- * optional string ip = 13;
- * @return the ip
+ * optional string ifix_version = 20;
+ * @return the ifixVersion
*/
- public String getIp() {
- return ip.getString();
+ public String getIfixVersion() {
+ return ifixVersion.getString();
}
/**
- * optional string ip = 13;
- * @return internal {@code Utf8String} representation of ip for reading
+ * optional string ifix_version = 20;
+ * @return internal {@code Utf8String} representation of ifixVersion for reading
*/
- public Utf8String getIpBytes() {
- return this.ip;
+ public Utf8String getIfixVersionBytes() {
+ return this.ifixVersion;
}
/**
- * optional string ip = 13;
- * @return internal {@code Utf8String} representation of ip for modifications
+ * optional string ifix_version = 20;
+ * @return internal {@code Utf8String} representation of ifixVersion for modifications
*/
- public Utf8String getMutableIpBytes() {
- bitField0_ |= 0x00000800;
- return this.ip;
+ public Utf8String getMutableIfixVersionBytes() {
+ bitField0_ |= 0x00001000;
+ return this.ifixVersion;
}
/**
- * optional string ip = 13;
- * @param value the ip to set
+ * optional string ifix_version = 20;
+ * @param value the ifixVersion to set
* @return this
*/
- public Gateserver setIp(final CharSequence value) {
- bitField0_ |= 0x00000800;
- ip.copyFrom(value);
+ public Gateserver setIfixVersion(final CharSequence value) {
+ bitField0_ |= 0x00001000;
+ ifixVersion.copyFrom(value);
return this;
}
/**
- * optional string ip = 13;
- * @param value the ip to set
+ * optional string ifix_version = 20;
+ * @param value the ifixVersion to set
* @return this
*/
- public Gateserver setIp(final Utf8String value) {
- bitField0_ |= 0x00000800;
- ip.copyFrom(value);
+ public Gateserver setIfixVersion(final Utf8String value) {
+ bitField0_ |= 0x00001000;
+ ifixVersion.copyFrom(value);
return this;
}
/**
- * optional string ifix_url = 1088;
+ * optional string ifix_url = 98;
* @return whether the ifixUrl field is set
*/
public boolean hasIfixUrl() {
- return (bitField0_ & 0x00001000) != 0;
+ return (bitField0_ & 0x00002000) != 0;
}
/**
- * optional string ifix_url = 1088;
+ * optional string ifix_url = 98;
* @return this
*/
public Gateserver clearIfixUrl() {
- bitField0_ &= ~0x00001000;
+ bitField0_ &= ~0x00002000;
ifixUrl.clear();
return this;
}
/**
- * optional string ifix_url = 1088;
+ * optional string ifix_url = 98;
* @return the ifixUrl
*/
public String getIfixUrl() {
@@ -733,7 +813,7 @@ public String getIfixUrl() {
}
/**
- * optional string ifix_url = 1088;
+ * optional string ifix_url = 98;
* @return internal {@code Utf8String} representation of ifixUrl for reading
*/
public Utf8String getIfixUrlBytes() {
@@ -741,56 +821,56 @@ public Utf8String getIfixUrlBytes() {
}
/**
- * optional string ifix_url = 1088;
+ * optional string ifix_url = 98;
* @return internal {@code Utf8String} representation of ifixUrl for modifications
*/
public Utf8String getMutableIfixUrlBytes() {
- bitField0_ |= 0x00001000;
+ bitField0_ |= 0x00002000;
return this.ifixUrl;
}
/**
- * optional string ifix_url = 1088;
+ * optional string ifix_url = 98;
* @param value the ifixUrl to set
* @return this
*/
public Gateserver setIfixUrl(final CharSequence value) {
- bitField0_ |= 0x00001000;
+ bitField0_ |= 0x00002000;
ifixUrl.copyFrom(value);
return this;
}
/**
- * optional string ifix_url = 1088;
+ * optional string ifix_url = 98;
* @param value the ifixUrl to set
* @return this
*/
public Gateserver setIfixUrl(final Utf8String value) {
- bitField0_ |= 0x00001000;
+ bitField0_ |= 0x00002000;
ifixUrl.copyFrom(value);
return this;
}
/**
- * optional string client_secret_key = 1200;
+ * optional string client_secret_key = 239;
* @return whether the clientSecretKey field is set
*/
public boolean hasClientSecretKey() {
- return (bitField0_ & 0x00002000) != 0;
+ return (bitField0_ & 0x00004000) != 0;
}
/**
- * optional string client_secret_key = 1200;
+ * optional string client_secret_key = 239;
* @return this
*/
public Gateserver clearClientSecretKey() {
- bitField0_ &= ~0x00002000;
+ bitField0_ &= ~0x00004000;
clientSecretKey.clear();
return this;
}
/**
- * optional string client_secret_key = 1200;
+ * optional string client_secret_key = 239;
* @return the clientSecretKey
*/
public String getClientSecretKey() {
@@ -798,7 +878,7 @@ public String getClientSecretKey() {
}
/**
- * optional string client_secret_key = 1200;
+ * optional string client_secret_key = 239;
* @return internal {@code Utf8String} representation of clientSecretKey for reading
*/
public Utf8String getClientSecretKeyBytes() {
@@ -806,68 +886,56 @@ public Utf8String getClientSecretKeyBytes() {
}
/**
- * optional string client_secret_key = 1200;
+ * optional string client_secret_key = 239;
* @return internal {@code Utf8String} representation of clientSecretKey for modifications
*/
public Utf8String getMutableClientSecretKeyBytes() {
- bitField0_ |= 0x00002000;
+ bitField0_ |= 0x00004000;
return this.clientSecretKey;
}
/**
- * optional string client_secret_key = 1200;
+ * optional string client_secret_key = 239;
* @param value the clientSecretKey to set
* @return this
*/
public Gateserver setClientSecretKey(final CharSequence value) {
- bitField0_ |= 0x00002000;
+ bitField0_ |= 0x00004000;
clientSecretKey.copyFrom(value);
return this;
}
/**
- * optional string client_secret_key = 1200;
+ * optional string client_secret_key = 239;
* @param value the clientSecretKey to set
* @return this
*/
public Gateserver setClientSecretKey(final Utf8String value) {
- bitField0_ |= 0x00002000;
+ bitField0_ |= 0x00004000;
clientSecretKey.copyFrom(value);
return this;
}
/**
- *
- * lua versionf
- *
- *
- * optional string mdk_res_version = 1213;
+ * optional string mdk_res_version = 1506;
* @return whether the mdkResVersion field is set
*/
public boolean hasMdkResVersion() {
- return (bitField0_ & 0x00004000) != 0;
+ return (bitField0_ & 0x00008000) != 0;
}
/**
- *
- * lua versionf
- *
- *
- * optional string mdk_res_version = 1213;
+ * optional string mdk_res_version = 1506;
* @return this
*/
public Gateserver clearMdkResVersion() {
- bitField0_ &= ~0x00004000;
+ bitField0_ &= ~0x00008000;
mdkResVersion.clear();
return this;
}
/**
- *
- * lua versionf
- *
- *
- * optional string mdk_res_version = 1213;
+ * optional string mdk_res_version = 1506;
* @return the mdkResVersion
*/
public String getMdkResVersion() {
@@ -875,11 +943,7 @@ public String getMdkResVersion() {
}
/**
- *
- * lua versionf
- *
- *
- * optional string mdk_res_version = 1213;
+ * optional string mdk_res_version = 1506;
* @return internal {@code Utf8String} representation of mdkResVersion for reading
*/
public Utf8String getMdkResVersionBytes() {
@@ -887,203 +951,33 @@ public Utf8String getMdkResVersionBytes() {
}
/**
- *
- * lua versionf
- *
- *
- * optional string mdk_res_version = 1213;
+ * optional string mdk_res_version = 1506;
* @return internal {@code Utf8String} representation of mdkResVersion for modifications
*/
public Utf8String getMutableMdkResVersionBytes() {
- bitField0_ |= 0x00004000;
+ bitField0_ |= 0x00008000;
return this.mdkResVersion;
}
/**
- *
- * lua versionf
- *
- *
- * optional string mdk_res_version = 1213;
+ * optional string mdk_res_version = 1506;
* @param value the mdkResVersion to set
* @return this
*/
public Gateserver setMdkResVersion(final CharSequence value) {
- bitField0_ |= 0x00004000;
+ bitField0_ |= 0x00008000;
mdkResVersion.copyFrom(value);
return this;
}
/**
- *
- * lua versionf
- *
- *
- * optional string mdk_res_version = 1213;
+ * optional string mdk_res_version = 1506;
* @param value the mdkResVersion to set
* @return this
*/
public Gateserver setMdkResVersion(final Utf8String value) {
- bitField0_ |= 0x00004000;
- mdkResVersion.copyFrom(value);
- return this;
- }
-
- /**
- *
- * ifix version
- *
- *
- * optional string ifix_version = 1268;
- * @return whether the ifixVersion field is set
- */
- public boolean hasIfixVersion() {
- return (bitField0_ & 0x00008000) != 0;
- }
-
- /**
- *
- * ifix version
- *
- *
- * optional string ifix_version = 1268;
- * @return this
- */
- public Gateserver clearIfixVersion() {
- bitField0_ &= ~0x00008000;
- ifixVersion.clear();
- return this;
- }
-
- /**
- *
- * ifix version
- *
- *
- * optional string ifix_version = 1268;
- * @return the ifixVersion
- */
- public String getIfixVersion() {
- return ifixVersion.getString();
- }
-
- /**
- *
- * ifix version
- *
- *
- * optional string ifix_version = 1268;
- * @return internal {@code Utf8String} representation of ifixVersion for reading
- */
- public Utf8String getIfixVersionBytes() {
- return this.ifixVersion;
- }
-
- /**
- *
- * ifix version
- *
- *
- * optional string ifix_version = 1268;
- * @return internal {@code Utf8String} representation of ifixVersion for modifications
- */
- public Utf8String getMutableIfixVersionBytes() {
bitField0_ |= 0x00008000;
- return this.ifixVersion;
- }
-
- /**
- *
- * ifix version
- *
- *
- * optional string ifix_version = 1268;
- * @param value the ifixVersion to set
- * @return this
- */
- public Gateserver setIfixVersion(final CharSequence value) {
- bitField0_ |= 0x00008000;
- ifixVersion.copyFrom(value);
- return this;
- }
-
- /**
- *
- * ifix version
- *
- *
- * optional string ifix_version = 1268;
- * @param value the ifixVersion to set
- * @return this
- */
- public Gateserver setIfixVersion(final Utf8String value) {
- bitField0_ |= 0x00008000;
- ifixVersion.copyFrom(value);
- return this;
- }
-
- /**
- * optional string msg = 1550;
- * @return whether the msg field is set
- */
- public boolean hasMsg() {
- return (bitField0_ & 0x00010000) != 0;
- }
-
- /**
- * optional string msg = 1550;
- * @return this
- */
- public Gateserver clearMsg() {
- bitField0_ &= ~0x00010000;
- msg.clear();
- return this;
- }
-
- /**
- * optional string msg = 1550;
- * @return the msg
- */
- public String getMsg() {
- return msg.getString();
- }
-
- /**
- * optional string msg = 1550;
- * @return internal {@code Utf8String} representation of msg for reading
- */
- public Utf8String getMsgBytes() {
- return this.msg;
- }
-
- /**
- * optional string msg = 1550;
- * @return internal {@code Utf8String} representation of msg for modifications
- */
- public Utf8String getMutableMsgBytes() {
- bitField0_ |= 0x00010000;
- return this.msg;
- }
-
- /**
- * optional string msg = 1550;
- * @param value the msg to set
- * @return this
- */
- public Gateserver setMsg(final CharSequence value) {
- bitField0_ |= 0x00010000;
- msg.copyFrom(value);
- return this;
- }
-
- /**
- * optional string msg = 1550;
- * @param value the msg to set
- * @return this
- */
- public Gateserver setMsg(final Utf8String value) {
- bitField0_ |= 0x00010000;
- msg.copyFrom(value);
+ mdkResVersion.copyFrom(value);
return this;
}
@@ -1095,20 +989,19 @@ public Gateserver copyFrom(final Gateserver other) {
port = other.port;
unk1 = other.unk1;
unk2 = other.unk2;
- unk5 = other.unk5;
unk3 = other.unk3;
- unk6 = other.unk6;
unk4 = other.unk4;
+ unk5 = other.unk5;
+ msg.copyFrom(other.msg);
+ ip.copyFrom(other.ip);
regionName.copyFrom(other.regionName);
luaUrl.copyFrom(other.luaUrl);
exResourceUrl.copyFrom(other.exResourceUrl);
assetBundleUrl.copyFrom(other.assetBundleUrl);
- ip.copyFrom(other.ip);
+ ifixVersion.copyFrom(other.ifixVersion);
ifixUrl.copyFrom(other.ifixUrl);
clientSecretKey.copyFrom(other.clientSecretKey);
mdkResVersion.copyFrom(other.mdkResVersion);
- ifixVersion.copyFrom(other.ifixVersion);
- msg.copyFrom(other.msg);
}
return this;
}
@@ -1128,17 +1021,20 @@ public Gateserver mergeFrom(final Gateserver other) {
if (other.hasUnk2()) {
setUnk2(other.unk2);
}
- if (other.hasUnk5()) {
- setUnk5(other.unk5);
- }
if (other.hasUnk3()) {
setUnk3(other.unk3);
}
- if (other.hasUnk6()) {
- setUnk6(other.unk6);
+ if (other.hasUnk4()) {
+ setUnk4(other.unk4);
+ }
+ if (other.hasUnk5()) {
+ setUnk5(other.unk5);
+ }
+ if (other.hasMsg()) {
+ getMutableMsgBytes().copyFrom(other.msg);
}
- if (other.hasUnk4()) {
- setUnk4(other.unk4);
+ if (other.hasIp()) {
+ getMutableIpBytes().copyFrom(other.ip);
}
if (other.hasRegionName()) {
getMutableRegionNameBytes().copyFrom(other.regionName);
@@ -1152,8 +1048,8 @@ public Gateserver mergeFrom(final Gateserver other) {
if (other.hasAssetBundleUrl()) {
getMutableAssetBundleUrlBytes().copyFrom(other.assetBundleUrl);
}
- if (other.hasIp()) {
- getMutableIpBytes().copyFrom(other.ip);
+ if (other.hasIfixVersion()) {
+ getMutableIfixVersionBytes().copyFrom(other.ifixVersion);
}
if (other.hasIfixUrl()) {
getMutableIfixUrlBytes().copyFrom(other.ifixUrl);
@@ -1164,12 +1060,6 @@ public Gateserver mergeFrom(final Gateserver other) {
if (other.hasMdkResVersion()) {
getMutableMdkResVersionBytes().copyFrom(other.mdkResVersion);
}
- if (other.hasIfixVersion()) {
- getMutableIfixVersionBytes().copyFrom(other.ifixVersion);
- }
- if (other.hasMsg()) {
- getMutableMsgBytes().copyFrom(other.msg);
- }
return this;
}
@@ -1183,20 +1073,19 @@ public Gateserver clear() {
port = 0;
unk1 = false;
unk2 = false;
- unk5 = false;
unk3 = false;
- unk6 = false;
unk4 = false;
+ unk5 = false;
+ msg.clear();
+ ip.clear();
regionName.clear();
luaUrl.clear();
exResourceUrl.clear();
assetBundleUrl.clear();
- ip.clear();
+ ifixVersion.clear();
ifixUrl.clear();
clientSecretKey.clear();
mdkResVersion.clear();
- ifixVersion.clear();
- msg.clear();
return this;
}
@@ -1207,16 +1096,16 @@ public Gateserver clearQuick() {
}
cachedSize = -1;
bitField0_ = 0;
+ msg.clear();
+ ip.clear();
regionName.clear();
luaUrl.clear();
exResourceUrl.clear();
assetBundleUrl.clear();
- ip.clear();
+ ifixVersion.clear();
ifixUrl.clear();
clientSecretKey.clear();
mdkResVersion.clear();
- ifixVersion.clear();
- msg.clear();
return this;
}
@@ -1233,91 +1122,86 @@ public boolean equals(Object o) {
&& (!hasPort() || port == other.port)
&& (!hasUnk1() || unk1 == other.unk1)
&& (!hasUnk2() || unk2 == other.unk2)
- && (!hasUnk5() || unk5 == other.unk5)
&& (!hasUnk3() || unk3 == other.unk3)
- && (!hasUnk6() || unk6 == other.unk6)
&& (!hasUnk4() || unk4 == other.unk4)
+ && (!hasUnk5() || unk5 == other.unk5)
+ && (!hasMsg() || msg.equals(other.msg))
+ && (!hasIp() || ip.equals(other.ip))
&& (!hasRegionName() || regionName.equals(other.regionName))
&& (!hasLuaUrl() || luaUrl.equals(other.luaUrl))
&& (!hasExResourceUrl() || exResourceUrl.equals(other.exResourceUrl))
&& (!hasAssetBundleUrl() || assetBundleUrl.equals(other.assetBundleUrl))
- && (!hasIp() || ip.equals(other.ip))
+ && (!hasIfixVersion() || ifixVersion.equals(other.ifixVersion))
&& (!hasIfixUrl() || ifixUrl.equals(other.ifixUrl))
&& (!hasClientSecretKey() || clientSecretKey.equals(other.clientSecretKey))
- && (!hasMdkResVersion() || mdkResVersion.equals(other.mdkResVersion))
- && (!hasIfixVersion() || ifixVersion.equals(other.ifixVersion))
- && (!hasMsg() || msg.equals(other.msg));
+ && (!hasMdkResVersion() || mdkResVersion.equals(other.mdkResVersion));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(port);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 40);
output.writeBoolNoTag(unk1);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 72);
output.writeBoolNoTag(unk2);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawLittleEndian16((short) 10928);
- output.writeBoolNoTag(unk5);
+ output.writeRawLittleEndian16((short) 2768);
+ output.writeBoolNoTag(unk3);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawLittleEndian16((short) 23464);
- output.writeBoolNoTag(unk3);
+ output.writeRawLittleEndian16((short) 22440);
+ output.writeBoolNoTag(unk4);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawLittleEndian16((short) 27640);
- output.writeBoolNoTag(unk6);
+ output.writeRawLittleEndian16((short) 26504);
+ output.writeBoolNoTag(unk5);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawLittleEndian16((short) 28320);
- output.writeBoolNoTag(unk4);
+ output.writeRawByte((byte) 10);
+ output.writeStringNoTag(msg);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRawByte((byte) 18);
- output.writeStringNoTag(regionName);
+ output.writeRawByte((byte) 26);
+ output.writeStringNoTag(ip);
}
if ((bitField0_ & 0x00000100) != 0) {
- output.writeRawByte((byte) 42);
- output.writeStringNoTag(luaUrl);
+ output.writeRawByte((byte) 34);
+ output.writeStringNoTag(regionName);
}
if ((bitField0_ & 0x00000200) != 0) {
- output.writeRawByte((byte) 66);
- output.writeStringNoTag(exResourceUrl);
+ output.writeRawByte((byte) 82);
+ output.writeStringNoTag(luaUrl);
}
if ((bitField0_ & 0x00000400) != 0) {
- output.writeRawByte((byte) 90);
- output.writeStringNoTag(assetBundleUrl);
+ output.writeRawByte((byte) 98);
+ output.writeStringNoTag(exResourceUrl);
}
if ((bitField0_ & 0x00000800) != 0) {
- output.writeRawByte((byte) 106);
- output.writeStringNoTag(ip);
+ output.writeRawByte((byte) 114);
+ output.writeStringNoTag(assetBundleUrl);
}
if ((bitField0_ & 0x00001000) != 0) {
- output.writeRawLittleEndian16((short) 17538);
- output.writeStringNoTag(ifixUrl);
+ output.writeRawLittleEndian16((short) 418);
+ output.writeStringNoTag(ifixVersion);
}
if ((bitField0_ & 0x00002000) != 0) {
- output.writeRawLittleEndian16((short) 19330);
- output.writeStringNoTag(clientSecretKey);
+ output.writeRawLittleEndian16((short) 1682);
+ output.writeStringNoTag(ifixUrl);
}
if ((bitField0_ & 0x00004000) != 0) {
- output.writeRawLittleEndian16((short) 19434);
- output.writeStringNoTag(mdkResVersion);
+ output.writeRawLittleEndian16((short) 3834);
+ output.writeStringNoTag(clientSecretKey);
}
if ((bitField0_ & 0x00008000) != 0) {
- output.writeRawLittleEndian16((short) 20386);
- output.writeStringNoTag(ifixVersion);
- }
- if ((bitField0_ & 0x00010000) != 0) {
- output.writeRawLittleEndian16((short) 24818);
- output.writeStringNoTag(msg);
+ output.writeRawLittleEndian16((short) 24210);
+ output.writeStringNoTag(mdkResVersion);
}
}
@@ -1343,37 +1227,34 @@ protected int computeSerializedSize() {
size += 3;
}
if ((bitField0_ & 0x00000040) != 0) {
- size += 3;
+ size += 1 + ProtoSink.computeStringSizeNoTag(msg);
}
if ((bitField0_ & 0x00000080) != 0) {
- size += 1 + ProtoSink.computeStringSizeNoTag(regionName);
+ size += 1 + ProtoSink.computeStringSizeNoTag(ip);
}
if ((bitField0_ & 0x00000100) != 0) {
- size += 1 + ProtoSink.computeStringSizeNoTag(luaUrl);
+ size += 1 + ProtoSink.computeStringSizeNoTag(regionName);
}
if ((bitField0_ & 0x00000200) != 0) {
- size += 1 + ProtoSink.computeStringSizeNoTag(exResourceUrl);
+ size += 1 + ProtoSink.computeStringSizeNoTag(luaUrl);
}
if ((bitField0_ & 0x00000400) != 0) {
- size += 1 + ProtoSink.computeStringSizeNoTag(assetBundleUrl);
+ size += 1 + ProtoSink.computeStringSizeNoTag(exResourceUrl);
}
if ((bitField0_ & 0x00000800) != 0) {
- size += 1 + ProtoSink.computeStringSizeNoTag(ip);
+ size += 1 + ProtoSink.computeStringSizeNoTag(assetBundleUrl);
}
if ((bitField0_ & 0x00001000) != 0) {
- size += 2 + ProtoSink.computeStringSizeNoTag(ifixUrl);
+ size += 2 + ProtoSink.computeStringSizeNoTag(ifixVersion);
}
if ((bitField0_ & 0x00002000) != 0) {
- size += 2 + ProtoSink.computeStringSizeNoTag(clientSecretKey);
+ size += 2 + ProtoSink.computeStringSizeNoTag(ifixUrl);
}
if ((bitField0_ & 0x00004000) != 0) {
- size += 2 + ProtoSink.computeStringSizeNoTag(mdkResVersion);
+ size += 2 + ProtoSink.computeStringSizeNoTag(clientSecretKey);
}
if ((bitField0_ & 0x00008000) != 0) {
- size += 2 + ProtoSink.computeStringSizeNoTag(ifixVersion);
- }
- if ((bitField0_ & 0x00010000) != 0) {
- size += 2 + ProtoSink.computeStringSizeNoTag(msg);
+ size += 2 + ProtoSink.computeStringSizeNoTag(mdkResVersion);
}
return size;
}
@@ -1385,155 +1266,146 @@ public Gateserver mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
+ case 120: {
// port
port = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 72) {
+ if (tag != 40) {
break;
}
}
- case 72: {
+ case 40: {
// unk1
unk1 = input.readBool();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 72) {
break;
}
}
- case 96: {
+ case 72: {
// unk2
unk2 = input.readBool();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 5424) {
+ if (tag != 1360) {
break;
}
}
- case 5424: {
- // unk5
- unk5 = input.readBool();
+ case 1360: {
+ // unk3
+ unk3 = input.readBool();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 11688) {
+ if (tag != 11176) {
break;
}
}
- case 11688: {
- // unk3
- unk3 = input.readBool();
+ case 11176: {
+ // unk4
+ unk4 = input.readBool();
bitField0_ |= 0x00000010;
tag = input.readTag();
- if (tag != 13816) {
+ if (tag != 13192) {
break;
}
}
- case 13816: {
- // unk6
- unk6 = input.readBool();
+ case 13192: {
+ // unk5
+ unk5 = input.readBool();
bitField0_ |= 0x00000020;
tag = input.readTag();
- if (tag != 14112) {
+ if (tag != 10) {
break;
}
}
- case 14112: {
- // unk4
- unk4 = input.readBool();
+ case 10: {
+ // msg
+ input.readString(msg);
bitField0_ |= 0x00000040;
tag = input.readTag();
- if (tag != 18) {
+ if (tag != 26) {
+ break;
+ }
+ }
+ case 26: {
+ // ip
+ input.readString(ip);
+ bitField0_ |= 0x00000080;
+ tag = input.readTag();
+ if (tag != 34) {
break;
}
}
- case 18: {
+ case 34: {
// regionName
input.readString(regionName);
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000100;
tag = input.readTag();
- if (tag != 42) {
+ if (tag != 82) {
break;
}
}
- case 42: {
+ case 82: {
// luaUrl
input.readString(luaUrl);
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000200;
tag = input.readTag();
- if (tag != 66) {
+ if (tag != 98) {
break;
}
}
- case 66: {
+ case 98: {
// exResourceUrl
input.readString(exResourceUrl);
- bitField0_ |= 0x00000200;
+ bitField0_ |= 0x00000400;
tag = input.readTag();
- if (tag != 90) {
+ if (tag != 114) {
break;
}
}
- case 90: {
+ case 114: {
// assetBundleUrl
input.readString(assetBundleUrl);
- bitField0_ |= 0x00000400;
+ bitField0_ |= 0x00000800;
tag = input.readTag();
- if (tag != 106) {
+ if (tag != 162) {
break;
}
}
- case 106: {
- // ip
- input.readString(ip);
- bitField0_ |= 0x00000800;
+ case 162: {
+ // ifixVersion
+ input.readString(ifixVersion);
+ bitField0_ |= 0x00001000;
tag = input.readTag();
- if (tag != 8706) {
+ if (tag != 786) {
break;
}
}
- case 8706: {
+ case 786: {
// ifixUrl
input.readString(ifixUrl);
- bitField0_ |= 0x00001000;
+ bitField0_ |= 0x00002000;
tag = input.readTag();
- if (tag != 9602) {
+ if (tag != 1914) {
break;
}
}
- case 9602: {
+ case 1914: {
// clientSecretKey
input.readString(clientSecretKey);
- bitField0_ |= 0x00002000;
+ bitField0_ |= 0x00004000;
tag = input.readTag();
- if (tag != 9706) {
+ if (tag != 12050) {
break;
}
}
- case 9706: {
+ case 12050: {
// mdkResVersion
input.readString(mdkResVersion);
- bitField0_ |= 0x00004000;
- tag = input.readTag();
- if (tag != 10146) {
- break;
- }
- }
- case 10146: {
- // ifixVersion
- input.readString(ifixVersion);
bitField0_ |= 0x00008000;
tag = input.readTag();
- if (tag != 12402) {
- break;
- }
- }
- case 12402: {
- // msg
- input.readString(msg);
- bitField0_ |= 0x00010000;
- tag = input.readTag();
if (tag != 0) {
break;
}
@@ -1565,46 +1437,43 @@ public void writeTo(final JsonSink output) throws IOException {
output.writeBool(FieldNames.unk2, unk2);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeBool(FieldNames.unk5, unk5);
+ output.writeBool(FieldNames.unk3, unk3);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeBool(FieldNames.unk3, unk3);
+ output.writeBool(FieldNames.unk4, unk4);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeBool(FieldNames.unk6, unk6);
+ output.writeBool(FieldNames.unk5, unk5);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeBool(FieldNames.unk4, unk4);
+ output.writeString(FieldNames.msg, msg);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeString(FieldNames.regionName, regionName);
+ output.writeString(FieldNames.ip, ip);
}
if ((bitField0_ & 0x00000100) != 0) {
- output.writeString(FieldNames.luaUrl, luaUrl);
+ output.writeString(FieldNames.regionName, regionName);
}
if ((bitField0_ & 0x00000200) != 0) {
- output.writeString(FieldNames.exResourceUrl, exResourceUrl);
+ output.writeString(FieldNames.luaUrl, luaUrl);
}
if ((bitField0_ & 0x00000400) != 0) {
- output.writeString(FieldNames.assetBundleUrl, assetBundleUrl);
+ output.writeString(FieldNames.exResourceUrl, exResourceUrl);
}
if ((bitField0_ & 0x00000800) != 0) {
- output.writeString(FieldNames.ip, ip);
+ output.writeString(FieldNames.assetBundleUrl, assetBundleUrl);
}
if ((bitField0_ & 0x00001000) != 0) {
- output.writeString(FieldNames.ifixUrl, ifixUrl);
+ output.writeString(FieldNames.ifixVersion, ifixVersion);
}
if ((bitField0_ & 0x00002000) != 0) {
- output.writeString(FieldNames.clientSecretKey, clientSecretKey);
+ output.writeString(FieldNames.ifixUrl, ifixUrl);
}
if ((bitField0_ & 0x00004000) != 0) {
- output.writeString(FieldNames.mdkResVersion, mdkResVersion);
+ output.writeString(FieldNames.clientSecretKey, clientSecretKey);
}
if ((bitField0_ & 0x00008000) != 0) {
- output.writeString(FieldNames.ifixVersion, ifixVersion);
- }
- if ((bitField0_ & 0x00010000) != 0) {
- output.writeString(FieldNames.msg, msg);
+ output.writeString(FieldNames.mdkResVersion, mdkResVersion);
}
output.endObject();
}
@@ -1649,10 +1518,10 @@ public Gateserver mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 3594627: {
- if (input.isAtField(FieldNames.unk5)) {
+ case 3594625: {
+ if (input.isAtField(FieldNames.unk3)) {
if (!input.trySkipNullValue()) {
- unk5 = input.readBool();
+ unk3 = input.readBool();
bitField0_ |= 0x00000008;
}
} else {
@@ -1660,10 +1529,10 @@ public Gateserver mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 3594625: {
- if (input.isAtField(FieldNames.unk3)) {
+ case 3594626: {
+ if (input.isAtField(FieldNames.unk4)) {
if (!input.trySkipNullValue()) {
- unk3 = input.readBool();
+ unk4 = input.readBool();
bitField0_ |= 0x00000010;
}
} else {
@@ -1671,10 +1540,10 @@ public Gateserver mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 3594628: {
- if (input.isAtField(FieldNames.unk6)) {
+ case 3594627: {
+ if (input.isAtField(FieldNames.unk5)) {
if (!input.trySkipNullValue()) {
- unk6 = input.readBool();
+ unk5 = input.readBool();
bitField0_ |= 0x00000020;
}
} else {
@@ -1682,10 +1551,10 @@ public Gateserver mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 3594626: {
- if (input.isAtField(FieldNames.unk4)) {
+ case 108417: {
+ if (input.isAtField(FieldNames.msg)) {
if (!input.trySkipNullValue()) {
- unk4 = input.readBool();
+ input.readString(msg);
bitField0_ |= 0x00000040;
}
} else {
@@ -1693,12 +1562,23 @@ public Gateserver mergeFrom(final JsonSource input) throws IOException {
}
break;
}
+ case 3367: {
+ if (input.isAtField(FieldNames.ip)) {
+ if (!input.trySkipNullValue()) {
+ input.readString(ip);
+ bitField0_ |= 0x00000080;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case -1990689889:
case -1565768458: {
if (input.isAtField(FieldNames.regionName)) {
if (!input.trySkipNullValue()) {
input.readString(regionName);
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000100;
}
} else {
input.skipUnknownField();
@@ -1710,7 +1590,7 @@ public Gateserver mergeFrom(final JsonSource input) throws IOException {
if (input.isAtField(FieldNames.luaUrl)) {
if (!input.trySkipNullValue()) {
input.readString(luaUrl);
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000200;
}
} else {
input.skipUnknownField();
@@ -1722,7 +1602,7 @@ public Gateserver mergeFrom(final JsonSource input) throws IOException {
if (input.isAtField(FieldNames.exResourceUrl)) {
if (!input.trySkipNullValue()) {
input.readString(exResourceUrl);
- bitField0_ |= 0x00000200;
+ bitField0_ |= 0x00000400;
}
} else {
input.skipUnknownField();
@@ -1734,18 +1614,19 @@ public Gateserver mergeFrom(final JsonSource input) throws IOException {
if (input.isAtField(FieldNames.assetBundleUrl)) {
if (!input.trySkipNullValue()) {
input.readString(assetBundleUrl);
- bitField0_ |= 0x00000400;
+ bitField0_ |= 0x00000800;
}
} else {
input.skipUnknownField();
}
break;
}
- case 3367: {
- if (input.isAtField(FieldNames.ip)) {
+ case 1625073708:
+ case -827048283: {
+ if (input.isAtField(FieldNames.ifixVersion)) {
if (!input.trySkipNullValue()) {
- input.readString(ip);
- bitField0_ |= 0x00000800;
+ input.readString(ifixVersion);
+ bitField0_ |= 0x00001000;
}
} else {
input.skipUnknownField();
@@ -1757,7 +1638,7 @@ public Gateserver mergeFrom(final JsonSource input) throws IOException {
if (input.isAtField(FieldNames.ifixUrl)) {
if (!input.trySkipNullValue()) {
input.readString(ifixUrl);
- bitField0_ |= 0x00001000;
+ bitField0_ |= 0x00002000;
}
} else {
input.skipUnknownField();
@@ -1769,7 +1650,7 @@ public Gateserver mergeFrom(final JsonSource input) throws IOException {
if (input.isAtField(FieldNames.clientSecretKey)) {
if (!input.trySkipNullValue()) {
input.readString(clientSecretKey);
- bitField0_ |= 0x00002000;
+ bitField0_ |= 0x00004000;
}
} else {
input.skipUnknownField();
@@ -1781,18 +1662,6 @@ public Gateserver mergeFrom(final JsonSource input) throws IOException {
if (input.isAtField(FieldNames.mdkResVersion)) {
if (!input.trySkipNullValue()) {
input.readString(mdkResVersion);
- bitField0_ |= 0x00004000;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 1625073708:
- case -827048283: {
- if (input.isAtField(FieldNames.ifixVersion)) {
- if (!input.trySkipNullValue()) {
- input.readString(ifixVersion);
bitField0_ |= 0x00008000;
}
} else {
@@ -1800,17 +1669,6 @@ public Gateserver mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 108417: {
- if (input.isAtField(FieldNames.msg)) {
- if (!input.trySkipNullValue()) {
- input.readString(msg);
- bitField0_ |= 0x00010000;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
default: {
input.skipUnknownField();
break;
@@ -1869,14 +1727,16 @@ static class FieldNames {
static final FieldName unk2 = FieldName.forField("unk2");
- static final FieldName unk5 = FieldName.forField("unk5");
-
static final FieldName unk3 = FieldName.forField("unk3");
- static final FieldName unk6 = FieldName.forField("unk6");
-
static final FieldName unk4 = FieldName.forField("unk4");
+ static final FieldName unk5 = FieldName.forField("unk5");
+
+ static final FieldName msg = FieldName.forField("msg");
+
+ static final FieldName ip = FieldName.forField("ip");
+
static final FieldName regionName = FieldName.forField("regionName", "region_name");
static final FieldName luaUrl = FieldName.forField("luaUrl", "lua_url");
@@ -1885,17 +1745,13 @@ static class FieldNames {
static final FieldName assetBundleUrl = FieldName.forField("assetBundleUrl", "asset_bundle_url");
- static final FieldName ip = FieldName.forField("ip");
+ static final FieldName ifixVersion = FieldName.forField("ifixVersion", "ifix_version");
static final FieldName ifixUrl = FieldName.forField("ifixUrl", "ifix_url");
static final FieldName clientSecretKey = FieldName.forField("clientSecretKey", "client_secret_key");
static final FieldName mdkResVersion = FieldName.forField("mdkResVersion", "mdk_res_version");
-
- static final FieldName ifixVersion = FieldName.forField("ifixVersion", "ifix_version");
-
- static final FieldName msg = FieldName.forField("msg");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/GetAllLineupDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetAllLineupDataScRspOuterClass.java
index d1cf999f8..8f7fb91ff 100644
--- a/src/generated/main/emu/lunarcore/proto/GetAllLineupDataScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetAllLineupDataScRspOuterClass.java
@@ -20,17 +20,17 @@ public static final class GetAllLineupDataScRsp extends ProtoMessageoptional uint32 cur_index = 4;
+ * optional uint32 cur_index = 5;
*/
private int curIndex;
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 6;
*/
private int retcode;
/**
- * repeated .LineupInfo lineup_list = 9;
+ * repeated .LineupInfo lineup_list = 10;
*/
private final RepeatedMessage lineupList = RepeatedMessage.newEmptyInstance(LineupInfoOuterClass.LineupInfo.getFactory());
@@ -45,7 +45,7 @@ public static GetAllLineupDataScRsp newInstance() {
}
/**
- * optional uint32 cur_index = 4;
+ * optional uint32 cur_index = 5;
* @return whether the curIndex field is set
*/
public boolean hasCurIndex() {
@@ -53,7 +53,7 @@ public boolean hasCurIndex() {
}
/**
- * optional uint32 cur_index = 4;
+ * optional uint32 cur_index = 5;
* @return this
*/
public GetAllLineupDataScRsp clearCurIndex() {
@@ -63,7 +63,7 @@ public GetAllLineupDataScRsp clearCurIndex() {
}
/**
- * optional uint32 cur_index = 4;
+ * optional uint32 cur_index = 5;
* @return the curIndex
*/
public int getCurIndex() {
@@ -71,7 +71,7 @@ public int getCurIndex() {
}
/**
- * optional uint32 cur_index = 4;
+ * optional uint32 cur_index = 5;
* @param value the curIndex to set
* @return this
*/
@@ -82,7 +82,7 @@ public GetAllLineupDataScRsp setCurIndex(final int value) {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 6;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -90,7 +90,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 6;
* @return this
*/
public GetAllLineupDataScRsp clearRetcode() {
@@ -100,7 +100,7 @@ public GetAllLineupDataScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 6;
* @return the retcode
*/
public int getRetcode() {
@@ -108,7 +108,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 6;
* @param value the retcode to set
* @return this
*/
@@ -119,7 +119,7 @@ public GetAllLineupDataScRsp setRetcode(final int value) {
}
/**
- * repeated .LineupInfo lineup_list = 9;
+ * repeated .LineupInfo lineup_list = 10;
* @return whether the lineupList field is set
*/
public boolean hasLineupList() {
@@ -127,7 +127,7 @@ public boolean hasLineupList() {
}
/**
- * repeated .LineupInfo lineup_list = 9;
+ * repeated .LineupInfo lineup_list = 10;
* @return this
*/
public GetAllLineupDataScRsp clearLineupList() {
@@ -137,7 +137,7 @@ public GetAllLineupDataScRsp clearLineupList() {
}
/**
- * repeated .LineupInfo lineup_list = 9;
+ * repeated .LineupInfo lineup_list = 10;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -151,7 +151,7 @@ public RepeatedMessage getLineupList() {
}
/**
- * repeated .LineupInfo lineup_list = 9;
+ * repeated .LineupInfo lineup_list = 10;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -165,7 +165,7 @@ public RepeatedMessage getMutableLineupList() {
}
/**
- * repeated .LineupInfo lineup_list = 9;
+ * repeated .LineupInfo lineup_list = 10;
* @param value the lineupList to add
* @return this
*/
@@ -176,7 +176,7 @@ public GetAllLineupDataScRsp addLineupList(final LineupInfoOuterClass.LineupInfo
}
/**
- * repeated .LineupInfo lineup_list = 9;
+ * repeated .LineupInfo lineup_list = 10;
* @param values the lineupList to add
* @return this
*/
@@ -258,16 +258,16 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(curIndex);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < lineupList.length(); i++) {
- output.writeRawByte((byte) 74);
+ output.writeRawByte((byte) 82);
output.writeMessageNoTag(lineupList.get(i));
}
}
@@ -295,25 +295,25 @@ public GetAllLineupDataScRsp mergeFrom(final ProtoSource input) throws IOExcepti
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
+ case 40: {
// curIndex
curIndex = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 48) {
break;
}
}
- case 96: {
+ case 48: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 74) {
+ if (tag != 82) {
break;
}
}
- case 74: {
+ case 82: {
// lineupList
tag = input.readRepeatedMessage(lineupList, tag);
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java
index f89e0247a..d32f5e638 100644
--- a/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java
@@ -19,12 +19,12 @@ public static final class GetArchiveDataScRsp extends ProtoMessageoptional uint32 retcode = 13;
+ * optional uint32 retcode = 5;
*/
private int retcode;
/**
- * optional .ArchiveData archive_data = 6;
+ * optional .ArchiveData archive_data = 1;
*/
private final ArchiveDataOuterClass.ArchiveData archiveData = ArchiveDataOuterClass.ArchiveData.newInstance();
@@ -39,7 +39,7 @@ public static GetArchiveDataScRsp newInstance() {
}
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 5;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -47,7 +47,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 5;
* @return this
*/
public GetArchiveDataScRsp clearRetcode() {
@@ -57,7 +57,7 @@ public GetArchiveDataScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 5;
* @return the retcode
*/
public int getRetcode() {
@@ -65,7 +65,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 5;
* @param value the retcode to set
* @return this
*/
@@ -76,7 +76,7 @@ public GetArchiveDataScRsp setRetcode(final int value) {
}
/**
- * optional .ArchiveData archive_data = 6;
+ * optional .ArchiveData archive_data = 1;
* @return whether the archiveData field is set
*/
public boolean hasArchiveData() {
@@ -84,7 +84,7 @@ public boolean hasArchiveData() {
}
/**
- * optional .ArchiveData archive_data = 6;
+ * optional .ArchiveData archive_data = 1;
* @return this
*/
public GetArchiveDataScRsp clearArchiveData() {
@@ -94,7 +94,7 @@ public GetArchiveDataScRsp clearArchiveData() {
}
/**
- * optional .ArchiveData archive_data = 6;
+ * optional .ArchiveData archive_data = 1;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public ArchiveDataOuterClass.ArchiveData getArchiveData() {
}
/**
- * optional .ArchiveData archive_data = 6;
+ * optional .ArchiveData archive_data = 1;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public ArchiveDataOuterClass.ArchiveData getMutableArchiveData() {
}
/**
- * optional .ArchiveData archive_data = 6;
+ * optional .ArchiveData archive_data = 1;
* @param value the archiveData to set
* @return this
*/
@@ -198,11 +198,11 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 50);
+ output.writeRawByte((byte) 10);
output.writeMessageNoTag(archiveData);
}
}
@@ -226,16 +226,16 @@ public GetArchiveDataScRsp mergeFrom(final ProtoSource input) throws IOException
int tag = input.readTag();
while (true) {
switch (tag) {
- case 104: {
+ case 40: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 50) {
+ if (tag != 10) {
break;
}
}
- case 50: {
+ case 10: {
// archiveData
input.readMessage(archiveData);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetAvatarDataCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetAvatarDataCsReqOuterClass.java
index 31c12e88e..af1a8453c 100644
--- a/src/generated/main/emu/lunarcore/proto/GetAvatarDataCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetAvatarDataCsReqOuterClass.java
@@ -20,12 +20,12 @@ public static final class GetAvatarDataCsReq extends ProtoMessageoptional bool is_get_all = 15;
+ * optional bool is_get_all = 5;
*/
private boolean isGetAll;
/**
- * repeated uint32 base_avatar_id_list = 1;
+ * repeated uint32 base_avatar_id_list = 15;
*/
private final RepeatedInt baseAvatarIdList = RepeatedInt.newEmptyInstance();
@@ -40,7 +40,7 @@ public static GetAvatarDataCsReq newInstance() {
}
/**
- * optional bool is_get_all = 15;
+ * optional bool is_get_all = 5;
* @return whether the isGetAll field is set
*/
public boolean hasIsGetAll() {
@@ -48,7 +48,7 @@ public boolean hasIsGetAll() {
}
/**
- * optional bool is_get_all = 15;
+ * optional bool is_get_all = 5;
* @return this
*/
public GetAvatarDataCsReq clearIsGetAll() {
@@ -58,7 +58,7 @@ public GetAvatarDataCsReq clearIsGetAll() {
}
/**
- * optional bool is_get_all = 15;
+ * optional bool is_get_all = 5;
* @return the isGetAll
*/
public boolean getIsGetAll() {
@@ -66,7 +66,7 @@ public boolean getIsGetAll() {
}
/**
- * optional bool is_get_all = 15;
+ * optional bool is_get_all = 5;
* @param value the isGetAll to set
* @return this
*/
@@ -77,7 +77,7 @@ public GetAvatarDataCsReq setIsGetAll(final boolean value) {
}
/**
- * repeated uint32 base_avatar_id_list = 1;
+ * repeated uint32 base_avatar_id_list = 15;
* @return whether the baseAvatarIdList field is set
*/
public boolean hasBaseAvatarIdList() {
@@ -85,7 +85,7 @@ public boolean hasBaseAvatarIdList() {
}
/**
- * repeated uint32 base_avatar_id_list = 1;
+ * repeated uint32 base_avatar_id_list = 15;
* @return this
*/
public GetAvatarDataCsReq clearBaseAvatarIdList() {
@@ -95,7 +95,7 @@ public GetAvatarDataCsReq clearBaseAvatarIdList() {
}
/**
- * repeated uint32 base_avatar_id_list = 1;
+ * repeated uint32 base_avatar_id_list = 15;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public RepeatedInt getBaseAvatarIdList() {
}
/**
- * repeated uint32 base_avatar_id_list = 1;
+ * repeated uint32 base_avatar_id_list = 15;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public RepeatedInt getMutableBaseAvatarIdList() {
}
/**
- * repeated uint32 base_avatar_id_list = 1;
+ * repeated uint32 base_avatar_id_list = 15;
* @param value the baseAvatarIdList to add
* @return this
*/
@@ -134,7 +134,7 @@ public GetAvatarDataCsReq addBaseAvatarIdList(final int value) {
}
/**
- * repeated uint32 base_avatar_id_list = 1;
+ * repeated uint32 base_avatar_id_list = 15;
* @param values the baseAvatarIdList to add
* @return this
*/
@@ -210,12 +210,12 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 40);
output.writeBoolNoTag(isGetAll);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < baseAvatarIdList.length(); i++) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(baseAvatarIdList.array()[i]);
}
}
@@ -240,16 +240,16 @@ public GetAvatarDataCsReq mergeFrom(final ProtoSource input) throws IOException
int tag = input.readTag();
while (true) {
switch (tag) {
- case 120: {
+ case 40: {
// isGetAll
isGetAll = input.readBool();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 10) {
+ if (tag != 122) {
break;
}
}
- case 10: {
+ case 122: {
// baseAvatarIdList [packed=true]
input.readPackedUInt32(baseAvatarIdList, tag);
bitField0_ |= 0x00000002;
@@ -268,7 +268,7 @@ public GetAvatarDataCsReq mergeFrom(final ProtoSource input) throws IOException
tag = input.readTag();
break;
}
- case 8: {
+ case 120: {
// 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 78154aec0..515028936 100644
--- a/src/generated/main/emu/lunarcore/proto/GetAvatarDataScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetAvatarDataScRspOuterClass.java
@@ -20,17 +20,17 @@ public static final class GetAvatarDataScRsp extends ProtoMessageoptional uint32 retcode = 5;
+ * optional uint32 retcode = 10;
*/
private int retcode;
/**
- * optional bool is_get_all = 11;
+ * optional bool is_get_all = 6;
*/
private boolean isGetAll;
/**
- * repeated .Avatar avatar_list = 3;
+ * repeated .Avatar avatar_list = 14;
*/
private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(AvatarOuterClass.Avatar.getFactory());
@@ -45,7 +45,7 @@ public static GetAvatarDataScRsp newInstance() {
}
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 10;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -53,7 +53,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 10;
* @return this
*/
public GetAvatarDataScRsp clearRetcode() {
@@ -63,7 +63,7 @@ public GetAvatarDataScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 10;
* @return the retcode
*/
public int getRetcode() {
@@ -71,7 +71,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 10;
* @param value the retcode to set
* @return this
*/
@@ -82,7 +82,7 @@ public GetAvatarDataScRsp setRetcode(final int value) {
}
/**
- * optional bool is_get_all = 11;
+ * optional bool is_get_all = 6;
* @return whether the isGetAll field is set
*/
public boolean hasIsGetAll() {
@@ -90,7 +90,7 @@ public boolean hasIsGetAll() {
}
/**
- * optional bool is_get_all = 11;
+ * optional bool is_get_all = 6;
* @return this
*/
public GetAvatarDataScRsp clearIsGetAll() {
@@ -100,7 +100,7 @@ public GetAvatarDataScRsp clearIsGetAll() {
}
/**
- * optional bool is_get_all = 11;
+ * optional bool is_get_all = 6;
* @return the isGetAll
*/
public boolean getIsGetAll() {
@@ -108,7 +108,7 @@ public boolean getIsGetAll() {
}
/**
- * optional bool is_get_all = 11;
+ * optional bool is_get_all = 6;
* @param value the isGetAll to set
* @return this
*/
@@ -119,7 +119,7 @@ public GetAvatarDataScRsp setIsGetAll(final boolean value) {
}
/**
- * repeated .Avatar avatar_list = 3;
+ * repeated .Avatar avatar_list = 14;
* @return whether the avatarList field is set
*/
public boolean hasAvatarList() {
@@ -127,7 +127,7 @@ public boolean hasAvatarList() {
}
/**
- * repeated .Avatar avatar_list = 3;
+ * repeated .Avatar avatar_list = 14;
* @return this
*/
public GetAvatarDataScRsp clearAvatarList() {
@@ -137,7 +137,7 @@ public GetAvatarDataScRsp clearAvatarList() {
}
/**
- * repeated .Avatar avatar_list = 3;
+ * repeated .Avatar 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.
@@ -151,7 +151,7 @@ public RepeatedMessage getAvatarList() {
}
/**
- * repeated .Avatar avatar_list = 3;
+ * repeated .Avatar 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
@@ -165,7 +165,7 @@ public RepeatedMessage getMutableAvatarList() {
}
/**
- * repeated .Avatar avatar_list = 3;
+ * repeated .Avatar avatar_list = 14;
* @param value the avatarList to add
* @return this
*/
@@ -176,7 +176,7 @@ public GetAvatarDataScRsp addAvatarList(final AvatarOuterClass.Avatar value) {
}
/**
- * repeated .Avatar avatar_list = 3;
+ * repeated .Avatar avatar_list = 14;
* @param values the avatarList to add
* @return this
*/
@@ -258,16 +258,16 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 48);
output.writeBoolNoTag(isGetAll);
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < avatarList.length(); i++) {
- output.writeRawByte((byte) 26);
+ output.writeRawByte((byte) 114);
output.writeMessageNoTag(avatarList.get(i));
}
}
@@ -295,25 +295,25 @@ public GetAvatarDataScRsp mergeFrom(final ProtoSource input) throws IOException
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
+ case 80: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 88) {
+ if (tag != 48) {
break;
}
}
- case 88: {
+ case 48: {
// isGetAll
isGetAll = input.readBool();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 26) {
+ if (tag != 114) {
break;
}
}
- case 26: {
+ case 114: {
// 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 719af6ec1..e3a66a62d 100644
--- a/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java
@@ -20,24 +20,24 @@ public static final class GetBagScRsp extends ProtoMessage implemen
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 15;
*/
private int retcode;
/**
- * repeated .Equipment equipment_list = 8;
+ * repeated .Equipment equipment_list = 1;
*/
private final RepeatedMessage equipmentList = RepeatedMessage.newEmptyInstance(EquipmentOuterClass.Equipment.getFactory());
/**
- * repeated .Relic relic_list = 10;
+ * repeated .Material material_list = 2;
*/
- private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicOuterClass.Relic.getFactory());
+ private final RepeatedMessage materialList = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory());
/**
- * repeated .Material material_list = 14;
+ * repeated .Relic relic_list = 13;
*/
- private final RepeatedMessage materialList = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory());
+ private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicOuterClass.Relic.getFactory());
private GetBagScRsp() {
}
@@ -50,7 +50,7 @@ public static GetBagScRsp newInstance() {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 15;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -58,7 +58,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 15;
* @return this
*/
public GetBagScRsp clearRetcode() {
@@ -68,7 +68,7 @@ public GetBagScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 15;
* @return the retcode
*/
public int getRetcode() {
@@ -76,7 +76,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 15;
* @param value the retcode to set
* @return this
*/
@@ -87,7 +87,7 @@ public GetBagScRsp setRetcode(final int value) {
}
/**
- * repeated .Equipment equipment_list = 8;
+ * repeated .Equipment equipment_list = 1;
* @return whether the equipmentList field is set
*/
public boolean hasEquipmentList() {
@@ -95,7 +95,7 @@ public boolean hasEquipmentList() {
}
/**
- * repeated .Equipment equipment_list = 8;
+ * repeated .Equipment equipment_list = 1;
* @return this
*/
public GetBagScRsp clearEquipmentList() {
@@ -105,7 +105,7 @@ public GetBagScRsp clearEquipmentList() {
}
/**
- * repeated .Equipment equipment_list = 8;
+ * repeated .Equipment equipment_list = 1;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -119,7 +119,7 @@ public RepeatedMessage getEquipmentList() {
}
/**
- * repeated .Equipment equipment_list = 8;
+ * repeated .Equipment equipment_list = 1;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -133,7 +133,7 @@ public RepeatedMessage getMutableEquipmentList()
}
/**
- * repeated .Equipment equipment_list = 8;
+ * repeated .Equipment equipment_list = 1;
* @param value the equipmentList to add
* @return this
*/
@@ -144,7 +144,7 @@ public GetBagScRsp addEquipmentList(final EquipmentOuterClass.Equipment value) {
}
/**
- * repeated .Equipment equipment_list = 8;
+ * repeated .Equipment equipment_list = 1;
* @param values the equipmentList to add
* @return this
*/
@@ -155,39 +155,39 @@ public GetBagScRsp addAllEquipmentList(final EquipmentOuterClass.Equipment... va
}
/**
- * repeated .Relic relic_list = 10;
- * @return whether the relicList field is set
+ * repeated .Material material_list = 2;
+ * @return whether the materialList field is set
*/
- public boolean hasRelicList() {
+ public boolean hasMaterialList() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * repeated .Relic relic_list = 10;
+ * repeated .Material material_list = 2;
* @return this
*/
- public GetBagScRsp clearRelicList() {
+ public GetBagScRsp clearMaterialList() {
bitField0_ &= ~0x00000004;
- relicList.clear();
+ materialList.clear();
return this;
}
/**
- * repeated .Relic relic_list = 10;
+ * repeated .Material material_list = 2;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
*
- * Use {@link #getMutableRelicList()} if you want to modify it.
+ * Use {@link #getMutableMaterialList()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public RepeatedMessage getRelicList() {
- return relicList;
+ public RepeatedMessage getMaterialList() {
+ return materialList;
}
/**
- * repeated .Relic relic_list = 10;
+ * repeated .Material material_list = 2;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -195,67 +195,67 @@ public RepeatedMessage getRelicList() {
*
* @return internal storage object for modifications
*/
- public RepeatedMessage getMutableRelicList() {
+ public RepeatedMessage getMutableMaterialList() {
bitField0_ |= 0x00000004;
- return relicList;
+ return materialList;
}
/**
- * repeated .Relic relic_list = 10;
- * @param value the relicList to add
+ * repeated .Material material_list = 2;
+ * @param value the materialList to add
* @return this
*/
- public GetBagScRsp addRelicList(final RelicOuterClass.Relic value) {
+ public GetBagScRsp addMaterialList(final MaterialOuterClass.Material value) {
bitField0_ |= 0x00000004;
- relicList.add(value);
+ materialList.add(value);
return this;
}
/**
- * repeated .Relic relic_list = 10;
- * @param values the relicList to add
+ * repeated .Material material_list = 2;
+ * @param values the materialList to add
* @return this
*/
- public GetBagScRsp addAllRelicList(final RelicOuterClass.Relic... values) {
+ public GetBagScRsp addAllMaterialList(final MaterialOuterClass.Material... values) {
bitField0_ |= 0x00000004;
- relicList.addAll(values);
+ materialList.addAll(values);
return this;
}
/**
- * repeated .Material material_list = 14;
- * @return whether the materialList field is set
+ * repeated .Relic relic_list = 13;
+ * @return whether the relicList field is set
*/
- public boolean hasMaterialList() {
+ public boolean hasRelicList() {
return (bitField0_ & 0x00000008) != 0;
}
/**
- * repeated .Material material_list = 14;
+ * repeated .Relic relic_list = 13;
* @return this
*/
- public GetBagScRsp clearMaterialList() {
+ public GetBagScRsp clearRelicList() {
bitField0_ &= ~0x00000008;
- materialList.clear();
+ relicList.clear();
return this;
}
/**
- * repeated .Material material_list = 14;
+ * repeated .Relic relic_list = 13;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
*
- * Use {@link #getMutableMaterialList()} if you want to modify it.
+ * Use {@link #getMutableRelicList()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public RepeatedMessage getMaterialList() {
- return materialList;
+ public RepeatedMessage getRelicList() {
+ return relicList;
}
/**
- * repeated .Material material_list = 14;
+ * repeated .Relic relic_list = 13;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -263,30 +263,30 @@ public RepeatedMessage getMaterialList() {
*
* @return internal storage object for modifications
*/
- public RepeatedMessage getMutableMaterialList() {
+ public RepeatedMessage getMutableRelicList() {
bitField0_ |= 0x00000008;
- return materialList;
+ return relicList;
}
/**
- * repeated .Material material_list = 14;
- * @param value the materialList to add
+ * repeated .Relic relic_list = 13;
+ * @param value the relicList to add
* @return this
*/
- public GetBagScRsp addMaterialList(final MaterialOuterClass.Material value) {
+ public GetBagScRsp addRelicList(final RelicOuterClass.Relic value) {
bitField0_ |= 0x00000008;
- materialList.add(value);
+ relicList.add(value);
return this;
}
/**
- * repeated .Material material_list = 14;
- * @param values the materialList to add
+ * repeated .Relic relic_list = 13;
+ * @param values the relicList to add
* @return this
*/
- public GetBagScRsp addAllMaterialList(final MaterialOuterClass.Material... values) {
+ public GetBagScRsp addAllRelicList(final RelicOuterClass.Relic... values) {
bitField0_ |= 0x00000008;
- materialList.addAll(values);
+ relicList.addAll(values);
return this;
}
@@ -297,8 +297,8 @@ public GetBagScRsp copyFrom(final GetBagScRsp other) {
bitField0_ = other.bitField0_;
retcode = other.retcode;
equipmentList.copyFrom(other.equipmentList);
- relicList.copyFrom(other.relicList);
materialList.copyFrom(other.materialList);
+ relicList.copyFrom(other.relicList);
}
return this;
}
@@ -315,12 +315,12 @@ public GetBagScRsp mergeFrom(final GetBagScRsp other) {
if (other.hasEquipmentList()) {
getMutableEquipmentList().addAll(other.equipmentList);
}
- if (other.hasRelicList()) {
- getMutableRelicList().addAll(other.relicList);
- }
if (other.hasMaterialList()) {
getMutableMaterialList().addAll(other.materialList);
}
+ if (other.hasRelicList()) {
+ getMutableRelicList().addAll(other.relicList);
+ }
return this;
}
@@ -333,8 +333,8 @@ public GetBagScRsp clear() {
bitField0_ = 0;
retcode = 0;
equipmentList.clear();
- relicList.clear();
materialList.clear();
+ relicList.clear();
return this;
}
@@ -346,8 +346,8 @@ public GetBagScRsp clearQuick() {
cachedSize = -1;
bitField0_ = 0;
equipmentList.clearQuick();
- relicList.clearQuick();
materialList.clearQuick();
+ relicList.clearQuick();
return this;
}
@@ -363,32 +363,32 @@ public boolean equals(Object o) {
return bitField0_ == other.bitField0_
&& (!hasRetcode() || retcode == other.retcode)
&& (!hasEquipmentList() || equipmentList.equals(other.equipmentList))
- && (!hasRelicList() || relicList.equals(other.relicList))
- && (!hasMaterialList() || materialList.equals(other.materialList));
+ && (!hasMaterialList() || materialList.equals(other.materialList))
+ && (!hasRelicList() || relicList.equals(other.relicList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < equipmentList.length(); i++) {
- output.writeRawByte((byte) 66);
+ output.writeRawByte((byte) 10);
output.writeMessageNoTag(equipmentList.get(i));
}
}
if ((bitField0_ & 0x00000004) != 0) {
- for (int i = 0; i < relicList.length(); i++) {
- output.writeRawByte((byte) 82);
- output.writeMessageNoTag(relicList.get(i));
+ for (int i = 0; i < materialList.length(); i++) {
+ output.writeRawByte((byte) 18);
+ output.writeMessageNoTag(materialList.get(i));
}
}
if ((bitField0_ & 0x00000008) != 0) {
- for (int i = 0; i < materialList.length(); i++) {
- output.writeRawByte((byte) 114);
- output.writeMessageNoTag(materialList.get(i));
+ for (int i = 0; i < relicList.length(); i++) {
+ output.writeRawByte((byte) 106);
+ output.writeMessageNoTag(relicList.get(i));
}
}
}
@@ -403,10 +403,10 @@ protected int computeSerializedSize() {
size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList);
+ size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList);
+ size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList);
}
return size;
}
@@ -418,34 +418,34 @@ public GetBagScRsp mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
+ case 120: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 66) {
+ if (tag != 10) {
break;
}
}
- case 66: {
+ case 10: {
// equipmentList
tag = input.readRepeatedMessage(equipmentList, tag);
bitField0_ |= 0x00000002;
- if (tag != 82) {
+ if (tag != 18) {
break;
}
}
- case 82: {
- // relicList
- tag = input.readRepeatedMessage(relicList, tag);
+ case 18: {
+ // materialList
+ tag = input.readRepeatedMessage(materialList, tag);
bitField0_ |= 0x00000004;
- if (tag != 114) {
+ if (tag != 106) {
break;
}
}
- case 114: {
- // materialList
- tag = input.readRepeatedMessage(materialList, tag);
+ case 106: {
+ // relicList
+ tag = input.readRepeatedMessage(relicList, tag);
bitField0_ |= 0x00000008;
if (tag != 0) {
break;
@@ -475,10 +475,10 @@ public void writeTo(final JsonSink output) throws IOException {
output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRepeatedMessage(FieldNames.relicList, relicList);
+ output.writeRepeatedMessage(FieldNames.materialList, materialList);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRepeatedMessage(FieldNames.materialList, materialList);
+ output.writeRepeatedMessage(FieldNames.relicList, relicList);
}
output.endObject();
}
@@ -513,11 +513,11 @@ public GetBagScRsp mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 204814001:
- case 2071893482: {
- if (input.isAtField(FieldNames.relicList)) {
+ case -2115854747:
+ case -1149360970: {
+ if (input.isAtField(FieldNames.materialList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(relicList);
+ input.readRepeatedMessage(materialList);
bitField0_ |= 0x00000004;
}
} else {
@@ -525,11 +525,11 @@ public GetBagScRsp mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case -2115854747:
- case -1149360970: {
- if (input.isAtField(FieldNames.materialList)) {
+ case 204814001:
+ case 2071893482: {
+ if (input.isAtField(FieldNames.relicList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(materialList);
+ input.readRepeatedMessage(relicList);
bitField0_ |= 0x00000008;
}
} else {
@@ -593,9 +593,9 @@ static class FieldNames {
static final FieldName equipmentList = FieldName.forField("equipmentList", "equipment_list");
- static final FieldName relicList = FieldName.forField("relicList", "relic_list");
-
static final FieldName materialList = FieldName.forField("materialList", "material_list");
+
+ static final FieldName relicList = FieldName.forField("relicList", "relic_list");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java
index 69d5374f7..5fc5fcbe3 100644
--- a/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java
@@ -19,42 +19,42 @@ public static final class GetBasicInfoScRsp extends ProtoMessageoptional int64 next_recover_time = 7;
+ * optional int64 last_set_nickname_time = 3;
*/
- private long nextRecoverTime;
+ private long lastSetNicknameTime;
/**
- * optional int64 last_set_nickname_time = 9;
+ * optional int64 next_recover_time = 15;
*/
- private long lastSetNicknameTime;
+ private long nextRecoverTime;
/**
- * optional uint32 cur_day = 3;
+ * optional uint32 cur_day = 1;
*/
private int curDay;
/**
- * optional uint32 gameplay_birthday = 4;
+ * optional uint32 week_cocoon_finished_count = 2;
*/
- private int gameplayBirthday;
+ private int weekCocoonFinishedCount;
/**
- * optional uint32 retcode = 11;
+ * optional uint32 exchange_times = 6;
*/
- private int retcode;
+ private int exchangeTimes;
/**
- * optional uint32 week_cocoon_finished_count = 13;
+ * optional uint32 gameplay_birthday = 9;
*/
- private int weekCocoonFinishedCount;
+ private int gameplayBirthday;
/**
- * optional uint32 exchange_times = 15;
+ * optional uint32 retcode = 10;
*/
- private int exchangeTimes;
+ private int retcode;
/**
- * optional .PlayerSettingInfo player_setting_info = 1;
+ * optional .PlayerSettingInfo player_setting_info = 14;
*/
private final PlayerSettingInfoOuterClass.PlayerSettingInfo playerSettingInfo = PlayerSettingInfoOuterClass.PlayerSettingInfo.newInstance();
@@ -69,81 +69,81 @@ public static GetBasicInfoScRsp newInstance() {
}
/**
- * optional int64 next_recover_time = 7;
- * @return whether the nextRecoverTime field is set
+ * optional int64 last_set_nickname_time = 3;
+ * @return whether the lastSetNicknameTime field is set
*/
- public boolean hasNextRecoverTime() {
+ public boolean hasLastSetNicknameTime() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional int64 next_recover_time = 7;
+ * optional int64 last_set_nickname_time = 3;
* @return this
*/
- public GetBasicInfoScRsp clearNextRecoverTime() {
+ public GetBasicInfoScRsp clearLastSetNicknameTime() {
bitField0_ &= ~0x00000001;
- nextRecoverTime = 0L;
+ lastSetNicknameTime = 0L;
return this;
}
/**
- * optional int64 next_recover_time = 7;
- * @return the nextRecoverTime
+ * optional int64 last_set_nickname_time = 3;
+ * @return the lastSetNicknameTime
*/
- public long getNextRecoverTime() {
- return nextRecoverTime;
+ public long getLastSetNicknameTime() {
+ return lastSetNicknameTime;
}
/**
- * optional int64 next_recover_time = 7;
- * @param value the nextRecoverTime to set
+ * optional int64 last_set_nickname_time = 3;
+ * @param value the lastSetNicknameTime to set
* @return this
*/
- public GetBasicInfoScRsp setNextRecoverTime(final long value) {
+ public GetBasicInfoScRsp setLastSetNicknameTime(final long value) {
bitField0_ |= 0x00000001;
- nextRecoverTime = value;
+ lastSetNicknameTime = value;
return this;
}
/**
- * optional int64 last_set_nickname_time = 9;
- * @return whether the lastSetNicknameTime field is set
+ * optional int64 next_recover_time = 15;
+ * @return whether the nextRecoverTime field is set
*/
- public boolean hasLastSetNicknameTime() {
+ public boolean hasNextRecoverTime() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional int64 last_set_nickname_time = 9;
+ * optional int64 next_recover_time = 15;
* @return this
*/
- public GetBasicInfoScRsp clearLastSetNicknameTime() {
+ public GetBasicInfoScRsp clearNextRecoverTime() {
bitField0_ &= ~0x00000002;
- lastSetNicknameTime = 0L;
+ nextRecoverTime = 0L;
return this;
}
/**
- * optional int64 last_set_nickname_time = 9;
- * @return the lastSetNicknameTime
+ * optional int64 next_recover_time = 15;
+ * @return the nextRecoverTime
*/
- public long getLastSetNicknameTime() {
- return lastSetNicknameTime;
+ public long getNextRecoverTime() {
+ return nextRecoverTime;
}
/**
- * optional int64 last_set_nickname_time = 9;
- * @param value the lastSetNicknameTime to set
+ * optional int64 next_recover_time = 15;
+ * @param value the nextRecoverTime to set
* @return this
*/
- public GetBasicInfoScRsp setLastSetNicknameTime(final long value) {
+ public GetBasicInfoScRsp setNextRecoverTime(final long value) {
bitField0_ |= 0x00000002;
- lastSetNicknameTime = value;
+ nextRecoverTime = value;
return this;
}
/**
- * optional uint32 cur_day = 3;
+ * optional uint32 cur_day = 1;
* @return whether the curDay field is set
*/
public boolean hasCurDay() {
@@ -151,7 +151,7 @@ public boolean hasCurDay() {
}
/**
- * optional uint32 cur_day = 3;
+ * optional uint32 cur_day = 1;
* @return this
*/
public GetBasicInfoScRsp clearCurDay() {
@@ -161,7 +161,7 @@ public GetBasicInfoScRsp clearCurDay() {
}
/**
- * optional uint32 cur_day = 3;
+ * optional uint32 cur_day = 1;
* @return the curDay
*/
public int getCurDay() {
@@ -169,7 +169,7 @@ public int getCurDay() {
}
/**
- * optional uint32 cur_day = 3;
+ * optional uint32 cur_day = 1;
* @param value the curDay to set
* @return this
*/
@@ -180,155 +180,155 @@ public GetBasicInfoScRsp setCurDay(final int value) {
}
/**
- * optional uint32 gameplay_birthday = 4;
- * @return whether the gameplayBirthday field is set
+ * optional uint32 week_cocoon_finished_count = 2;
+ * @return whether the weekCocoonFinishedCount field is set
*/
- public boolean hasGameplayBirthday() {
+ public boolean hasWeekCocoonFinishedCount() {
return (bitField0_ & 0x00000008) != 0;
}
/**
- * optional uint32 gameplay_birthday = 4;
+ * optional uint32 week_cocoon_finished_count = 2;
* @return this
*/
- public GetBasicInfoScRsp clearGameplayBirthday() {
+ public GetBasicInfoScRsp clearWeekCocoonFinishedCount() {
bitField0_ &= ~0x00000008;
- gameplayBirthday = 0;
+ weekCocoonFinishedCount = 0;
return this;
}
/**
- * optional uint32 gameplay_birthday = 4;
- * @return the gameplayBirthday
+ * optional uint32 week_cocoon_finished_count = 2;
+ * @return the weekCocoonFinishedCount
*/
- public int getGameplayBirthday() {
- return gameplayBirthday;
+ public int getWeekCocoonFinishedCount() {
+ return weekCocoonFinishedCount;
}
/**
- * optional uint32 gameplay_birthday = 4;
- * @param value the gameplayBirthday to set
+ * optional uint32 week_cocoon_finished_count = 2;
+ * @param value the weekCocoonFinishedCount to set
* @return this
*/
- public GetBasicInfoScRsp setGameplayBirthday(final int value) {
+ public GetBasicInfoScRsp setWeekCocoonFinishedCount(final int value) {
bitField0_ |= 0x00000008;
- gameplayBirthday = value;
+ weekCocoonFinishedCount = value;
return this;
}
/**
- * optional uint32 retcode = 11;
- * @return whether the retcode field is set
+ * optional uint32 exchange_times = 6;
+ * @return whether the exchangeTimes field is set
*/
- public boolean hasRetcode() {
+ public boolean hasExchangeTimes() {
return (bitField0_ & 0x00000010) != 0;
}
/**
- * optional uint32 retcode = 11;
+ * optional uint32 exchange_times = 6;
* @return this
*/
- public GetBasicInfoScRsp clearRetcode() {
+ public GetBasicInfoScRsp clearExchangeTimes() {
bitField0_ &= ~0x00000010;
- retcode = 0;
+ exchangeTimes = 0;
return this;
}
/**
- * optional uint32 retcode = 11;
- * @return the retcode
+ * optional uint32 exchange_times = 6;
+ * @return the exchangeTimes
*/
- public int getRetcode() {
- return retcode;
+ public int getExchangeTimes() {
+ return exchangeTimes;
}
/**
- * optional uint32 retcode = 11;
- * @param value the retcode to set
+ * optional uint32 exchange_times = 6;
+ * @param value the exchangeTimes to set
* @return this
*/
- public GetBasicInfoScRsp setRetcode(final int value) {
+ public GetBasicInfoScRsp setExchangeTimes(final int value) {
bitField0_ |= 0x00000010;
- retcode = value;
+ exchangeTimes = value;
return this;
}
/**
- * optional uint32 week_cocoon_finished_count = 13;
- * @return whether the weekCocoonFinishedCount field is set
+ * optional uint32 gameplay_birthday = 9;
+ * @return whether the gameplayBirthday field is set
*/
- public boolean hasWeekCocoonFinishedCount() {
+ public boolean hasGameplayBirthday() {
return (bitField0_ & 0x00000020) != 0;
}
/**
- * optional uint32 week_cocoon_finished_count = 13;
+ * optional uint32 gameplay_birthday = 9;
* @return this
*/
- public GetBasicInfoScRsp clearWeekCocoonFinishedCount() {
+ public GetBasicInfoScRsp clearGameplayBirthday() {
bitField0_ &= ~0x00000020;
- weekCocoonFinishedCount = 0;
+ gameplayBirthday = 0;
return this;
}
/**
- * optional uint32 week_cocoon_finished_count = 13;
- * @return the weekCocoonFinishedCount
+ * optional uint32 gameplay_birthday = 9;
+ * @return the gameplayBirthday
*/
- public int getWeekCocoonFinishedCount() {
- return weekCocoonFinishedCount;
+ public int getGameplayBirthday() {
+ return gameplayBirthday;
}
/**
- * optional uint32 week_cocoon_finished_count = 13;
- * @param value the weekCocoonFinishedCount to set
+ * optional uint32 gameplay_birthday = 9;
+ * @param value the gameplayBirthday to set
* @return this
*/
- public GetBasicInfoScRsp setWeekCocoonFinishedCount(final int value) {
+ public GetBasicInfoScRsp setGameplayBirthday(final int value) {
bitField0_ |= 0x00000020;
- weekCocoonFinishedCount = value;
+ gameplayBirthday = value;
return this;
}
/**
- * optional uint32 exchange_times = 15;
- * @return whether the exchangeTimes field is set
+ * optional uint32 retcode = 10;
+ * @return whether the retcode field is set
*/
- public boolean hasExchangeTimes() {
+ public boolean hasRetcode() {
return (bitField0_ & 0x00000040) != 0;
}
/**
- * optional uint32 exchange_times = 15;
+ * optional uint32 retcode = 10;
* @return this
*/
- public GetBasicInfoScRsp clearExchangeTimes() {
+ public GetBasicInfoScRsp clearRetcode() {
bitField0_ &= ~0x00000040;
- exchangeTimes = 0;
+ retcode = 0;
return this;
}
/**
- * optional uint32 exchange_times = 15;
- * @return the exchangeTimes
+ * optional uint32 retcode = 10;
+ * @return the retcode
*/
- public int getExchangeTimes() {
- return exchangeTimes;
+ public int getRetcode() {
+ return retcode;
}
/**
- * optional uint32 exchange_times = 15;
- * @param value the exchangeTimes to set
+ * optional uint32 retcode = 10;
+ * @param value the retcode to set
* @return this
*/
- public GetBasicInfoScRsp setExchangeTimes(final int value) {
+ public GetBasicInfoScRsp setRetcode(final int value) {
bitField0_ |= 0x00000040;
- exchangeTimes = value;
+ retcode = value;
return this;
}
/**
- * optional .PlayerSettingInfo player_setting_info = 1;
+ * optional .PlayerSettingInfo player_setting_info = 14;
* @return whether the playerSettingInfo field is set
*/
public boolean hasPlayerSettingInfo() {
@@ -336,7 +336,7 @@ public boolean hasPlayerSettingInfo() {
}
/**
- * optional .PlayerSettingInfo player_setting_info = 1;
+ * optional .PlayerSettingInfo player_setting_info = 14;
* @return this
*/
public GetBasicInfoScRsp clearPlayerSettingInfo() {
@@ -346,7 +346,7 @@ public GetBasicInfoScRsp clearPlayerSettingInfo() {
}
/**
- * optional .PlayerSettingInfo player_setting_info = 1;
+ * optional .PlayerSettingInfo player_setting_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.
@@ -360,7 +360,7 @@ public PlayerSettingInfoOuterClass.PlayerSettingInfo getPlayerSettingInfo() {
}
/**
- * optional .PlayerSettingInfo player_setting_info = 1;
+ * optional .PlayerSettingInfo player_setting_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
@@ -374,7 +374,7 @@ public PlayerSettingInfoOuterClass.PlayerSettingInfo getMutablePlayerSettingInfo
}
/**
- * optional .PlayerSettingInfo player_setting_info = 1;
+ * optional .PlayerSettingInfo player_setting_info = 14;
* @param value the playerSettingInfo to set
* @return this
*/
@@ -390,13 +390,13 @@ public GetBasicInfoScRsp copyFrom(final GetBasicInfoScRsp other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- nextRecoverTime = other.nextRecoverTime;
lastSetNicknameTime = other.lastSetNicknameTime;
+ nextRecoverTime = other.nextRecoverTime;
curDay = other.curDay;
- gameplayBirthday = other.gameplayBirthday;
- retcode = other.retcode;
weekCocoonFinishedCount = other.weekCocoonFinishedCount;
exchangeTimes = other.exchangeTimes;
+ gameplayBirthday = other.gameplayBirthday;
+ retcode = other.retcode;
playerSettingInfo.copyFrom(other.playerSettingInfo);
}
return this;
@@ -408,27 +408,27 @@ public GetBasicInfoScRsp mergeFrom(final GetBasicInfoScRsp other) {
return this;
}
cachedSize = -1;
- if (other.hasNextRecoverTime()) {
- setNextRecoverTime(other.nextRecoverTime);
- }
if (other.hasLastSetNicknameTime()) {
setLastSetNicknameTime(other.lastSetNicknameTime);
}
+ if (other.hasNextRecoverTime()) {
+ setNextRecoverTime(other.nextRecoverTime);
+ }
if (other.hasCurDay()) {
setCurDay(other.curDay);
}
- if (other.hasGameplayBirthday()) {
- setGameplayBirthday(other.gameplayBirthday);
- }
- if (other.hasRetcode()) {
- setRetcode(other.retcode);
- }
if (other.hasWeekCocoonFinishedCount()) {
setWeekCocoonFinishedCount(other.weekCocoonFinishedCount);
}
if (other.hasExchangeTimes()) {
setExchangeTimes(other.exchangeTimes);
}
+ if (other.hasGameplayBirthday()) {
+ setGameplayBirthday(other.gameplayBirthday);
+ }
+ if (other.hasRetcode()) {
+ setRetcode(other.retcode);
+ }
if (other.hasPlayerSettingInfo()) {
getMutablePlayerSettingInfo().mergeFrom(other.playerSettingInfo);
}
@@ -442,13 +442,13 @@ public GetBasicInfoScRsp clear() {
}
cachedSize = -1;
bitField0_ = 0;
- nextRecoverTime = 0L;
lastSetNicknameTime = 0L;
+ nextRecoverTime = 0L;
curDay = 0;
- gameplayBirthday = 0;
- retcode = 0;
weekCocoonFinishedCount = 0;
exchangeTimes = 0;
+ gameplayBirthday = 0;
+ retcode = 0;
playerSettingInfo.clear();
return this;
}
@@ -474,48 +474,48 @@ public boolean equals(Object o) {
}
GetBasicInfoScRsp other = (GetBasicInfoScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasNextRecoverTime() || nextRecoverTime == other.nextRecoverTime)
&& (!hasLastSetNicknameTime() || lastSetNicknameTime == other.lastSetNicknameTime)
+ && (!hasNextRecoverTime() || nextRecoverTime == other.nextRecoverTime)
&& (!hasCurDay() || curDay == other.curDay)
- && (!hasGameplayBirthday() || gameplayBirthday == other.gameplayBirthday)
- && (!hasRetcode() || retcode == other.retcode)
&& (!hasWeekCocoonFinishedCount() || weekCocoonFinishedCount == other.weekCocoonFinishedCount)
&& (!hasExchangeTimes() || exchangeTimes == other.exchangeTimes)
+ && (!hasGameplayBirthday() || gameplayBirthday == other.gameplayBirthday)
+ && (!hasRetcode() || retcode == other.retcode)
&& (!hasPlayerSettingInfo() || playerSettingInfo.equals(other.playerSettingInfo));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
- output.writeInt64NoTag(nextRecoverTime);
+ output.writeRawByte((byte) 24);
+ output.writeInt64NoTag(lastSetNicknameTime);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 72);
- output.writeInt64NoTag(lastSetNicknameTime);
+ output.writeRawByte((byte) 120);
+ output.writeInt64NoTag(nextRecoverTime);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(curDay);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(gameplayBirthday);
+ output.writeRawByte((byte) 16);
+ output.writeUInt32NoTag(weekCocoonFinishedCount);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 88);
- output.writeUInt32NoTag(retcode);
+ output.writeRawByte((byte) 48);
+ output.writeUInt32NoTag(exchangeTimes);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 104);
- output.writeUInt32NoTag(weekCocoonFinishedCount);
+ output.writeRawByte((byte) 72);
+ output.writeUInt32NoTag(gameplayBirthday);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawByte((byte) 120);
- output.writeUInt32NoTag(exchangeTimes);
+ output.writeRawByte((byte) 80);
+ output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRawByte((byte) 10);
+ output.writeRawByte((byte) 114);
output.writeMessageNoTag(playerSettingInfo);
}
}
@@ -524,25 +524,25 @@ public void writeTo(final ProtoSink output) throws IOException {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeInt64SizeNoTag(nextRecoverTime);
+ size += 1 + ProtoSink.computeInt64SizeNoTag(lastSetNicknameTime);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeInt64SizeNoTag(lastSetNicknameTime);
+ size += 1 + ProtoSink.computeInt64SizeNoTag(nextRecoverTime);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(curDay);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(gameplayBirthday);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(weekCocoonFinishedCount);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(exchangeTimes);
}
if ((bitField0_ & 0x00000020) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(weekCocoonFinishedCount);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(gameplayBirthday);
}
if ((bitField0_ & 0x00000040) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(exchangeTimes);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000080) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(playerSettingInfo);
@@ -557,70 +557,70 @@ public GetBasicInfoScRsp mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
- // nextRecoverTime
- nextRecoverTime = input.readInt64();
+ case 24: {
+ // lastSetNicknameTime
+ lastSetNicknameTime = input.readInt64();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 72) {
+ if (tag != 120) {
break;
}
}
- case 72: {
- // lastSetNicknameTime
- lastSetNicknameTime = input.readInt64();
+ case 120: {
+ // nextRecoverTime
+ nextRecoverTime = input.readInt64();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 24) {
+ if (tag != 8) {
break;
}
}
- case 24: {
+ case 8: {
// curDay
curDay = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 32) {
+ if (tag != 16) {
break;
}
}
- case 32: {
- // gameplayBirthday
- gameplayBirthday = input.readUInt32();
+ case 16: {
+ // weekCocoonFinishedCount
+ weekCocoonFinishedCount = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 88) {
+ if (tag != 48) {
break;
}
}
- case 88: {
- // retcode
- retcode = input.readUInt32();
+ case 48: {
+ // exchangeTimes
+ exchangeTimes = input.readUInt32();
bitField0_ |= 0x00000010;
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 72) {
break;
}
}
- case 104: {
- // weekCocoonFinishedCount
- weekCocoonFinishedCount = input.readUInt32();
+ case 72: {
+ // gameplayBirthday
+ gameplayBirthday = input.readUInt32();
bitField0_ |= 0x00000020;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 80) {
break;
}
}
- case 120: {
- // exchangeTimes
- exchangeTimes = input.readUInt32();
+ case 80: {
+ // retcode
+ retcode = input.readUInt32();
bitField0_ |= 0x00000040;
tag = input.readTag();
- if (tag != 10) {
+ if (tag != 114) {
break;
}
}
- case 10: {
+ case 114: {
// playerSettingInfo
input.readMessage(playerSettingInfo);
bitField0_ |= 0x00000080;
@@ -647,25 +647,25 @@ public GetBasicInfoScRsp mergeFrom(final ProtoSource input) throws IOException {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeInt64(FieldNames.nextRecoverTime, nextRecoverTime);
+ output.writeInt64(FieldNames.lastSetNicknameTime, lastSetNicknameTime);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeInt64(FieldNames.lastSetNicknameTime, lastSetNicknameTime);
+ output.writeInt64(FieldNames.nextRecoverTime, nextRecoverTime);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.curDay, curDay);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.gameplayBirthday, gameplayBirthday);
+ output.writeUInt32(FieldNames.weekCocoonFinishedCount, weekCocoonFinishedCount);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.exchangeTimes, exchangeTimes);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeUInt32(FieldNames.weekCocoonFinishedCount, weekCocoonFinishedCount);
+ output.writeUInt32(FieldNames.gameplayBirthday, gameplayBirthday);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeUInt32(FieldNames.exchangeTimes, exchangeTimes);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000080) != 0) {
output.writeMessage(FieldNames.playerSettingInfo, playerSettingInfo);
@@ -680,11 +680,11 @@ public GetBasicInfoScRsp mergeFrom(final JsonSource input) throws IOException {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- 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_ |= 0x00000001;
}
} else {
@@ -692,11 +692,11 @@ public GetBasicInfoScRsp mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- 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_ |= 0x00000002;
}
} else {
@@ -716,11 +716,11 @@ public GetBasicInfoScRsp mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 686542531:
- case 172986486: {
- if (input.isAtField(FieldNames.gameplayBirthday)) {
+ case 1387396786:
+ case 668486783: {
+ if (input.isAtField(FieldNames.weekCocoonFinishedCount)) {
if (!input.trySkipNullValue()) {
- gameplayBirthday = input.readUInt32();
+ weekCocoonFinishedCount = input.readUInt32();
bitField0_ |= 0x00000008;
}
} else {
@@ -728,10 +728,11 @@ public GetBasicInfoScRsp mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case 1371137763:
+ case -119434710: {
+ if (input.isAtField(FieldNames.exchangeTimes)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ exchangeTimes = input.readUInt32();
bitField0_ |= 0x00000010;
}
} else {
@@ -739,11 +740,11 @@ public GetBasicInfoScRsp mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 1387396786:
- case 668486783: {
- if (input.isAtField(FieldNames.weekCocoonFinishedCount)) {
+ case 686542531:
+ case 172986486: {
+ if (input.isAtField(FieldNames.gameplayBirthday)) {
if (!input.trySkipNullValue()) {
- weekCocoonFinishedCount = input.readUInt32();
+ gameplayBirthday = input.readUInt32();
bitField0_ |= 0x00000020;
}
} else {
@@ -751,11 +752,10 @@ public GetBasicInfoScRsp mergeFrom(final JsonSource input) throws IOException {
}
break;
}
- case 1371137763:
- case -119434710: {
- if (input.isAtField(FieldNames.exchangeTimes)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- exchangeTimes = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000040;
}
} else {
@@ -828,20 +828,20 @@ public GetBasicInfoScRsp create() {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName nextRecoverTime = FieldName.forField("nextRecoverTime", "next_recover_time");
-
static final FieldName lastSetNicknameTime = FieldName.forField("lastSetNicknameTime", "last_set_nickname_time");
- static final FieldName curDay = FieldName.forField("curDay", "cur_day");
-
- static final FieldName gameplayBirthday = FieldName.forField("gameplayBirthday", "gameplay_birthday");
+ static final FieldName nextRecoverTime = FieldName.forField("nextRecoverTime", "next_recover_time");
- static final FieldName retcode = FieldName.forField("retcode");
+ static final FieldName curDay = FieldName.forField("curDay", "cur_day");
static final FieldName weekCocoonFinishedCount = FieldName.forField("weekCocoonFinishedCount", "week_cocoon_finished_count");
static final FieldName exchangeTimes = FieldName.forField("exchangeTimes", "exchange_times");
+ static final FieldName gameplayBirthday = FieldName.forField("gameplayBirthday", "gameplay_birthday");
+
+ static final FieldName retcode = FieldName.forField("retcode");
+
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 a21e763aa..3d268e000 100644
--- a/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java
@@ -20,17 +20,17 @@ public static final class GetChallengeScRsp extends ProtoMessageoptional uint32 retcode = 13;
+ * optional uint32 retcode = 15;
*/
private int retcode;
/**
- * repeated .Challenge challenge_list = 5;
+ * repeated .Challenge challenge_list = 8;
*/
private final RepeatedMessage challengeList = RepeatedMessage.newEmptyInstance(ChallengeOuterClass.Challenge.getFactory());
/**
- * repeated .ChallengeReward challenge_reward_list = 14;
+ * repeated .ChallengeReward challenge_reward_list = 9;
*/
private final RepeatedMessage challengeRewardList = RepeatedMessage.newEmptyInstance(ChallengeRewardOuterClass.ChallengeReward.getFactory());
@@ -45,7 +45,7 @@ public static GetChallengeScRsp newInstance() {
}
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 15;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -53,7 +53,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 15;
* @return this
*/
public GetChallengeScRsp clearRetcode() {
@@ -63,7 +63,7 @@ public GetChallengeScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 15;
* @return the retcode
*/
public int getRetcode() {
@@ -71,7 +71,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 15;
* @param value the retcode to set
* @return this
*/
@@ -82,7 +82,7 @@ public GetChallengeScRsp setRetcode(final int value) {
}
/**
- * repeated .Challenge challenge_list = 5;
+ * repeated .Challenge challenge_list = 8;
* @return whether the challengeList field is set
*/
public boolean hasChallengeList() {
@@ -90,7 +90,7 @@ public boolean hasChallengeList() {
}
/**
- * repeated .Challenge challenge_list = 5;
+ * repeated .Challenge challenge_list = 8;
* @return this
*/
public GetChallengeScRsp clearChallengeList() {
@@ -100,7 +100,7 @@ public GetChallengeScRsp clearChallengeList() {
}
/**
- * repeated .Challenge challenge_list = 5;
+ * repeated .Challenge challenge_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.
@@ -114,7 +114,7 @@ public RepeatedMessage getChallengeList() {
}
/**
- * repeated .Challenge challenge_list = 5;
+ * repeated .Challenge challenge_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
@@ -128,7 +128,7 @@ public RepeatedMessage getMutableChallengeList()
}
/**
- * repeated .Challenge challenge_list = 5;
+ * repeated .Challenge challenge_list = 8;
* @param value the challengeList to add
* @return this
*/
@@ -139,7 +139,7 @@ public GetChallengeScRsp addChallengeList(final ChallengeOuterClass.Challenge va
}
/**
- * repeated .Challenge challenge_list = 5;
+ * repeated .Challenge challenge_list = 8;
* @param values the challengeList to add
* @return this
*/
@@ -150,7 +150,7 @@ public GetChallengeScRsp addAllChallengeList(final ChallengeOuterClass.Challenge
}
/**
- * repeated .ChallengeReward challenge_reward_list = 14;
+ * repeated .ChallengeReward challenge_reward_list = 9;
* @return whether the challengeRewardList field is set
*/
public boolean hasChallengeRewardList() {
@@ -158,7 +158,7 @@ public boolean hasChallengeRewardList() {
}
/**
- * repeated .ChallengeReward challenge_reward_list = 14;
+ * repeated .ChallengeReward challenge_reward_list = 9;
* @return this
*/
public GetChallengeScRsp clearChallengeRewardList() {
@@ -168,7 +168,7 @@ public GetChallengeScRsp clearChallengeRewardList() {
}
/**
- * repeated .ChallengeReward challenge_reward_list = 14;
+ * repeated .ChallengeReward challenge_reward_list = 9;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -182,7 +182,7 @@ public RepeatedMessage getChallengeRe
}
/**
- * repeated .ChallengeReward challenge_reward_list = 14;
+ * repeated .ChallengeReward challenge_reward_list = 9;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -197,7 +197,7 @@ public RepeatedMessage getMutableChal
}
/**
- * repeated .ChallengeReward challenge_reward_list = 14;
+ * repeated .ChallengeReward challenge_reward_list = 9;
* @param value the challengeRewardList to add
* @return this
*/
@@ -209,7 +209,7 @@ public GetChallengeScRsp addChallengeRewardList(
}
/**
- * repeated .ChallengeReward challenge_reward_list = 14;
+ * repeated .ChallengeReward challenge_reward_list = 9;
* @param values the challengeRewardList to add
* @return this
*/
@@ -293,18 +293,18 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < challengeList.length(); i++) {
- output.writeRawByte((byte) 42);
+ output.writeRawByte((byte) 66);
output.writeMessageNoTag(challengeList.get(i));
}
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < challengeRewardList.length(); i++) {
- output.writeRawByte((byte) 114);
+ output.writeRawByte((byte) 74);
output.writeMessageNoTag(challengeRewardList.get(i));
}
}
@@ -332,24 +332,24 @@ public GetChallengeScRsp mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 104: {
+ case 120: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 42) {
+ if (tag != 66) {
break;
}
}
- case 42: {
+ case 66: {
// challengeList
tag = input.readRepeatedMessage(challengeList, tag);
bitField0_ |= 0x00000002;
- if (tag != 114) {
+ if (tag != 74) {
break;
}
}
- case 114: {
+ case 74: {
// challengeRewardList
tag = input.readRepeatedMessage(challengeRewardList, tag);
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/GetCurChallengeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetCurChallengeScRspOuterClass.java
index abedada6a..aa8ac8c8b 100644
--- a/src/generated/main/emu/lunarcore/proto/GetCurChallengeScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetCurChallengeScRspOuterClass.java
@@ -19,12 +19,12 @@ public static final class GetCurChallengeScRsp extends ProtoMessageoptional uint32 retcode = 12;
+ * optional uint32 retcode = 5;
*/
private int retcode;
/**
- * optional .ChallengeInfo challenge_info = 5;
+ * optional .ChallengeInfo challenge_info = 9;
*/
private final ChallengeInfoOuterClass.ChallengeInfo challengeInfo = ChallengeInfoOuterClass.ChallengeInfo.newInstance();
@@ -39,7 +39,7 @@ public static GetCurChallengeScRsp newInstance() {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 5;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -47,7 +47,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 5;
* @return this
*/
public GetCurChallengeScRsp clearRetcode() {
@@ -57,7 +57,7 @@ public GetCurChallengeScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 5;
* @return the retcode
*/
public int getRetcode() {
@@ -65,7 +65,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 5;
* @param value the retcode to set
* @return this
*/
@@ -76,7 +76,7 @@ public GetCurChallengeScRsp setRetcode(final int value) {
}
/**
- * optional .ChallengeInfo challenge_info = 5;
+ * optional .ChallengeInfo challenge_info = 9;
* @return whether the challengeInfo field is set
*/
public boolean hasChallengeInfo() {
@@ -84,7 +84,7 @@ public boolean hasChallengeInfo() {
}
/**
- * optional .ChallengeInfo challenge_info = 5;
+ * optional .ChallengeInfo challenge_info = 9;
* @return this
*/
public GetCurChallengeScRsp clearChallengeInfo() {
@@ -94,7 +94,7 @@ public GetCurChallengeScRsp clearChallengeInfo() {
}
/**
- * optional .ChallengeInfo challenge_info = 5;
+ * optional .ChallengeInfo challenge_info = 9;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public ChallengeInfoOuterClass.ChallengeInfo getChallengeInfo() {
}
/**
- * optional .ChallengeInfo challenge_info = 5;
+ * optional .ChallengeInfo challenge_info = 9;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public ChallengeInfoOuterClass.ChallengeInfo getMutableChallengeInfo() {
}
/**
- * optional .ChallengeInfo challenge_info = 5;
+ * optional .ChallengeInfo challenge_info = 9;
* @param value the challengeInfo to set
* @return this
*/
@@ -199,11 +199,11 @@ public boolean equals(Object o) {
@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) 42);
+ output.writeRawByte((byte) 74);
output.writeMessageNoTag(challengeInfo);
}
}
@@ -227,16 +227,16 @@ public GetCurChallengeScRsp mergeFrom(final ProtoSource input) throws IOExceptio
int tag = input.readTag();
while (true) {
switch (tag) {
- case 96: {
+ case 40: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 42) {
+ if (tag != 74) {
break;
}
}
- case 42: {
+ case 74: {
// challengeInfo
input.readMessage(challengeInfo);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetCurLineupDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetCurLineupDataScRspOuterClass.java
index a2ca0ae9a..c4f350582 100644
--- a/src/generated/main/emu/lunarcore/proto/GetCurLineupDataScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetCurLineupDataScRspOuterClass.java
@@ -19,12 +19,12 @@ public static final class GetCurLineupDataScRsp extends ProtoMessageoptional uint32 retcode = 15;
+ * optional uint32 retcode = 7;
*/
private int retcode;
/**
- * optional .LineupInfo lineup = 11;
+ * optional .LineupInfo lineup = 2;
*/
private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance();
@@ -39,7 +39,7 @@ public static GetCurLineupDataScRsp newInstance() {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 7;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -47,7 +47,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 7;
* @return this
*/
public GetCurLineupDataScRsp clearRetcode() {
@@ -57,7 +57,7 @@ public GetCurLineupDataScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 7;
* @return the retcode
*/
public int getRetcode() {
@@ -65,7 +65,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 7;
* @param value the retcode to set
* @return this
*/
@@ -76,7 +76,7 @@ public GetCurLineupDataScRsp setRetcode(final int value) {
}
/**
- * optional .LineupInfo lineup = 11;
+ * optional .LineupInfo lineup = 2;
* @return whether the lineup field is set
*/
public boolean hasLineup() {
@@ -84,7 +84,7 @@ public boolean hasLineup() {
}
/**
- * optional .LineupInfo lineup = 11;
+ * optional .LineupInfo lineup = 2;
* @return this
*/
public GetCurLineupDataScRsp clearLineup() {
@@ -94,7 +94,7 @@ public GetCurLineupDataScRsp clearLineup() {
}
/**
- * optional .LineupInfo lineup = 11;
+ * optional .LineupInfo lineup = 2;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public LineupInfoOuterClass.LineupInfo getLineup() {
}
/**
- * optional .LineupInfo lineup = 11;
+ * optional .LineupInfo lineup = 2;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public LineupInfoOuterClass.LineupInfo getMutableLineup() {
}
/**
- * optional .LineupInfo lineup = 11;
+ * optional .LineupInfo lineup = 2;
* @param value the lineup to set
* @return this
*/
@@ -198,11 +198,11 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 90);
+ output.writeRawByte((byte) 18);
output.writeMessageNoTag(lineup);
}
}
@@ -226,16 +226,16 @@ public GetCurLineupDataScRsp mergeFrom(final ProtoSource input) throws IOExcepti
int tag = input.readTag();
while (true) {
switch (tag) {
- case 120: {
+ case 56: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 90) {
+ if (tag != 18) {
break;
}
}
- case 90: {
+ case 18: {
// 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 f8d844a99..3d803ebd7 100644
--- a/src/generated/main/emu/lunarcore/proto/GetCurSceneInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetCurSceneInfoScRspOuterClass.java
@@ -19,12 +19,12 @@ public static final class GetCurSceneInfoScRsp extends ProtoMessageoptional uint32 retcode = 8;
+ * optional uint32 retcode = 1;
*/
private int retcode;
/**
- * optional .SceneInfo scene = 10;
+ * optional .SceneInfo scene = 15;
*/
private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance();
@@ -39,7 +39,7 @@ public static GetCurSceneInfoScRsp newInstance() {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 1;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -47,7 +47,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 1;
* @return this
*/
public GetCurSceneInfoScRsp clearRetcode() {
@@ -57,7 +57,7 @@ public GetCurSceneInfoScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 1;
* @return the retcode
*/
public int getRetcode() {
@@ -65,7 +65,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 1;
* @param value the retcode to set
* @return this
*/
@@ -76,7 +76,7 @@ public GetCurSceneInfoScRsp setRetcode(final int value) {
}
/**
- * optional .SceneInfo scene = 10;
+ * optional .SceneInfo scene = 15;
* @return whether the scene field is set
*/
public boolean hasScene() {
@@ -84,7 +84,7 @@ public boolean hasScene() {
}
/**
- * optional .SceneInfo scene = 10;
+ * optional .SceneInfo scene = 15;
* @return this
*/
public GetCurSceneInfoScRsp clearScene() {
@@ -94,7 +94,7 @@ public GetCurSceneInfoScRsp clearScene() {
}
/**
- * optional .SceneInfo scene = 10;
+ * optional .SceneInfo scene = 15;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public SceneInfoOuterClass.SceneInfo getScene() {
}
/**
- * optional .SceneInfo scene = 10;
+ * optional .SceneInfo scene = 15;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public SceneInfoOuterClass.SceneInfo getMutableScene() {
}
/**
- * optional .SceneInfo scene = 10;
+ * optional .SceneInfo scene = 15;
* @param value the scene to set
* @return this
*/
@@ -198,11 +198,11 @@ public boolean equals(Object o) {
@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) 82);
+ output.writeRawByte((byte) 122);
output.writeMessageNoTag(scene);
}
}
@@ -226,16 +226,16 @@ public GetCurSceneInfoScRsp mergeFrom(final ProtoSource input) throws IOExceptio
int tag = input.readTag();
while (true) {
switch (tag) {
- case 64: {
+ case 8: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 82) {
+ if (tag != 122) {
break;
}
}
- case 82: {
+ case 122: {
// scene
input.readMessage(scene);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java
index 075356005..9506cc429 100644
--- a/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java
@@ -20,12 +20,12 @@ public static final class GetEnteredSceneScRsp extends ProtoMessageoptional uint32 retcode = 5;
+ * optional uint32 retcode = 3;
*/
private int retcode;
/**
- * repeated .EnteredSceneInfo entered_scene_info = 8;
+ * repeated .EnteredSceneInfo entered_scene_info = 4;
*/
private final RepeatedMessage enteredSceneInfo = RepeatedMessage.newEmptyInstance(EnteredSceneInfoOuterClass.EnteredSceneInfo.getFactory());
@@ -40,7 +40,7 @@ public static GetEnteredSceneScRsp newInstance() {
}
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 3;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 3;
* @return this
*/
public GetEnteredSceneScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public GetEnteredSceneScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 3;
* @return the retcode
*/
public int getRetcode() {
@@ -66,7 +66,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 3;
* @param value the retcode to set
* @return this
*/
@@ -77,7 +77,7 @@ public GetEnteredSceneScRsp setRetcode(final int value) {
}
/**
- * repeated .EnteredSceneInfo entered_scene_info = 8;
+ * repeated .EnteredSceneInfo entered_scene_info = 4;
* @return whether the enteredSceneInfo field is set
*/
public boolean hasEnteredSceneInfo() {
@@ -85,7 +85,7 @@ public boolean hasEnteredSceneInfo() {
}
/**
- * repeated .EnteredSceneInfo entered_scene_info = 8;
+ * repeated .EnteredSceneInfo entered_scene_info = 4;
* @return this
*/
public GetEnteredSceneScRsp clearEnteredSceneInfo() {
@@ -95,7 +95,7 @@ public GetEnteredSceneScRsp clearEnteredSceneInfo() {
}
/**
- * repeated .EnteredSceneInfo entered_scene_info = 8;
+ * repeated .EnteredSceneInfo entered_scene_info = 4;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public RepeatedMessage getEnteredSc
}
/**
- * repeated .EnteredSceneInfo entered_scene_info = 8;
+ * repeated .EnteredSceneInfo entered_scene_info = 4;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -124,7 +124,7 @@ public RepeatedMessage getMutableEn
}
/**
- * repeated .EnteredSceneInfo entered_scene_info = 8;
+ * repeated .EnteredSceneInfo entered_scene_info = 4;
* @param value the enteredSceneInfo to add
* @return this
*/
@@ -136,7 +136,7 @@ public GetEnteredSceneScRsp addEnteredSceneInfo(
}
/**
- * repeated .EnteredSceneInfo entered_scene_info = 8;
+ * repeated .EnteredSceneInfo entered_scene_info = 4;
* @param values the enteredSceneInfo to add
* @return this
*/
@@ -213,12 +213,12 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < enteredSceneInfo.length(); i++) {
- output.writeRawByte((byte) 66);
+ output.writeRawByte((byte) 34);
output.writeMessageNoTag(enteredSceneInfo.get(i));
}
}
@@ -243,16 +243,16 @@ public GetEnteredSceneScRsp mergeFrom(final ProtoSource input) throws IOExceptio
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
+ case 24: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 66) {
+ if (tag != 34) {
break;
}
}
- case 66: {
+ case 34: {
// enteredSceneInfo
tag = input.readRepeatedMessage(enteredSceneInfo, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcCsReqOuterClass.java
index e368eab54..5340f10ef 100644
--- a/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcCsReqOuterClass.java
@@ -20,7 +20,7 @@ public static final class GetFirstTalkByPerformanceNpcCsReq extends ProtoMessage
private static final long serialVersionUID = 0L;
/**
- * repeated uint32 npc_talk_list = 4;
+ * repeated uint32 npc_talk_list = 2;
*/
private final RepeatedInt npcTalkList = RepeatedInt.newEmptyInstance();
@@ -35,7 +35,7 @@ public static GetFirstTalkByPerformanceNpcCsReq newInstance() {
}
/**
- * repeated uint32 npc_talk_list = 4;
+ * repeated uint32 npc_talk_list = 2;
* @return whether the npcTalkList field is set
*/
public boolean hasNpcTalkList() {
@@ -43,7 +43,7 @@ public boolean hasNpcTalkList() {
}
/**
- * repeated uint32 npc_talk_list = 4;
+ * repeated uint32 npc_talk_list = 2;
* @return this
*/
public GetFirstTalkByPerformanceNpcCsReq clearNpcTalkList() {
@@ -53,7 +53,7 @@ public GetFirstTalkByPerformanceNpcCsReq clearNpcTalkList() {
}
/**
- * repeated uint32 npc_talk_list = 4;
+ * repeated uint32 npc_talk_list = 2;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public RepeatedInt getNpcTalkList() {
}
/**
- * repeated uint32 npc_talk_list = 4;
+ * repeated uint32 npc_talk_list = 2;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public RepeatedInt getMutableNpcTalkList() {
}
/**
- * repeated uint32 npc_talk_list = 4;
+ * repeated uint32 npc_talk_list = 2;
* @param value the npcTalkList to add
* @return this
*/
@@ -92,7 +92,7 @@ public GetFirstTalkByPerformanceNpcCsReq addNpcTalkList(final int value) {
}
/**
- * repeated uint32 npc_talk_list = 4;
+ * repeated uint32 npc_talk_list = 2;
* @param values the npcTalkList to add
* @return this
*/
@@ -165,7 +165,7 @@ public boolean equals(Object o) {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < npcTalkList.length(); i++) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(npcTalkList.array()[i]);
}
}
@@ -187,7 +187,7 @@ public GetFirstTalkByPerformanceNpcCsReq mergeFrom(final ProtoSource input) thro
int tag = input.readTag();
while (true) {
switch (tag) {
- case 34: {
+ case 18: {
// npcTalkList [packed=true]
input.readPackedUInt32(npcTalkList, tag);
bitField0_ |= 0x00000001;
@@ -206,7 +206,7 @@ public GetFirstTalkByPerformanceNpcCsReq mergeFrom(final ProtoSource input) thro
tag = input.readTag();
break;
}
- case 32: {
+ case 16: {
// npcTalkList [packed=false]
tag = input.readRepeatedUInt32(npcTalkList, tag);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcScRspOuterClass.java
index 3061819f1..811b5c2a8 100644
--- a/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcScRspOuterClass.java
@@ -20,12 +20,12 @@ public static final class GetFirstTalkByPerformanceNpcScRsp extends ProtoMessage
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 8;
*/
private int retcode;
/**
- * repeated .NpcTalkInfo npc_talk_info_list = 13;
+ * repeated .NpcTalkInfo npc_talk_info_list = 11;
*/
private final RepeatedMessage npcTalkInfoList = RepeatedMessage.newEmptyInstance(NpcTalkInfoOuterClass.NpcTalkInfo.getFactory());
@@ -40,7 +40,7 @@ public static GetFirstTalkByPerformanceNpcScRsp newInstance() {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 8;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 8;
* @return this
*/
public GetFirstTalkByPerformanceNpcScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public GetFirstTalkByPerformanceNpcScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 8;
* @return the retcode
*/
public int getRetcode() {
@@ -66,7 +66,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 8;
* @param value the retcode to set
* @return this
*/
@@ -77,7 +77,7 @@ public GetFirstTalkByPerformanceNpcScRsp setRetcode(final int value) {
}
/**
- * repeated .NpcTalkInfo npc_talk_info_list = 13;
+ * repeated .NpcTalkInfo npc_talk_info_list = 11;
* @return whether the npcTalkInfoList field is set
*/
public boolean hasNpcTalkInfoList() {
@@ -85,7 +85,7 @@ public boolean hasNpcTalkInfoList() {
}
/**
- * repeated .NpcTalkInfo npc_talk_info_list = 13;
+ * repeated .NpcTalkInfo npc_talk_info_list = 11;
* @return this
*/
public GetFirstTalkByPerformanceNpcScRsp clearNpcTalkInfoList() {
@@ -95,7 +95,7 @@ public GetFirstTalkByPerformanceNpcScRsp clearNpcTalkInfoList() {
}
/**
- * repeated .NpcTalkInfo npc_talk_info_list = 13;
+ * repeated .NpcTalkInfo npc_talk_info_list = 11;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public RepeatedMessage getNpcTalkInfoList() {
}
/**
- * repeated .NpcTalkInfo npc_talk_info_list = 13;
+ * repeated .NpcTalkInfo npc_talk_info_list = 11;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public RepeatedMessage getMutableNpcTalkInfoL
}
/**
- * repeated .NpcTalkInfo npc_talk_info_list = 13;
+ * repeated .NpcTalkInfo npc_talk_info_list = 11;
* @param value the npcTalkInfoList to add
* @return this
*/
@@ -135,7 +135,7 @@ public GetFirstTalkByPerformanceNpcScRsp addNpcTalkInfoList(
}
/**
- * repeated .NpcTalkInfo npc_talk_info_list = 13;
+ * repeated .NpcTalkInfo npc_talk_info_list = 11;
* @param values the npcTalkInfoList to add
* @return this
*/
@@ -214,12 +214,12 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < npcTalkInfoList.length(); i++) {
- output.writeRawByte((byte) 106);
+ output.writeRawByte((byte) 90);
output.writeMessageNoTag(npcTalkInfoList.get(i));
}
}
@@ -244,16 +244,16 @@ public GetFirstTalkByPerformanceNpcScRsp mergeFrom(final ProtoSource input) thro
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
+ case 64: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 106) {
+ if (tag != 90) {
break;
}
}
- case 106: {
+ case 90: {
// npcTalkInfoList
tag = input.readRepeatedMessage(npcTalkInfoList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetFriendApplyListInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFriendApplyListInfoScRspOuterClass.java
index 2545352fe..02c9f3619 100644
--- a/src/generated/main/emu/lunarcore/proto/GetFriendApplyListInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetFriendApplyListInfoScRspOuterClass.java
@@ -20,14 +20,14 @@ public static final class GetFriendApplyListInfoScRsp extends ProtoMessageoptional uint32 retcode = 4;
+ * optional uint32 retcode = 3;
*/
private int retcode;
/**
- * repeated .FriendApplyListInfo friend_apply_list = 8;
+ * repeated .FriendApplyInfo friend_apply_list = 1;
*/
- private final RepeatedMessage friendApplyList = RepeatedMessage.newEmptyInstance(FriendApplyListInfoOuterClass.FriendApplyListInfo.getFactory());
+ private final RepeatedMessage friendApplyList = RepeatedMessage.newEmptyInstance(FriendApplyInfoOuterClass.FriendApplyInfo.getFactory());
private GetFriendApplyListInfoScRsp() {
}
@@ -40,7 +40,7 @@ public static GetFriendApplyListInfoScRsp newInstance() {
}
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 3;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 3;
* @return this
*/
public GetFriendApplyListInfoScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public GetFriendApplyListInfoScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 3;
* @return the retcode
*/
public int getRetcode() {
@@ -66,7 +66,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 3;
* @param value the retcode to set
* @return this
*/
@@ -77,7 +77,7 @@ public GetFriendApplyListInfoScRsp setRetcode(final int value) {
}
/**
- * repeated .FriendApplyListInfo friend_apply_list = 8;
+ * repeated .FriendApplyInfo friend_apply_list = 1;
* @return whether the friendApplyList field is set
*/
public boolean hasFriendApplyList() {
@@ -85,7 +85,7 @@ public boolean hasFriendApplyList() {
}
/**
- * repeated .FriendApplyListInfo friend_apply_list = 8;
+ * repeated .FriendApplyInfo friend_apply_list = 1;
* @return this
*/
public GetFriendApplyListInfoScRsp clearFriendApplyList() {
@@ -95,7 +95,7 @@ public GetFriendApplyListInfoScRsp clearFriendApplyList() {
}
/**
- * repeated .FriendApplyListInfo friend_apply_list = 8;
+ * repeated .FriendApplyInfo friend_apply_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.
@@ -104,12 +104,12 @@ public GetFriendApplyListInfoScRsp clearFriendApplyList() {
*
* @return internal storage object for reading
*/
- public RepeatedMessage getFriendApplyList() {
+ public RepeatedMessage getFriendApplyList() {
return friendApplyList;
}
/**
- * repeated .FriendApplyListInfo friend_apply_list = 8;
+ * repeated .FriendApplyInfo friend_apply_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
@@ -117,31 +117,30 @@ public RepeatedMessage getFri
*
* @return internal storage object for modifications
*/
- public RepeatedMessage getMutableFriendApplyList(
- ) {
+ public RepeatedMessage getMutableFriendApplyList() {
bitField0_ |= 0x00000002;
return friendApplyList;
}
/**
- * repeated .FriendApplyListInfo friend_apply_list = 8;
+ * repeated .FriendApplyInfo friend_apply_list = 1;
* @param value the friendApplyList to add
* @return this
*/
public GetFriendApplyListInfoScRsp addFriendApplyList(
- final FriendApplyListInfoOuterClass.FriendApplyListInfo value) {
+ final FriendApplyInfoOuterClass.FriendApplyInfo value) {
bitField0_ |= 0x00000002;
friendApplyList.add(value);
return this;
}
/**
- * repeated .FriendApplyListInfo friend_apply_list = 8;
+ * repeated .FriendApplyInfo friend_apply_list = 1;
* @param values the friendApplyList to add
* @return this
*/
public GetFriendApplyListInfoScRsp addAllFriendApplyList(
- final FriendApplyListInfoOuterClass.FriendApplyListInfo... values) {
+ final FriendApplyInfoOuterClass.FriendApplyInfo... values) {
bitField0_ |= 0x00000002;
friendApplyList.addAll(values);
return this;
@@ -213,12 +212,12 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < friendApplyList.length(); i++) {
- output.writeRawByte((byte) 66);
+ output.writeRawByte((byte) 10);
output.writeMessageNoTag(friendApplyList.get(i));
}
}
@@ -243,16 +242,16 @@ public GetFriendApplyListInfoScRsp mergeFrom(final ProtoSource input) throws IOE
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
+ case 24: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 66) {
+ if (tag != 10) {
break;
}
}
- case 66: {
+ case 10: {
// friendApplyList
tag = input.readRepeatedMessage(friendApplyList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetFriendListInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFriendListInfoScRspOuterClass.java
index 9f47aaaf2..e3af62198 100644
--- a/src/generated/main/emu/lunarcore/proto/GetFriendListInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetFriendListInfoScRspOuterClass.java
@@ -20,19 +20,19 @@ public static final class GetFriendListInfoScRsp extends ProtoMessageoptional uint32 retcode = 7;
+ * optional uint32 retcode = 14;
*/
private int retcode;
/**
- * repeated .FriendListInfo friend_list = 4;
+ * repeated .SimpleInfo simple_info = 1;
*/
- private final RepeatedMessage friendList = RepeatedMessage.newEmptyInstance(FriendListInfoOuterClass.FriendListInfo.getFactory());
+ private final RepeatedMessage simpleInfo = RepeatedMessage.newEmptyInstance(SimpleInfoOuterClass.SimpleInfo.getFactory());
/**
- * repeated .SimpleInfo simple_info = 9;
+ * repeated .FriendListInfo friend_list = 3;
*/
- private final RepeatedMessage simpleInfo = RepeatedMessage.newEmptyInstance(SimpleInfoOuterClass.SimpleInfo.getFactory());
+ private final RepeatedMessage friendList = RepeatedMessage.newEmptyInstance(FriendListInfoOuterClass.FriendListInfo.getFactory());
private GetFriendListInfoScRsp() {
}
@@ -45,7 +45,7 @@ public static GetFriendListInfoScRsp newInstance() {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 14;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -53,7 +53,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 14;
* @return this
*/
public GetFriendListInfoScRsp clearRetcode() {
@@ -63,7 +63,7 @@ public GetFriendListInfoScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 14;
* @return the retcode
*/
public int getRetcode() {
@@ -71,7 +71,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 14;
* @param value the retcode to set
* @return this
*/
@@ -82,39 +82,39 @@ public GetFriendListInfoScRsp setRetcode(final int value) {
}
/**
- * repeated .FriendListInfo friend_list = 4;
- * @return whether the friendList field is set
+ * repeated .SimpleInfo simple_info = 1;
+ * @return whether the simpleInfo field is set
*/
- public boolean hasFriendList() {
+ public boolean hasSimpleInfo() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * repeated .FriendListInfo friend_list = 4;
+ * repeated .SimpleInfo simple_info = 1;
* @return this
*/
- public GetFriendListInfoScRsp clearFriendList() {
+ public GetFriendListInfoScRsp clearSimpleInfo() {
bitField0_ &= ~0x00000002;
- friendList.clear();
+ simpleInfo.clear();
return this;
}
/**
- * repeated .FriendListInfo friend_list = 4;
+ * repeated .SimpleInfo simple_info = 1;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
*
- * Use {@link #getMutableFriendList()} if you want to modify it.
+ * Use {@link #getMutableSimpleInfo()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public RepeatedMessage getFriendList() {
- return friendList;
+ public RepeatedMessage getSimpleInfo() {
+ return simpleInfo;
}
/**
- * repeated .FriendListInfo friend_list = 4;
+ * repeated .SimpleInfo simple_info = 1;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,69 +122,68 @@ public RepeatedMessage getFriendList()
*
* @return internal storage object for modifications
*/
- public RepeatedMessage getMutableFriendList() {
+ public RepeatedMessage getMutableSimpleInfo() {
bitField0_ |= 0x00000002;
- return friendList;
+ return simpleInfo;
}
/**
- * repeated .FriendListInfo friend_list = 4;
- * @param value the friendList to add
+ * repeated .SimpleInfo simple_info = 1;
+ * @param value the simpleInfo to add
* @return this
*/
- public GetFriendListInfoScRsp addFriendList(
- final FriendListInfoOuterClass.FriendListInfo value) {
+ public GetFriendListInfoScRsp addSimpleInfo(final SimpleInfoOuterClass.SimpleInfo value) {
bitField0_ |= 0x00000002;
- friendList.add(value);
+ simpleInfo.add(value);
return this;
}
/**
- * repeated .FriendListInfo friend_list = 4;
- * @param values the friendList to add
+ * repeated .SimpleInfo simple_info = 1;
+ * @param values the simpleInfo to add
* @return this
*/
- public GetFriendListInfoScRsp addAllFriendList(
- final FriendListInfoOuterClass.FriendListInfo... values) {
+ public GetFriendListInfoScRsp addAllSimpleInfo(
+ final SimpleInfoOuterClass.SimpleInfo... values) {
bitField0_ |= 0x00000002;
- friendList.addAll(values);
+ simpleInfo.addAll(values);
return this;
}
/**
- * repeated .SimpleInfo simple_info = 9;
- * @return whether the simpleInfo field is set
+ * repeated .FriendListInfo friend_list = 3;
+ * @return whether the friendList field is set
*/
- public boolean hasSimpleInfo() {
+ public boolean hasFriendList() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * repeated .SimpleInfo simple_info = 9;
+ * repeated .FriendListInfo friend_list = 3;
* @return this
*/
- public GetFriendListInfoScRsp clearSimpleInfo() {
+ public GetFriendListInfoScRsp clearFriendList() {
bitField0_ &= ~0x00000004;
- simpleInfo.clear();
+ friendList.clear();
return this;
}
/**
- * repeated .SimpleInfo simple_info = 9;
+ * repeated .FriendListInfo friend_list = 3;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
*
- * Use {@link #getMutableSimpleInfo()} if you want to modify it.
+ * Use {@link #getMutableFriendList()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public RepeatedMessage getSimpleInfo() {
- return simpleInfo;
+ public RepeatedMessage getFriendList() {
+ return friendList;
}
/**
- * repeated .SimpleInfo simple_info = 9;
+ * repeated .FriendListInfo friend_list = 3;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -192,31 +191,32 @@ public RepeatedMessage getSimpleInfo() {
*
* @return internal storage object for modifications
*/
- public RepeatedMessage getMutableSimpleInfo() {
+ public RepeatedMessage getMutableFriendList() {
bitField0_ |= 0x00000004;
- return simpleInfo;
+ return friendList;
}
/**
- * repeated .SimpleInfo simple_info = 9;
- * @param value the simpleInfo to add
+ * repeated .FriendListInfo friend_list = 3;
+ * @param value the friendList to add
* @return this
*/
- public GetFriendListInfoScRsp addSimpleInfo(final SimpleInfoOuterClass.SimpleInfo value) {
+ public GetFriendListInfoScRsp addFriendList(
+ final FriendListInfoOuterClass.FriendListInfo value) {
bitField0_ |= 0x00000004;
- simpleInfo.add(value);
+ friendList.add(value);
return this;
}
/**
- * repeated .SimpleInfo simple_info = 9;
- * @param values the simpleInfo to add
+ * repeated .FriendListInfo friend_list = 3;
+ * @param values the friendList to add
* @return this
*/
- public GetFriendListInfoScRsp addAllSimpleInfo(
- final SimpleInfoOuterClass.SimpleInfo... values) {
+ public GetFriendListInfoScRsp addAllFriendList(
+ final FriendListInfoOuterClass.FriendListInfo... values) {
bitField0_ |= 0x00000004;
- simpleInfo.addAll(values);
+ friendList.addAll(values);
return this;
}
@@ -226,8 +226,8 @@ public GetFriendListInfoScRsp copyFrom(final GetFriendListInfoScRsp other) {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
retcode = other.retcode;
- friendList.copyFrom(other.friendList);
simpleInfo.copyFrom(other.simpleInfo);
+ friendList.copyFrom(other.friendList);
}
return this;
}
@@ -241,12 +241,12 @@ public GetFriendListInfoScRsp mergeFrom(final GetFriendListInfoScRsp other) {
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
- if (other.hasFriendList()) {
- getMutableFriendList().addAll(other.friendList);
- }
if (other.hasSimpleInfo()) {
getMutableSimpleInfo().addAll(other.simpleInfo);
}
+ if (other.hasFriendList()) {
+ getMutableFriendList().addAll(other.friendList);
+ }
return this;
}
@@ -258,8 +258,8 @@ public GetFriendListInfoScRsp clear() {
cachedSize = -1;
bitField0_ = 0;
retcode = 0;
- friendList.clear();
simpleInfo.clear();
+ friendList.clear();
return this;
}
@@ -270,8 +270,8 @@ public GetFriendListInfoScRsp clearQuick() {
}
cachedSize = -1;
bitField0_ = 0;
- friendList.clearQuick();
simpleInfo.clearQuick();
+ friendList.clearQuick();
return this;
}
@@ -286,26 +286,26 @@ public boolean equals(Object o) {
GetFriendListInfoScRsp other = (GetFriendListInfoScRsp) o;
return bitField0_ == other.bitField0_
&& (!hasRetcode() || retcode == other.retcode)
- && (!hasFriendList() || friendList.equals(other.friendList))
- && (!hasSimpleInfo() || simpleInfo.equals(other.simpleInfo));
+ && (!hasSimpleInfo() || simpleInfo.equals(other.simpleInfo))
+ && (!hasFriendList() || friendList.equals(other.friendList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 112);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- for (int i = 0; i < friendList.length(); i++) {
- output.writeRawByte((byte) 34);
- output.writeMessageNoTag(friendList.get(i));
+ for (int i = 0; i < simpleInfo.length(); i++) {
+ output.writeRawByte((byte) 10);
+ output.writeMessageNoTag(simpleInfo.get(i));
}
}
if ((bitField0_ & 0x00000004) != 0) {
- for (int i = 0; i < simpleInfo.length(); i++) {
- output.writeRawByte((byte) 74);
- output.writeMessageNoTag(simpleInfo.get(i));
+ for (int i = 0; i < friendList.length(); i++) {
+ output.writeRawByte((byte) 26);
+ output.writeMessageNoTag(friendList.get(i));
}
}
}
@@ -317,10 +317,10 @@ protected int computeSerializedSize() {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += (1 * friendList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(friendList);
+ size += (1 * simpleInfo.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(simpleInfo);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += (1 * simpleInfo.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(simpleInfo);
+ size += (1 * friendList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(friendList);
}
return size;
}
@@ -332,26 +332,26 @@ public GetFriendListInfoScRsp mergeFrom(final ProtoSource input) throws IOExcept
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
+ case 112: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 34) {
+ if (tag != 10) {
break;
}
}
- case 34: {
- // friendList
- tag = input.readRepeatedMessage(friendList, tag);
+ case 10: {
+ // simpleInfo
+ tag = input.readRepeatedMessage(simpleInfo, tag);
bitField0_ |= 0x00000002;
- if (tag != 74) {
+ if (tag != 26) {
break;
}
}
- case 74: {
- // simpleInfo
- tag = input.readRepeatedMessage(simpleInfo, tag);
+ case 26: {
+ // friendList
+ tag = input.readRepeatedMessage(friendList, tag);
bitField0_ |= 0x00000004;
if (tag != 0) {
break;
@@ -378,10 +378,10 @@ public void writeTo(final JsonSink output) throws IOException {
output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRepeatedMessage(FieldNames.friendList, friendList);
+ output.writeRepeatedMessage(FieldNames.simpleInfo, simpleInfo);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRepeatedMessage(FieldNames.simpleInfo, simpleInfo);
+ output.writeRepeatedMessage(FieldNames.friendList, friendList);
}
output.endObject();
}
@@ -404,11 +404,11 @@ public GetFriendListInfoScRsp mergeFrom(final JsonSource input) throws IOExcepti
}
break;
}
- case -1756909476:
- case 1388007839: {
- if (input.isAtField(FieldNames.friendList)) {
+ case -1431903872:
+ case -1419171045: {
+ if (input.isAtField(FieldNames.simpleInfo)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(friendList);
+ input.readRepeatedMessage(simpleInfo);
bitField0_ |= 0x00000002;
}
} else {
@@ -416,11 +416,11 @@ public GetFriendListInfoScRsp mergeFrom(final JsonSource input) throws IOExcepti
}
break;
}
- case -1431903872:
- case -1419171045: {
- if (input.isAtField(FieldNames.simpleInfo)) {
+ case -1756909476:
+ case 1388007839: {
+ if (input.isAtField(FieldNames.friendList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(simpleInfo);
+ input.readRepeatedMessage(friendList);
bitField0_ |= 0x00000004;
}
} else {
@@ -483,9 +483,9 @@ public GetFriendListInfoScRsp create() {
static class FieldNames {
static final FieldName retcode = FieldName.forField("retcode");
- static final FieldName friendList = FieldName.forField("friendList", "friend_list");
-
static final FieldName simpleInfo = FieldName.forField("simpleInfo", "simple_info");
+
+ static final FieldName friendList = FieldName.forField("friendList", "friend_list");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/GetFriendLoginInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFriendLoginInfoScRspOuterClass.java
index d4f885f30..83e99f063 100644
--- a/src/generated/main/emu/lunarcore/proto/GetFriendLoginInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetFriendLoginInfoScRspOuterClass.java
@@ -20,30 +20,20 @@ public static final class GetFriendLoginInfoScRsp extends ProtoMessageoptional uint32 retcode = 5;
+ * optional uint32 retcode = 11;
*/
private int retcode;
/**
- * optional bool show_red_dot_flag = 1;
+ * repeated uint32 friend_uid_list = 5;
*/
- private boolean showRedDotFlag;
-
- /**
- * optional bool is_allow_other_apply = 10;
- */
- private boolean isAllowOtherApply;
+ private final RepeatedInt friendUidList = RepeatedInt.newEmptyInstance();
/**
- * repeated uint32 black_uid_list = 4;
+ * repeated uint32 black_uid_list = 15;
*/
private final RepeatedInt blackUidList = RepeatedInt.newEmptyInstance();
- /**
- * repeated uint32 friend_uid_list = 14;
- */
- private final RepeatedInt friendUidList = RepeatedInt.newEmptyInstance();
-
private GetFriendLoginInfoScRsp() {
}
@@ -55,7 +45,7 @@ public static GetFriendLoginInfoScRsp newInstance() {
}
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 11;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -63,7 +53,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 11;
* @return this
*/
public GetFriendLoginInfoScRsp clearRetcode() {
@@ -73,7 +63,7 @@ public GetFriendLoginInfoScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 11;
* @return the retcode
*/
public int getRetcode() {
@@ -81,7 +71,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 11;
* @param value the retcode to set
* @return this
*/
@@ -92,99 +82,93 @@ public GetFriendLoginInfoScRsp setRetcode(final int value) {
}
/**
- * optional bool show_red_dot_flag = 1;
- * @return whether the showRedDotFlag field is set
+ * repeated uint32 friend_uid_list = 5;
+ * @return whether the friendUidList field is set
*/
- public boolean hasShowRedDotFlag() {
+ public boolean hasFriendUidList() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional bool show_red_dot_flag = 1;
+ * repeated uint32 friend_uid_list = 5;
* @return this
*/
- public GetFriendLoginInfoScRsp clearShowRedDotFlag() {
+ public GetFriendLoginInfoScRsp clearFriendUidList() {
bitField0_ &= ~0x00000002;
- showRedDotFlag = false;
+ friendUidList.clear();
return this;
}
/**
- * optional bool show_red_dot_flag = 1;
- * @return the showRedDotFlag
+ * repeated uint32 friend_uid_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 #getMutableFriendUidList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
*/
- public boolean getShowRedDotFlag() {
- return showRedDotFlag;
+ public RepeatedInt getFriendUidList() {
+ return friendUidList;
}
/**
- * optional bool show_red_dot_flag = 1;
- * @param value the showRedDotFlag to set
- * @return this
+ * repeated uint32 friend_uid_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 GetFriendLoginInfoScRsp setShowRedDotFlag(final boolean value) {
+ public RepeatedInt getMutableFriendUidList() {
bitField0_ |= 0x00000002;
- showRedDotFlag = value;
- return this;
- }
-
- /**
- * optional bool is_allow_other_apply = 10;
- * @return whether the isAllowOtherApply field is set
- */
- public boolean hasIsAllowOtherApply() {
- return (bitField0_ & 0x00000004) != 0;
+ return friendUidList;
}
/**
- * optional bool is_allow_other_apply = 10;
+ * repeated uint32 friend_uid_list = 5;
+ * @param value the friendUidList to add
* @return this
*/
- public GetFriendLoginInfoScRsp clearIsAllowOtherApply() {
- bitField0_ &= ~0x00000004;
- isAllowOtherApply = false;
+ public GetFriendLoginInfoScRsp addFriendUidList(final int value) {
+ bitField0_ |= 0x00000002;
+ friendUidList.add(value);
return this;
}
/**
- * optional bool is_allow_other_apply = 10;
- * @return the isAllowOtherApply
- */
- public boolean getIsAllowOtherApply() {
- return isAllowOtherApply;
- }
-
- /**
- * optional bool is_allow_other_apply = 10;
- * @param value the isAllowOtherApply to set
+ * repeated uint32 friend_uid_list = 5;
+ * @param values the friendUidList to add
* @return this
*/
- public GetFriendLoginInfoScRsp setIsAllowOtherApply(final boolean value) {
- bitField0_ |= 0x00000004;
- isAllowOtherApply = value;
+ public GetFriendLoginInfoScRsp addAllFriendUidList(final int... values) {
+ bitField0_ |= 0x00000002;
+ friendUidList.addAll(values);
return this;
}
/**
- * repeated uint32 black_uid_list = 4;
+ * repeated uint32 black_uid_list = 15;
* @return whether the blackUidList field is set
*/
public boolean hasBlackUidList() {
- return (bitField0_ & 0x00000008) != 0;
+ return (bitField0_ & 0x00000004) != 0;
}
/**
- * repeated uint32 black_uid_list = 4;
+ * repeated uint32 black_uid_list = 15;
* @return this
*/
public GetFriendLoginInfoScRsp clearBlackUidList() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000004;
blackUidList.clear();
return this;
}
/**
- * repeated uint32 black_uid_list = 4;
+ * repeated uint32 black_uid_list = 15;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -198,7 +182,7 @@ public RepeatedInt getBlackUidList() {
}
/**
- * repeated uint32 black_uid_list = 4;
+ * repeated uint32 black_uid_list = 15;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -207,110 +191,40 @@ public RepeatedInt getBlackUidList() {
* @return internal storage object for modifications
*/
public RepeatedInt getMutableBlackUidList() {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
return blackUidList;
}
/**
- * repeated uint32 black_uid_list = 4;
+ * repeated uint32 black_uid_list = 15;
* @param value the blackUidList to add
* @return this
*/
public GetFriendLoginInfoScRsp addBlackUidList(final int value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
blackUidList.add(value);
return this;
}
/**
- * repeated uint32 black_uid_list = 4;
+ * repeated uint32 black_uid_list = 15;
* @param values the blackUidList to add
* @return this
*/
public GetFriendLoginInfoScRsp addAllBlackUidList(final int... values) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
blackUidList.addAll(values);
return this;
}
- /**
- * repeated uint32 friend_uid_list = 14;
- * @return whether the friendUidList field is set
- */
- public boolean hasFriendUidList() {
- return (bitField0_ & 0x00000010) != 0;
- }
-
- /**
- * repeated uint32 friend_uid_list = 14;
- * @return this
- */
- public GetFriendLoginInfoScRsp clearFriendUidList() {
- bitField0_ &= ~0x00000010;
- friendUidList.clear();
- return this;
- }
-
- /**
- * repeated uint32 friend_uid_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 #getMutableFriendUidList()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedInt getFriendUidList() {
- return friendUidList;
- }
-
- /**
- * repeated uint32 friend_uid_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 getMutableFriendUidList() {
- bitField0_ |= 0x00000010;
- return friendUidList;
- }
-
- /**
- * repeated uint32 friend_uid_list = 14;
- * @param value the friendUidList to add
- * @return this
- */
- public GetFriendLoginInfoScRsp addFriendUidList(final int value) {
- bitField0_ |= 0x00000010;
- friendUidList.add(value);
- return this;
- }
-
- /**
- * repeated uint32 friend_uid_list = 14;
- * @param values the friendUidList to add
- * @return this
- */
- public GetFriendLoginInfoScRsp addAllFriendUidList(final int... values) {
- bitField0_ |= 0x00000010;
- friendUidList.addAll(values);
- return this;
- }
-
@Override
public GetFriendLoginInfoScRsp copyFrom(final GetFriendLoginInfoScRsp other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
retcode = other.retcode;
- showRedDotFlag = other.showRedDotFlag;
- isAllowOtherApply = other.isAllowOtherApply;
- blackUidList.copyFrom(other.blackUidList);
friendUidList.copyFrom(other.friendUidList);
+ blackUidList.copyFrom(other.blackUidList);
}
return this;
}
@@ -324,18 +238,12 @@ public GetFriendLoginInfoScRsp mergeFrom(final GetFriendLoginInfoScRsp other) {
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
- if (other.hasShowRedDotFlag()) {
- setShowRedDotFlag(other.showRedDotFlag);
- }
- if (other.hasIsAllowOtherApply()) {
- setIsAllowOtherApply(other.isAllowOtherApply);
+ if (other.hasFriendUidList()) {
+ getMutableFriendUidList().addAll(other.friendUidList);
}
if (other.hasBlackUidList()) {
getMutableBlackUidList().addAll(other.blackUidList);
}
- if (other.hasFriendUidList()) {
- getMutableFriendUidList().addAll(other.friendUidList);
- }
return this;
}
@@ -347,10 +255,8 @@ public GetFriendLoginInfoScRsp clear() {
cachedSize = -1;
bitField0_ = 0;
retcode = 0;
- showRedDotFlag = false;
- isAllowOtherApply = false;
- blackUidList.clear();
friendUidList.clear();
+ blackUidList.clear();
return this;
}
@@ -361,8 +267,8 @@ public GetFriendLoginInfoScRsp clearQuick() {
}
cachedSize = -1;
bitField0_ = 0;
- blackUidList.clear();
friendUidList.clear();
+ blackUidList.clear();
return this;
}
@@ -377,38 +283,28 @@ public boolean equals(Object o) {
GetFriendLoginInfoScRsp other = (GetFriendLoginInfoScRsp) o;
return bitField0_ == other.bitField0_
&& (!hasRetcode() || retcode == other.retcode)
- && (!hasShowRedDotFlag() || showRedDotFlag == other.showRedDotFlag)
- && (!hasIsAllowOtherApply() || isAllowOtherApply == other.isAllowOtherApply)
- && (!hasBlackUidList() || blackUidList.equals(other.blackUidList))
- && (!hasFriendUidList() || friendUidList.equals(other.friendUidList));
+ && (!hasFriendUidList() || friendUidList.equals(other.friendUidList))
+ && (!hasBlackUidList() || blackUidList.equals(other.blackUidList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 8);
- output.writeBoolNoTag(showRedDotFlag);
+ for (int i = 0; i < friendUidList.length(); i++) {
+ output.writeRawByte((byte) 40);
+ output.writeUInt32NoTag(friendUidList.array()[i]);
+ }
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 80);
- output.writeBoolNoTag(isAllowOtherApply);
- }
- if ((bitField0_ & 0x00000008) != 0) {
for (int i = 0; i < blackUidList.length(); i++) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(blackUidList.array()[i]);
}
}
- if ((bitField0_ & 0x00000010) != 0) {
- for (int i = 0; i < friendUidList.length(); i++) {
- output.writeRawByte((byte) 112);
- output.writeUInt32NoTag(friendUidList.array()[i]);
- }
- }
}
@Override
@@ -418,17 +314,11 @@ protected int computeSerializedSize() {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 2;
+ size += (1 * friendUidList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(friendUidList);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 2;
- }
- if ((bitField0_ & 0x00000008) != 0) {
size += (1 * blackUidList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(blackUidList);
}
- if ((bitField0_ & 0x00000010) != 0) {
- size += (1 * friendUidList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(friendUidList);
- }
return size;
}
@@ -439,46 +329,28 @@ public GetFriendLoginInfoScRsp mergeFrom(final ProtoSource input) throws IOExcep
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
+ case 88: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 8) {
+ if (tag != 42) {
break;
}
}
- case 8: {
- // showRedDotFlag
- showRedDotFlag = input.readBool();
+ case 42: {
+ // friendUidList [packed=true]
+ input.readPackedUInt32(friendUidList, tag);
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 80) {
- break;
- }
- }
- case 80: {
- // isAllowOtherApply
- isAllowOtherApply = input.readBool();
- bitField0_ |= 0x00000004;
- tag = input.readTag();
- if (tag != 34) {
+ if (tag != 122) {
break;
}
}
- case 34: {
+ case 122: {
// blackUidList [packed=true]
input.readPackedUInt32(blackUidList, tag);
- bitField0_ |= 0x00000008;
- tag = input.readTag();
- if (tag != 114) {
- break;
- }
- }
- case 114: {
- // friendUidList [packed=true]
- input.readPackedUInt32(friendUidList, tag);
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 0) {
break;
@@ -494,16 +366,16 @@ public GetFriendLoginInfoScRsp mergeFrom(final ProtoSource input) throws IOExcep
tag = input.readTag();
break;
}
- case 32: {
- // blackUidList [packed=false]
- tag = input.readRepeatedUInt32(blackUidList, tag);
- bitField0_ |= 0x00000008;
- break;
- }
- case 112: {
+ case 40: {
// friendUidList [packed=false]
tag = input.readRepeatedUInt32(friendUidList, tag);
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000002;
+ break;
+ }
+ case 120: {
+ // blackUidList [packed=false]
+ tag = input.readRepeatedUInt32(blackUidList, tag);
+ bitField0_ |= 0x00000004;
break;
}
}
@@ -517,17 +389,11 @@ public void writeTo(final JsonSink output) throws IOException {
output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeBool(FieldNames.showRedDotFlag, showRedDotFlag);
+ output.writeRepeatedUInt32(FieldNames.friendUidList, friendUidList);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeBool(FieldNames.isAllowOtherApply, isAllowOtherApply);
- }
- if ((bitField0_ & 0x00000008) != 0) {
output.writeRepeatedUInt32(FieldNames.blackUidList, blackUidList);
}
- if ((bitField0_ & 0x00000010) != 0) {
- output.writeRepeatedUInt32(FieldNames.friendUidList, friendUidList);
- }
output.endObject();
}
@@ -549,11 +415,11 @@ public GetFriendLoginInfoScRsp mergeFrom(final JsonSource input) throws IOExcept
}
break;
}
- case 197350753:
- case 1123923602: {
- if (input.isAtField(FieldNames.showRedDotFlag)) {
+ case 2058895504:
+ case -2016931922: {
+ if (input.isAtField(FieldNames.friendUidList)) {
if (!input.trySkipNullValue()) {
- showRedDotFlag = input.readBool();
+ input.readRepeatedUInt32(friendUidList);
bitField0_ |= 0x00000002;
}
} else {
@@ -561,36 +427,12 @@ public GetFriendLoginInfoScRsp mergeFrom(final JsonSource input) throws IOExcept
}
break;
}
- case 442705885:
- case 1355216308: {
- if (input.isAtField(FieldNames.isAllowOtherApply)) {
- if (!input.trySkipNullValue()) {
- isAllowOtherApply = input.readBool();
- bitField0_ |= 0x00000004;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 1562975247:
case -1854929043: {
if (input.isAtField(FieldNames.blackUidList)) {
if (!input.trySkipNullValue()) {
input.readRepeatedUInt32(blackUidList);
- bitField0_ |= 0x00000008;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 2058895504:
- case -2016931922: {
- if (input.isAtField(FieldNames.friendUidList)) {
- if (!input.trySkipNullValue()) {
- input.readRepeatedUInt32(friendUidList);
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000004;
}
} else {
input.skipUnknownField();
@@ -652,13 +494,9 @@ public GetFriendLoginInfoScRsp create() {
static class FieldNames {
static final FieldName retcode = FieldName.forField("retcode");
- static final FieldName showRedDotFlag = FieldName.forField("showRedDotFlag", "show_red_dot_flag");
-
- static final FieldName isAllowOtherApply = FieldName.forField("isAllowOtherApply", "is_allow_other_apply");
+ static final FieldName friendUidList = FieldName.forField("friendUidList", "friend_uid_list");
static final FieldName blackUidList = FieldName.forField("blackUidList", "black_uid_list");
-
- static final FieldName friendUidList = FieldName.forField("friendUidList", "friend_uid_list");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/GetFriendRecommendListInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFriendRecommendListInfoScRspOuterClass.java
index 51a27de06..c5ce8f425 100644
--- a/src/generated/main/emu/lunarcore/proto/GetFriendRecommendListInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetFriendRecommendListInfoScRspOuterClass.java
@@ -20,12 +20,12 @@ public static final class GetFriendRecommendListInfoScRsp extends ProtoMessageoptional uint32 retcode = 12;
+ * optional uint32 retcode = 3;
*/
private int retcode;
/**
- * repeated .FriendRecommendInfo friend_recommend_list = 5;
+ * repeated .FriendRecommendInfo friend_recommend_list = 13;
*/
private final RepeatedMessage friendRecommendList = RepeatedMessage.newEmptyInstance(FriendRecommendInfoOuterClass.FriendRecommendInfo.getFactory());
@@ -40,7 +40,7 @@ public static GetFriendRecommendListInfoScRsp newInstance() {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 3;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 3;
* @return this
*/
public GetFriendRecommendListInfoScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public GetFriendRecommendListInfoScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 3;
* @return the retcode
*/
public int getRetcode() {
@@ -66,7 +66,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 3;
* @param value the retcode to set
* @return this
*/
@@ -77,7 +77,7 @@ public GetFriendRecommendListInfoScRsp setRetcode(final int value) {
}
/**
- * repeated .FriendRecommendInfo friend_recommend_list = 5;
+ * repeated .FriendRecommendInfo friend_recommend_list = 13;
* @return whether the friendRecommendList field is set
*/
public boolean hasFriendRecommendList() {
@@ -85,7 +85,7 @@ public boolean hasFriendRecommendList() {
}
/**
- * repeated .FriendRecommendInfo friend_recommend_list = 5;
+ * repeated .FriendRecommendInfo friend_recommend_list = 13;
* @return this
*/
public GetFriendRecommendListInfoScRsp clearFriendRecommendList() {
@@ -95,7 +95,7 @@ public GetFriendRecommendListInfoScRsp clearFriendRecommendList() {
}
/**
- * repeated .FriendRecommendInfo friend_recommend_list = 5;
+ * repeated .FriendRecommendInfo friend_recommend_list = 13;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -110,7 +110,7 @@ public RepeatedMessage getFri
}
/**
- * repeated .FriendRecommendInfo friend_recommend_list = 5;
+ * repeated .FriendRecommendInfo friend_recommend_list = 13;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -125,7 +125,7 @@ public RepeatedMessage getMut
}
/**
- * repeated .FriendRecommendInfo friend_recommend_list = 5;
+ * repeated .FriendRecommendInfo friend_recommend_list = 13;
* @param value the friendRecommendList to add
* @return this
*/
@@ -137,7 +137,7 @@ public GetFriendRecommendListInfoScRsp addFriendRecommendList(
}
/**
- * repeated .FriendRecommendInfo friend_recommend_list = 5;
+ * repeated .FriendRecommendInfo friend_recommend_list = 13;
* @param values the friendRecommendList to add
* @return this
*/
@@ -214,12 +214,12 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < friendRecommendList.length(); i++) {
- output.writeRawByte((byte) 42);
+ output.writeRawByte((byte) 106);
output.writeMessageNoTag(friendRecommendList.get(i));
}
}
@@ -244,16 +244,16 @@ public GetFriendRecommendListInfoScRsp mergeFrom(final ProtoSource input) throws
int tag = input.readTag();
while (true) {
switch (tag) {
- case 96: {
+ case 24: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 42) {
+ if (tag != 106) {
break;
}
}
- case 42: {
+ case 106: {
// friendRecommendList
tag = input.readRepeatedMessage(friendRecommendList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetGachaCeilingCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetGachaCeilingCsReqOuterClass.java
index c9ae508d8..a23ac56cb 100644
--- a/src/generated/main/emu/lunarcore/proto/GetGachaCeilingCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetGachaCeilingCsReqOuterClass.java
@@ -19,7 +19,7 @@ public static final class GetGachaCeilingCsReq extends ProtoMessageoptional uint32 gacha_type = 4;
+ * optional uint32 gacha_type = 10;
*/
private int gachaType;
@@ -34,7 +34,7 @@ public static GetGachaCeilingCsReq newInstance() {
}
/**
- * optional uint32 gacha_type = 4;
+ * optional uint32 gacha_type = 10;
* @return whether the gachaType field is set
*/
public boolean hasGachaType() {
@@ -42,7 +42,7 @@ public boolean hasGachaType() {
}
/**
- * optional uint32 gacha_type = 4;
+ * optional uint32 gacha_type = 10;
* @return this
*/
public GetGachaCeilingCsReq clearGachaType() {
@@ -52,7 +52,7 @@ public GetGachaCeilingCsReq clearGachaType() {
}
/**
- * optional uint32 gacha_type = 4;
+ * optional uint32 gacha_type = 10;
* @return the gachaType
*/
public int getGachaType() {
@@ -60,7 +60,7 @@ public int getGachaType() {
}
/**
- * optional uint32 gacha_type = 4;
+ * optional uint32 gacha_type = 10;
* @param value the gachaType to set
* @return this
*/
@@ -129,7 +129,7 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(gachaType);
}
}
@@ -150,7 +150,7 @@ public GetGachaCeilingCsReq mergeFrom(final ProtoSource input) throws IOExceptio
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
+ case 80: {
// gachaType
gachaType = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/GetGachaCeilingScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetGachaCeilingScRspOuterClass.java
index 131c21d60..bf918d3f3 100644
--- a/src/generated/main/emu/lunarcore/proto/GetGachaCeilingScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetGachaCeilingScRspOuterClass.java
@@ -19,7 +19,7 @@ public static final class GetGachaCeilingScRsp extends ProtoMessageoptional uint32 gacha_type = 14;
+ * optional uint32 gacha_type = 3;
*/
private int gachaType;
@@ -29,7 +29,7 @@ public static final class GetGachaCeilingScRsp extends ProtoMessageoptional .GachaCeiling gacha_ceiling = 6;
+ * optional .GachaCeiling gacha_ceiling = 1;
*/
private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance();
@@ -44,7 +44,7 @@ public static GetGachaCeilingScRsp newInstance() {
}
/**
- * optional uint32 gacha_type = 14;
+ * optional uint32 gacha_type = 3;
* @return whether the gachaType field is set
*/
public boolean hasGachaType() {
@@ -52,7 +52,7 @@ public boolean hasGachaType() {
}
/**
- * optional uint32 gacha_type = 14;
+ * optional uint32 gacha_type = 3;
* @return this
*/
public GetGachaCeilingScRsp clearGachaType() {
@@ -62,7 +62,7 @@ public GetGachaCeilingScRsp clearGachaType() {
}
/**
- * optional uint32 gacha_type = 14;
+ * optional uint32 gacha_type = 3;
* @return the gachaType
*/
public int getGachaType() {
@@ -70,7 +70,7 @@ public int getGachaType() {
}
/**
- * optional uint32 gacha_type = 14;
+ * optional uint32 gacha_type = 3;
* @param value the gachaType to set
* @return this
*/
@@ -118,7 +118,7 @@ public GetGachaCeilingScRsp setRetcode(final int value) {
}
/**
- * optional .GachaCeiling gacha_ceiling = 6;
+ * optional .GachaCeiling gacha_ceiling = 1;
* @return whether the gachaCeiling field is set
*/
public boolean hasGachaCeiling() {
@@ -126,7 +126,7 @@ public boolean hasGachaCeiling() {
}
/**
- * optional .GachaCeiling gacha_ceiling = 6;
+ * optional .GachaCeiling gacha_ceiling = 1;
* @return this
*/
public GetGachaCeilingScRsp clearGachaCeiling() {
@@ -136,7 +136,7 @@ public GetGachaCeilingScRsp clearGachaCeiling() {
}
/**
- * optional .GachaCeiling gacha_ceiling = 6;
+ * optional .GachaCeiling gacha_ceiling = 1;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -150,7 +150,7 @@ public GachaCeilingOuterClass.GachaCeiling getGachaCeiling() {
}
/**
- * optional .GachaCeiling gacha_ceiling = 6;
+ * optional .GachaCeiling gacha_ceiling = 1;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -164,7 +164,7 @@ public GachaCeilingOuterClass.GachaCeiling getMutableGachaCeiling() {
}
/**
- * optional .GachaCeiling gacha_ceiling = 6;
+ * optional .GachaCeiling gacha_ceiling = 1;
* @param value the gachaCeiling to set
* @return this
*/
@@ -246,7 +246,7 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(gachaType);
}
if ((bitField0_ & 0x00000002) != 0) {
@@ -254,7 +254,7 @@ public void writeTo(final ProtoSink output) throws IOException {
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 50);
+ output.writeRawByte((byte) 10);
output.writeMessageNoTag(gachaCeiling);
}
}
@@ -281,7 +281,7 @@ public GetGachaCeilingScRsp mergeFrom(final ProtoSource input) throws IOExceptio
int tag = input.readTag();
while (true) {
switch (tag) {
- case 112: {
+ case 24: {
// gachaType
gachaType = input.readUInt32();
bitField0_ |= 0x00000001;
@@ -295,11 +295,11 @@ public GetGachaCeilingScRsp mergeFrom(final ProtoSource input) throws IOExceptio
retcode = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 50) {
+ if (tag != 10) {
break;
}
}
- case 50: {
+ case 10: {
// gachaCeiling
input.readMessage(gachaCeiling);
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java
index f1efa72a5..ee4e6b008 100644
--- a/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java
@@ -20,12 +20,12 @@ public static final class GetGachaInfoScRsp extends ProtoMessageoptional uint32 retcode = 9;
+ * optional uint32 retcode = 11;
*/
private int retcode;
/**
- * repeated .GachaInfo gacha_info_list = 1;
+ * repeated .GachaInfo gacha_info_list = 8;
*/
private final RepeatedMessage gachaInfoList = RepeatedMessage.newEmptyInstance(GachaInfoOuterClass.GachaInfo.getFactory());
@@ -40,7 +40,7 @@ public static GetGachaInfoScRsp newInstance() {
}
/**
- * optional uint32 retcode = 9;
+ * optional uint32 retcode = 11;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 9;
+ * optional uint32 retcode = 11;
* @return this
*/
public GetGachaInfoScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public GetGachaInfoScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 9;
+ * optional uint32 retcode = 11;
* @return the retcode
*/
public int getRetcode() {
@@ -66,7 +66,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 9;
+ * optional uint32 retcode = 11;
* @param value the retcode to set
* @return this
*/
@@ -77,7 +77,7 @@ public GetGachaInfoScRsp setRetcode(final int value) {
}
/**
- * repeated .GachaInfo gacha_info_list = 1;
+ * repeated .GachaInfo gacha_info_list = 8;
* @return whether the gachaInfoList field is set
*/
public boolean hasGachaInfoList() {
@@ -85,7 +85,7 @@ public boolean hasGachaInfoList() {
}
/**
- * repeated .GachaInfo gacha_info_list = 1;
+ * repeated .GachaInfo gacha_info_list = 8;
* @return this
*/
public GetGachaInfoScRsp clearGachaInfoList() {
@@ -95,7 +95,7 @@ public GetGachaInfoScRsp clearGachaInfoList() {
}
/**
- * repeated .GachaInfo gacha_info_list = 1;
+ * repeated .GachaInfo gacha_info_list = 8;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public RepeatedMessage getGachaInfoList() {
}
/**
- * repeated .GachaInfo gacha_info_list = 1;
+ * repeated .GachaInfo gacha_info_list = 8;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public RepeatedMessage getMutableGachaInfoList()
}
/**
- * repeated .GachaInfo gacha_info_list = 1;
+ * repeated .GachaInfo gacha_info_list = 8;
* @param value the gachaInfoList to add
* @return this
*/
@@ -134,7 +134,7 @@ public GetGachaInfoScRsp addGachaInfoList(final GachaInfoOuterClass.GachaInfo va
}
/**
- * repeated .GachaInfo gacha_info_list = 1;
+ * repeated .GachaInfo gacha_info_list = 8;
* @param values the gachaInfoList to add
* @return this
*/
@@ -210,12 +210,12 @@ public boolean equals(Object o) {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < gachaInfoList.length(); i++) {
- output.writeRawByte((byte) 10);
+ output.writeRawByte((byte) 66);
output.writeMessageNoTag(gachaInfoList.get(i));
}
}
@@ -240,16 +240,16 @@ public GetGachaInfoScRsp mergeFrom(final ProtoSource input) throws IOException {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 72: {
+ case 88: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 10) {
+ if (tag != 66) {
break;
}
}
- case 10: {
+ case 66: {
// gachaInfoList
tag = input.readRepeatedMessage(gachaInfoList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java
index 2d1ed0e27..1e28b3286 100644
--- a/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java
@@ -20,22 +20,22 @@ public static final class GetHeroBasicTypeInfoScRsp extends ProtoMessageoptional uint32 retcode = 12;
+ * optional uint32 retcode = 2;
*/
private int retcode;
/**
- * optional .Gender gender = 5;
+ * optional .HeroBasicType cur_basic_type = 7;
*/
- private int gender;
+ private int curBasicType;
/**
- * optional .HeroBasicType cur_basic_type = 11;
+ * optional .Gender gender = 13;
*/
- private int curBasicType;
+ private int gender;
/**
- * repeated .HeroBasicTypeInfo basic_type_info_list = 6;
+ * repeated .HeroBasicTypeInfo basic_type_info_list = 5;
*/
private final RepeatedMessage basicTypeInfoList = RepeatedMessage.newEmptyInstance(HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo.getFactory());
@@ -50,7 +50,7 @@ public static GetHeroBasicTypeInfoScRsp newInstance() {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 2;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -58,7 +58,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 2;
* @return this
*/
public GetHeroBasicTypeInfoScRsp clearRetcode() {
@@ -68,7 +68,7 @@ public GetHeroBasicTypeInfoScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 2;
* @return the retcode
*/
public int getRetcode() {
@@ -76,7 +76,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 2;
* @param value the retcode to set
* @return this
*/
@@ -87,132 +87,132 @@ public GetHeroBasicTypeInfoScRsp setRetcode(final int value) {
}
/**
- * optional .Gender gender = 5;
- * @return whether the gender field is set
+ * optional .HeroBasicType cur_basic_type = 7;
+ * @return whether the curBasicType field is set
*/
- public boolean hasGender() {
+ public boolean hasCurBasicType() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional .Gender gender = 5;
+ * optional .HeroBasicType cur_basic_type = 7;
* @return this
*/
- public GetHeroBasicTypeInfoScRsp clearGender() {
+ public GetHeroBasicTypeInfoScRsp clearCurBasicType() {
bitField0_ &= ~0x00000002;
- gender = 0;
+ curBasicType = 0;
return this;
}
/**
- * optional .Gender gender = 5;
- * @return the gender
+ * optional .HeroBasicType cur_basic_type = 7;
+ * @return the curBasicType
*/
- public GenderOuterClass.Gender getGender() {
- return GenderOuterClass.Gender.forNumber(gender);
+ public HeroBasicTypeOuterClass.HeroBasicType getCurBasicType() {
+ return HeroBasicTypeOuterClass.HeroBasicType.forNumber(curBasicType);
}
/**
* Gets the value of the internal enum store. The result is
- * equivalent to {@link GetHeroBasicTypeInfoScRsp#getGender()}.getNumber().
+ * equivalent to {@link GetHeroBasicTypeInfoScRsp#getCurBasicType()}.getNumber().
*
* @return numeric wire representation
*/
- public int getGenderValue() {
- return gender;
+ 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 GenderOuterClass.Gender}. Setting an invalid value
- * can cause {@link GetHeroBasicTypeInfoScRsp#getGender()} to return null
+ * 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 setGenderValue(final int value) {
+ public GetHeroBasicTypeInfoScRsp setCurBasicTypeValue(final int value) {
bitField0_ |= 0x00000002;
- gender = value;
+ curBasicType = value;
return this;
}
/**
- * optional .Gender gender = 5;
- * @param value the gender to set
+ * optional .HeroBasicType cur_basic_type = 7;
+ * @param value the curBasicType to set
* @return this
*/
- public GetHeroBasicTypeInfoScRsp setGender(final GenderOuterClass.Gender value) {
+ public GetHeroBasicTypeInfoScRsp setCurBasicType(
+ final HeroBasicTypeOuterClass.HeroBasicType value) {
bitField0_ |= 0x00000002;
- gender = value.getNumber();
+ curBasicType = value.getNumber();
return this;
}
/**
- * optional .HeroBasicType cur_basic_type = 11;
- * @return whether the curBasicType field is set
+ * optional .Gender gender = 13;
+ * @return whether the gender field is set
*/
- public boolean hasCurBasicType() {
+ public boolean hasGender() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional .HeroBasicType cur_basic_type = 11;
+ * optional .Gender gender = 13;
* @return this
*/
- public GetHeroBasicTypeInfoScRsp clearCurBasicType() {
+ public GetHeroBasicTypeInfoScRsp clearGender() {
bitField0_ &= ~0x00000004;
- curBasicType = 0;
+ gender = 0;
return this;
}
/**
- * optional .HeroBasicType cur_basic_type = 11;
- * @return the curBasicType
+ * optional .Gender gender = 13;
+ * @return the gender
*/
- public HeroBasicTypeOuterClass.HeroBasicType getCurBasicType() {
- return HeroBasicTypeOuterClass.HeroBasicType.forNumber(curBasicType);
+ public GenderOuterClass.Gender getGender() {
+ return GenderOuterClass.Gender.forNumber(gender);
}
/**
* Gets the value of the internal enum store. The result is
- * equivalent to {@link GetHeroBasicTypeInfoScRsp#getCurBasicType()}.getNumber().
+ * equivalent to {@link GetHeroBasicTypeInfoScRsp#getGender()}.getNumber().
*
* @return numeric wire representation
*/
- public int getCurBasicTypeValue() {
- return curBasicType;
+ public int getGenderValue() {
+ return gender;
}
/**
* Sets the value of the internal enum store. This does not
* do any validity checks, so be sure to use appropriate value
- * constants from {@link HeroBasicTypeOuterClass.HeroBasicType}. Setting an invalid value
- * can cause {@link GetHeroBasicTypeInfoScRsp#getCurBasicType()} to return null
+ * constants from {@link GenderOuterClass.Gender}. Setting an invalid value
+ * can cause {@link GetHeroBasicTypeInfoScRsp#getGender()} to return null
*
* @param value the numeric wire value to set
* @return this
*/
- public GetHeroBasicTypeInfoScRsp setCurBasicTypeValue(final int value) {
+ public GetHeroBasicTypeInfoScRsp setGenderValue(final int value) {
bitField0_ |= 0x00000004;
- curBasicType = value;
+ gender = value;
return this;
}
/**
- * optional .HeroBasicType cur_basic_type = 11;
- * @param value the curBasicType to set
+ * optional .Gender gender = 13;
+ * @param value the gender to set
* @return this
*/
- public GetHeroBasicTypeInfoScRsp setCurBasicType(
- final HeroBasicTypeOuterClass.HeroBasicType value) {
+ public GetHeroBasicTypeInfoScRsp setGender(final GenderOuterClass.Gender value) {
bitField0_ |= 0x00000004;
- curBasicType = value.getNumber();
+ gender = value.getNumber();
return this;
}
/**
- * repeated .HeroBasicTypeInfo basic_type_info_list = 6;
+ * repeated .HeroBasicTypeInfo basic_type_info_list = 5;
* @return whether the basicTypeInfoList field is set
*/
public boolean hasBasicTypeInfoList() {
@@ -220,7 +220,7 @@ public boolean hasBasicTypeInfoList() {
}
/**
- * repeated .HeroBasicTypeInfo basic_type_info_list = 6;
+ * repeated .HeroBasicTypeInfo basic_type_info_list = 5;
* @return this
*/
public GetHeroBasicTypeInfoScRsp clearBasicTypeInfoList() {
@@ -230,7 +230,7 @@ public GetHeroBasicTypeInfoScRsp clearBasicTypeInfoList() {
}
/**
- * repeated .HeroBasicTypeInfo basic_type_info_list = 6;
+ * repeated .HeroBasicTypeInfo basic_type_info_list = 5;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -244,7 +244,7 @@ public RepeatedMessage getBasicTy
}
/**
- * repeated .HeroBasicTypeInfo basic_type_info_list = 6;
+ * repeated .HeroBasicTypeInfo basic_type_info_list = 5;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -259,7 +259,7 @@ public RepeatedMessage getMutable
}
/**
- * repeated .HeroBasicTypeInfo basic_type_info_list = 6;
+ * repeated .HeroBasicTypeInfo basic_type_info_list = 5;
* @param value the basicTypeInfoList to add
* @return this
*/
@@ -271,7 +271,7 @@ public GetHeroBasicTypeInfoScRsp addBasicTypeInfoList(
}
/**
- * repeated .HeroBasicTypeInfo basic_type_info_list = 6;
+ * repeated .HeroBasicTypeInfo basic_type_info_list = 5;
* @param values the basicTypeInfoList to add
* @return this
*/
@@ -288,8 +288,8 @@ public GetHeroBasicTypeInfoScRsp copyFrom(final GetHeroBasicTypeInfoScRsp other)
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
retcode = other.retcode;
- gender = other.gender;
curBasicType = other.curBasicType;
+ gender = other.gender;
basicTypeInfoList.copyFrom(other.basicTypeInfoList);
}
return this;
@@ -304,12 +304,12 @@ public GetHeroBasicTypeInfoScRsp mergeFrom(final GetHeroBasicTypeInfoScRsp other
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
- if (other.hasGender()) {
- setGenderValue(other.gender);
- }
if (other.hasCurBasicType()) {
setCurBasicTypeValue(other.curBasicType);
}
+ if (other.hasGender()) {
+ setGenderValue(other.gender);
+ }
if (other.hasBasicTypeInfoList()) {
getMutableBasicTypeInfoList().addAll(other.basicTypeInfoList);
}
@@ -324,8 +324,8 @@ public GetHeroBasicTypeInfoScRsp clear() {
cachedSize = -1;
bitField0_ = 0;
retcode = 0;
- gender = 0;
curBasicType = 0;
+ gender = 0;
basicTypeInfoList.clear();
return this;
}
@@ -352,28 +352,28 @@ public boolean equals(Object o) {
GetHeroBasicTypeInfoScRsp other = (GetHeroBasicTypeInfoScRsp) o;
return bitField0_ == other.bitField0_
&& (!hasRetcode() || retcode == other.retcode)
- && (!hasGender() || gender == other.gender)
&& (!hasCurBasicType() || curBasicType == other.curBasicType)
+ && (!hasGender() || gender == other.gender)
&& (!hasBasicTypeInfoList() || basicTypeInfoList.equals(other.basicTypeInfoList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 40);
- output.writeEnumNoTag(gender);
+ output.writeRawByte((byte) 56);
+ output.writeEnumNoTag(curBasicType);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 88);
- output.writeEnumNoTag(curBasicType);
+ output.writeRawByte((byte) 104);
+ output.writeEnumNoTag(gender);
}
if ((bitField0_ & 0x00000008) != 0) {
for (int i = 0; i < basicTypeInfoList.length(); i++) {
- output.writeRawByte((byte) 50);
+ output.writeRawByte((byte) 42);
output.writeMessageNoTag(basicTypeInfoList.get(i));
}
}
@@ -386,10 +386,10 @@ protected int computeSerializedSize() {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeEnumSizeNoTag(gender);
+ size += 1 + ProtoSink.computeEnumSizeNoTag(curBasicType);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeEnumSizeNoTag(curBasicType);
+ size += 1 + ProtoSink.computeEnumSizeNoTag(gender);
}
if ((bitField0_ & 0x00000008) != 0) {
size += (1 * basicTypeInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(basicTypeInfoList);
@@ -404,40 +404,40 @@ public GetHeroBasicTypeInfoScRsp mergeFrom(final ProtoSource input) throws IOExc
int tag = input.readTag();
while (true) {
switch (tag) {
- case 96: {
+ case 16: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 40) {
+ if (tag != 56) {
break;
}
}
- case 40: {
- // gender
+ case 56: {
+ // curBasicType
final int value = input.readInt32();
- if (GenderOuterClass.Gender.forNumber(value) != null) {
- gender = value;
+ if (HeroBasicTypeOuterClass.HeroBasicType.forNumber(value) != null) {
+ curBasicType = value;
bitField0_ |= 0x00000002;
}
tag = input.readTag();
- if (tag != 88) {
+ if (tag != 104) {
break;
}
}
- case 88: {
- // curBasicType
+ case 104: {
+ // gender
final int value = input.readInt32();
- if (HeroBasicTypeOuterClass.HeroBasicType.forNumber(value) != null) {
- curBasicType = value;
+ if (GenderOuterClass.Gender.forNumber(value) != null) {
+ gender = value;
bitField0_ |= 0x00000004;
}
tag = input.readTag();
- if (tag != 50) {
+ if (tag != 42) {
break;
}
}
- case 50: {
+ case 42: {
// basicTypeInfoList
tag = input.readRepeatedMessage(basicTypeInfoList, tag);
bitField0_ |= 0x00000008;
@@ -466,10 +466,10 @@ public void writeTo(final JsonSink output) throws IOException {
output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeEnum(FieldNames.gender, gender, GenderOuterClass.Gender.converter());
+ output.writeEnum(FieldNames.curBasicType, curBasicType, HeroBasicTypeOuterClass.HeroBasicType.converter());
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeEnum(FieldNames.curBasicType, curBasicType, HeroBasicTypeOuterClass.HeroBasicType.converter());
+ output.writeEnum(FieldNames.gender, gender, GenderOuterClass.Gender.converter());
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeRepeatedMessage(FieldNames.basicTypeInfoList, basicTypeInfoList);
@@ -495,12 +495,13 @@ public GetHeroBasicTypeInfoScRsp mergeFrom(final JsonSource input) throws IOExce
}
break;
}
- case -1249512767: {
- if (input.isAtField(FieldNames.gender)) {
+ case -518506968:
+ case -979186678: {
+ if (input.isAtField(FieldNames.curBasicType)) {
if (!input.trySkipNullValue()) {
- final GenderOuterClass.Gender value = input.readEnum(GenderOuterClass.Gender.converter());
+ final HeroBasicTypeOuterClass.HeroBasicType value = input.readEnum(HeroBasicTypeOuterClass.HeroBasicType.converter());
if (value != null) {
- gender = value.getNumber();
+ curBasicType = value.getNumber();
bitField0_ |= 0x00000002;
} else {
input.skipUnknownEnumValue();
@@ -511,13 +512,12 @@ public GetHeroBasicTypeInfoScRsp mergeFrom(final JsonSource input) throws IOExce
}
break;
}
- case -518506968:
- case -979186678: {
- if (input.isAtField(FieldNames.curBasicType)) {
+ case -1249512767: {
+ if (input.isAtField(FieldNames.gender)) {
if (!input.trySkipNullValue()) {
- final HeroBasicTypeOuterClass.HeroBasicType value = input.readEnum(HeroBasicTypeOuterClass.HeroBasicType.converter());
+ final GenderOuterClass.Gender value = input.readEnum(GenderOuterClass.Gender.converter());
if (value != null) {
- curBasicType = value.getNumber();
+ gender = value.getNumber();
bitField0_ |= 0x00000004;
} else {
input.skipUnknownEnumValue();
@@ -595,10 +595,10 @@ public GetHeroBasicTypeInfoScRsp create() {
static class FieldNames {
static final FieldName retcode = FieldName.forField("retcode");
- static final FieldName gender = FieldName.forField("gender");
-
static final FieldName curBasicType = FieldName.forField("curBasicType", "cur_basic_type");
+ static final FieldName gender = FieldName.forField("gender");
+
static final FieldName basicTypeInfoList = FieldName.forField("basicTypeInfoList", "basic_type_info_list");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java
index 2c22642e9..ed6da2464 100644
--- a/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java
@@ -25,14 +25,14 @@ public static final class GetJukeboxDataScRsp extends ProtoMessageoptional uint32 retcode = 14;
+ * optional uint32 retcode = 13;
*/
private int retcode;
/**
- * repeated .GetJukeboxDataScRsp.UnlockedMusic music_list = 7;
+ * repeated .UnlockedMusic music_list = 14;
*/
- private final RepeatedMessage musicList = RepeatedMessage.newEmptyInstance(UnlockedMusic.getFactory());
+ private final RepeatedMessage musicList = RepeatedMessage.newEmptyInstance(UnlockedMusicOuterClass.UnlockedMusic.getFactory());
private GetJukeboxDataScRsp() {
}
@@ -82,7 +82,7 @@ public GetJukeboxDataScRsp setPlayingId(final int value) {
}
/**
- * optional uint32 retcode = 14;
+ * optional uint32 retcode = 13;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -90,7 +90,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 14;
+ * optional uint32 retcode = 13;
* @return this
*/
public GetJukeboxDataScRsp clearRetcode() {
@@ -100,7 +100,7 @@ public GetJukeboxDataScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 14;
+ * optional uint32 retcode = 13;
* @return the retcode
*/
public int getRetcode() {
@@ -108,7 +108,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 14;
+ * optional uint32 retcode = 13;
* @param value the retcode to set
* @return this
*/
@@ -119,7 +119,7 @@ public GetJukeboxDataScRsp setRetcode(final int value) {
}
/**
- * repeated .GetJukeboxDataScRsp.UnlockedMusic music_list = 7;
+ * repeated .UnlockedMusic music_list = 14;
* @return whether the musicList field is set
*/
public boolean hasMusicList() {
@@ -127,7 +127,7 @@ public boolean hasMusicList() {
}
/**
- * repeated .GetJukeboxDataScRsp.UnlockedMusic music_list = 7;
+ * repeated .UnlockedMusic music_list = 14;
* @return this
*/
public GetJukeboxDataScRsp clearMusicList() {
@@ -137,7 +137,7 @@ public GetJukeboxDataScRsp clearMusicList() {
}
/**
- * repeated .GetJukeboxDataScRsp.UnlockedMusic music_list = 7;
+ * repeated .UnlockedMusic music_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.
@@ -146,12 +146,12 @@ public GetJukeboxDataScRsp clearMusicList() {
*
* @return internal storage object for reading
*/
- public RepeatedMessage getMusicList() {
+ public RepeatedMessage getMusicList() {
return musicList;
}
/**
- * repeated .GetJukeboxDataScRsp.UnlockedMusic music_list = 7;
+ * repeated .UnlockedMusic music_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
@@ -159,28 +159,29 @@ public RepeatedMessage getMusicList() {
*
* @return internal storage object for modifications
*/
- public RepeatedMessage getMutableMusicList() {
+ public RepeatedMessage getMutableMusicList() {
bitField0_ |= 0x00000004;
return musicList;
}
/**
- * repeated .GetJukeboxDataScRsp.UnlockedMusic music_list = 7;
+ * repeated .UnlockedMusic music_list = 14;
* @param value the musicList to add
* @return this
*/
- public GetJukeboxDataScRsp addMusicList(final UnlockedMusic value) {
+ public GetJukeboxDataScRsp addMusicList(final UnlockedMusicOuterClass.UnlockedMusic value) {
bitField0_ |= 0x00000004;
musicList.add(value);
return this;
}
/**
- * repeated .GetJukeboxDataScRsp.UnlockedMusic music_list = 7;
+ * repeated .UnlockedMusic music_list = 14;
* @param values the musicList to add
* @return this
*/
- public GetJukeboxDataScRsp addAllMusicList(final UnlockedMusic... values) {
+ public GetJukeboxDataScRsp addAllMusicList(
+ final UnlockedMusicOuterClass.UnlockedMusic... values) {
bitField0_ |= 0x00000004;
musicList.addAll(values);
return this;
@@ -262,12 +263,12 @@ public void writeTo(final ProtoSink output) throws IOException {
output.writeUInt32NoTag(playingId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 104);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < musicList.length(); i++) {
- output.writeRawByte((byte) 58);
+ output.writeRawByte((byte) 114);
output.writeMessageNoTag(musicList.get(i));
}
}
@@ -300,20 +301,20 @@ public GetJukeboxDataScRsp mergeFrom(final ProtoSource input) throws IOException
playingId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 112) {
+ if (tag != 104) {
break;
}
}
- case 112: {
+ case 104: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 58) {
+ if (tag != 114) {
break;
}
}
- case 58: {
+ case 114: {
// musicList
tag = input.readRepeatedMessage(musicList, tag);
bitField0_ |= 0x00000004;
@@ -432,412 +433,6 @@ public static MessageFactory getFactory() {
return GetJukeboxDataScRspFactory.INSTANCE;
}
- /**
- * Protobuf type {@code UnlockedMusic}
- */
- public static final class UnlockedMusic extends ProtoMessage implements Cloneable {
- private static final long serialVersionUID = 0L;
-
- /**
- * optional uint32 group_id = 1;
- */
- private int groupId;
-
- /**
- * optional uint32 id = 8;
- */
- private int id;
-
- /**
- * optional bool unkbool = 7;
- */
- private boolean unkbool;
-
- private UnlockedMusic() {
- }
-
- /**
- * @return a new empty instance of {@code UnlockedMusic}
- */
- public static UnlockedMusic newInstance() {
- return new UnlockedMusic();
- }
-
- /**
- * optional uint32 group_id = 1;
- * @return whether the groupId field is set
- */
- public boolean hasGroupId() {
- return (bitField0_ & 0x00000001) != 0;
- }
-
- /**
- * optional uint32 group_id = 1;
- * @return this
- */
- public UnlockedMusic clearGroupId() {
- bitField0_ &= ~0x00000001;
- groupId = 0;
- return this;
- }
-
- /**
- * optional uint32 group_id = 1;
- * @return the groupId
- */
- public int getGroupId() {
- return groupId;
- }
-
- /**
- * optional uint32 group_id = 1;
- * @param value the groupId to set
- * @return this
- */
- public UnlockedMusic setGroupId(final int value) {
- bitField0_ |= 0x00000001;
- groupId = value;
- return this;
- }
-
- /**
- * optional uint32 id = 8;
- * @return whether the id field is set
- */
- public boolean hasId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 id = 8;
- * @return this
- */
- public UnlockedMusic clearId() {
- bitField0_ &= ~0x00000002;
- id = 0;
- return this;
- }
-
- /**
- * optional uint32 id = 8;
- * @return the id
- */
- public int getId() {
- return id;
- }
-
- /**
- * optional uint32 id = 8;
- * @param value the id to set
- * @return this
- */
- public UnlockedMusic setId(final int value) {
- bitField0_ |= 0x00000002;
- id = value;
- return this;
- }
-
- /**
- * optional bool unkbool = 7;
- * @return whether the unkbool field is set
- */
- public boolean hasUnkbool() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional bool unkbool = 7;
- * @return this
- */
- public UnlockedMusic clearUnkbool() {
- bitField0_ &= ~0x00000004;
- unkbool = false;
- return this;
- }
-
- /**
- * optional bool unkbool = 7;
- * @return the unkbool
- */
- public boolean getUnkbool() {
- return unkbool;
- }
-
- /**
- * optional bool unkbool = 7;
- * @param value the unkbool to set
- * @return this
- */
- public UnlockedMusic setUnkbool(final boolean value) {
- bitField0_ |= 0x00000004;
- unkbool = value;
- return this;
- }
-
- @Override
- public UnlockedMusic copyFrom(final UnlockedMusic other) {
- cachedSize = other.cachedSize;
- if ((bitField0_ | other.bitField0_) != 0) {
- bitField0_ = other.bitField0_;
- groupId = other.groupId;
- id = other.id;
- unkbool = other.unkbool;
- }
- return this;
- }
-
- @Override
- public UnlockedMusic mergeFrom(final UnlockedMusic other) {
- if (other.isEmpty()) {
- return this;
- }
- cachedSize = -1;
- if (other.hasGroupId()) {
- setGroupId(other.groupId);
- }
- if (other.hasId()) {
- setId(other.id);
- }
- if (other.hasUnkbool()) {
- setUnkbool(other.unkbool);
- }
- return this;
- }
-
- @Override
- public UnlockedMusic clear() {
- if (isEmpty()) {
- return this;
- }
- cachedSize = -1;
- bitField0_ = 0;
- groupId = 0;
- id = 0;
- unkbool = false;
- return this;
- }
-
- @Override
- public UnlockedMusic clearQuick() {
- if (isEmpty()) {
- return this;
- }
- cachedSize = -1;
- bitField0_ = 0;
- return this;
- }
-
- @Override
- public boolean equals(Object o) {
- if (o == this) {
- return true;
- }
- if (!(o instanceof UnlockedMusic)) {
- return false;
- }
- UnlockedMusic other = (UnlockedMusic) o;
- return bitField0_ == other.bitField0_
- && (!hasGroupId() || groupId == other.groupId)
- && (!hasId() || id == other.id)
- && (!hasUnkbool() || unkbool == other.unkbool);
- }
-
- @Override
- public void writeTo(final ProtoSink output) throws IOException {
- if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(groupId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 64);
- output.writeUInt32NoTag(id);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 56);
- output.writeBoolNoTag(unkbool);
- }
- }
-
- @Override
- protected int computeSerializedSize() {
- int size = 0;
- if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(id);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- size += 2;
- }
- return size;
- }
-
- @Override
- @SuppressWarnings("fallthrough")
- public UnlockedMusic mergeFrom(final ProtoSource input) throws IOException {
- // Enabled Fall-Through Optimization (QuickBuffers)
- int tag = input.readTag();
- while (true) {
- switch (tag) {
- case 8: {
- // groupId
- groupId = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 64) {
- break;
- }
- }
- case 64: {
- // id
- id = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 56) {
- break;
- }
- }
- case 56: {
- // unkbool
- unkbool = input.readBool();
- bitField0_ |= 0x00000004;
- tag = input.readTag();
- if (tag != 0) {
- break;
- }
- }
- case 0: {
- return this;
- }
- default: {
- if (!input.skipField(tag)) {
- return this;
- }
- tag = input.readTag();
- break;
- }
- }
- }
- }
-
- @Override
- public void writeTo(final JsonSink output) throws IOException {
- output.beginObject();
- if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.groupId, groupId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.id, id);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeBool(FieldNames.unkbool, unkbool);
- }
- output.endObject();
- }
-
- @Override
- public UnlockedMusic mergeFrom(final JsonSource input) throws IOException {
- if (!input.beginObject()) {
- return this;
- }
- while (!input.isAtEnd()) {
- switch (input.readFieldHash()) {
- case 293428218:
- case 506361563: {
- if (input.isAtField(FieldNames.groupId)) {
- if (!input.trySkipNullValue()) {
- groupId = input.readUInt32();
- bitField0_ |= 0x00000001;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 3355: {
- if (input.isAtField(FieldNames.id)) {
- if (!input.trySkipNullValue()) {
- id = input.readUInt32();
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case -285198628: {
- if (input.isAtField(FieldNames.unkbool)) {
- if (!input.trySkipNullValue()) {
- unkbool = input.readBool();
- bitField0_ |= 0x00000004;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- default: {
- input.skipUnknownField();
- break;
- }
- }
- }
- input.endObject();
- return this;
- }
-
- @Override
- public UnlockedMusic clone() {
- return new UnlockedMusic().copyFrom(this);
- }
-
- @Override
- public boolean isEmpty() {
- return ((bitField0_) == 0);
- }
-
- public static UnlockedMusic parseFrom(final byte[] data) throws
- InvalidProtocolBufferException {
- return ProtoMessage.mergeFrom(new UnlockedMusic(), data).checkInitialized();
- }
-
- public static UnlockedMusic parseFrom(final ProtoSource input) throws IOException {
- return ProtoMessage.mergeFrom(new UnlockedMusic(), input).checkInitialized();
- }
-
- public static UnlockedMusic parseFrom(final JsonSource input) throws IOException {
- return ProtoMessage.mergeFrom(new UnlockedMusic(), input).checkInitialized();
- }
-
- /**
- * @return factory for creating UnlockedMusic messages
- */
- public static MessageFactory getFactory() {
- return UnlockedMusicFactory.INSTANCE;
- }
-
- private enum UnlockedMusicFactory implements MessageFactory {
- INSTANCE;
-
- @Override
- public UnlockedMusic create() {
- return UnlockedMusic.newInstance();
- }
- }
-
- /**
- * Contains name constants used for serializing JSON
- */
- static class FieldNames {
- static final FieldName groupId = FieldName.forField("groupId", "group_id");
-
- static final FieldName id = FieldName.forField("id");
-
- static final FieldName unkbool = FieldName.forField("unkbool");
- }
- }
-
private enum GetJukeboxDataScRspFactory implements MessageFactory {
INSTANCE;
diff --git a/src/generated/main/emu/lunarcore/proto/GetMailScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetMailScRspOuterClass.java
index 3897f8230..b3d4cc0a4 100644
--- a/src/generated/main/emu/lunarcore/proto/GetMailScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetMailScRspOuterClass.java
@@ -20,34 +20,34 @@ public static final class GetMailScRsp extends ProtoMessage implem
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 1;
*/
private int retcode;
/**
- * optional uint32 start = 7;
+ * optional uint32 total_num = 2;
*/
- private int start;
+ private int totalNum;
/**
- * optional uint32 total_num = 13;
+ * optional uint32 start = 4;
*/
- private int totalNum;
+ private int start;
/**
- * optional bool is_end = 1;
+ * optional bool is_end = 5;
*/
private boolean isEnd;
/**
- * repeated .ClientMail mail_list = 6;
+ * repeated .ClientMail notice_mail_list = 8;
*/
- private final RepeatedMessage mailList = RepeatedMessage.newEmptyInstance(ClientMailOuterClass.ClientMail.getFactory());
+ private final RepeatedMessage noticeMailList = RepeatedMessage.newEmptyInstance(ClientMailOuterClass.ClientMail.getFactory());
/**
- * repeated .ClientMail notice_mail_list = 10;
+ * repeated .ClientMail mail_list = 15;
*/
- private final RepeatedMessage noticeMailList = RepeatedMessage.newEmptyInstance(ClientMailOuterClass.ClientMail.getFactory());
+ private final RepeatedMessage mailList = RepeatedMessage.newEmptyInstance(ClientMailOuterClass.ClientMail.getFactory());
private GetMailScRsp() {
}
@@ -60,7 +60,7 @@ public static GetMailScRsp newInstance() {
}
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 1;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -68,7 +68,7 @@ public boolean hasRetcode() {
}
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 1;
* @return this
*/
public GetMailScRsp clearRetcode() {
@@ -78,7 +78,7 @@ public GetMailScRsp clearRetcode() {
}
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 1;
* @return the retcode
*/
public int getRetcode() {
@@ -86,7 +86,7 @@ public int getRetcode() {
}
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 1;
* @param value the retcode to set
* @return this
*/
@@ -97,81 +97,81 @@ public GetMailScRsp setRetcode(final int value) {
}
/**
- * optional uint32 start = 7;
- * @return whether the start field is set
+ * optional uint32 total_num = 2;
+ * @return whether the totalNum field is set
*/
- public boolean hasStart() {
+ public boolean hasTotalNum() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 start = 7;
+ * optional uint32 total_num = 2;
* @return this
*/
- public GetMailScRsp clearStart() {
+ public GetMailScRsp clearTotalNum() {
bitField0_ &= ~0x00000002;
- start = 0;
+ totalNum = 0;
return this;
}
/**
- * optional uint32 start = 7;
- * @return the start
+ * optional uint32 total_num = 2;
+ * @return the totalNum
*/
- public int getStart() {
- return start;
+ public int getTotalNum() {
+ return totalNum;
}
/**
- * optional uint32 start = 7;
- * @param value the start to set
+ * optional uint32 total_num = 2;
+ * @param value the totalNum to set
* @return this
*/
- public GetMailScRsp setStart(final int value) {
+ public GetMailScRsp setTotalNum(final int value) {
bitField0_ |= 0x00000002;
- start = value;
+ totalNum = value;
return this;
}
/**
- * optional uint32 total_num = 13;
- * @return whether the totalNum field is set
+ * optional uint32 start = 4;
+ * @return whether the start field is set
*/
- public boolean hasTotalNum() {
+ public boolean hasStart() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 total_num = 13;
+ * optional uint32 start = 4;
* @return this
*/
- public GetMailScRsp clearTotalNum() {
+ public GetMailScRsp clearStart() {
bitField0_ &= ~0x00000004;
- totalNum = 0;
+ start = 0;
return this;
}
/**
- * optional uint32 total_num = 13;
- * @return the totalNum
+ * optional uint32 start = 4;
+ * @return the start
*/
- public int getTotalNum() {
- return totalNum;
+ public int getStart() {
+ return start;
}
/**
- * optional uint32 total_num = 13;
- * @param value the totalNum to set
+ * optional uint32 start = 4;
+ * @param value the start to set
* @return this
*/
- public GetMailScRsp setTotalNum(final int value) {
+ public GetMailScRsp setStart(final int value) {
bitField0_ |= 0x00000004;
- totalNum = value;
+ start = value;
return this;
}
/**
- * optional bool is_end = 1;
+ * optional bool is_end = 5;
* @return whether the isEnd field is set
*/
public boolean hasIsEnd() {
@@ -179,7 +179,7 @@ public boolean hasIsEnd() {
}
/**
- * optional bool is_end = 1;
+ * optional bool is_end = 5;
* @return this
*/
public GetMailScRsp clearIsEnd() {
@@ -189,7 +189,7 @@ public GetMailScRsp clearIsEnd() {
}
/**
- * optional bool is_end = 1;
+ * optional bool is_end = 5;
* @return the isEnd
*/
public boolean getIsEnd() {
@@ -197,7 +197,7 @@ public boolean getIsEnd() {
}
/**
- * optional bool is_end = 1;
+ * optional bool is_end = 5;
* @param value the isEnd to set
* @return this
*/
@@ -208,39 +208,39 @@ public GetMailScRsp setIsEnd(final boolean value) {
}
/**
- * repeated .ClientMail mail_list = 6;
- * @return whether the mailList field is set
+ * repeated .ClientMail notice_mail_list = 8;
+ * @return whether the noticeMailList field is set
*/
- public boolean hasMailList() {
+ public boolean hasNoticeMailList() {
return (bitField0_ & 0x00000010) != 0;
}
/**
- * repeated .ClientMail mail_list = 6;
+ * repeated .ClientMail notice_mail_list = 8;
* @return this
*/
- public GetMailScRsp clearMailList() {
+ public GetMailScRsp clearNoticeMailList() {
bitField0_ &= ~0x00000010;
- mailList.clear();
+ noticeMailList.clear();
return this;
}
/**
- * repeated .ClientMail mail_list = 6;
+ * repeated .ClientMail notice_mail_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 #getMutableMailList()} if you want to modify it.
+ * Use {@link #getMutableNoticeMailList()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public RepeatedMessage getMailList() {
- return mailList;
+ public RepeatedMessage
