optional uint32 entity_id = 4;
- */
- private int entityId;
-
- /**
- * optional uint32 world_level = 15;
+ * optional uint32 world_level = 11;
*/
private int worldLevel;
+ /**
+ * optional uint32 entity_id = 14;
+ */
+ private int entityId;
+
private ActivateFarmElementCsReq() {
}
@@ -39,62 +39,25 @@ public final class ActivateFarmElementCsReqOuterClass {
}
/**
- * optional uint32 entity_id = 4;
- * @return whether the entityId field is set
+ * optional uint32 world_level = 11;
+ * @return whether the worldLevel field is set
*/
- public boolean hasEntityId() {
+ public boolean hasWorldLevel() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 entity_id = 4;
- * @return this
- */
- public ActivateFarmElementCsReq clearEntityId() {
- bitField0_ &= ~0x00000001;
- entityId = 0;
- return this;
- }
-
- /**
- * optional uint32 entity_id = 4;
- * @return the entityId
- */
- public int getEntityId() {
- return entityId;
- }
-
- /**
- * optional uint32 entity_id = 4;
- * @param value the entityId to set
- * @return this
- */
- public ActivateFarmElementCsReq setEntityId(final int value) {
- bitField0_ |= 0x00000001;
- entityId = value;
- return this;
- }
-
- /**
- * optional uint32 world_level = 15;
- * @return whether the worldLevel field is set
- */
- public boolean hasWorldLevel() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 world_level = 15;
+ * optional uint32 world_level = 11;
* @return this
*/
public ActivateFarmElementCsReq clearWorldLevel() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
worldLevel = 0;
return this;
}
/**
- * optional uint32 world_level = 15;
+ * optional uint32 world_level = 11;
* @return the worldLevel
*/
public int getWorldLevel() {
@@ -102,23 +65,60 @@ public final class ActivateFarmElementCsReqOuterClass {
}
/**
- * optional uint32 world_level = 15;
+ * optional uint32 world_level = 11;
* @param value the worldLevel to set
* @return this
*/
public ActivateFarmElementCsReq setWorldLevel(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
worldLevel = value;
return this;
}
+ /**
+ * optional uint32 entity_id = 14;
+ * @return whether the entityId field is set
+ */
+ public boolean hasEntityId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 entity_id = 14;
+ * @return this
+ */
+ public ActivateFarmElementCsReq clearEntityId() {
+ bitField0_ &= ~0x00000002;
+ entityId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 entity_id = 14;
+ * @return the entityId
+ */
+ public int getEntityId() {
+ return entityId;
+ }
+
+ /**
+ * optional uint32 entity_id = 14;
+ * @param value the entityId to set
+ * @return this
+ */
+ public ActivateFarmElementCsReq setEntityId(final int value) {
+ bitField0_ |= 0x00000002;
+ entityId = value;
+ return this;
+ }
+
@Override
public ActivateFarmElementCsReq copyFrom(final ActivateFarmElementCsReq other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- entityId = other.entityId;
worldLevel = other.worldLevel;
+ entityId = other.entityId;
}
return this;
}
@@ -129,12 +129,12 @@ public final class ActivateFarmElementCsReqOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasEntityId()) {
- setEntityId(other.entityId);
- }
if (other.hasWorldLevel()) {
setWorldLevel(other.worldLevel);
}
+ if (other.hasEntityId()) {
+ setEntityId(other.entityId);
+ }
return this;
}
@@ -145,8 +145,8 @@ public final class ActivateFarmElementCsReqOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- entityId = 0;
worldLevel = 0;
+ entityId = 0;
return this;
}
@@ -170,19 +170,19 @@ public final class ActivateFarmElementCsReqOuterClass {
}
ActivateFarmElementCsReq other = (ActivateFarmElementCsReq) o;
return bitField0_ == other.bitField0_
- && (!hasEntityId() || entityId == other.entityId)
- && (!hasWorldLevel() || worldLevel == other.worldLevel);
+ && (!hasWorldLevel() || worldLevel == other.worldLevel)
+ && (!hasEntityId() || entityId == other.entityId);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(entityId);
+ output.writeRawByte((byte) 88);
+ output.writeUInt32NoTag(worldLevel);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 120);
- output.writeUInt32NoTag(worldLevel);
+ output.writeRawByte((byte) 112);
+ output.writeUInt32NoTag(entityId);
}
}
@@ -190,10 +190,10 @@ public final class ActivateFarmElementCsReqOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId);
}
return size;
}
@@ -205,18 +205,18 @@ public final class ActivateFarmElementCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
- // entityId
- entityId = input.readUInt32();
+ case 88: {
+ // worldLevel
+ worldLevel = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 112) {
break;
}
}
- case 120: {
- // worldLevel
- worldLevel = input.readUInt32();
+ case 112: {
+ // entityId
+ entityId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
@@ -241,10 +241,10 @@ public final class ActivateFarmElementCsReqOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.entityId, entityId);
+ output.writeUInt32(FieldNames.worldLevel, worldLevel);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.worldLevel, worldLevel);
+ output.writeUInt32(FieldNames.entityId, entityId);
}
output.endObject();
}
@@ -256,11 +256,11 @@ public final class ActivateFarmElementCsReqOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- 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_ |= 0x00000001;
}
} else {
@@ -268,11 +268,11 @@ public final class ActivateFarmElementCsReqOuterClass {
}
break;
}
- 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_ |= 0x00000002;
}
} else {
@@ -333,9 +333,9 @@ public final class ActivateFarmElementCsReqOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName entityId = FieldName.forField("entityId", "entity_id");
-
static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level");
+
+ static final FieldName entityId = FieldName.forField("entityId", "entity_id");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java
index 7451ddd..13c87d8 100644
--- a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java
@@ -19,19 +19,19 @@ public final class ActivateFarmElementScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 world_level = 4;
+ * optional uint32 entity_id = 3;
*/
- private int worldLevel;
+ private int entityId;
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 9;
*/
private int retcode;
/**
- * optional uint32 entity_id = 7;
+ * optional uint32 world_level = 14;
*/
- private int entityId;
+ private int worldLevel;
private ActivateFarmElementScRsp() {
}
@@ -44,44 +44,44 @@ public final class ActivateFarmElementScRspOuterClass {
}
/**
- * optional uint32 world_level = 4;
- * @return whether the worldLevel field is set
+ * optional uint32 entity_id = 3;
+ * @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 = 3;
* @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 = 3;
+ * @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 = 3;
+ * @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 retcode = 5;
+ * optional uint32 retcode = 9;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -89,7 +89,7 @@ public final class ActivateFarmElementScRspOuterClass {
}
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 9;
* @return this
*/
public ActivateFarmElementScRsp clearRetcode() {
@@ -99,7 +99,7 @@ public final class ActivateFarmElementScRspOuterClass {
}
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 9;
* @return the retcode
*/
public int getRetcode() {
@@ -107,7 +107,7 @@ public final class ActivateFarmElementScRspOuterClass {
}
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 9;
* @param value the retcode to set
* @return this
*/
@@ -118,39 +118,39 @@ public final class ActivateFarmElementScRspOuterClass {
}
/**
- * optional uint32 entity_id = 7;
- * @return whether the entityId field is set
+ * optional uint32 world_level = 14;
+ * @return whether the worldLevel field is set
*/
- public boolean hasEntityId() {
+ public boolean hasWorldLevel() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 entity_id = 7;
+ * optional uint32 world_level = 14;
* @return this
*/
- public ActivateFarmElementScRsp clearEntityId() {
+ public ActivateFarmElementScRsp clearWorldLevel() {
bitField0_ &= ~0x00000004;
- entityId = 0;
+ worldLevel = 0;
return this;
}
/**
- * optional uint32 entity_id = 7;
- * @return the entityId
+ * optional uint32 world_level = 14;
+ * @return the worldLevel
*/
- public int getEntityId() {
- return entityId;
+ public int getWorldLevel() {
+ return worldLevel;
}
/**
- * optional uint32 entity_id = 7;
- * @param value the entityId to set
+ * optional uint32 world_level = 14;
+ * @param value the worldLevel to set
* @return this
*/
- public ActivateFarmElementScRsp setEntityId(final int value) {
+ public ActivateFarmElementScRsp setWorldLevel(final int value) {
bitField0_ |= 0x00000004;
- entityId = value;
+ worldLevel = value;
return this;
}
@@ -159,9 +159,9 @@ public final class ActivateFarmElementScRspOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- worldLevel = other.worldLevel;
- retcode = other.retcode;
entityId = other.entityId;
+ retcode = other.retcode;
+ worldLevel = other.worldLevel;
}
return this;
}
@@ -172,14 +172,14 @@ public final class ActivateFarmElementScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasWorldLevel()) {
- setWorldLevel(other.worldLevel);
+ if (other.hasEntityId()) {
+ setEntityId(other.entityId);
}
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
- if (other.hasEntityId()) {
- setEntityId(other.entityId);
+ if (other.hasWorldLevel()) {
+ setWorldLevel(other.worldLevel);
}
return this;
}
@@ -191,9 +191,9 @@ public final class ActivateFarmElementScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- worldLevel = 0;
- retcode = 0;
entityId = 0;
+ retcode = 0;
+ worldLevel = 0;
return this;
}
@@ -217,24 +217,24 @@ public final class ActivateFarmElementScRspOuterClass {
}
ActivateFarmElementScRsp other = (ActivateFarmElementScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasWorldLevel() || worldLevel == other.worldLevel)
+ && (!hasEntityId() || entityId == other.entityId)
&& (!hasRetcode() || retcode == other.retcode)
- && (!hasEntityId() || entityId == other.entityId);
+ && (!hasWorldLevel() || worldLevel == other.worldLevel);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(worldLevel);
+ output.writeRawByte((byte) 24);
+ output.writeUInt32NoTag(entityId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 72);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 56);
- output.writeUInt32NoTag(entityId);
+ output.writeRawByte((byte) 112);
+ output.writeUInt32NoTag(worldLevel);
}
}
@@ -242,13 +242,13 @@ public final class ActivateFarmElementScRspOuterClass {
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(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel);
}
return size;
}
@@ -260,27 +260,27 @@ public final class ActivateFarmElementScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
- // worldLevel
- worldLevel = input.readUInt32();
+ case 24: {
+ // entityId
+ entityId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 40) {
+ if (tag != 72) {
break;
}
}
- case 40: {
+ case 72: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 56) {
+ if (tag != 112) {
break;
}
}
- case 56: {
- // entityId
- entityId = input.readUInt32();
+ case 112: {
+ // worldLevel
+ worldLevel = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 0) {
@@ -305,13 +305,13 @@ public final class ActivateFarmElementScRspOuterClass {
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.retcode, retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.entityId, entityId);
+ output.writeUInt32(FieldNames.worldLevel, worldLevel);
}
output.endObject();
}
@@ -323,11 +323,11 @@ public final class ActivateFarmElementScRspOuterClass {
}
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 {
@@ -346,11 +346,11 @@ public final class ActivateFarmElementScRspOuterClass {
}
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_ |= 0x00000004;
}
} else {
@@ -411,11 +411,11 @@ public final class ActivateFarmElementScRspOuterClass {
* 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 retcode = FieldName.forField("retcode");
- static final FieldName entityId = FieldName.forField("entityId", "entity_id");
+ static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java
index cb922ee..275369e 100644
--- a/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java
@@ -19,22 +19,22 @@ public final class ActivityScheduleInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional int64 begin_time = 1;
- */
- private long beginTime;
-
- /**
- * optional int64 end_time = 5;
+ * optional int64 end_time = 9;
*/
private long endTime;
/**
- * optional uint32 module_id = 2;
+ * optional int64 begin_time = 13;
+ */
+ private long beginTime;
+
+ /**
+ * optional uint32 module_id = 3;
*/
private int moduleId;
/**
- * optional uint32 activity_id = 13;
+ * optional uint32 activity_id = 6;
*/
private int activityId;
@@ -49,62 +49,25 @@ public final class ActivityScheduleInfoOuterClass {
}
/**
- * optional int64 begin_time = 1;
- * @return whether the beginTime field is set
+ * optional int64 end_time = 9;
+ * @return whether the endTime field is set
*/
- public boolean hasBeginTime() {
+ public boolean hasEndTime() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional int64 begin_time = 1;
- * @return this
- */
- public ActivityScheduleInfo clearBeginTime() {
- bitField0_ &= ~0x00000001;
- beginTime = 0L;
- return this;
- }
-
- /**
- * optional int64 begin_time = 1;
- * @return the beginTime
- */
- public long getBeginTime() {
- return beginTime;
- }
-
- /**
- * optional int64 begin_time = 1;
- * @param value the beginTime to set
- * @return this
- */
- public ActivityScheduleInfo setBeginTime(final long value) {
- bitField0_ |= 0x00000001;
- beginTime = value;
- return this;
- }
-
- /**
- * optional int64 end_time = 5;
- * @return whether the endTime field is set
- */
- public boolean hasEndTime() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional int64 end_time = 5;
+ * optional int64 end_time = 9;
* @return this
*/
public ActivityScheduleInfo clearEndTime() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
endTime = 0L;
return this;
}
/**
- * optional int64 end_time = 5;
+ * optional int64 end_time = 9;
* @return the endTime
*/
public long getEndTime() {
@@ -112,18 +75,55 @@ public final class ActivityScheduleInfoOuterClass {
}
/**
- * optional int64 end_time = 5;
+ * optional int64 end_time = 9;
* @param value the endTime to set
* @return this
*/
public ActivityScheduleInfo setEndTime(final long value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
endTime = value;
return this;
}
/**
- * optional uint32 module_id = 2;
+ * optional int64 begin_time = 13;
+ * @return whether the beginTime field is set
+ */
+ public boolean hasBeginTime() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional int64 begin_time = 13;
+ * @return this
+ */
+ public ActivityScheduleInfo clearBeginTime() {
+ bitField0_ &= ~0x00000002;
+ beginTime = 0L;
+ return this;
+ }
+
+ /**
+ * optional int64 begin_time = 13;
+ * @return the beginTime
+ */
+ public long getBeginTime() {
+ return beginTime;
+ }
+
+ /**
+ * optional int64 begin_time = 13;
+ * @param value the beginTime to set
+ * @return this
+ */
+ public ActivityScheduleInfo setBeginTime(final long value) {
+ bitField0_ |= 0x00000002;
+ beginTime = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 module_id = 3;
* @return whether the moduleId field is set
*/
public boolean hasModuleId() {
@@ -131,7 +131,7 @@ public final class ActivityScheduleInfoOuterClass {
}
/**
- * optional uint32 module_id = 2;
+ * optional uint32 module_id = 3;
* @return this
*/
public ActivityScheduleInfo clearModuleId() {
@@ -141,7 +141,7 @@ public final class ActivityScheduleInfoOuterClass {
}
/**
- * optional uint32 module_id = 2;
+ * optional uint32 module_id = 3;
* @return the moduleId
*/
public int getModuleId() {
@@ -149,7 +149,7 @@ public final class ActivityScheduleInfoOuterClass {
}
/**
- * optional uint32 module_id = 2;
+ * optional uint32 module_id = 3;
* @param value the moduleId to set
* @return this
*/
@@ -160,7 +160,7 @@ public final class ActivityScheduleInfoOuterClass {
}
/**
- * optional uint32 activity_id = 13;
+ * optional uint32 activity_id = 6;
* @return whether the activityId field is set
*/
public boolean hasActivityId() {
@@ -168,7 +168,7 @@ public final class ActivityScheduleInfoOuterClass {
}
/**
- * optional uint32 activity_id = 13;
+ * optional uint32 activity_id = 6;
* @return this
*/
public ActivityScheduleInfo clearActivityId() {
@@ -178,7 +178,7 @@ public final class ActivityScheduleInfoOuterClass {
}
/**
- * optional uint32 activity_id = 13;
+ * optional uint32 activity_id = 6;
* @return the activityId
*/
public int getActivityId() {
@@ -186,7 +186,7 @@ public final class ActivityScheduleInfoOuterClass {
}
/**
- * optional uint32 activity_id = 13;
+ * optional uint32 activity_id = 6;
* @param value the activityId to set
* @return this
*/
@@ -201,8 +201,8 @@ public final class ActivityScheduleInfoOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- beginTime = other.beginTime;
endTime = other.endTime;
+ beginTime = other.beginTime;
moduleId = other.moduleId;
activityId = other.activityId;
}
@@ -215,12 +215,12 @@ public final class ActivityScheduleInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasBeginTime()) {
- setBeginTime(other.beginTime);
- }
if (other.hasEndTime()) {
setEndTime(other.endTime);
}
+ if (other.hasBeginTime()) {
+ setBeginTime(other.beginTime);
+ }
if (other.hasModuleId()) {
setModuleId(other.moduleId);
}
@@ -237,8 +237,8 @@ public final class ActivityScheduleInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- beginTime = 0L;
endTime = 0L;
+ beginTime = 0L;
moduleId = 0;
activityId = 0;
return this;
@@ -264,8 +264,8 @@ public final class ActivityScheduleInfoOuterClass {
}
ActivityScheduleInfo other = (ActivityScheduleInfo) o;
return bitField0_ == other.bitField0_
- && (!hasBeginTime() || beginTime == other.beginTime)
&& (!hasEndTime() || endTime == other.endTime)
+ && (!hasBeginTime() || beginTime == other.beginTime)
&& (!hasModuleId() || moduleId == other.moduleId)
&& (!hasActivityId() || activityId == other.activityId);
}
@@ -273,19 +273,19 @@ public final class ActivityScheduleInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
- output.writeInt64NoTag(beginTime);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 72);
output.writeInt64NoTag(endTime);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 104);
+ output.writeInt64NoTag(beginTime);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(moduleId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(activityId);
}
}
@@ -294,10 +294,10 @@ public final class ActivityScheduleInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime);
+ size += 1 + ProtoSink.computeInt64SizeNoTag(endTime);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeInt64SizeNoTag(endTime);
+ size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(moduleId);
@@ -315,34 +315,34 @@ public final class ActivityScheduleInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
- // beginTime
- beginTime = input.readInt64();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 40) {
- break;
- }
- }
- case 40: {
+ case 72: {
// endTime
endTime = input.readInt64();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 16) {
- break;
- }
- }
- case 16: {
- // moduleId
- moduleId = input.readUInt32();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
if (tag != 104) {
break;
}
}
case 104: {
+ // beginTime
+ beginTime = input.readInt64();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 24) {
+ break;
+ }
+ }
+ case 24: {
+ // moduleId
+ moduleId = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 48) {
+ break;
+ }
+ }
+ case 48: {
// activityId
activityId = input.readUInt32();
bitField0_ |= 0x00000008;
@@ -369,10 +369,10 @@ public final class ActivityScheduleInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeInt64(FieldNames.beginTime, beginTime);
+ output.writeInt64(FieldNames.endTime, endTime);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeInt64(FieldNames.endTime, endTime);
+ output.writeInt64(FieldNames.beginTime, beginTime);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.moduleId, moduleId);
@@ -390,11 +390,11 @@ public final class ActivityScheduleInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1072839914:
- case 1112183971: {
- if (input.isAtField(FieldNames.beginTime)) {
+ case -1607243192:
+ case 1725551537: {
+ if (input.isAtField(FieldNames.endTime)) {
if (!input.trySkipNullValue()) {
- beginTime = input.readInt64();
+ endTime = input.readInt64();
bitField0_ |= 0x00000001;
}
} else {
@@ -402,11 +402,11 @@ public final class ActivityScheduleInfoOuterClass {
}
break;
}
- case -1607243192:
- case 1725551537: {
- if (input.isAtField(FieldNames.endTime)) {
+ case -1072839914:
+ case 1112183971: {
+ if (input.isAtField(FieldNames.beginTime)) {
if (!input.trySkipNullValue()) {
- endTime = input.readInt64();
+ beginTime = input.readInt64();
bitField0_ |= 0x00000002;
}
} else {
@@ -491,10 +491,10 @@ public final class ActivityScheduleInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName beginTime = FieldName.forField("beginTime", "begin_time");
-
static final FieldName endTime = FieldName.forField("endTime", "end_time");
+ static final FieldName beginTime = FieldName.forField("beginTime", "begin_time");
+
static final FieldName moduleId = FieldName.forField("moduleId", "module_id");
static final FieldName activityId = FieldName.forField("activityId", "activity_id");
diff --git a/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java
index c13dcf7..bdf1df3 100644
--- a/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class ApplyFriendCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 uid = 9;
+ * optional uint32 uid = 7;
*/
private int uid;
@@ -39,7 +39,7 @@ public final class ApplyFriendCsReqOuterClass {
}
/**
- * optional uint32 uid = 9;
+ * optional uint32 uid = 7;
* @return whether the uid field is set
*/
public boolean hasUid() {
@@ -47,7 +47,7 @@ public final class ApplyFriendCsReqOuterClass {
}
/**
- * optional uint32 uid = 9;
+ * optional uint32 uid = 7;
* @return this
*/
public ApplyFriendCsReq clearUid() {
@@ -57,7 +57,7 @@ public final class ApplyFriendCsReqOuterClass {
}
/**
- * optional uint32 uid = 9;
+ * optional uint32 uid = 7;
* @return the uid
*/
public int getUid() {
@@ -65,7 +65,7 @@ public final class ApplyFriendCsReqOuterClass {
}
/**
- * optional uint32 uid = 9;
+ * optional uint32 uid = 7;
* @param value the uid to set
* @return this
*/
@@ -202,7 +202,7 @@ public final class ApplyFriendCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(uid);
}
if ((bitField0_ & 0x00000002) != 0) {
@@ -230,7 +230,7 @@ public final class ApplyFriendCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 72: {
+ case 56: {
// uid
uid = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/ArchiveDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/ArchiveDataOuterClass.java
index 4c9bcc7..1a26098 100644
--- a/src/generated/main/emu/lunarcore/proto/ArchiveDataOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ArchiveDataOuterClass.java
@@ -22,41 +22,37 @@ public final class ArchiveDataOuterClass {
/**
*
- * PGDKODMDBJG
+ * isnt used
*
*
- * repeated uint32 archive_equipment_id_list = 3;
+ * repeated uint32 archive_missing_avatar_id_list = 2;
+ */
+ private final RepeatedInt archiveMissingAvatarIdList = RepeatedInt.newEmptyInstance();
+
+ /**
+ * repeated uint32 archive_equipment_id_list = 5;
*/
private final RepeatedInt archiveEquipmentIdList = RepeatedInt.newEmptyInstance();
/**
*
- * EMKDCKBMGNO
+ * isnt used
*
*
- * repeated uint32 archive_missing_equipment_id_list = 6;
+ * repeated uint32 archive_missing_equipment_id_list = 14;
*/
private final RepeatedInt archiveMissingEquipmentIdList = RepeatedInt.newEmptyInstance();
/**
- * - * GKHKFMGJNOG - *- * - *
repeated uint32 archive_missing_avatar_id_list = 7;
- */
- private final RepeatedInt archiveMissingAvatarIdList = RepeatedInt.newEmptyInstance();
-
- /**
- * repeated .RelicArchive relic_list = 1;
- */
- private final RepeatedMessagerepeated .MonsterArchive archive_monster_id_list = 5;
+ * repeated .MonsterArchive archive_monster_id_list = 8;
*/
private final RepeatedMessagerepeated .RelicArchive relic_list = 10;
+ */
+ private final RepeatedMessage
- * PGDKODMDBJG
+ * isnt used
*
*
- * repeated uint32 archive_equipment_id_list = 3;
- * @return whether the archiveEquipmentIdList field is set
+ * repeated uint32 archive_missing_avatar_id_list = 2;
+ * @return whether the archiveMissingAvatarIdList field is set
*/
- public boolean hasArchiveEquipmentIdList() {
+ public boolean hasArchiveMissingAvatarIdList() {
return (bitField0_ & 0x00000001) != 0;
}
/**
*
- * PGDKODMDBJG
+ * isnt used
*
*
- * repeated uint32 archive_equipment_id_list = 3;
- * @return this
- */
- public ArchiveData clearArchiveEquipmentIdList() {
- bitField0_ &= ~0x00000001;
- archiveEquipmentIdList.clear();
- return this;
- }
-
- /**
- * - * PGDKODMDBJG - *- * - *
repeated uint32 archive_equipment_id_list = 3;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableArchiveEquipmentIdList()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedInt getArchiveEquipmentIdList() {
- return archiveEquipmentIdList;
- }
-
- /**
- * - * PGDKODMDBJG - *- * - *
repeated uint32 archive_equipment_id_list = 3;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedInt getMutableArchiveEquipmentIdList() {
- bitField0_ |= 0x00000001;
- return archiveEquipmentIdList;
- }
-
- /**
- * - * PGDKODMDBJG - *- * - *
repeated uint32 archive_equipment_id_list = 3;
- * @param value the archiveEquipmentIdList to add
- * @return this
- */
- public ArchiveData addArchiveEquipmentIdList(final int value) {
- bitField0_ |= 0x00000001;
- archiveEquipmentIdList.add(value);
- return this;
- }
-
- /**
- * - * PGDKODMDBJG - *- * - *
repeated uint32 archive_equipment_id_list = 3;
- * @param values the archiveEquipmentIdList to add
- * @return this
- */
- public ArchiveData addAllArchiveEquipmentIdList(final int... values) {
- bitField0_ |= 0x00000001;
- archiveEquipmentIdList.addAll(values);
- return this;
- }
-
- /**
- * - * EMKDCKBMGNO - *- * - *
repeated uint32 archive_missing_equipment_id_list = 6;
- * @return whether the archiveMissingEquipmentIdList field is set
- */
- public boolean hasArchiveMissingEquipmentIdList() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * - * EMKDCKBMGNO - *- * - *
repeated uint32 archive_missing_equipment_id_list = 6;
- * @return this
- */
- public ArchiveData clearArchiveMissingEquipmentIdList() {
- bitField0_ &= ~0x00000002;
- archiveMissingEquipmentIdList.clear();
- return this;
- }
-
- /**
- * - * EMKDCKBMGNO - *- * - *
repeated uint32 archive_missing_equipment_id_list = 6;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableArchiveMissingEquipmentIdList()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedInt getArchiveMissingEquipmentIdList() {
- return archiveMissingEquipmentIdList;
- }
-
- /**
- * - * EMKDCKBMGNO - *- * - *
repeated uint32 archive_missing_equipment_id_list = 6;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedInt getMutableArchiveMissingEquipmentIdList() {
- bitField0_ |= 0x00000002;
- return archiveMissingEquipmentIdList;
- }
-
- /**
- * - * EMKDCKBMGNO - *- * - *
repeated uint32 archive_missing_equipment_id_list = 6;
- * @param value the archiveMissingEquipmentIdList to add
- * @return this
- */
- public ArchiveData addArchiveMissingEquipmentIdList(final int value) {
- bitField0_ |= 0x00000002;
- archiveMissingEquipmentIdList.add(value);
- return this;
- }
-
- /**
- * - * EMKDCKBMGNO - *- * - *
repeated uint32 archive_missing_equipment_id_list = 6;
- * @param values the archiveMissingEquipmentIdList to add
- * @return this
- */
- public ArchiveData addAllArchiveMissingEquipmentIdList(final int... values) {
- bitField0_ |= 0x00000002;
- archiveMissingEquipmentIdList.addAll(values);
- return this;
- }
-
- /**
- * - * GKHKFMGJNOG - *- * - *
repeated uint32 archive_missing_avatar_id_list = 7;
- * @return whether the archiveMissingAvatarIdList field is set
- */
- public boolean hasArchiveMissingAvatarIdList() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * - * GKHKFMGJNOG - *- * - *
repeated uint32 archive_missing_avatar_id_list = 7;
+ * repeated uint32 archive_missing_avatar_id_list = 2;
* @return this
*/
public ArchiveData clearArchiveMissingAvatarIdList() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000001;
archiveMissingAvatarIdList.clear();
return this;
}
/**
*
- * GKHKFMGJNOG
+ * isnt used
*
*
- * repeated uint32 archive_missing_avatar_id_list = 7;
+ * repeated uint32 archive_missing_avatar_id_list = 2;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -297,10 +109,10 @@ public final class ArchiveDataOuterClass {
/**
*
- * GKHKFMGJNOG
+ * isnt used
*
*
- * repeated uint32 archive_missing_avatar_id_list = 7;
+ * repeated uint32 archive_missing_avatar_id_list = 2;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -309,74 +121,74 @@ public final class ArchiveDataOuterClass {
* @return internal storage object for modifications
*/
public RepeatedInt getMutableArchiveMissingAvatarIdList() {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
return archiveMissingAvatarIdList;
}
/**
*
- * GKHKFMGJNOG
+ * isnt used
*
*
- * repeated uint32 archive_missing_avatar_id_list = 7;
+ * repeated uint32 archive_missing_avatar_id_list = 2;
* @param value the archiveMissingAvatarIdList to add
* @return this
*/
public ArchiveData addArchiveMissingAvatarIdList(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
archiveMissingAvatarIdList.add(value);
return this;
}
/**
*
- * GKHKFMGJNOG
+ * isnt used
*
*
- * repeated uint32 archive_missing_avatar_id_list = 7;
+ * repeated uint32 archive_missing_avatar_id_list = 2;
* @param values the archiveMissingAvatarIdList to add
* @return this
*/
public ArchiveData addAllArchiveMissingAvatarIdList(final int... values) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
archiveMissingAvatarIdList.addAll(values);
return this;
}
/**
- * repeated .RelicArchive relic_list = 1;
- * @return whether the relicList field is set
+ * repeated uint32 archive_equipment_id_list = 5;
+ * @return whether the archiveEquipmentIdList field is set
*/
- public boolean hasRelicList() {
- return (bitField0_ & 0x00000008) != 0;
+ public boolean hasArchiveEquipmentIdList() {
+ return (bitField0_ & 0x00000002) != 0;
}
/**
- * repeated .RelicArchive relic_list = 1;
+ * repeated uint32 archive_equipment_id_list = 5;
* @return this
*/
- public ArchiveData clearRelicList() {
- bitField0_ &= ~0x00000008;
- relicList.clear();
+ public ArchiveData clearArchiveEquipmentIdList() {
+ bitField0_ &= ~0x00000002;
+ archiveEquipmentIdList.clear();
return this;
}
/**
- * repeated .RelicArchive relic_list = 1;
+ * repeated uint32 archive_equipment_id_list = 5;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
*
- * Use {@link #getMutableRelicList()} if you want to modify it.
+ * Use {@link #getMutableArchiveEquipmentIdList()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public RepeatedMessagerepeated .RelicArchive relic_list = 1;
+ * repeated uint32 archive_equipment_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
@@ -384,53 +196,145 @@ public final class ArchiveDataOuterClass {
*
* @return internal storage object for modifications
*/
- public RepeatedMessagerepeated .RelicArchive relic_list = 1;
- * @param value the relicList to add
+ * repeated uint32 archive_equipment_id_list = 5;
+ * @param value the archiveEquipmentIdList to add
* @return this
*/
- public ArchiveData addRelicList(final RelicArchiveOuterClass.RelicArchive value) {
- bitField0_ |= 0x00000008;
- relicList.add(value);
+ public ArchiveData addArchiveEquipmentIdList(final int value) {
+ bitField0_ |= 0x00000002;
+ archiveEquipmentIdList.add(value);
return this;
}
/**
- * repeated .RelicArchive relic_list = 1;
- * @param values the relicList to add
+ * repeated uint32 archive_equipment_id_list = 5;
+ * @param values the archiveEquipmentIdList to add
* @return this
*/
- public ArchiveData addAllRelicList(final RelicArchiveOuterClass.RelicArchive... values) {
- bitField0_ |= 0x00000008;
- relicList.addAll(values);
+ public ArchiveData addAllArchiveEquipmentIdList(final int... values) {
+ bitField0_ |= 0x00000002;
+ archiveEquipmentIdList.addAll(values);
return this;
}
/**
- * repeated .MonsterArchive archive_monster_id_list = 5;
+ * + * isnt used + *+ * + *
repeated uint32 archive_missing_equipment_id_list = 14;
+ * @return whether the archiveMissingEquipmentIdList field is set
+ */
+ public boolean hasArchiveMissingEquipmentIdList() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * + * isnt used + *+ * + *
repeated uint32 archive_missing_equipment_id_list = 14;
+ * @return this
+ */
+ public ArchiveData clearArchiveMissingEquipmentIdList() {
+ bitField0_ &= ~0x00000004;
+ archiveMissingEquipmentIdList.clear();
+ return this;
+ }
+
+ /**
+ * + * isnt used + *+ * + *
repeated uint32 archive_missing_equipment_id_list = 14;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableArchiveMissingEquipmentIdList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedInt getArchiveMissingEquipmentIdList() {
+ return archiveMissingEquipmentIdList;
+ }
+
+ /**
+ * + * isnt used + *+ * + *
repeated uint32 archive_missing_equipment_id_list = 14;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedInt getMutableArchiveMissingEquipmentIdList() {
+ bitField0_ |= 0x00000004;
+ return archiveMissingEquipmentIdList;
+ }
+
+ /**
+ * + * isnt used + *+ * + *
repeated uint32 archive_missing_equipment_id_list = 14;
+ * @param value the archiveMissingEquipmentIdList to add
+ * @return this
+ */
+ public ArchiveData addArchiveMissingEquipmentIdList(final int value) {
+ bitField0_ |= 0x00000004;
+ archiveMissingEquipmentIdList.add(value);
+ return this;
+ }
+
+ /**
+ * + * isnt used + *+ * + *
repeated uint32 archive_missing_equipment_id_list = 14;
+ * @param values the archiveMissingEquipmentIdList to add
+ * @return this
+ */
+ public ArchiveData addAllArchiveMissingEquipmentIdList(final int... values) {
+ bitField0_ |= 0x00000004;
+ archiveMissingEquipmentIdList.addAll(values);
+ return this;
+ }
+
+ /**
+ * repeated .MonsterArchive archive_monster_id_list = 8;
* @return whether the archiveMonsterIdList field is set
*/
public boolean hasArchiveMonsterIdList() {
- return (bitField0_ & 0x00000010) != 0;
+ return (bitField0_ & 0x00000008) != 0;
}
/**
- * repeated .MonsterArchive archive_monster_id_list = 5;
+ * repeated .MonsterArchive archive_monster_id_list = 8;
* @return this
*/
public ArchiveData clearArchiveMonsterIdList() {
- bitField0_ &= ~0x00000010;
+ bitField0_ &= ~0x00000008;
archiveMonsterIdList.clear();
return this;
}
/**
- * repeated .MonsterArchive archive_monster_id_list = 5;
+ * repeated .MonsterArchive archive_monster_id_list = 8;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -444,7 +348,7 @@ public final class ArchiveDataOuterClass {
}
/**
- * repeated .MonsterArchive archive_monster_id_list = 5;
+ * repeated .MonsterArchive archive_monster_id_list = 8;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -454,44 +358,112 @@ public final class ArchiveDataOuterClass {
*/
public RepeatedMessagerepeated .MonsterArchive archive_monster_id_list = 5;
+ * repeated .MonsterArchive archive_monster_id_list = 8;
* @param value the archiveMonsterIdList to add
* @return this
*/
public ArchiveData addArchiveMonsterIdList(
final MonsterArchiveOuterClass.MonsterArchive value) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
archiveMonsterIdList.add(value);
return this;
}
/**
- * repeated .MonsterArchive archive_monster_id_list = 5;
+ * repeated .MonsterArchive archive_monster_id_list = 8;
* @param values the archiveMonsterIdList to add
* @return this
*/
public ArchiveData addAllArchiveMonsterIdList(
final MonsterArchiveOuterClass.MonsterArchive... values) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
archiveMonsterIdList.addAll(values);
return this;
}
+ /**
+ * repeated .RelicArchive relic_list = 10;
+ * @return whether the relicList field is set
+ */
+ public boolean hasRelicList() {
+ return (bitField0_ & 0x00000010) != 0;
+ }
+
+ /**
+ * repeated .RelicArchive relic_list = 10;
+ * @return this
+ */
+ public ArchiveData clearRelicList() {
+ bitField0_ &= ~0x00000010;
+ relicList.clear();
+ return this;
+ }
+
+ /**
+ * repeated .RelicArchive relic_list = 10;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableRelicList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedMessagerepeated .RelicArchive relic_list = 10;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedMessagerepeated .RelicArchive relic_list = 10;
+ * @param value the relicList to add
+ * @return this
+ */
+ public ArchiveData addRelicList(final RelicArchiveOuterClass.RelicArchive value) {
+ bitField0_ |= 0x00000010;
+ relicList.add(value);
+ return this;
+ }
+
+ /**
+ * repeated .RelicArchive relic_list = 10;
+ * @param values the relicList to add
+ * @return this
+ */
+ public ArchiveData addAllRelicList(final RelicArchiveOuterClass.RelicArchive... values) {
+ bitField0_ |= 0x00000010;
+ relicList.addAll(values);
+ return this;
+ }
+
@Override
public ArchiveData copyFrom(final ArchiveData other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
+ archiveMissingAvatarIdList.copyFrom(other.archiveMissingAvatarIdList);
archiveEquipmentIdList.copyFrom(other.archiveEquipmentIdList);
archiveMissingEquipmentIdList.copyFrom(other.archiveMissingEquipmentIdList);
- archiveMissingAvatarIdList.copyFrom(other.archiveMissingAvatarIdList);
- relicList.copyFrom(other.relicList);
archiveMonsterIdList.copyFrom(other.archiveMonsterIdList);
+ relicList.copyFrom(other.relicList);
}
return this;
}
@@ -502,21 +474,21 @@ public final class ArchiveDataOuterClass {
return this;
}
cachedSize = -1;
+ if (other.hasArchiveMissingAvatarIdList()) {
+ getMutableArchiveMissingAvatarIdList().addAll(other.archiveMissingAvatarIdList);
+ }
if (other.hasArchiveEquipmentIdList()) {
getMutableArchiveEquipmentIdList().addAll(other.archiveEquipmentIdList);
}
if (other.hasArchiveMissingEquipmentIdList()) {
getMutableArchiveMissingEquipmentIdList().addAll(other.archiveMissingEquipmentIdList);
}
- if (other.hasArchiveMissingAvatarIdList()) {
- getMutableArchiveMissingAvatarIdList().addAll(other.archiveMissingAvatarIdList);
+ if (other.hasArchiveMonsterIdList()) {
+ getMutableArchiveMonsterIdList().addAll(other.archiveMonsterIdList);
}
if (other.hasRelicList()) {
getMutableRelicList().addAll(other.relicList);
}
- if (other.hasArchiveMonsterIdList()) {
- getMutableArchiveMonsterIdList().addAll(other.archiveMonsterIdList);
- }
return this;
}
@@ -527,11 +499,11 @@ public final class ArchiveDataOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
+ archiveMissingAvatarIdList.clear();
archiveEquipmentIdList.clear();
archiveMissingEquipmentIdList.clear();
- archiveMissingAvatarIdList.clear();
- relicList.clear();
archiveMonsterIdList.clear();
+ relicList.clear();
return this;
}
@@ -542,11 +514,11 @@ public final class ArchiveDataOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
+ archiveMissingAvatarIdList.clear();
archiveEquipmentIdList.clear();
archiveMissingEquipmentIdList.clear();
- archiveMissingAvatarIdList.clear();
- relicList.clearQuick();
archiveMonsterIdList.clearQuick();
+ relicList.clearQuick();
return this;
}
@@ -560,43 +532,43 @@ public final class ArchiveDataOuterClass {
}
ArchiveData other = (ArchiveData) o;
return bitField0_ == other.bitField0_
+ && (!hasArchiveMissingAvatarIdList() || archiveMissingAvatarIdList.equals(other.archiveMissingAvatarIdList))
&& (!hasArchiveEquipmentIdList() || archiveEquipmentIdList.equals(other.archiveEquipmentIdList))
&& (!hasArchiveMissingEquipmentIdList() || archiveMissingEquipmentIdList.equals(other.archiveMissingEquipmentIdList))
- && (!hasArchiveMissingAvatarIdList() || archiveMissingAvatarIdList.equals(other.archiveMissingAvatarIdList))
- && (!hasRelicList() || relicList.equals(other.relicList))
- && (!hasArchiveMonsterIdList() || archiveMonsterIdList.equals(other.archiveMonsterIdList));
+ && (!hasArchiveMonsterIdList() || archiveMonsterIdList.equals(other.archiveMonsterIdList))
+ && (!hasRelicList() || relicList.equals(other.relicList));
}
@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]);
- }
- }
- if ((bitField0_ & 0x00000002) != 0) {
- for (int i = 0; i < archiveMissingEquipmentIdList.length(); i++) {
- output.writeRawByte((byte) 48);
- output.writeUInt32NoTag(archiveMissingEquipmentIdList.array()[i]);
- }
- }
- if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < archiveMissingAvatarIdList.length(); i++) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(archiveMissingAvatarIdList.array()[i]);
}
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ for (int i = 0; i < archiveEquipmentIdList.length(); i++) {
+ output.writeRawByte((byte) 40);
+ output.writeUInt32NoTag(archiveEquipmentIdList.array()[i]);
+ }
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
+ for (int i = 0; i < archiveMissingEquipmentIdList.length(); i++) {
+ output.writeRawByte((byte) 112);
+ output.writeUInt32NoTag(archiveMissingEquipmentIdList.array()[i]);
+ }
+ }
if ((bitField0_ & 0x00000008) != 0) {
- for (int i = 0; i < relicList.length(); i++) {
- output.writeRawByte((byte) 10);
- output.writeMessageNoTag(relicList.get(i));
+ for (int i = 0; i < archiveMonsterIdList.length(); i++) {
+ output.writeRawByte((byte) 66);
+ output.writeMessageNoTag(archiveMonsterIdList.get(i));
}
}
if ((bitField0_ & 0x00000010) != 0) {
- for (int i = 0; i < archiveMonsterIdList.length(); i++) {
- output.writeRawByte((byte) 42);
- output.writeMessageNoTag(archiveMonsterIdList.get(i));
+ for (int i = 0; i < relicList.length(); i++) {
+ output.writeRawByte((byte) 82);
+ output.writeMessageNoTag(relicList.get(i));
}
}
}
@@ -605,19 +577,19 @@ public final class ArchiveDataOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += (1 * archiveEquipmentIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveEquipmentIdList);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- size += (1 * archiveMissingEquipmentIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveMissingEquipmentIdList);
- }
- if ((bitField0_ & 0x00000004) != 0) {
size += (1 * archiveMissingAvatarIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveMissingAvatarIdList);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ size += (1 * archiveEquipmentIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveEquipmentIdList);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += (1 * archiveMissingEquipmentIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveMissingEquipmentIdList);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList);
+ size += (1 * archiveMonsterIdList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(archiveMonsterIdList);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += (1 * archiveMonsterIdList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(archiveMonsterIdList);
+ size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList);
}
return size;
}
@@ -629,44 +601,44 @@ public final class ArchiveDataOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 26: {
- // archiveEquipmentIdList [packed=true]
- input.readPackedUInt32(archiveEquipmentIdList, tag);
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 50) {
- break;
- }
- }
- case 50: {
- // archiveMissingEquipmentIdList [packed=true]
- input.readPackedUInt32(archiveMissingEquipmentIdList, tag);
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 58) {
- break;
- }
- }
- case 58: {
+ case 18: {
// archiveMissingAvatarIdList [packed=true]
input.readPackedUInt32(archiveMissingAvatarIdList, tag);
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 10) {
- break;
- }
- }
- case 10: {
- // relicList
- tag = input.readRepeatedMessage(relicList, tag);
- bitField0_ |= 0x00000008;
if (tag != 42) {
break;
}
}
case 42: {
+ // archiveEquipmentIdList [packed=true]
+ input.readPackedUInt32(archiveEquipmentIdList, tag);
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 114) {
+ break;
+ }
+ }
+ case 114: {
+ // archiveMissingEquipmentIdList [packed=true]
+ input.readPackedUInt32(archiveMissingEquipmentIdList, tag);
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 66) {
+ break;
+ }
+ }
+ case 66: {
// archiveMonsterIdList
tag = input.readRepeatedMessage(archiveMonsterIdList, tag);
+ bitField0_ |= 0x00000008;
+ if (tag != 82) {
+ break;
+ }
+ }
+ case 82: {
+ // relicList
+ tag = input.readRepeatedMessage(relicList, tag);
bitField0_ |= 0x00000010;
if (tag != 0) {
break;
@@ -682,21 +654,21 @@ public final class ArchiveDataOuterClass {
tag = input.readTag();
break;
}
- case 24: {
- // archiveEquipmentIdList [packed=false]
- tag = input.readRepeatedUInt32(archiveEquipmentIdList, tag);
+ case 16: {
+ // archiveMissingAvatarIdList [packed=false]
+ tag = input.readRepeatedUInt32(archiveMissingAvatarIdList, tag);
bitField0_ |= 0x00000001;
break;
}
- case 48: {
- // archiveMissingEquipmentIdList [packed=false]
- tag = input.readRepeatedUInt32(archiveMissingEquipmentIdList, tag);
+ case 40: {
+ // archiveEquipmentIdList [packed=false]
+ tag = input.readRepeatedUInt32(archiveEquipmentIdList, tag);
bitField0_ |= 0x00000002;
break;
}
- case 56: {
- // archiveMissingAvatarIdList [packed=false]
- tag = input.readRepeatedUInt32(archiveMissingAvatarIdList, tag);
+ case 112: {
+ // archiveMissingEquipmentIdList [packed=false]
+ tag = input.readRepeatedUInt32(archiveMissingEquipmentIdList, tag);
bitField0_ |= 0x00000004;
break;
}
@@ -708,19 +680,19 @@ public final class ArchiveDataOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRepeatedUInt32(FieldNames.archiveEquipmentIdList, archiveEquipmentIdList);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRepeatedUInt32(FieldNames.archiveMissingEquipmentIdList, archiveMissingEquipmentIdList);
- }
- if ((bitField0_ & 0x00000004) != 0) {
output.writeRepeatedUInt32(FieldNames.archiveMissingAvatarIdList, archiveMissingAvatarIdList);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRepeatedUInt32(FieldNames.archiveEquipmentIdList, archiveEquipmentIdList);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRepeatedUInt32(FieldNames.archiveMissingEquipmentIdList, archiveMissingEquipmentIdList);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRepeatedMessage(FieldNames.relicList, relicList);
+ output.writeRepeatedMessage(FieldNames.archiveMonsterIdList, archiveMonsterIdList);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRepeatedMessage(FieldNames.archiveMonsterIdList, archiveMonsterIdList);
+ output.writeRepeatedMessage(FieldNames.relicList, relicList);
}
output.endObject();
}
@@ -732,12 +704,24 @@ public final class ArchiveDataOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
+ case 891812726:
+ case 1757924466: {
+ if (input.isAtField(FieldNames.archiveMissingAvatarIdList)) {
+ if (!input.trySkipNullValue()) {
+ input.readRepeatedUInt32(archiveMissingAvatarIdList);
+ bitField0_ |= 0x00000001;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case 1521227365:
case 967463252: {
if (input.isAtField(FieldNames.archiveEquipmentIdList)) {
if (!input.trySkipNullValue()) {
input.readRepeatedUInt32(archiveEquipmentIdList);
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
}
} else {
input.skipUnknownField();
@@ -749,18 +733,6 @@ public final class ArchiveDataOuterClass {
if (input.isAtField(FieldNames.archiveMissingEquipmentIdList)) {
if (!input.trySkipNullValue()) {
input.readRepeatedUInt32(archiveMissingEquipmentIdList);
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 891812726:
- case 1757924466: {
- if (input.isAtField(FieldNames.archiveMissingAvatarIdList)) {
- if (!input.trySkipNullValue()) {
- input.readRepeatedUInt32(archiveMissingAvatarIdList);
bitField0_ |= 0x00000004;
}
} else {
@@ -768,23 +740,23 @@ public final class ArchiveDataOuterClass {
}
break;
}
- case 204814001:
- case 2071893482: {
- if (input.isAtField(FieldNames.relicList)) {
- if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(relicList);
- bitField0_ |= 0x00000008;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 912174897:
case 1817787488: {
if (input.isAtField(FieldNames.archiveMonsterIdList)) {
if (!input.trySkipNullValue()) {
input.readRepeatedMessage(archiveMonsterIdList);
+ bitField0_ |= 0x00000008;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 204814001:
+ case 2071893482: {
+ if (input.isAtField(FieldNames.relicList)) {
+ if (!input.trySkipNullValue()) {
+ input.readRepeatedMessage(relicList);
bitField0_ |= 0x00000010;
}
} else {
@@ -844,15 +816,15 @@ public final class ArchiveDataOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
+ static final FieldName archiveMissingAvatarIdList = FieldName.forField("archiveMissingAvatarIdList", "archive_missing_avatar_id_list");
+
static final FieldName archiveEquipmentIdList = FieldName.forField("archiveEquipmentIdList", "archive_equipment_id_list");
static final FieldName archiveMissingEquipmentIdList = FieldName.forField("archiveMissingEquipmentIdList", "archive_missing_equipment_id_list");
- static final FieldName archiveMissingAvatarIdList = FieldName.forField("archiveMissingAvatarIdList", "archive_missing_avatar_id_list");
+ static final FieldName archiveMonsterIdList = FieldName.forField("archiveMonsterIdList", "archive_monster_id_list");
static final FieldName relicList = FieldName.forField("relicList", "relic_list");
-
- static final FieldName archiveMonsterIdList = FieldName.forField("archiveMonsterIdList", "archive_monster_id_list");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/AssistMonsterWaveOuterClass.java b/src/generated/main/emu/lunarcore/proto/AssistMonsterWaveOuterClass.java
new file mode 100644
index 0000000..982db4c
--- /dev/null
+++ b/src/generated/main/emu/lunarcore/proto/AssistMonsterWaveOuterClass.java
@@ -0,0 +1,301 @@
+// Code generated by protocol buffer compiler. Do not edit!
+package emu.lunarcore.proto;
+
+import java.io.IOException;
+import us.hebi.quickbuf.FieldName;
+import us.hebi.quickbuf.InvalidProtocolBufferException;
+import us.hebi.quickbuf.JsonSink;
+import us.hebi.quickbuf.JsonSource;
+import us.hebi.quickbuf.MessageFactory;
+import us.hebi.quickbuf.ProtoMessage;
+import us.hebi.quickbuf.ProtoSink;
+import us.hebi.quickbuf.ProtoSource;
+import us.hebi.quickbuf.RepeatedInt;
+
+public final class AssistMonsterWaveOuterClass {
+ /**
+ * Protobuf type {@code AssistMonsterWave}
+ */
+ public static final class AssistMonsterWave extends ProtoMessagerepeated uint32 entity_id_list = 10;
+ */
+ private final RepeatedInt entityIdList = RepeatedInt.newEmptyInstance();
+
+ private AssistMonsterWave() {
+ }
+
+ /**
+ * @return a new empty instance of {@code AssistMonsterWave}
+ */
+ public static AssistMonsterWave newInstance() {
+ return new AssistMonsterWave();
+ }
+
+ /**
+ * repeated uint32 entity_id_list = 10;
+ * @return whether the entityIdList field is set
+ */
+ public boolean hasEntityIdList() {
+ return (bitField0_ & 0x00000001) != 0;
+ }
+
+ /**
+ * repeated uint32 entity_id_list = 10;
+ * @return this
+ */
+ public AssistMonsterWave clearEntityIdList() {
+ bitField0_ &= ~0x00000001;
+ entityIdList.clear();
+ return this;
+ }
+
+ /**
+ * repeated uint32 entity_id_list = 10;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableEntityIdList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedInt getEntityIdList() {
+ return entityIdList;
+ }
+
+ /**
+ * repeated uint32 entity_id_list = 10;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedInt getMutableEntityIdList() {
+ bitField0_ |= 0x00000001;
+ return entityIdList;
+ }
+
+ /**
+ * repeated uint32 entity_id_list = 10;
+ * @param value the entityIdList to add
+ * @return this
+ */
+ public AssistMonsterWave addEntityIdList(final int value) {
+ bitField0_ |= 0x00000001;
+ entityIdList.add(value);
+ return this;
+ }
+
+ /**
+ * repeated uint32 entity_id_list = 10;
+ * @param values the entityIdList to add
+ * @return this
+ */
+ public AssistMonsterWave addAllEntityIdList(final int... values) {
+ bitField0_ |= 0x00000001;
+ entityIdList.addAll(values);
+ return this;
+ }
+
+ @Override
+ public AssistMonsterWave copyFrom(final AssistMonsterWave other) {
+ cachedSize = other.cachedSize;
+ if ((bitField0_ | other.bitField0_) != 0) {
+ bitField0_ = other.bitField0_;
+ entityIdList.copyFrom(other.entityIdList);
+ }
+ return this;
+ }
+
+ @Override
+ public AssistMonsterWave mergeFrom(final AssistMonsterWave other) {
+ if (other.isEmpty()) {
+ return this;
+ }
+ cachedSize = -1;
+ if (other.hasEntityIdList()) {
+ getMutableEntityIdList().addAll(other.entityIdList);
+ }
+ return this;
+ }
+
+ @Override
+ public AssistMonsterWave clear() {
+ if (isEmpty()) {
+ return this;
+ }
+ cachedSize = -1;
+ bitField0_ = 0;
+ entityIdList.clear();
+ return this;
+ }
+
+ @Override
+ public AssistMonsterWave clearQuick() {
+ if (isEmpty()) {
+ return this;
+ }
+ cachedSize = -1;
+ bitField0_ = 0;
+ entityIdList.clear();
+ return this;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ }
+ if (!(o instanceof AssistMonsterWave)) {
+ return false;
+ }
+ AssistMonsterWave other = (AssistMonsterWave) o;
+ return bitField0_ == other.bitField0_
+ && (!hasEntityIdList() || entityIdList.equals(other.entityIdList));
+ }
+
+ @Override
+ public void writeTo(final ProtoSink output) throws IOException {
+ if ((bitField0_ & 0x00000001) != 0) {
+ for (int i = 0; i < entityIdList.length(); i++) {
+ output.writeRawByte((byte) 80);
+ output.writeUInt32NoTag(entityIdList.array()[i]);
+ }
+ }
+ }
+
+ @Override
+ protected int computeSerializedSize() {
+ int size = 0;
+ if ((bitField0_ & 0x00000001) != 0) {
+ size += (1 * entityIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(entityIdList);
+ }
+ return size;
+ }
+
+ @Override
+ @SuppressWarnings("fallthrough")
+ public AssistMonsterWave mergeFrom(final ProtoSource input) throws IOException {
+ // Enabled Fall-Through Optimization (QuickBuffers)
+ int tag = input.readTag();
+ while (true) {
+ switch (tag) {
+ case 82: {
+ // entityIdList [packed=true]
+ input.readPackedUInt32(entityIdList, tag);
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 0) {
+ break;
+ }
+ }
+ case 0: {
+ return this;
+ }
+ default: {
+ if (!input.skipField(tag)) {
+ return this;
+ }
+ tag = input.readTag();
+ break;
+ }
+ case 80: {
+ // entityIdList [packed=false]
+ tag = input.readRepeatedUInt32(entityIdList, tag);
+ bitField0_ |= 0x00000001;
+ break;
+ }
+ }
+ }
+ }
+
+ @Override
+ public void writeTo(final JsonSink output) throws IOException {
+ output.beginObject();
+ if ((bitField0_ & 0x00000001) != 0) {
+ output.writeRepeatedUInt32(FieldNames.entityIdList, entityIdList);
+ }
+ output.endObject();
+ }
+
+ @Override
+ public AssistMonsterWave mergeFrom(final JsonSource input) throws IOException {
+ if (!input.beginObject()) {
+ return this;
+ }
+ while (!input.isAtEnd()) {
+ switch (input.readFieldHash()) {
+ case 432358940:
+ case -607564570: {
+ if (input.isAtField(FieldNames.entityIdList)) {
+ if (!input.trySkipNullValue()) {
+ input.readRepeatedUInt32(entityIdList);
+ bitField0_ |= 0x00000001;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ default: {
+ input.skipUnknownField();
+ break;
+ }
+ }
+ }
+ input.endObject();
+ return this;
+ }
+
+ @Override
+ public AssistMonsterWave clone() {
+ return new AssistMonsterWave().copyFrom(this);
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return ((bitField0_) == 0);
+ }
+
+ public static AssistMonsterWave parseFrom(final byte[] data) throws
+ InvalidProtocolBufferException {
+ return ProtoMessage.mergeFrom(new AssistMonsterWave(), data).checkInitialized();
+ }
+
+ public static AssistMonsterWave parseFrom(final ProtoSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new AssistMonsterWave(), input).checkInitialized();
+ }
+
+ public static AssistMonsterWave parseFrom(final JsonSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new AssistMonsterWave(), input).checkInitialized();
+ }
+
+ /**
+ * @return factory for creating AssistMonsterWave messages
+ */
+ public static MessageFactoryoptional uint32 dressed_skin_id = 4;
- */
- private int dressedSkinId;
-
- /**
- * optional uint32 avatar_id = 10;
+ * optional uint32 avatar_id = 7;
*/
private int avatarId;
/**
- * optional uint32 pos = 13;
- */
- private int pos;
-
- /**
- * optional uint32 level = 15;
+ * optional uint32 level = 8;
*/
private int level;
+ /**
+ * optional uint32 dressed_skin_id = 11;
+ */
+ private int dressedSkinId;
+
+ /**
+ * optional uint32 pos = 14;
+ */
+ private int pos;
+
private AssistSimpleInfo() {
}
@@ -49,62 +49,25 @@ public final class AssistSimpleInfoOuterClass {
}
/**
- * optional uint32 dressed_skin_id = 4;
- * @return whether the dressedSkinId field is set
+ * optional uint32 avatar_id = 7;
+ * @return whether the avatarId field is set
*/
- public boolean hasDressedSkinId() {
+ public boolean hasAvatarId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 dressed_skin_id = 4;
- * @return this
- */
- public AssistSimpleInfo clearDressedSkinId() {
- bitField0_ &= ~0x00000001;
- dressedSkinId = 0;
- return this;
- }
-
- /**
- * optional uint32 dressed_skin_id = 4;
- * @return the dressedSkinId
- */
- public int getDressedSkinId() {
- return dressedSkinId;
- }
-
- /**
- * optional uint32 dressed_skin_id = 4;
- * @param value the dressedSkinId to set
- * @return this
- */
- public AssistSimpleInfo setDressedSkinId(final int value) {
- bitField0_ |= 0x00000001;
- dressedSkinId = value;
- return this;
- }
-
- /**
- * optional uint32 avatar_id = 10;
- * @return whether the avatarId field is set
- */
- public boolean hasAvatarId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 avatar_id = 10;
+ * optional uint32 avatar_id = 7;
* @return this
*/
public AssistSimpleInfo clearAvatarId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
avatarId = 0;
return this;
}
/**
- * optional uint32 avatar_id = 10;
+ * optional uint32 avatar_id = 7;
* @return the avatarId
*/
public int getAvatarId() {
@@ -112,73 +75,36 @@ public final class AssistSimpleInfoOuterClass {
}
/**
- * optional uint32 avatar_id = 10;
+ * optional uint32 avatar_id = 7;
* @param value the avatarId to set
* @return this
*/
public AssistSimpleInfo setAvatarId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
avatarId = value;
return this;
}
/**
- * optional uint32 pos = 13;
- * @return whether the pos field is set
- */
- public boolean hasPos() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 pos = 13;
- * @return this
- */
- public AssistSimpleInfo clearPos() {
- bitField0_ &= ~0x00000004;
- pos = 0;
- return this;
- }
-
- /**
- * optional uint32 pos = 13;
- * @return the pos
- */
- public int getPos() {
- return pos;
- }
-
- /**
- * optional uint32 pos = 13;
- * @param value the pos to set
- * @return this
- */
- public AssistSimpleInfo setPos(final int value) {
- bitField0_ |= 0x00000004;
- pos = value;
- return this;
- }
-
- /**
- * optional uint32 level = 15;
+ * optional uint32 level = 8;
* @return whether the level field is set
*/
public boolean hasLevel() {
- return (bitField0_ & 0x00000008) != 0;
+ return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 level = 15;
+ * optional uint32 level = 8;
* @return this
*/
public AssistSimpleInfo clearLevel() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000002;
level = 0;
return this;
}
/**
- * optional uint32 level = 15;
+ * optional uint32 level = 8;
* @return the level
*/
public int getLevel() {
@@ -186,25 +112,99 @@ public final class AssistSimpleInfoOuterClass {
}
/**
- * optional uint32 level = 15;
+ * optional uint32 level = 8;
* @param value the level to set
* @return this
*/
public AssistSimpleInfo setLevel(final int value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000002;
level = value;
return this;
}
+ /**
+ * optional uint32 dressed_skin_id = 11;
+ * @return whether the dressedSkinId field is set
+ */
+ public boolean hasDressedSkinId() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 dressed_skin_id = 11;
+ * @return this
+ */
+ public AssistSimpleInfo clearDressedSkinId() {
+ bitField0_ &= ~0x00000004;
+ dressedSkinId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 dressed_skin_id = 11;
+ * @return the dressedSkinId
+ */
+ public int getDressedSkinId() {
+ return dressedSkinId;
+ }
+
+ /**
+ * optional uint32 dressed_skin_id = 11;
+ * @param value the dressedSkinId to set
+ * @return this
+ */
+ public AssistSimpleInfo setDressedSkinId(final int value) {
+ bitField0_ |= 0x00000004;
+ dressedSkinId = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 pos = 14;
+ * @return whether the pos field is set
+ */
+ public boolean hasPos() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional uint32 pos = 14;
+ * @return this
+ */
+ public AssistSimpleInfo clearPos() {
+ bitField0_ &= ~0x00000008;
+ pos = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 pos = 14;
+ * @return the pos
+ */
+ public int getPos() {
+ return pos;
+ }
+
+ /**
+ * optional uint32 pos = 14;
+ * @param value the pos to set
+ * @return this
+ */
+ public AssistSimpleInfo setPos(final int value) {
+ bitField0_ |= 0x00000008;
+ pos = value;
+ return this;
+ }
+
@Override
public AssistSimpleInfo copyFrom(final AssistSimpleInfo other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- dressedSkinId = other.dressedSkinId;
avatarId = other.avatarId;
- pos = other.pos;
level = other.level;
+ dressedSkinId = other.dressedSkinId;
+ pos = other.pos;
}
return this;
}
@@ -215,18 +215,18 @@ public final class AssistSimpleInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasDressedSkinId()) {
- setDressedSkinId(other.dressedSkinId);
- }
if (other.hasAvatarId()) {
setAvatarId(other.avatarId);
}
- if (other.hasPos()) {
- setPos(other.pos);
- }
if (other.hasLevel()) {
setLevel(other.level);
}
+ if (other.hasDressedSkinId()) {
+ setDressedSkinId(other.dressedSkinId);
+ }
+ if (other.hasPos()) {
+ setPos(other.pos);
+ }
return this;
}
@@ -237,10 +237,10 @@ public final class AssistSimpleInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- dressedSkinId = 0;
avatarId = 0;
- pos = 0;
level = 0;
+ dressedSkinId = 0;
+ pos = 0;
return this;
}
@@ -264,29 +264,29 @@ public final class AssistSimpleInfoOuterClass {
}
AssistSimpleInfo other = (AssistSimpleInfo) o;
return bitField0_ == other.bitField0_
- && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId)
&& (!hasAvatarId() || avatarId == other.avatarId)
- && (!hasPos() || pos == other.pos)
- && (!hasLevel() || level == other.level);
+ && (!hasLevel() || level == other.level)
+ && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId)
+ && (!hasPos() || pos == other.pos);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(dressedSkinId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(avatarId);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 64);
+ output.writeUInt32NoTag(level);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 104);
- output.writeUInt32NoTag(pos);
+ output.writeRawByte((byte) 88);
+ output.writeUInt32NoTag(dressedSkinId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 120);
- output.writeUInt32NoTag(level);
+ output.writeRawByte((byte) 112);
+ output.writeUInt32NoTag(pos);
}
}
@@ -294,16 +294,16 @@ public final class AssistSimpleInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(pos);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(pos);
}
return size;
}
@@ -315,36 +315,36 @@ public final class AssistSimpleInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
- // dressedSkinId
- dressedSkinId = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 80) {
- break;
- }
- }
- case 80: {
+ case 56: {
// avatarId
avatarId = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 64) {
break;
}
}
- case 104: {
- // pos
- pos = input.readUInt32();
- bitField0_ |= 0x00000004;
- tag = input.readTag();
- if (tag != 120) {
- break;
- }
- }
- case 120: {
+ case 64: {
// level
level = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 88) {
+ break;
+ }
+ }
+ case 88: {
+ // dressedSkinId
+ dressedSkinId = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 112) {
+ break;
+ }
+ }
+ case 112: {
+ // pos
+ pos = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
if (tag != 0) {
@@ -369,16 +369,16 @@ public final class AssistSimpleInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.avatarId, avatarId);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeUInt32(FieldNames.level, level);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.pos, pos);
+ output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.level, level);
+ output.writeUInt32(FieldNames.pos, pos);
}
output.endObject();
}
@@ -390,35 +390,12 @@ public final class AssistSimpleInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -407000018:
- case 2012697844: {
- if (input.isAtField(FieldNames.dressedSkinId)) {
- if (!input.trySkipNullValue()) {
- dressedSkinId = input.readUInt32();
- bitField0_ |= 0x00000001;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 1787287636:
case -428636735: {
if (input.isAtField(FieldNames.avatarId)) {
if (!input.trySkipNullValue()) {
avatarId = input.readUInt32();
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 111188: {
- if (input.isAtField(FieldNames.pos)) {
- if (!input.trySkipNullValue()) {
- pos = input.readUInt32();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
}
} else {
input.skipUnknownField();
@@ -429,6 +406,29 @@ public final class AssistSimpleInfoOuterClass {
if (input.isAtField(FieldNames.level)) {
if (!input.trySkipNullValue()) {
level = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -407000018:
+ case 2012697844: {
+ if (input.isAtField(FieldNames.dressedSkinId)) {
+ if (!input.trySkipNullValue()) {
+ dressedSkinId = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 111188: {
+ if (input.isAtField(FieldNames.pos)) {
+ if (!input.trySkipNullValue()) {
+ pos = input.readUInt32();
bitField0_ |= 0x00000008;
}
} else {
@@ -489,13 +489,13 @@ public final class AssistSimpleInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id");
-
static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id");
- static final FieldName pos = FieldName.forField("pos");
-
static final FieldName level = FieldName.forField("level");
+
+ static final FieldName dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id");
+
+ static final FieldName pos = FieldName.forField("pos");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/AvatarExpUpCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/AvatarExpUpCsReqOuterClass.java
index 8994e30..721a74f 100644
--- a/src/generated/main/emu/lunarcore/proto/AvatarExpUpCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/AvatarExpUpCsReqOuterClass.java
@@ -19,12 +19,12 @@ public final class AvatarExpUpCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 base_avatar_id = 13;
+ * optional uint32 base_avatar_id = 5;
*/
private int baseAvatarId;
/**
- * optional .ItemCostList item_cost_list = 1;
+ * optional .ItemCostList item_cost_list = 6;
*/
private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance();
@@ -39,7 +39,7 @@ public final class AvatarExpUpCsReqOuterClass {
}
/**
- * optional uint32 base_avatar_id = 13;
+ * optional uint32 base_avatar_id = 5;
* @return whether the baseAvatarId field is set
*/
public boolean hasBaseAvatarId() {
@@ -47,7 +47,7 @@ public final class AvatarExpUpCsReqOuterClass {
}
/**
- * optional uint32 base_avatar_id = 13;
+ * optional uint32 base_avatar_id = 5;
* @return this
*/
public AvatarExpUpCsReq clearBaseAvatarId() {
@@ -57,7 +57,7 @@ public final class AvatarExpUpCsReqOuterClass {
}
/**
- * optional uint32 base_avatar_id = 13;
+ * optional uint32 base_avatar_id = 5;
* @return the baseAvatarId
*/
public int getBaseAvatarId() {
@@ -65,7 +65,7 @@ public final class AvatarExpUpCsReqOuterClass {
}
/**
- * optional uint32 base_avatar_id = 13;
+ * optional uint32 base_avatar_id = 5;
* @param value the baseAvatarId to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class AvatarExpUpCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 1;
+ * optional .ItemCostList item_cost_list = 6;
* @return whether the itemCostList field is set
*/
public boolean hasItemCostList() {
@@ -84,7 +84,7 @@ public final class AvatarExpUpCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 1;
+ * optional .ItemCostList item_cost_list = 6;
* @return this
*/
public AvatarExpUpCsReq clearItemCostList() {
@@ -94,7 +94,7 @@ public final class AvatarExpUpCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 1;
+ * optional .ItemCostList item_cost_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.
@@ -108,7 +108,7 @@ public final class AvatarExpUpCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 1;
+ * optional .ItemCostList item_cost_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
@@ -122,7 +122,7 @@ public final class AvatarExpUpCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 1;
+ * optional .ItemCostList item_cost_list = 6;
* @param value the itemCostList to set
* @return this
*/
@@ -198,11 +198,11 @@ public final class AvatarExpUpCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(baseAvatarId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 10);
+ output.writeRawByte((byte) 50);
output.writeMessageNoTag(itemCostList);
}
}
@@ -226,16 +226,16 @@ public final class AvatarExpUpCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 104: {
+ case 40: {
// baseAvatarId
baseAvatarId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 10) {
+ if (tag != 50) {
break;
}
}
- case 10: {
+ case 50: {
// 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 a4b8a20..ffd757f 100644
--- a/src/generated/main/emu/lunarcore/proto/AvatarExpUpScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/AvatarExpUpScRspOuterClass.java
@@ -20,12 +20,12 @@ public final class AvatarExpUpScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 10;
*/
private int retcode;
/**
- * repeated .PileItem return_item_list = 9;
+ * repeated .PileItem return_item_list = 1;
*/
private final RepeatedMessageoptional uint32 retcode = 7;
+ * optional uint32 retcode = 10;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public final class AvatarExpUpScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 10;
* @return this
*/
public AvatarExpUpScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public final class AvatarExpUpScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 10;
* @return the retcode
*/
public int getRetcode() {
@@ -66,7 +66,7 @@ public final class AvatarExpUpScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 10;
* @param value the retcode to set
* @return this
*/
@@ -77,7 +77,7 @@ public final class AvatarExpUpScRspOuterClass {
}
/**
- * repeated .PileItem return_item_list = 9;
+ * repeated .PileItem return_item_list = 1;
* @return whether the returnItemList field is set
*/
public boolean hasReturnItemList() {
@@ -85,7 +85,7 @@ public final class AvatarExpUpScRspOuterClass {
}
/**
- * repeated .PileItem return_item_list = 9;
+ * repeated .PileItem return_item_list = 1;
* @return this
*/
public AvatarExpUpScRsp clearReturnItemList() {
@@ -95,7 +95,7 @@ public final class AvatarExpUpScRspOuterClass {
}
/**
- * repeated .PileItem return_item_list = 9;
+ * repeated .PileItem return_item_list = 1;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class AvatarExpUpScRspOuterClass {
}
/**
- * repeated .PileItem return_item_list = 9;
+ * repeated .PileItem return_item_list = 1;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public final class AvatarExpUpScRspOuterClass {
}
/**
- * repeated .PileItem return_item_list = 9;
+ * repeated .PileItem return_item_list = 1;
* @param value the returnItemList to add
* @return this
*/
@@ -134,7 +134,7 @@ public final class AvatarExpUpScRspOuterClass {
}
/**
- * repeated .PileItem return_item_list = 9;
+ * repeated .PileItem return_item_list = 1;
* @param values the returnItemList to add
* @return this
*/
@@ -210,12 +210,12 @@ public final class AvatarExpUpScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < returnItemList.length(); i++) {
- output.writeRawByte((byte) 74);
+ output.writeRawByte((byte) 10);
output.writeMessageNoTag(returnItemList.get(i));
}
}
@@ -240,16 +240,16 @@ public final class AvatarExpUpScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
+ case 80: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 74) {
+ if (tag != 10) {
break;
}
}
- case 74: {
+ case 10: {
// returnItemList
tag = input.readRepeatedMessage(returnItemList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/AvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/AvatarOuterClass.java
index abf26f0..228526c 100644
--- a/src/generated/main/emu/lunarcore/proto/AvatarOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/AvatarOuterClass.java
@@ -21,60 +21,65 @@ public final class AvatarOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint64 first_met_timestamp = 13;
+ * optional uint64 first_met_timestamp = 2;
*/
private long firstMetTimestamp;
/**
- * optional uint32 promotion = 1;
- */
- private int promotion;
-
- /**
- * optional uint32 rank = 2;
- */
- private int rank;
-
- /**
- * optional uint32 level = 3;
- */
- private int level;
-
- /**
- * optional uint32 dressed_skin_id = 7;
+ * optional uint32 dressed_skin_id = 1;
*/
private int dressedSkinId;
/**
- * optional uint32 base_avatar_id = 9;
+ * optional uint32 promotion = 4;
*/
- private int baseAvatarId;
+ private int promotion;
/**
- * optional uint32 equipment_unique_id = 10;
+ * optional uint32 equipment_unique_id = 6;
*/
private int equipmentUniqueId;
/**
- * optional uint32 exp = 12;
+ * optional uint32 exp = 9;
*/
private int exp;
/**
- * repeated uint32 taken_rewards = 4;
+ * optional uint32 level = 13;
+ */
+ private int level;
+
+ /**
+ * optional uint32 base_avatar_id = 14;
+ */
+ private int baseAvatarId;
+
+ /**
+ * optional uint32 rank = 15;
+ */
+ private int rank;
+
+ /**
+ * optional bool is_marked = 10;
+ */
+ private boolean isMarked;
+
+ /**
+ * repeated uint32 taken_rewards = 8;
*/
private final RepeatedInt takenRewards = RepeatedInt.newEmptyInstance();
/**
- * repeated .EquipRelic equip_relic_list = 6;
- */
- private final RepeatedMessagerepeated .AvatarSkillTree skilltree_list = 8;
+ * repeated .AvatarSkillTree skilltree_list = 3;
*/
private final RepeatedMessagerepeated .EquipRelic equip_relic_list = 5;
+ */
+ private final RepeatedMessageoptional uint64 first_met_timestamp = 13;
+ * optional uint64 first_met_timestamp = 2;
* @return whether the firstMetTimestamp field is set
*/
public boolean hasFirstMetTimestamp() {
@@ -94,7 +99,7 @@ public final class AvatarOuterClass {
}
/**
- * optional uint64 first_met_timestamp = 13;
+ * optional uint64 first_met_timestamp = 2;
* @return this
*/
public Avatar clearFirstMetTimestamp() {
@@ -104,7 +109,7 @@ public final class AvatarOuterClass {
}
/**
- * optional uint64 first_met_timestamp = 13;
+ * optional uint64 first_met_timestamp = 2;
* @return the firstMetTimestamp
*/
public long getFirstMetTimestamp() {
@@ -112,7 +117,7 @@ public final class AvatarOuterClass {
}
/**
- * optional uint64 first_met_timestamp = 13;
+ * optional uint64 first_met_timestamp = 2;
* @param value the firstMetTimestamp to set
* @return this
*/
@@ -123,136 +128,25 @@ public final class AvatarOuterClass {
}
/**
- * optional uint32 promotion = 1;
- * @return whether the promotion field is set
+ * optional uint32 dressed_skin_id = 1;
+ * @return whether the dressedSkinId field is set
*/
- public boolean hasPromotion() {
+ public boolean hasDressedSkinId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 promotion = 1;
- * @return this
- */
- public Avatar clearPromotion() {
- bitField0_ &= ~0x00000002;
- promotion = 0;
- return this;
- }
-
- /**
- * optional uint32 promotion = 1;
- * @return the promotion
- */
- public int getPromotion() {
- return promotion;
- }
-
- /**
- * optional uint32 promotion = 1;
- * @param value the promotion to set
- * @return this
- */
- public Avatar setPromotion(final int value) {
- bitField0_ |= 0x00000002;
- promotion = value;
- return this;
- }
-
- /**
- * optional uint32 rank = 2;
- * @return whether the rank field is set
- */
- public boolean hasRank() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 rank = 2;
- * @return this
- */
- public Avatar clearRank() {
- bitField0_ &= ~0x00000004;
- rank = 0;
- return this;
- }
-
- /**
- * optional uint32 rank = 2;
- * @return the rank
- */
- public int getRank() {
- return rank;
- }
-
- /**
- * optional uint32 rank = 2;
- * @param value the rank to set
- * @return this
- */
- public Avatar setRank(final int value) {
- bitField0_ |= 0x00000004;
- rank = value;
- return this;
- }
-
- /**
- * optional uint32 level = 3;
- * @return whether the level field is set
- */
- public boolean hasLevel() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional uint32 level = 3;
- * @return this
- */
- public Avatar clearLevel() {
- bitField0_ &= ~0x00000008;
- level = 0;
- return this;
- }
-
- /**
- * optional uint32 level = 3;
- * @return the level
- */
- public int getLevel() {
- return level;
- }
-
- /**
- * optional uint32 level = 3;
- * @param value the level to set
- * @return this
- */
- public Avatar setLevel(final int value) {
- bitField0_ |= 0x00000008;
- level = value;
- return this;
- }
-
- /**
- * optional uint32 dressed_skin_id = 7;
- * @return whether the dressedSkinId field is set
- */
- public boolean hasDressedSkinId() {
- return (bitField0_ & 0x00000010) != 0;
- }
-
- /**
- * optional uint32 dressed_skin_id = 7;
+ * optional uint32 dressed_skin_id = 1;
* @return this
*/
public Avatar clearDressedSkinId() {
- bitField0_ &= ~0x00000010;
+ bitField0_ &= ~0x00000002;
dressedSkinId = 0;
return this;
}
/**
- * optional uint32 dressed_skin_id = 7;
+ * optional uint32 dressed_skin_id = 1;
* @return the dressedSkinId
*/
public int getDressedSkinId() {
@@ -260,73 +154,73 @@ public final class AvatarOuterClass {
}
/**
- * optional uint32 dressed_skin_id = 7;
+ * optional uint32 dressed_skin_id = 1;
* @param value the dressedSkinId to set
* @return this
*/
public Avatar setDressedSkinId(final int value) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000002;
dressedSkinId = value;
return this;
}
/**
- * optional uint32 base_avatar_id = 9;
- * @return whether the baseAvatarId field is set
+ * optional uint32 promotion = 4;
+ * @return whether the promotion field is set
*/
- public boolean hasBaseAvatarId() {
- return (bitField0_ & 0x00000020) != 0;
+ public boolean hasPromotion() {
+ return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 base_avatar_id = 9;
+ * optional uint32 promotion = 4;
* @return this
*/
- public Avatar clearBaseAvatarId() {
- bitField0_ &= ~0x00000020;
- baseAvatarId = 0;
+ public Avatar clearPromotion() {
+ bitField0_ &= ~0x00000004;
+ promotion = 0;
return this;
}
/**
- * optional uint32 base_avatar_id = 9;
- * @return the baseAvatarId
+ * optional uint32 promotion = 4;
+ * @return the promotion
*/
- public int getBaseAvatarId() {
- return baseAvatarId;
+ public int getPromotion() {
+ return promotion;
}
/**
- * optional uint32 base_avatar_id = 9;
- * @param value the baseAvatarId to set
+ * optional uint32 promotion = 4;
+ * @param value the promotion to set
* @return this
*/
- public Avatar setBaseAvatarId(final int value) {
- bitField0_ |= 0x00000020;
- baseAvatarId = value;
+ public Avatar setPromotion(final int value) {
+ bitField0_ |= 0x00000004;
+ promotion = value;
return this;
}
/**
- * optional uint32 equipment_unique_id = 10;
+ * optional uint32 equipment_unique_id = 6;
* @return whether the equipmentUniqueId field is set
*/
public boolean hasEquipmentUniqueId() {
- return (bitField0_ & 0x00000040) != 0;
+ return (bitField0_ & 0x00000008) != 0;
}
/**
- * optional uint32 equipment_unique_id = 10;
+ * optional uint32 equipment_unique_id = 6;
* @return this
*/
public Avatar clearEquipmentUniqueId() {
- bitField0_ &= ~0x00000040;
+ bitField0_ &= ~0x00000008;
equipmentUniqueId = 0;
return this;
}
/**
- * optional uint32 equipment_unique_id = 10;
+ * optional uint32 equipment_unique_id = 6;
* @return the equipmentUniqueId
*/
public int getEquipmentUniqueId() {
@@ -334,36 +228,36 @@ public final class AvatarOuterClass {
}
/**
- * optional uint32 equipment_unique_id = 10;
+ * optional uint32 equipment_unique_id = 6;
* @param value the equipmentUniqueId to set
* @return this
*/
public Avatar setEquipmentUniqueId(final int value) {
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000008;
equipmentUniqueId = value;
return this;
}
/**
- * optional uint32 exp = 12;
+ * optional uint32 exp = 9;
* @return whether the exp field is set
*/
public boolean hasExp() {
- return (bitField0_ & 0x00000080) != 0;
+ return (bitField0_ & 0x00000010) != 0;
}
/**
- * optional uint32 exp = 12;
+ * optional uint32 exp = 9;
* @return this
*/
public Avatar clearExp() {
- bitField0_ &= ~0x00000080;
+ bitField0_ &= ~0x00000010;
exp = 0;
return this;
}
/**
- * optional uint32 exp = 12;
+ * optional uint32 exp = 9;
* @return the exp
*/
public int getExp() {
@@ -371,36 +265,184 @@ public final class AvatarOuterClass {
}
/**
- * optional uint32 exp = 12;
+ * optional uint32 exp = 9;
* @param value the exp to set
* @return this
*/
public Avatar setExp(final int value) {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000010;
exp = value;
return this;
}
/**
- * repeated uint32 taken_rewards = 4;
- * @return whether the takenRewards field is set
+ * optional uint32 level = 13;
+ * @return whether the level field is set
*/
- public boolean hasTakenRewards() {
+ public boolean hasLevel() {
+ return (bitField0_ & 0x00000020) != 0;
+ }
+
+ /**
+ * optional uint32 level = 13;
+ * @return this
+ */
+ public Avatar clearLevel() {
+ bitField0_ &= ~0x00000020;
+ level = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 level = 13;
+ * @return the level
+ */
+ public int getLevel() {
+ return level;
+ }
+
+ /**
+ * optional uint32 level = 13;
+ * @param value the level to set
+ * @return this
+ */
+ public Avatar setLevel(final int value) {
+ bitField0_ |= 0x00000020;
+ level = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 base_avatar_id = 14;
+ * @return whether the baseAvatarId field is set
+ */
+ public boolean hasBaseAvatarId() {
+ return (bitField0_ & 0x00000040) != 0;
+ }
+
+ /**
+ * optional uint32 base_avatar_id = 14;
+ * @return this
+ */
+ public Avatar clearBaseAvatarId() {
+ bitField0_ &= ~0x00000040;
+ baseAvatarId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 base_avatar_id = 14;
+ * @return the baseAvatarId
+ */
+ public int getBaseAvatarId() {
+ return baseAvatarId;
+ }
+
+ /**
+ * optional uint32 base_avatar_id = 14;
+ * @param value the baseAvatarId to set
+ * @return this
+ */
+ public Avatar setBaseAvatarId(final int value) {
+ bitField0_ |= 0x00000040;
+ baseAvatarId = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 rank = 15;
+ * @return whether the rank field is set
+ */
+ public boolean hasRank() {
+ return (bitField0_ & 0x00000080) != 0;
+ }
+
+ /**
+ * optional uint32 rank = 15;
+ * @return this
+ */
+ public Avatar clearRank() {
+ bitField0_ &= ~0x00000080;
+ rank = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 rank = 15;
+ * @return the rank
+ */
+ public int getRank() {
+ return rank;
+ }
+
+ /**
+ * optional uint32 rank = 15;
+ * @param value the rank to set
+ * @return this
+ */
+ public Avatar setRank(final int value) {
+ bitField0_ |= 0x00000080;
+ rank = value;
+ return this;
+ }
+
+ /**
+ * optional bool is_marked = 10;
+ * @return whether the isMarked field is set
+ */
+ public boolean hasIsMarked() {
return (bitField0_ & 0x00000100) != 0;
}
/**
- * repeated uint32 taken_rewards = 4;
+ * optional bool is_marked = 10;
+ * @return this
+ */
+ public Avatar clearIsMarked() {
+ bitField0_ &= ~0x00000100;
+ isMarked = false;
+ return this;
+ }
+
+ /**
+ * optional bool is_marked = 10;
+ * @return the isMarked
+ */
+ public boolean getIsMarked() {
+ return isMarked;
+ }
+
+ /**
+ * optional bool is_marked = 10;
+ * @param value the isMarked to set
+ * @return this
+ */
+ public Avatar setIsMarked(final boolean value) {
+ bitField0_ |= 0x00000100;
+ isMarked = value;
+ return this;
+ }
+
+ /**
+ * repeated uint32 taken_rewards = 8;
+ * @return whether the takenRewards field is set
+ */
+ public boolean hasTakenRewards() {
+ return (bitField0_ & 0x00000200) != 0;
+ }
+
+ /**
+ * repeated uint32 taken_rewards = 8;
* @return this
*/
public Avatar clearTakenRewards() {
- bitField0_ &= ~0x00000100;
+ bitField0_ &= ~0x00000200;
takenRewards.clear();
return this;
}
/**
- * repeated uint32 taken_rewards = 4;
+ * repeated uint32 taken_rewards = 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.
@@ -414,7 +456,7 @@ public final class AvatarOuterClass {
}
/**
- * repeated uint32 taken_rewards = 4;
+ * repeated uint32 taken_rewards = 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
@@ -423,102 +465,34 @@ public final class AvatarOuterClass {
* @return internal storage object for modifications
*/
public RepeatedInt getMutableTakenRewards() {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000200;
return takenRewards;
}
/**
- * repeated uint32 taken_rewards = 4;
+ * repeated uint32 taken_rewards = 8;
* @param value the takenRewards to add
* @return this
*/
public Avatar addTakenRewards(final int value) {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000200;
takenRewards.add(value);
return this;
}
/**
- * repeated uint32 taken_rewards = 4;
+ * repeated uint32 taken_rewards = 8;
* @param values the takenRewards to add
* @return this
*/
public Avatar addAllTakenRewards(final int... values) {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000200;
takenRewards.addAll(values);
return this;
}
/**
- * repeated .EquipRelic equip_relic_list = 6;
- * @return whether the equipRelicList field is set
- */
- public boolean hasEquipRelicList() {
- return (bitField0_ & 0x00000200) != 0;
- }
-
- /**
- * repeated .EquipRelic equip_relic_list = 6;
- * @return this
- */
- public Avatar clearEquipRelicList() {
- bitField0_ &= ~0x00000200;
- equipRelicList.clear();
- return this;
- }
-
- /**
- * repeated .EquipRelic equip_relic_list = 6;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableEquipRelicList()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedMessagerepeated .EquipRelic equip_relic_list = 6;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedMessagerepeated .EquipRelic equip_relic_list = 6;
- * @param value the equipRelicList to add
- * @return this
- */
- public Avatar addEquipRelicList(final EquipRelicOuterClass.EquipRelic value) {
- bitField0_ |= 0x00000200;
- equipRelicList.add(value);
- return this;
- }
-
- /**
- * repeated .EquipRelic equip_relic_list = 6;
- * @param values the equipRelicList to add
- * @return this
- */
- public Avatar addAllEquipRelicList(final EquipRelicOuterClass.EquipRelic... values) {
- bitField0_ |= 0x00000200;
- equipRelicList.addAll(values);
- return this;
- }
-
- /**
- * repeated .AvatarSkillTree skilltree_list = 8;
+ * repeated .AvatarSkillTree skilltree_list = 3;
* @return whether the skilltreeList field is set
*/
public boolean hasSkilltreeList() {
@@ -526,7 +500,7 @@ public final class AvatarOuterClass {
}
/**
- * repeated .AvatarSkillTree skilltree_list = 8;
+ * repeated .AvatarSkillTree skilltree_list = 3;
* @return this
*/
public Avatar clearSkilltreeList() {
@@ -536,7 +510,7 @@ public final class AvatarOuterClass {
}
/**
- * repeated .AvatarSkillTree skilltree_list = 8;
+ * repeated .AvatarSkillTree skilltree_list = 3;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -550,7 +524,7 @@ public final class AvatarOuterClass {
}
/**
- * repeated .AvatarSkillTree skilltree_list = 8;
+ * repeated .AvatarSkillTree skilltree_list = 3;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -564,7 +538,7 @@ public final class AvatarOuterClass {
}
/**
- * repeated .AvatarSkillTree skilltree_list = 8;
+ * repeated .AvatarSkillTree skilltree_list = 3;
* @param value the skilltreeList to add
* @return this
*/
@@ -575,7 +549,7 @@ public final class AvatarOuterClass {
}
/**
- * repeated .AvatarSkillTree skilltree_list = 8;
+ * repeated .AvatarSkillTree skilltree_list = 3;
* @param values the skilltreeList to add
* @return this
*/
@@ -585,22 +559,91 @@ public final class AvatarOuterClass {
return this;
}
+ /**
+ * repeated .EquipRelic equip_relic_list = 5;
+ * @return whether the equipRelicList field is set
+ */
+ public boolean hasEquipRelicList() {
+ return (bitField0_ & 0x00000800) != 0;
+ }
+
+ /**
+ * repeated .EquipRelic equip_relic_list = 5;
+ * @return this
+ */
+ public Avatar clearEquipRelicList() {
+ bitField0_ &= ~0x00000800;
+ equipRelicList.clear();
+ return this;
+ }
+
+ /**
+ * repeated .EquipRelic equip_relic_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 #getMutableEquipRelicList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedMessagerepeated .EquipRelic equip_relic_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 RepeatedMessagerepeated .EquipRelic equip_relic_list = 5;
+ * @param value the equipRelicList to add
+ * @return this
+ */
+ public Avatar addEquipRelicList(final EquipRelicOuterClass.EquipRelic value) {
+ bitField0_ |= 0x00000800;
+ equipRelicList.add(value);
+ return this;
+ }
+
+ /**
+ * repeated .EquipRelic equip_relic_list = 5;
+ * @param values the equipRelicList to add
+ * @return this
+ */
+ public Avatar addAllEquipRelicList(final EquipRelicOuterClass.EquipRelic... values) {
+ bitField0_ |= 0x00000800;
+ equipRelicList.addAll(values);
+ return this;
+ }
+
@Override
public Avatar copyFrom(final Avatar other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
firstMetTimestamp = other.firstMetTimestamp;
- promotion = other.promotion;
- rank = other.rank;
- level = other.level;
dressedSkinId = other.dressedSkinId;
- baseAvatarId = other.baseAvatarId;
+ promotion = other.promotion;
equipmentUniqueId = other.equipmentUniqueId;
exp = other.exp;
+ level = other.level;
+ baseAvatarId = other.baseAvatarId;
+ rank = other.rank;
+ isMarked = other.isMarked;
takenRewards.copyFrom(other.takenRewards);
- equipRelicList.copyFrom(other.equipRelicList);
skilltreeList.copyFrom(other.skilltreeList);
+ equipRelicList.copyFrom(other.equipRelicList);
}
return this;
}
@@ -614,20 +657,11 @@ public final class AvatarOuterClass {
if (other.hasFirstMetTimestamp()) {
setFirstMetTimestamp(other.firstMetTimestamp);
}
- if (other.hasPromotion()) {
- setPromotion(other.promotion);
- }
- if (other.hasRank()) {
- setRank(other.rank);
- }
- if (other.hasLevel()) {
- setLevel(other.level);
- }
if (other.hasDressedSkinId()) {
setDressedSkinId(other.dressedSkinId);
}
- if (other.hasBaseAvatarId()) {
- setBaseAvatarId(other.baseAvatarId);
+ if (other.hasPromotion()) {
+ setPromotion(other.promotion);
}
if (other.hasEquipmentUniqueId()) {
setEquipmentUniqueId(other.equipmentUniqueId);
@@ -635,15 +669,27 @@ public final class AvatarOuterClass {
if (other.hasExp()) {
setExp(other.exp);
}
+ if (other.hasLevel()) {
+ setLevel(other.level);
+ }
+ if (other.hasBaseAvatarId()) {
+ setBaseAvatarId(other.baseAvatarId);
+ }
+ if (other.hasRank()) {
+ setRank(other.rank);
+ }
+ if (other.hasIsMarked()) {
+ setIsMarked(other.isMarked);
+ }
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;
}
@@ -655,16 +701,17 @@ public final class AvatarOuterClass {
cachedSize = -1;
bitField0_ = 0;
firstMetTimestamp = 0L;
- promotion = 0;
- rank = 0;
- level = 0;
dressedSkinId = 0;
- baseAvatarId = 0;
+ promotion = 0;
equipmentUniqueId = 0;
exp = 0;
+ level = 0;
+ baseAvatarId = 0;
+ rank = 0;
+ isMarked = false;
takenRewards.clear();
- equipRelicList.clear();
skilltreeList.clear();
+ equipRelicList.clear();
return this;
}
@@ -676,8 +723,8 @@ public final class AvatarOuterClass {
cachedSize = -1;
bitField0_ = 0;
takenRewards.clear();
- equipRelicList.clearQuick();
skilltreeList.clearQuick();
+ equipRelicList.clearQuick();
return this;
}
@@ -692,70 +739,75 @@ public final class AvatarOuterClass {
Avatar other = (Avatar) o;
return bitField0_ == other.bitField0_
&& (!hasFirstMetTimestamp() || firstMetTimestamp == other.firstMetTimestamp)
- && (!hasPromotion() || promotion == other.promotion)
- && (!hasRank() || rank == other.rank)
- && (!hasLevel() || level == other.level)
&& (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId)
- && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
+ && (!hasPromotion() || promotion == other.promotion)
&& (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId)
&& (!hasExp() || exp == other.exp)
+ && (!hasLevel() || level == other.level)
+ && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
+ && (!hasRank() || rank == other.rank)
+ && (!hasIsMarked() || isMarked == other.isMarked)
&& (!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
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 16);
output.writeUInt64NoTag(firstMetTimestamp);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(promotion);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(rank);
- }
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(level);
- }
- if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 56);
output.writeUInt32NoTag(dressedSkinId);
}
- if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 72);
- output.writeUInt32NoTag(baseAvatarId);
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 32);
+ output.writeUInt32NoTag(promotion);
}
- if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawByte((byte) 80);
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(equipmentUniqueId);
}
- if ((bitField0_ & 0x00000080) != 0) {
- output.writeRawByte((byte) 96);
+ if ((bitField0_ & 0x00000010) != 0) {
+ output.writeRawByte((byte) 72);
output.writeUInt32NoTag(exp);
}
+ if ((bitField0_ & 0x00000020) != 0) {
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(level);
+ }
+ if ((bitField0_ & 0x00000040) != 0) {
+ output.writeRawByte((byte) 112);
+ output.writeUInt32NoTag(baseAvatarId);
+ }
+ if ((bitField0_ & 0x00000080) != 0) {
+ output.writeRawByte((byte) 120);
+ output.writeUInt32NoTag(rank);
+ }
if ((bitField0_ & 0x00000100) != 0) {
- for (int i = 0; i < takenRewards.length(); i++) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(takenRewards.array()[i]);
- }
+ output.writeRawByte((byte) 80);
+ output.writeBoolNoTag(isMarked);
}
if ((bitField0_ & 0x00000200) != 0) {
- for (int i = 0; i < equipRelicList.length(); i++) {
- output.writeRawByte((byte) 50);
- output.writeMessageNoTag(equipRelicList.get(i));
+ for (int i = 0; i < takenRewards.length(); i++) {
+ output.writeRawByte((byte) 64);
+ output.writeUInt32NoTag(takenRewards.array()[i]);
}
}
if ((bitField0_ & 0x00000400) != 0) {
for (int i = 0; i < skilltreeList.length(); i++) {
- output.writeRawByte((byte) 66);
+ output.writeRawByte((byte) 26);
output.writeMessageNoTag(skilltreeList.get(i));
}
}
+ if ((bitField0_ & 0x00000800) != 0) {
+ for (int i = 0; i < equipRelicList.length(); i++) {
+ output.writeRawByte((byte) 42);
+ output.writeMessageNoTag(equipRelicList.get(i));
+ }
+ }
}
@Override
@@ -765,35 +817,38 @@ public final class AvatarOuterClass {
size += 1 + ProtoSink.computeUInt64SizeNoTag(firstMetTimestamp);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(rank);
- }
- if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
- }
- if ((bitField0_ & 0x00000010) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId);
}
- if ((bitField0_ & 0x00000020) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion);
}
- if ((bitField0_ & 0x00000040) != 0) {
+ if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId);
}
- if ((bitField0_ & 0x00000080) != 0) {
+ if ((bitField0_ & 0x00000010) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(exp);
}
+ if ((bitField0_ & 0x00000020) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
+ }
+ if ((bitField0_ & 0x00000040) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
+ }
+ if ((bitField0_ & 0x00000080) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(rank);
+ }
if ((bitField0_ & 0x00000100) != 0) {
- size += (1 * takenRewards.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(takenRewards);
+ size += 2;
}
if ((bitField0_ & 0x00000200) != 0) {
- size += (1 * equipRelicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipRelicList);
+ size += (1 * takenRewards.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(takenRewards);
}
if ((bitField0_ & 0x00000400) != 0) {
size += (1 * skilltreeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(skilltreeList);
}
+ if ((bitField0_ & 0x00000800) != 0) {
+ size += (1 * equipRelicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipRelicList);
+ }
return size;
}
@@ -804,7 +859,7 @@ public final class AvatarOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 104: {
+ case 16: {
// firstMetTimestamp
firstMetTimestamp = input.readUInt64();
bitField0_ |= 0x00000001;
@@ -814,89 +869,98 @@ public final class AvatarOuterClass {
}
}
case 8: {
- // promotion
- promotion = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 16) {
- break;
- }
- }
- case 16: {
- // rank
- rank = input.readUInt32();
- bitField0_ |= 0x00000004;
- tag = input.readTag();
- if (tag != 24) {
- break;
- }
- }
- case 24: {
- // level
- level = input.readUInt32();
- bitField0_ |= 0x00000008;
- tag = input.readTag();
- if (tag != 56) {
- break;
- }
- }
- case 56: {
// dressedSkinId
dressedSkinId = input.readUInt32();
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 32) {
+ break;
+ }
+ }
+ case 32: {
+ // promotion
+ promotion = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 48) {
+ break;
+ }
+ }
+ case 48: {
+ // equipmentUniqueId
+ equipmentUniqueId = input.readUInt32();
+ bitField0_ |= 0x00000008;
tag = input.readTag();
if (tag != 72) {
break;
}
}
case 72: {
+ // exp
+ exp = input.readUInt32();
+ bitField0_ |= 0x00000010;
+ tag = input.readTag();
+ if (tag != 104) {
+ break;
+ }
+ }
+ case 104: {
+ // level
+ level = input.readUInt32();
+ bitField0_ |= 0x00000020;
+ tag = input.readTag();
+ if (tag != 112) {
+ break;
+ }
+ }
+ case 112: {
// baseAvatarId
baseAvatarId = input.readUInt32();
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000040;
+ tag = input.readTag();
+ if (tag != 120) {
+ break;
+ }
+ }
+ case 120: {
+ // rank
+ rank = input.readUInt32();
+ bitField0_ |= 0x00000080;
tag = input.readTag();
if (tag != 80) {
break;
}
}
case 80: {
- // equipmentUniqueId
- equipmentUniqueId = input.readUInt32();
- bitField0_ |= 0x00000040;
- tag = input.readTag();
- if (tag != 96) {
- break;
- }
- }
- case 96: {
- // exp
- exp = input.readUInt32();
- bitField0_ |= 0x00000080;
- tag = input.readTag();
- if (tag != 34) {
- break;
- }
- }
- case 34: {
- // takenRewards [packed=true]
- input.readPackedUInt32(takenRewards, tag);
+ // isMarked
+ isMarked = input.readBool();
bitField0_ |= 0x00000100;
tag = input.readTag();
- if (tag != 50) {
- break;
- }
- }
- case 50: {
- // equipRelicList
- tag = input.readRepeatedMessage(equipRelicList, tag);
- bitField0_ |= 0x00000200;
if (tag != 66) {
break;
}
}
case 66: {
+ // takenRewards [packed=true]
+ input.readPackedUInt32(takenRewards, tag);
+ bitField0_ |= 0x00000200;
+ tag = input.readTag();
+ if (tag != 26) {
+ break;
+ }
+ }
+ case 26: {
// skilltreeList
tag = input.readRepeatedMessage(skilltreeList, tag);
bitField0_ |= 0x00000400;
+ if (tag != 42) {
+ break;
+ }
+ }
+ case 42: {
+ // equipRelicList
+ tag = input.readRepeatedMessage(equipRelicList, tag);
+ bitField0_ |= 0x00000800;
if (tag != 0) {
break;
}
@@ -911,10 +975,10 @@ public final class AvatarOuterClass {
tag = input.readTag();
break;
}
- case 32: {
+ case 64: {
// takenRewards [packed=false]
tag = input.readRepeatedUInt32(takenRewards, tag);
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000200;
break;
}
}
@@ -928,35 +992,38 @@ public final class AvatarOuterClass {
output.writeUInt64(FieldNames.firstMetTimestamp, firstMetTimestamp);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.promotion, promotion);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.rank, rank);
- }
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.level, level);
- }
- if ((bitField0_ & 0x00000010) != 0) {
output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId);
}
- if ((bitField0_ & 0x00000020) != 0) {
- output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeUInt32(FieldNames.promotion, promotion);
}
- if ((bitField0_ & 0x00000040) != 0) {
+ if ((bitField0_ & 0x00000008) != 0) {
output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId);
}
- if ((bitField0_ & 0x00000080) != 0) {
+ if ((bitField0_ & 0x00000010) != 0) {
output.writeUInt32(FieldNames.exp, exp);
}
+ if ((bitField0_ & 0x00000020) != 0) {
+ output.writeUInt32(FieldNames.level, level);
+ }
+ if ((bitField0_ & 0x00000040) != 0) {
+ output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
+ }
+ if ((bitField0_ & 0x00000080) != 0) {
+ output.writeUInt32(FieldNames.rank, rank);
+ }
if ((bitField0_ & 0x00000100) != 0) {
- output.writeRepeatedUInt32(FieldNames.takenRewards, takenRewards);
+ output.writeBool(FieldNames.isMarked, isMarked);
}
if ((bitField0_ & 0x00000200) != 0) {
- output.writeRepeatedMessage(FieldNames.equipRelicList, equipRelicList);
+ output.writeRepeatedUInt32(FieldNames.takenRewards, takenRewards);
}
if ((bitField0_ & 0x00000400) != 0) {
output.writeRepeatedMessage(FieldNames.skilltreeList, skilltreeList);
}
+ if ((bitField0_ & 0x00000800) != 0) {
+ output.writeRepeatedMessage(FieldNames.equipRelicList, equipRelicList);
+ }
output.endObject();
}
@@ -979,10 +1046,11 @@ public final class AvatarOuterClass {
}
break;
}
- case -799212381: {
- if (input.isAtField(FieldNames.promotion)) {
+ case -407000018:
+ case 2012697844: {
+ if (input.isAtField(FieldNames.dressedSkinId)) {
if (!input.trySkipNullValue()) {
- promotion = input.readUInt32();
+ dressedSkinId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -990,10 +1058,10 @@ public final class AvatarOuterClass {
}
break;
}
- case 3492908: {
- if (input.isAtField(FieldNames.rank)) {
+ case -799212381: {
+ if (input.isAtField(FieldNames.promotion)) {
if (!input.trySkipNullValue()) {
- rank = input.readUInt32();
+ promotion = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -1001,47 +1069,12 @@ public final class AvatarOuterClass {
}
break;
}
- case 102865796: {
- if (input.isAtField(FieldNames.level)) {
- if (!input.trySkipNullValue()) {
- level = input.readUInt32();
- bitField0_ |= 0x00000008;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case -407000018:
- case 2012697844: {
- if (input.isAtField(FieldNames.dressedSkinId)) {
- if (!input.trySkipNullValue()) {
- dressedSkinId = input.readUInt32();
- bitField0_ |= 0x00000010;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 118022725:
- case -1756826157: {
- if (input.isAtField(FieldNames.baseAvatarId)) {
- if (!input.trySkipNullValue()) {
- baseAvatarId = input.readUInt32();
- bitField0_ |= 0x00000020;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case -1867136902:
case 760467160: {
if (input.isAtField(FieldNames.equipmentUniqueId)) {
if (!input.trySkipNullValue()) {
equipmentUniqueId = input.readUInt32();
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000008;
}
} else {
input.skipUnknownField();
@@ -1052,6 +1085,40 @@ public final class AvatarOuterClass {
if (input.isAtField(FieldNames.exp)) {
if (!input.trySkipNullValue()) {
exp = input.readUInt32();
+ bitField0_ |= 0x00000010;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 102865796: {
+ if (input.isAtField(FieldNames.level)) {
+ if (!input.trySkipNullValue()) {
+ level = input.readUInt32();
+ bitField0_ |= 0x00000020;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 118022725:
+ case -1756826157: {
+ if (input.isAtField(FieldNames.baseAvatarId)) {
+ if (!input.trySkipNullValue()) {
+ baseAvatarId = input.readUInt32();
+ bitField0_ |= 0x00000040;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 3492908: {
+ if (input.isAtField(FieldNames.rank)) {
+ if (!input.trySkipNullValue()) {
+ rank = input.readUInt32();
bitField0_ |= 0x00000080;
}
} else {
@@ -1059,23 +1126,23 @@ public final class AvatarOuterClass {
}
break;
}
+ case -407271946:
+ case -617266975: {
+ if (input.isAtField(FieldNames.isMarked)) {
+ if (!input.trySkipNullValue()) {
+ isMarked = input.readBool();
+ bitField0_ |= 0x00000100;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case -932367267:
case 500229036: {
if (input.isAtField(FieldNames.takenRewards)) {
if (!input.trySkipNullValue()) {
input.readRepeatedUInt32(takenRewards);
- bitField0_ |= 0x00000100;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 1578968161:
- case -795441831: {
- if (input.isAtField(FieldNames.equipRelicList)) {
- if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(equipRelicList);
bitField0_ |= 0x00000200;
}
} else {
@@ -1095,6 +1162,18 @@ public final class AvatarOuterClass {
}
break;
}
+ case 1578968161:
+ case -795441831: {
+ if (input.isAtField(FieldNames.equipRelicList)) {
+ if (!input.trySkipNullValue()) {
+ input.readRepeatedMessage(equipRelicList);
+ bitField0_ |= 0x00000800;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
default: {
input.skipUnknownField();
break;
@@ -1149,25 +1228,27 @@ public final class AvatarOuterClass {
static class FieldNames {
static final FieldName firstMetTimestamp = FieldName.forField("firstMetTimestamp", "first_met_timestamp");
- static final FieldName promotion = FieldName.forField("promotion");
-
- static final FieldName rank = FieldName.forField("rank");
-
- static final FieldName level = FieldName.forField("level");
-
static final FieldName dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id");
- static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
+ static final FieldName promotion = FieldName.forField("promotion");
static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id");
static final FieldName exp = FieldName.forField("exp");
+ static final FieldName level = FieldName.forField("level");
+
+ static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
+
+ static final FieldName rank = FieldName.forField("rank");
+
+ static final FieldName isMarked = FieldName.forField("isMarked", "is_marked");
+
static final FieldName takenRewards = FieldName.forField("takenRewards", "taken_rewards");
- static final FieldName equipRelicList = FieldName.forField("equipRelicList", "equip_relic_list");
-
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 7aa1227..a65251f 100644
--- a/src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java
@@ -20,7 +20,7 @@ public final class AvatarSyncOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated .Avatar avatar_list = 13;
+ * repeated .Avatar avatar_list = 5;
*/
private final RepeatedMessagerepeated .Avatar avatar_list = 13;
+ * repeated .Avatar avatar_list = 5;
* @return whether the avatarList field is set
*/
public boolean hasAvatarList() {
@@ -43,7 +43,7 @@ public final class AvatarSyncOuterClass {
}
/**
- * repeated .Avatar avatar_list = 13;
+ * repeated .Avatar avatar_list = 5;
* @return this
*/
public AvatarSync clearAvatarList() {
@@ -53,7 +53,7 @@ public final class AvatarSyncOuterClass {
}
/**
- * repeated .Avatar avatar_list = 13;
+ * repeated .Avatar avatar_list = 5;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class AvatarSyncOuterClass {
}
/**
- * repeated .Avatar avatar_list = 13;
+ * repeated .Avatar avatar_list = 5;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class AvatarSyncOuterClass {
}
/**
- * repeated .Avatar avatar_list = 13;
+ * repeated .Avatar avatar_list = 5;
* @param value the avatarList to add
* @return this
*/
@@ -92,7 +92,7 @@ public final class AvatarSyncOuterClass {
}
/**
- * repeated .Avatar avatar_list = 13;
+ * repeated .Avatar avatar_list = 5;
* @param values the avatarList to add
* @return this
*/
@@ -163,7 +163,7 @@ public final class AvatarSyncOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < avatarList.length(); i++) {
- output.writeRawByte((byte) 106);
+ output.writeRawByte((byte) 42);
output.writeMessageNoTag(avatarList.get(i));
}
}
@@ -185,7 +185,7 @@ public final class AvatarSyncOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 106: {
+ case 42: {
// avatarList
tag = input.readRepeatedMessage(avatarList, tag);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/BattlePassInfoNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/BattlePassInfoNotifyOuterClass.java
index f91f45e..e95afe0 100644
--- a/src/generated/main/emu/lunarcore/proto/BattlePassInfoNotifyOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/BattlePassInfoNotifyOuterClass.java
@@ -21,57 +21,57 @@ public final class BattlePassInfoNotifyOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint64 taken_free_reward = 1;
+ * optional uint64 taken_free_reward = 2;
*/
private long takenFreeReward;
/**
- * optional uint64 taken_premium_reward2 = 7;
- */
- private long takenPremiumReward2;
-
- /**
- * optional uint64 taken_premium_reward1 = 9;
- */
- private long takenPremiumReward1;
-
- /**
- * optional uint64 taken_premium_extended_reward = 11;
- */
- private long takenPremiumExtendedReward;
-
- /**
- * optional uint64 taken_free_extended_reward = 12;
+ * optional uint64 taken_free_extended_reward = 3;
*/
private long takenFreeExtendedReward;
/**
- * optional uint64 taken_premium_optional_reward = 13;
+ * optional uint64 taken_premium_reward2 = 6;
+ */
+ private long takenPremiumReward2;
+
+ /**
+ * optional uint64 taken_premium_optional_reward = 8;
*/
private long takenPremiumOptionalReward;
/**
- * optional uint32 cur_bp_id = 5;
+ * optional uint64 taken_premium_reward1 = 10;
+ */
+ private long takenPremiumReward1;
+
+ /**
+ * optional uint64 taken_premium_extended_reward = 13;
+ */
+ private long takenPremiumExtendedReward;
+
+ /**
+ * optional uint32 cur_bp_id = 1;
*/
private int curBpId;
/**
- * optional uint32 cur_week_add_exp_sum = 8;
- */
- private int curWeekAddExpSum;
-
- /**
- * optional uint32 exp = 14;
+ * optional uint32 exp = 7;
*/
private int exp;
/**
- * optional uint32 level = 15;
+ * optional uint32 level = 9;
*/
private int level;
/**
- * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 3;
+ * optional uint32 cur_week_add_exp_sum = 15;
+ */
+ private int curWeekAddExpSum;
+
+ /**
+ * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 4;
*/
private int bpTierType;
@@ -86,7 +86,7 @@ public final class BattlePassInfoNotifyOuterClass {
}
/**
- * optional uint64 taken_free_reward = 1;
+ * optional uint64 taken_free_reward = 2;
* @return whether the takenFreeReward field is set
*/
public boolean hasTakenFreeReward() {
@@ -94,7 +94,7 @@ public final class BattlePassInfoNotifyOuterClass {
}
/**
- * optional uint64 taken_free_reward = 1;
+ * optional uint64 taken_free_reward = 2;
* @return this
*/
public BattlePassInfoNotify clearTakenFreeReward() {
@@ -104,7 +104,7 @@ public final class BattlePassInfoNotifyOuterClass {
}
/**
- * optional uint64 taken_free_reward = 1;
+ * optional uint64 taken_free_reward = 2;
* @return the takenFreeReward
*/
public long getTakenFreeReward() {
@@ -112,7 +112,7 @@ public final class BattlePassInfoNotifyOuterClass {
}
/**
- * optional uint64 taken_free_reward = 1;
+ * optional uint64 taken_free_reward = 2;
* @param value the takenFreeReward to set
* @return this
*/
@@ -123,136 +123,25 @@ public final class BattlePassInfoNotifyOuterClass {
}
/**
- * optional uint64 taken_premium_reward2 = 7;
- * @return whether the takenPremiumReward2 field is set
+ * optional uint64 taken_free_extended_reward = 3;
+ * @return whether the takenFreeExtendedReward field is set
*/
- public boolean hasTakenPremiumReward2() {
+ public boolean hasTakenFreeExtendedReward() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint64 taken_premium_reward2 = 7;
- * @return this
- */
- public BattlePassInfoNotify clearTakenPremiumReward2() {
- bitField0_ &= ~0x00000002;
- takenPremiumReward2 = 0L;
- return this;
- }
-
- /**
- * optional uint64 taken_premium_reward2 = 7;
- * @return the takenPremiumReward2
- */
- public long getTakenPremiumReward2() {
- return takenPremiumReward2;
- }
-
- /**
- * optional uint64 taken_premium_reward2 = 7;
- * @param value the takenPremiumReward2 to set
- * @return this
- */
- public BattlePassInfoNotify setTakenPremiumReward2(final long value) {
- bitField0_ |= 0x00000002;
- takenPremiumReward2 = value;
- return this;
- }
-
- /**
- * optional uint64 taken_premium_reward1 = 9;
- * @return whether the takenPremiumReward1 field is set
- */
- public boolean hasTakenPremiumReward1() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint64 taken_premium_reward1 = 9;
- * @return this
- */
- public BattlePassInfoNotify clearTakenPremiumReward1() {
- bitField0_ &= ~0x00000004;
- takenPremiumReward1 = 0L;
- return this;
- }
-
- /**
- * optional uint64 taken_premium_reward1 = 9;
- * @return the takenPremiumReward1
- */
- public long getTakenPremiumReward1() {
- return takenPremiumReward1;
- }
-
- /**
- * optional uint64 taken_premium_reward1 = 9;
- * @param value the takenPremiumReward1 to set
- * @return this
- */
- public BattlePassInfoNotify setTakenPremiumReward1(final long value) {
- bitField0_ |= 0x00000004;
- takenPremiumReward1 = value;
- return this;
- }
-
- /**
- * optional uint64 taken_premium_extended_reward = 11;
- * @return whether the takenPremiumExtendedReward field is set
- */
- public boolean hasTakenPremiumExtendedReward() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional uint64 taken_premium_extended_reward = 11;
- * @return this
- */
- public BattlePassInfoNotify clearTakenPremiumExtendedReward() {
- bitField0_ &= ~0x00000008;
- takenPremiumExtendedReward = 0L;
- return this;
- }
-
- /**
- * optional uint64 taken_premium_extended_reward = 11;
- * @return the takenPremiumExtendedReward
- */
- public long getTakenPremiumExtendedReward() {
- return takenPremiumExtendedReward;
- }
-
- /**
- * optional uint64 taken_premium_extended_reward = 11;
- * @param value the takenPremiumExtendedReward to set
- * @return this
- */
- public BattlePassInfoNotify setTakenPremiumExtendedReward(final long value) {
- bitField0_ |= 0x00000008;
- takenPremiumExtendedReward = value;
- return this;
- }
-
- /**
- * optional uint64 taken_free_extended_reward = 12;
- * @return whether the takenFreeExtendedReward field is set
- */
- public boolean hasTakenFreeExtendedReward() {
- return (bitField0_ & 0x00000010) != 0;
- }
-
- /**
- * optional uint64 taken_free_extended_reward = 12;
+ * optional uint64 taken_free_extended_reward = 3;
* @return this
*/
public BattlePassInfoNotify clearTakenFreeExtendedReward() {
- bitField0_ &= ~0x00000010;
+ bitField0_ &= ~0x00000002;
takenFreeExtendedReward = 0L;
return this;
}
/**
- * optional uint64 taken_free_extended_reward = 12;
+ * optional uint64 taken_free_extended_reward = 3;
* @return the takenFreeExtendedReward
*/
public long getTakenFreeExtendedReward() {
@@ -260,36 +149,73 @@ public final class BattlePassInfoNotifyOuterClass {
}
/**
- * optional uint64 taken_free_extended_reward = 12;
+ * optional uint64 taken_free_extended_reward = 3;
* @param value the takenFreeExtendedReward to set
* @return this
*/
public BattlePassInfoNotify setTakenFreeExtendedReward(final long value) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000002;
takenFreeExtendedReward = value;
return this;
}
/**
- * optional uint64 taken_premium_optional_reward = 13;
- * @return whether the takenPremiumOptionalReward field is set
+ * optional uint64 taken_premium_reward2 = 6;
+ * @return whether the takenPremiumReward2 field is set
*/
- public boolean hasTakenPremiumOptionalReward() {
- return (bitField0_ & 0x00000020) != 0;
+ public boolean hasTakenPremiumReward2() {
+ return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint64 taken_premium_optional_reward = 13;
+ * optional uint64 taken_premium_reward2 = 6;
+ * @return this
+ */
+ public BattlePassInfoNotify clearTakenPremiumReward2() {
+ bitField0_ &= ~0x00000004;
+ takenPremiumReward2 = 0L;
+ return this;
+ }
+
+ /**
+ * optional uint64 taken_premium_reward2 = 6;
+ * @return the takenPremiumReward2
+ */
+ public long getTakenPremiumReward2() {
+ return takenPremiumReward2;
+ }
+
+ /**
+ * optional uint64 taken_premium_reward2 = 6;
+ * @param value the takenPremiumReward2 to set
+ * @return this
+ */
+ public BattlePassInfoNotify setTakenPremiumReward2(final long value) {
+ bitField0_ |= 0x00000004;
+ takenPremiumReward2 = value;
+ return this;
+ }
+
+ /**
+ * optional uint64 taken_premium_optional_reward = 8;
+ * @return whether the takenPremiumOptionalReward field is set
+ */
+ public boolean hasTakenPremiumOptionalReward() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional uint64 taken_premium_optional_reward = 8;
* @return this
*/
public BattlePassInfoNotify clearTakenPremiumOptionalReward() {
- bitField0_ &= ~0x00000020;
+ bitField0_ &= ~0x00000008;
takenPremiumOptionalReward = 0L;
return this;
}
/**
- * optional uint64 taken_premium_optional_reward = 13;
+ * optional uint64 taken_premium_optional_reward = 8;
* @return the takenPremiumOptionalReward
*/
public long getTakenPremiumOptionalReward() {
@@ -297,18 +223,92 @@ public final class BattlePassInfoNotifyOuterClass {
}
/**
- * optional uint64 taken_premium_optional_reward = 13;
+ * optional uint64 taken_premium_optional_reward = 8;
* @param value the takenPremiumOptionalReward to set
* @return this
*/
public BattlePassInfoNotify setTakenPremiumOptionalReward(final long value) {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000008;
takenPremiumOptionalReward = value;
return this;
}
/**
- * optional uint32 cur_bp_id = 5;
+ * optional uint64 taken_premium_reward1 = 10;
+ * @return whether the takenPremiumReward1 field is set
+ */
+ public boolean hasTakenPremiumReward1() {
+ return (bitField0_ & 0x00000010) != 0;
+ }
+
+ /**
+ * optional uint64 taken_premium_reward1 = 10;
+ * @return this
+ */
+ public BattlePassInfoNotify clearTakenPremiumReward1() {
+ bitField0_ &= ~0x00000010;
+ takenPremiumReward1 = 0L;
+ return this;
+ }
+
+ /**
+ * optional uint64 taken_premium_reward1 = 10;
+ * @return the takenPremiumReward1
+ */
+ public long getTakenPremiumReward1() {
+ return takenPremiumReward1;
+ }
+
+ /**
+ * optional uint64 taken_premium_reward1 = 10;
+ * @param value the takenPremiumReward1 to set
+ * @return this
+ */
+ public BattlePassInfoNotify setTakenPremiumReward1(final long value) {
+ bitField0_ |= 0x00000010;
+ takenPremiumReward1 = value;
+ return this;
+ }
+
+ /**
+ * optional uint64 taken_premium_extended_reward = 13;
+ * @return whether the takenPremiumExtendedReward field is set
+ */
+ public boolean hasTakenPremiumExtendedReward() {
+ return (bitField0_ & 0x00000020) != 0;
+ }
+
+ /**
+ * optional uint64 taken_premium_extended_reward = 13;
+ * @return this
+ */
+ public BattlePassInfoNotify clearTakenPremiumExtendedReward() {
+ bitField0_ &= ~0x00000020;
+ takenPremiumExtendedReward = 0L;
+ return this;
+ }
+
+ /**
+ * optional uint64 taken_premium_extended_reward = 13;
+ * @return the takenPremiumExtendedReward
+ */
+ public long getTakenPremiumExtendedReward() {
+ return takenPremiumExtendedReward;
+ }
+
+ /**
+ * optional uint64 taken_premium_extended_reward = 13;
+ * @param value the takenPremiumExtendedReward to set
+ * @return this
+ */
+ public BattlePassInfoNotify setTakenPremiumExtendedReward(final long value) {
+ bitField0_ |= 0x00000020;
+ takenPremiumExtendedReward = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 cur_bp_id = 1;
* @return whether the curBpId field is set
*/
public boolean hasCurBpId() {
@@ -316,7 +316,7 @@ public final class BattlePassInfoNotifyOuterClass {
}
/**
- * optional uint32 cur_bp_id = 5;
+ * optional uint32 cur_bp_id = 1;
* @return this
*/
public BattlePassInfoNotify clearCurBpId() {
@@ -326,7 +326,7 @@ public final class BattlePassInfoNotifyOuterClass {
}
/**
- * optional uint32 cur_bp_id = 5;
+ * optional uint32 cur_bp_id = 1;
* @return the curBpId
*/
public int getCurBpId() {
@@ -334,7 +334,7 @@ public final class BattlePassInfoNotifyOuterClass {
}
/**
- * optional uint32 cur_bp_id = 5;
+ * optional uint32 cur_bp_id = 1;
* @param value the curBpId to set
* @return this
*/
@@ -345,62 +345,25 @@ public final class BattlePassInfoNotifyOuterClass {
}
/**
- * optional uint32 cur_week_add_exp_sum = 8;
- * @return whether the curWeekAddExpSum field is set
+ * optional uint32 exp = 7;
+ * @return whether the exp field is set
*/
- public boolean hasCurWeekAddExpSum() {
+ public boolean hasExp() {
return (bitField0_ & 0x00000080) != 0;
}
/**
- * optional uint32 cur_week_add_exp_sum = 8;
- * @return this
- */
- public BattlePassInfoNotify clearCurWeekAddExpSum() {
- bitField0_ &= ~0x00000080;
- curWeekAddExpSum = 0;
- return this;
- }
-
- /**
- * optional uint32 cur_week_add_exp_sum = 8;
- * @return the curWeekAddExpSum
- */
- public int getCurWeekAddExpSum() {
- return curWeekAddExpSum;
- }
-
- /**
- * optional uint32 cur_week_add_exp_sum = 8;
- * @param value the curWeekAddExpSum to set
- * @return this
- */
- public BattlePassInfoNotify setCurWeekAddExpSum(final int value) {
- bitField0_ |= 0x00000080;
- curWeekAddExpSum = value;
- return this;
- }
-
- /**
- * optional uint32 exp = 14;
- * @return whether the exp field is set
- */
- public boolean hasExp() {
- return (bitField0_ & 0x00000100) != 0;
- }
-
- /**
- * optional uint32 exp = 14;
+ * optional uint32 exp = 7;
* @return this
*/
public BattlePassInfoNotify clearExp() {
- bitField0_ &= ~0x00000100;
+ bitField0_ &= ~0x00000080;
exp = 0;
return this;
}
/**
- * optional uint32 exp = 14;
+ * optional uint32 exp = 7;
* @return the exp
*/
public int getExp() {
@@ -408,36 +371,36 @@ public final class BattlePassInfoNotifyOuterClass {
}
/**
- * optional uint32 exp = 14;
+ * optional uint32 exp = 7;
* @param value the exp to set
* @return this
*/
public BattlePassInfoNotify setExp(final int value) {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000080;
exp = value;
return this;
}
/**
- * optional uint32 level = 15;
+ * optional uint32 level = 9;
* @return whether the level field is set
*/
public boolean hasLevel() {
- return (bitField0_ & 0x00000200) != 0;
+ return (bitField0_ & 0x00000100) != 0;
}
/**
- * optional uint32 level = 15;
+ * optional uint32 level = 9;
* @return this
*/
public BattlePassInfoNotify clearLevel() {
- bitField0_ &= ~0x00000200;
+ bitField0_ &= ~0x00000100;
level = 0;
return this;
}
/**
- * optional uint32 level = 15;
+ * optional uint32 level = 9;
* @return the level
*/
public int getLevel() {
@@ -445,18 +408,55 @@ public final class BattlePassInfoNotifyOuterClass {
}
/**
- * optional uint32 level = 15;
+ * optional uint32 level = 9;
* @param value the level to set
* @return this
*/
public BattlePassInfoNotify setLevel(final int value) {
- bitField0_ |= 0x00000200;
+ bitField0_ |= 0x00000100;
level = value;
return this;
}
/**
- * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 3;
+ * optional uint32 cur_week_add_exp_sum = 15;
+ * @return whether the curWeekAddExpSum field is set
+ */
+ public boolean hasCurWeekAddExpSum() {
+ return (bitField0_ & 0x00000200) != 0;
+ }
+
+ /**
+ * optional uint32 cur_week_add_exp_sum = 15;
+ * @return this
+ */
+ public BattlePassInfoNotify clearCurWeekAddExpSum() {
+ bitField0_ &= ~0x00000200;
+ curWeekAddExpSum = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 cur_week_add_exp_sum = 15;
+ * @return the curWeekAddExpSum
+ */
+ public int getCurWeekAddExpSum() {
+ return curWeekAddExpSum;
+ }
+
+ /**
+ * optional uint32 cur_week_add_exp_sum = 15;
+ * @param value the curWeekAddExpSum to set
+ * @return this
+ */
+ public BattlePassInfoNotify setCurWeekAddExpSum(final int value) {
+ bitField0_ |= 0x00000200;
+ curWeekAddExpSum = value;
+ return this;
+ }
+
+ /**
+ * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 4;
* @return whether the bpTierType field is set
*/
public boolean hasBpTierType() {
@@ -464,7 +464,7 @@ public final class BattlePassInfoNotifyOuterClass {
}
/**
- * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 3;
+ * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 4;
* @return this
*/
public BattlePassInfoNotify clearBpTierType() {
@@ -474,7 +474,7 @@ public final class BattlePassInfoNotifyOuterClass {
}
/**
- * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 3;
+ * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 4;
* @return the bpTierType
*/
public BpTierType getBpTierType() {
@@ -507,7 +507,7 @@ public final class BattlePassInfoNotifyOuterClass {
}
/**
- * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 3;
+ * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 4;
* @param value the bpTierType to set
* @return this
*/
@@ -523,15 +523,15 @@ public final class BattlePassInfoNotifyOuterClass {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
takenFreeReward = other.takenFreeReward;
+ takenFreeExtendedReward = other.takenFreeExtendedReward;
takenPremiumReward2 = other.takenPremiumReward2;
+ takenPremiumOptionalReward = other.takenPremiumOptionalReward;
takenPremiumReward1 = other.takenPremiumReward1;
takenPremiumExtendedReward = other.takenPremiumExtendedReward;
- takenFreeExtendedReward = other.takenFreeExtendedReward;
- takenPremiumOptionalReward = other.takenPremiumOptionalReward;
curBpId = other.curBpId;
- curWeekAddExpSum = other.curWeekAddExpSum;
exp = other.exp;
level = other.level;
+ curWeekAddExpSum = other.curWeekAddExpSum;
bpTierType = other.bpTierType;
}
return this;
@@ -546,33 +546,33 @@ public final class BattlePassInfoNotifyOuterClass {
if (other.hasTakenFreeReward()) {
setTakenFreeReward(other.takenFreeReward);
}
+ if (other.hasTakenFreeExtendedReward()) {
+ setTakenFreeExtendedReward(other.takenFreeExtendedReward);
+ }
if (other.hasTakenPremiumReward2()) {
setTakenPremiumReward2(other.takenPremiumReward2);
}
+ if (other.hasTakenPremiumOptionalReward()) {
+ setTakenPremiumOptionalReward(other.takenPremiumOptionalReward);
+ }
if (other.hasTakenPremiumReward1()) {
setTakenPremiumReward1(other.takenPremiumReward1);
}
if (other.hasTakenPremiumExtendedReward()) {
setTakenPremiumExtendedReward(other.takenPremiumExtendedReward);
}
- if (other.hasTakenFreeExtendedReward()) {
- setTakenFreeExtendedReward(other.takenFreeExtendedReward);
- }
- if (other.hasTakenPremiumOptionalReward()) {
- setTakenPremiumOptionalReward(other.takenPremiumOptionalReward);
- }
if (other.hasCurBpId()) {
setCurBpId(other.curBpId);
}
- if (other.hasCurWeekAddExpSum()) {
- setCurWeekAddExpSum(other.curWeekAddExpSum);
- }
if (other.hasExp()) {
setExp(other.exp);
}
if (other.hasLevel()) {
setLevel(other.level);
}
+ if (other.hasCurWeekAddExpSum()) {
+ setCurWeekAddExpSum(other.curWeekAddExpSum);
+ }
if (other.hasBpTierType()) {
setBpTierTypeValue(other.bpTierType);
}
@@ -587,15 +587,15 @@ public final class BattlePassInfoNotifyOuterClass {
cachedSize = -1;
bitField0_ = 0;
takenFreeReward = 0L;
+ takenFreeExtendedReward = 0L;
takenPremiumReward2 = 0L;
+ takenPremiumOptionalReward = 0L;
takenPremiumReward1 = 0L;
takenPremiumExtendedReward = 0L;
- takenFreeExtendedReward = 0L;
- takenPremiumOptionalReward = 0L;
curBpId = 0;
- curWeekAddExpSum = 0;
exp = 0;
level = 0;
+ curWeekAddExpSum = 0;
bpTierType = 0;
return this;
}
@@ -621,62 +621,62 @@ public final class BattlePassInfoNotifyOuterClass {
BattlePassInfoNotify other = (BattlePassInfoNotify) o;
return bitField0_ == other.bitField0_
&& (!hasTakenFreeReward() || takenFreeReward == other.takenFreeReward)
+ && (!hasTakenFreeExtendedReward() || takenFreeExtendedReward == other.takenFreeExtendedReward)
&& (!hasTakenPremiumReward2() || takenPremiumReward2 == other.takenPremiumReward2)
+ && (!hasTakenPremiumOptionalReward() || takenPremiumOptionalReward == other.takenPremiumOptionalReward)
&& (!hasTakenPremiumReward1() || takenPremiumReward1 == other.takenPremiumReward1)
&& (!hasTakenPremiumExtendedReward() || takenPremiumExtendedReward == other.takenPremiumExtendedReward)
- && (!hasTakenFreeExtendedReward() || takenFreeExtendedReward == other.takenFreeExtendedReward)
- && (!hasTakenPremiumOptionalReward() || takenPremiumOptionalReward == other.takenPremiumOptionalReward)
&& (!hasCurBpId() || curBpId == other.curBpId)
- && (!hasCurWeekAddExpSum() || curWeekAddExpSum == other.curWeekAddExpSum)
&& (!hasExp() || exp == other.exp)
&& (!hasLevel() || level == other.level)
+ && (!hasCurWeekAddExpSum() || curWeekAddExpSum == other.curWeekAddExpSum)
&& (!hasBpTierType() || bpTierType == other.bpTierType);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 16);
output.writeUInt64NoTag(takenFreeReward);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 56);
- output.writeUInt64NoTag(takenPremiumReward2);
+ output.writeRawByte((byte) 24);
+ output.writeUInt64NoTag(takenFreeExtendedReward);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 72);
- output.writeUInt64NoTag(takenPremiumReward1);
+ output.writeRawByte((byte) 48);
+ output.writeUInt64NoTag(takenPremiumReward2);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 88);
- output.writeUInt64NoTag(takenPremiumExtendedReward);
+ output.writeRawByte((byte) 64);
+ output.writeUInt64NoTag(takenPremiumOptionalReward);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 96);
- output.writeUInt64NoTag(takenFreeExtendedReward);
+ output.writeRawByte((byte) 80);
+ output.writeUInt64NoTag(takenPremiumReward1);
}
if ((bitField0_ & 0x00000020) != 0) {
output.writeRawByte((byte) 104);
- output.writeUInt64NoTag(takenPremiumOptionalReward);
+ output.writeUInt64NoTag(takenPremiumExtendedReward);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(curBpId);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRawByte((byte) 64);
- output.writeUInt32NoTag(curWeekAddExpSum);
+ output.writeRawByte((byte) 56);
+ output.writeUInt32NoTag(exp);
}
if ((bitField0_ & 0x00000100) != 0) {
- output.writeRawByte((byte) 112);
- output.writeUInt32NoTag(exp);
+ output.writeRawByte((byte) 72);
+ output.writeUInt32NoTag(level);
}
if ((bitField0_ & 0x00000200) != 0) {
output.writeRawByte((byte) 120);
- output.writeUInt32NoTag(level);
+ output.writeUInt32NoTag(curWeekAddExpSum);
}
if ((bitField0_ & 0x00000400) != 0) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 32);
output.writeEnumNoTag(bpTierType);
}
}
@@ -688,32 +688,32 @@ public final class BattlePassInfoNotifyOuterClass {
size += 1 + ProtoSink.computeUInt64SizeNoTag(takenFreeReward);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumReward2);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumReward1);
- }
- if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumExtendedReward);
- }
- if ((bitField0_ & 0x00000010) != 0) {
size += 1 + ProtoSink.computeUInt64SizeNoTag(takenFreeExtendedReward);
}
- if ((bitField0_ & 0x00000020) != 0) {
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumReward2);
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumOptionalReward);
}
+ if ((bitField0_ & 0x00000010) != 0) {
+ size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumReward1);
+ }
+ if ((bitField0_ & 0x00000020) != 0) {
+ size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumExtendedReward);
+ }
if ((bitField0_ & 0x00000040) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(curBpId);
}
if ((bitField0_ & 0x00000080) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(curWeekAddExpSum);
- }
- if ((bitField0_ & 0x00000100) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(exp);
}
- if ((bitField0_ & 0x00000200) != 0) {
+ if ((bitField0_ & 0x00000100) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
}
+ if ((bitField0_ & 0x00000200) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(curWeekAddExpSum);
+ }
if ((bitField0_ & 0x00000400) != 0) {
size += 1 + ProtoSink.computeEnumSizeNoTag(bpTierType);
}
@@ -727,45 +727,45 @@ public final class BattlePassInfoNotifyOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 16: {
// takenFreeReward
takenFreeReward = input.readUInt64();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 56) {
+ if (tag != 24) {
break;
}
}
- case 56: {
- // takenPremiumReward2
- takenPremiumReward2 = input.readUInt64();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 72) {
- break;
- }
- }
- case 72: {
- // takenPremiumReward1
- takenPremiumReward1 = input.readUInt64();
- bitField0_ |= 0x00000004;
- tag = input.readTag();
- if (tag != 88) {
- break;
- }
- }
- case 88: {
- // takenPremiumExtendedReward
- takenPremiumExtendedReward = input.readUInt64();
- bitField0_ |= 0x00000008;
- tag = input.readTag();
- if (tag != 96) {
- break;
- }
- }
- case 96: {
+ case 24: {
// takenFreeExtendedReward
takenFreeExtendedReward = input.readUInt64();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 48) {
+ break;
+ }
+ }
+ case 48: {
+ // takenPremiumReward2
+ takenPremiumReward2 = input.readUInt64();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 64) {
+ break;
+ }
+ }
+ case 64: {
+ // takenPremiumOptionalReward
+ takenPremiumOptionalReward = input.readUInt64();
+ bitField0_ |= 0x00000008;
+ tag = input.readTag();
+ if (tag != 80) {
+ break;
+ }
+ }
+ case 80: {
+ // takenPremiumReward1
+ takenPremiumReward1 = input.readUInt64();
bitField0_ |= 0x00000010;
tag = input.readTag();
if (tag != 104) {
@@ -773,35 +773,35 @@ public final class BattlePassInfoNotifyOuterClass {
}
}
case 104: {
- // takenPremiumOptionalReward
- takenPremiumOptionalReward = input.readUInt64();
+ // takenPremiumExtendedReward
+ takenPremiumExtendedReward = input.readUInt64();
bitField0_ |= 0x00000020;
tag = input.readTag();
- if (tag != 40) {
+ if (tag != 8) {
break;
}
}
- case 40: {
+ case 8: {
// curBpId
curBpId = input.readUInt32();
bitField0_ |= 0x00000040;
tag = input.readTag();
- if (tag != 64) {
+ if (tag != 56) {
break;
}
}
- case 64: {
- // curWeekAddExpSum
- curWeekAddExpSum = input.readUInt32();
- bitField0_ |= 0x00000080;
- tag = input.readTag();
- if (tag != 112) {
- break;
- }
- }
- case 112: {
+ case 56: {
// exp
exp = input.readUInt32();
+ bitField0_ |= 0x00000080;
+ tag = input.readTag();
+ if (tag != 72) {
+ break;
+ }
+ }
+ case 72: {
+ // level
+ level = input.readUInt32();
bitField0_ |= 0x00000100;
tag = input.readTag();
if (tag != 120) {
@@ -809,15 +809,15 @@ public final class BattlePassInfoNotifyOuterClass {
}
}
case 120: {
- // level
- level = input.readUInt32();
+ // curWeekAddExpSum
+ curWeekAddExpSum = input.readUInt32();
bitField0_ |= 0x00000200;
tag = input.readTag();
- if (tag != 24) {
+ if (tag != 32) {
break;
}
}
- case 24: {
+ case 32: {
// bpTierType
final int value = input.readInt32();
if (BpTierType.forNumber(value) != null) {
@@ -850,32 +850,32 @@ public final class BattlePassInfoNotifyOuterClass {
output.writeUInt64(FieldNames.takenFreeReward, takenFreeReward);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt64(FieldNames.takenPremiumReward2, takenPremiumReward2);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt64(FieldNames.takenPremiumReward1, takenPremiumReward1);
- }
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt64(FieldNames.takenPremiumExtendedReward, takenPremiumExtendedReward);
- }
- if ((bitField0_ & 0x00000010) != 0) {
output.writeUInt64(FieldNames.takenFreeExtendedReward, takenFreeExtendedReward);
}
- if ((bitField0_ & 0x00000020) != 0) {
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeUInt64(FieldNames.takenPremiumReward2, takenPremiumReward2);
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
output.writeUInt64(FieldNames.takenPremiumOptionalReward, takenPremiumOptionalReward);
}
+ if ((bitField0_ & 0x00000010) != 0) {
+ output.writeUInt64(FieldNames.takenPremiumReward1, takenPremiumReward1);
+ }
+ if ((bitField0_ & 0x00000020) != 0) {
+ output.writeUInt64(FieldNames.takenPremiumExtendedReward, takenPremiumExtendedReward);
+ }
if ((bitField0_ & 0x00000040) != 0) {
output.writeUInt32(FieldNames.curBpId, curBpId);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeUInt32(FieldNames.curWeekAddExpSum, curWeekAddExpSum);
- }
- if ((bitField0_ & 0x00000100) != 0) {
output.writeUInt32(FieldNames.exp, exp);
}
- if ((bitField0_ & 0x00000200) != 0) {
+ if ((bitField0_ & 0x00000100) != 0) {
output.writeUInt32(FieldNames.level, level);
}
+ if ((bitField0_ & 0x00000200) != 0) {
+ output.writeUInt32(FieldNames.curWeekAddExpSum, curWeekAddExpSum);
+ }
if ((bitField0_ & 0x00000400) != 0) {
output.writeEnum(FieldNames.bpTierType, bpTierType, BpTierType.converter());
}
@@ -901,11 +901,11 @@ public final class BattlePassInfoNotifyOuterClass {
}
break;
}
- case 226926899:
- case 1195903363: {
- if (input.isAtField(FieldNames.takenPremiumReward2)) {
+ case -1116117893:
+ case 1257087386: {
+ if (input.isAtField(FieldNames.takenFreeExtendedReward)) {
if (!input.trySkipNullValue()) {
- takenPremiumReward2 = input.readUInt64();
+ takenFreeExtendedReward = input.readUInt64();
bitField0_ |= 0x00000002;
}
} else {
@@ -913,11 +913,11 @@ public final class BattlePassInfoNotifyOuterClass {
}
break;
}
- case 226926898:
- case 1195903362: {
- if (input.isAtField(FieldNames.takenPremiumReward1)) {
+ case 226926899:
+ case 1195903363: {
+ if (input.isAtField(FieldNames.takenPremiumReward2)) {
if (!input.trySkipNullValue()) {
- takenPremiumReward1 = input.readUInt64();
+ takenPremiumReward2 = input.readUInt64();
bitField0_ |= 0x00000004;
}
} else {
@@ -925,35 +925,35 @@ public final class BattlePassInfoNotifyOuterClass {
}
break;
}
- case -1290021512:
- case -2138632299: {
- if (input.isAtField(FieldNames.takenPremiumExtendedReward)) {
- if (!input.trySkipNullValue()) {
- takenPremiumExtendedReward = input.readUInt64();
- bitField0_ |= 0x00000008;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case -1116117893:
- case 1257087386: {
- if (input.isAtField(FieldNames.takenFreeExtendedReward)) {
- if (!input.trySkipNullValue()) {
- takenFreeExtendedReward = input.readUInt64();
- bitField0_ |= 0x00000010;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 736311903:
case 548161422: {
if (input.isAtField(FieldNames.takenPremiumOptionalReward)) {
if (!input.trySkipNullValue()) {
takenPremiumOptionalReward = input.readUInt64();
+ bitField0_ |= 0x00000008;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 226926898:
+ case 1195903362: {
+ if (input.isAtField(FieldNames.takenPremiumReward1)) {
+ if (!input.trySkipNullValue()) {
+ takenPremiumReward1 = input.readUInt64();
+ bitField0_ |= 0x00000010;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -1290021512:
+ case -2138632299: {
+ if (input.isAtField(FieldNames.takenPremiumExtendedReward)) {
+ if (!input.trySkipNullValue()) {
+ takenPremiumExtendedReward = input.readUInt64();
bitField0_ |= 0x00000020;
}
} else {
@@ -973,23 +973,11 @@ public final class BattlePassInfoNotifyOuterClass {
}
break;
}
- case 835771131:
- case 26830815: {
- if (input.isAtField(FieldNames.curWeekAddExpSum)) {
- if (!input.trySkipNullValue()) {
- curWeekAddExpSum = input.readUInt32();
- bitField0_ |= 0x00000080;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 100893: {
if (input.isAtField(FieldNames.exp)) {
if (!input.trySkipNullValue()) {
exp = input.readUInt32();
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000080;
}
} else {
input.skipUnknownField();
@@ -1000,6 +988,18 @@ public final class BattlePassInfoNotifyOuterClass {
if (input.isAtField(FieldNames.level)) {
if (!input.trySkipNullValue()) {
level = input.readUInt32();
+ bitField0_ |= 0x00000100;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 835771131:
+ case 26830815: {
+ if (input.isAtField(FieldNames.curWeekAddExpSum)) {
+ if (!input.trySkipNullValue()) {
+ curWeekAddExpSum = input.readUInt32();
bitField0_ |= 0x00000200;
}
} else {
@@ -1065,6 +1065,11 @@ public final class BattlePassInfoNotifyOuterClass {
}
/**
+ * + * up to lv64 => normal + * after lv64 => extended + *+ * * Protobuf enum {@code BpTierType} */ public enum BpTierType implements ProtoEnum
optional uint32 CDLKMKKOGLL = 3;
- */
- private int cDLKMKKOGLL;
-
private BattleTarget() {
}
@@ -117,43 +112,6 @@ public final class BattleTargetOuterClass {
return this;
}
- /**
- * optional uint32 CDLKMKKOGLL = 3;
- * @return whether the cDLKMKKOGLL field is set
- */
- public boolean hasCDLKMKKOGLL() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 CDLKMKKOGLL = 3;
- * @return this
- */
- public BattleTarget clearCDLKMKKOGLL() {
- bitField0_ &= ~0x00000004;
- cDLKMKKOGLL = 0;
- return this;
- }
-
- /**
- * optional uint32 CDLKMKKOGLL = 3;
- * @return the cDLKMKKOGLL
- */
- public int getCDLKMKKOGLL() {
- return cDLKMKKOGLL;
- }
-
- /**
- * optional uint32 CDLKMKKOGLL = 3;
- * @param value the cDLKMKKOGLL to set
- * @return this
- */
- public BattleTarget setCDLKMKKOGLL(final int value) {
- bitField0_ |= 0x00000004;
- cDLKMKKOGLL = value;
- return this;
- }
-
@Override
public BattleTarget copyFrom(final BattleTarget other) {
cachedSize = other.cachedSize;
@@ -161,7 +119,6 @@ public final class BattleTargetOuterClass {
bitField0_ = other.bitField0_;
id = other.id;
progress = other.progress;
- cDLKMKKOGLL = other.cDLKMKKOGLL;
}
return this;
}
@@ -178,9 +135,6 @@ public final class BattleTargetOuterClass {
if (other.hasProgress()) {
setProgress(other.progress);
}
- if (other.hasCDLKMKKOGLL()) {
- setCDLKMKKOGLL(other.cDLKMKKOGLL);
- }
return this;
}
@@ -193,7 +147,6 @@ public final class BattleTargetOuterClass {
bitField0_ = 0;
id = 0;
progress = 0;
- cDLKMKKOGLL = 0;
return this;
}
@@ -218,8 +171,7 @@ public final class BattleTargetOuterClass {
BattleTarget other = (BattleTarget) o;
return bitField0_ == other.bitField0_
&& (!hasId() || id == other.id)
- && (!hasProgress() || progress == other.progress)
- && (!hasCDLKMKKOGLL() || cDLKMKKOGLL == other.cDLKMKKOGLL);
+ && (!hasProgress() || progress == other.progress);
}
@Override
@@ -232,10 +184,6 @@ public final class BattleTargetOuterClass {
output.writeRawByte((byte) 16);
output.writeUInt32NoTag(progress);
}
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(cDLKMKKOGLL);
- }
}
@Override
@@ -247,9 +195,6 @@ public final class BattleTargetOuterClass {
if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(progress);
}
- if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(cDLKMKKOGLL);
- }
return size;
}
@@ -274,15 +219,6 @@ public final class BattleTargetOuterClass {
progress = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 24) {
- break;
- }
- }
- case 24: {
- // cDLKMKKOGLL
- cDLKMKKOGLL = input.readUInt32();
- bitField0_ |= 0x00000004;
- tag = input.readTag();
if (tag != 0) {
break;
}
@@ -310,9 +246,6 @@ public final class BattleTargetOuterClass {
if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.progress, progress);
}
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.cDLKMKKOGLL, cDLKMKKOGLL);
- }
output.endObject();
}
@@ -345,17 +278,6 @@ public final class BattleTargetOuterClass {
}
break;
}
- case -1138288731: {
- if (input.isAtField(FieldNames.cDLKMKKOGLL)) {
- if (!input.trySkipNullValue()) {
- cDLKMKKOGLL = input.readUInt32();
- bitField0_ |= 0x00000004;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
default: {
input.skipUnknownField();
break;
@@ -411,8 +333,6 @@ public final class BattleTargetOuterClass {
static final FieldName id = FieldName.forField("id");
static final FieldName progress = FieldName.forField("progress");
-
- static final FieldName cDLKMKKOGLL = FieldName.forField("CDLKMKKOGLL");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java b/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java
index f88cf2f..a08ceca 100644
--- a/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java
@@ -21,12 +21,12 @@ public final class BoardDataSyncOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional string signature = 15;
+ * optional string signature = 13;
*/
private final Utf8String signature = Utf8String.newEmptyInstance();
/**
- * repeated .HeadIcon unlocked_head_icon_list = 9;
+ * repeated .HeadIcon unlocked_head_icon_list = 7;
*/
private final RepeatedMessageoptional string signature = 15;
+ * optional string signature = 13;
* @return whether the signature field is set
*/
public boolean hasSignature() {
@@ -49,7 +49,7 @@ public final class BoardDataSyncOuterClass {
}
/**
- * optional string signature = 15;
+ * optional string signature = 13;
* @return this
*/
public BoardDataSync clearSignature() {
@@ -59,7 +59,7 @@ public final class BoardDataSyncOuterClass {
}
/**
- * optional string signature = 15;
+ * optional string signature = 13;
* @return the signature
*/
public String getSignature() {
@@ -67,7 +67,7 @@ public final class BoardDataSyncOuterClass {
}
/**
- * optional string signature = 15;
+ * optional string signature = 13;
* @return internal {@code Utf8String} representation of signature for reading
*/
public Utf8String getSignatureBytes() {
@@ -75,7 +75,7 @@ public final class BoardDataSyncOuterClass {
}
/**
- * optional string signature = 15;
+ * optional string signature = 13;
* @return internal {@code Utf8String} representation of signature for modifications
*/
public Utf8String getMutableSignatureBytes() {
@@ -84,7 +84,7 @@ public final class BoardDataSyncOuterClass {
}
/**
- * optional string signature = 15;
+ * optional string signature = 13;
* @param value the signature to set
* @return this
*/
@@ -95,7 +95,7 @@ public final class BoardDataSyncOuterClass {
}
/**
- * optional string signature = 15;
+ * optional string signature = 13;
* @param value the signature to set
* @return this
*/
@@ -106,7 +106,7 @@ public final class BoardDataSyncOuterClass {
}
/**
- * repeated .HeadIcon unlocked_head_icon_list = 9;
+ * repeated .HeadIcon unlocked_head_icon_list = 7;
* @return whether the unlockedHeadIconList field is set
*/
public boolean hasUnlockedHeadIconList() {
@@ -114,7 +114,7 @@ public final class BoardDataSyncOuterClass {
}
/**
- * repeated .HeadIcon unlocked_head_icon_list = 9;
+ * repeated .HeadIcon unlocked_head_icon_list = 7;
* @return this
*/
public BoardDataSync clearUnlockedHeadIconList() {
@@ -124,7 +124,7 @@ public final class BoardDataSyncOuterClass {
}
/**
- * repeated .HeadIcon unlocked_head_icon_list = 9;
+ * repeated .HeadIcon unlocked_head_icon_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.
@@ -138,7 +138,7 @@ public final class BoardDataSyncOuterClass {
}
/**
- * repeated .HeadIcon unlocked_head_icon_list = 9;
+ * repeated .HeadIcon unlocked_head_icon_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
@@ -152,7 +152,7 @@ public final class BoardDataSyncOuterClass {
}
/**
- * repeated .HeadIcon unlocked_head_icon_list = 9;
+ * repeated .HeadIcon unlocked_head_icon_list = 7;
* @param value the unlockedHeadIconList to add
* @return this
*/
@@ -163,7 +163,7 @@ public final class BoardDataSyncOuterClass {
}
/**
- * repeated .HeadIcon unlocked_head_icon_list = 9;
+ * repeated .HeadIcon unlocked_head_icon_list = 7;
* @param values the unlockedHeadIconList to add
* @return this
*/
@@ -240,12 +240,12 @@ public final class BoardDataSyncOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 122);
+ output.writeRawByte((byte) 106);
output.writeStringNoTag(signature);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < unlockedHeadIconList.length(); i++) {
- output.writeRawByte((byte) 74);
+ output.writeRawByte((byte) 58);
output.writeMessageNoTag(unlockedHeadIconList.get(i));
}
}
@@ -270,16 +270,16 @@ public final class BoardDataSyncOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 122: {
+ case 106: {
// signature
input.readString(signature);
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 74) {
+ if (tag != 58) {
break;
}
}
- case 74: {
+ case 58: {
// 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 9b0af1d..062aa4f 100644
--- a/src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java
@@ -22,37 +22,37 @@ public final class BuffInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint64 add_time_ms = 5;
+ * optional uint64 add_time_ms = 8;
*/
private long addTimeMs;
/**
- * optional float life_time = 10;
+ * optional float life_time = 9;
*/
private float lifeTime;
/**
- * optional uint32 base_avatar_id = 4;
- */
- private int baseAvatarId;
-
- /**
- * optional uint32 buff_id = 8;
- */
- private int buffId;
-
- /**
- * optional uint32 count = 11;
+ * optional uint32 count = 1;
*/
private int count;
/**
- * optional uint32 level = 13;
+ * optional uint32 buff_id = 5;
+ */
+ private int buffId;
+
+ /**
+ * optional uint32 base_avatar_id = 11;
+ */
+ private int baseAvatarId;
+
+ /**
+ * optional uint32 level = 14;
*/
private int level;
/**
- * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 1;
+ * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4;
*/
private final RepeatedMessageoptional uint64 add_time_ms = 5;
+ * optional uint64 add_time_ms = 8;
* @return whether the addTimeMs field is set
*/
public boolean hasAddTimeMs() {
@@ -75,7 +75,7 @@ public final class BuffInfoOuterClass {
}
/**
- * optional uint64 add_time_ms = 5;
+ * optional uint64 add_time_ms = 8;
* @return this
*/
public BuffInfo clearAddTimeMs() {
@@ -85,7 +85,7 @@ public final class BuffInfoOuterClass {
}
/**
- * optional uint64 add_time_ms = 5;
+ * optional uint64 add_time_ms = 8;
* @return the addTimeMs
*/
public long getAddTimeMs() {
@@ -93,7 +93,7 @@ public final class BuffInfoOuterClass {
}
/**
- * optional uint64 add_time_ms = 5;
+ * optional uint64 add_time_ms = 8;
* @param value the addTimeMs to set
* @return this
*/
@@ -104,7 +104,7 @@ public final class BuffInfoOuterClass {
}
/**
- * optional float life_time = 10;
+ * optional float life_time = 9;
* @return whether the lifeTime field is set
*/
public boolean hasLifeTime() {
@@ -112,7 +112,7 @@ public final class BuffInfoOuterClass {
}
/**
- * optional float life_time = 10;
+ * optional float life_time = 9;
* @return this
*/
public BuffInfo clearLifeTime() {
@@ -122,7 +122,7 @@ public final class BuffInfoOuterClass {
}
/**
- * optional float life_time = 10;
+ * optional float life_time = 9;
* @return the lifeTime
*/
public float getLifeTime() {
@@ -130,7 +130,7 @@ public final class BuffInfoOuterClass {
}
/**
- * optional float life_time = 10;
+ * optional float life_time = 9;
* @param value the lifeTime to set
* @return this
*/
@@ -141,44 +141,44 @@ public final class BuffInfoOuterClass {
}
/**
- * optional uint32 base_avatar_id = 4;
- * @return whether the baseAvatarId field is set
+ * optional uint32 count = 1;
+ * @return whether the count field is set
*/
- public boolean hasBaseAvatarId() {
+ public boolean hasCount() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 base_avatar_id = 4;
+ * optional uint32 count = 1;
* @return this
*/
- public BuffInfo clearBaseAvatarId() {
+ public BuffInfo clearCount() {
bitField0_ &= ~0x00000004;
- baseAvatarId = 0;
+ count = 0;
return this;
}
/**
- * optional uint32 base_avatar_id = 4;
- * @return the baseAvatarId
+ * optional uint32 count = 1;
+ * @return the count
*/
- public int getBaseAvatarId() {
- return baseAvatarId;
+ public int getCount() {
+ return count;
}
/**
- * optional uint32 base_avatar_id = 4;
- * @param value the baseAvatarId to set
+ * optional uint32 count = 1;
+ * @param value the count to set
* @return this
*/
- public BuffInfo setBaseAvatarId(final int value) {
+ public BuffInfo setCount(final int value) {
bitField0_ |= 0x00000004;
- baseAvatarId = value;
+ count = value;
return this;
}
/**
- * optional uint32 buff_id = 8;
+ * optional uint32 buff_id = 5;
* @return whether the buffId field is set
*/
public boolean hasBuffId() {
@@ -186,7 +186,7 @@ public final class BuffInfoOuterClass {
}
/**
- * optional uint32 buff_id = 8;
+ * optional uint32 buff_id = 5;
* @return this
*/
public BuffInfo clearBuffId() {
@@ -196,7 +196,7 @@ public final class BuffInfoOuterClass {
}
/**
- * optional uint32 buff_id = 8;
+ * optional uint32 buff_id = 5;
* @return the buffId
*/
public int getBuffId() {
@@ -204,7 +204,7 @@ public final class BuffInfoOuterClass {
}
/**
- * optional uint32 buff_id = 8;
+ * optional uint32 buff_id = 5;
* @param value the buffId to set
* @return this
*/
@@ -215,44 +215,44 @@ public final class BuffInfoOuterClass {
}
/**
- * optional uint32 count = 11;
- * @return whether the count field is set
+ * optional uint32 base_avatar_id = 11;
+ * @return whether the baseAvatarId field is set
*/
- public boolean hasCount() {
+ public boolean hasBaseAvatarId() {
return (bitField0_ & 0x00000010) != 0;
}
/**
- * optional uint32 count = 11;
+ * optional uint32 base_avatar_id = 11;
* @return this
*/
- public BuffInfo clearCount() {
+ public BuffInfo clearBaseAvatarId() {
bitField0_ &= ~0x00000010;
- count = 0;
+ baseAvatarId = 0;
return this;
}
/**
- * optional uint32 count = 11;
- * @return the count
+ * optional uint32 base_avatar_id = 11;
+ * @return the baseAvatarId
*/
- public int getCount() {
- return count;
+ public int getBaseAvatarId() {
+ return baseAvatarId;
}
/**
- * optional uint32 count = 11;
- * @param value the count to set
+ * optional uint32 base_avatar_id = 11;
+ * @param value the baseAvatarId to set
* @return this
*/
- public BuffInfo setCount(final int value) {
+ public BuffInfo setBaseAvatarId(final int value) {
bitField0_ |= 0x00000010;
- count = value;
+ baseAvatarId = value;
return this;
}
/**
- * optional uint32 level = 13;
+ * optional uint32 level = 14;
* @return whether the level field is set
*/
public boolean hasLevel() {
@@ -260,7 +260,7 @@ public final class BuffInfoOuterClass {
}
/**
- * optional uint32 level = 13;
+ * optional uint32 level = 14;
* @return this
*/
public BuffInfo clearLevel() {
@@ -270,7 +270,7 @@ public final class BuffInfoOuterClass {
}
/**
- * optional uint32 level = 13;
+ * optional uint32 level = 14;
* @return the level
*/
public int getLevel() {
@@ -278,7 +278,7 @@ public final class BuffInfoOuterClass {
}
/**
- * optional uint32 level = 13;
+ * optional uint32 level = 14;
* @param value the level to set
* @return this
*/
@@ -289,7 +289,7 @@ public final class BuffInfoOuterClass {
}
/**
- * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 1;
+ * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4;
* @return whether the dynamicValues field is set
*/
public boolean hasDynamicValues() {
@@ -297,7 +297,7 @@ public final class BuffInfoOuterClass {
}
/**
- * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 1;
+ * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4;
* @return this
*/
public BuffInfo clearDynamicValues() {
@@ -307,7 +307,7 @@ public final class BuffInfoOuterClass {
}
/**
- * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 1;
+ * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 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.
@@ -321,7 +321,7 @@ public final class BuffInfoOuterClass {
}
/**
- * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 1;
+ * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 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
@@ -335,7 +335,7 @@ public final class BuffInfoOuterClass {
}
/**
- * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 1;
+ * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4;
* @param value the dynamicValues to add
* @return this
*/
@@ -346,7 +346,7 @@ public final class BuffInfoOuterClass {
}
/**
- * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 1;
+ * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4;
* @param values the dynamicValues to add
* @return this
*/
@@ -363,9 +363,9 @@ public final class BuffInfoOuterClass {
bitField0_ = other.bitField0_;
addTimeMs = other.addTimeMs;
lifeTime = other.lifeTime;
- baseAvatarId = other.baseAvatarId;
- buffId = other.buffId;
count = other.count;
+ buffId = other.buffId;
+ baseAvatarId = other.baseAvatarId;
level = other.level;
dynamicValues.copyFrom(other.dynamicValues);
}
@@ -384,14 +384,14 @@ public final class BuffInfoOuterClass {
if (other.hasLifeTime()) {
setLifeTime(other.lifeTime);
}
- if (other.hasBaseAvatarId()) {
- setBaseAvatarId(other.baseAvatarId);
+ if (other.hasCount()) {
+ setCount(other.count);
}
if (other.hasBuffId()) {
setBuffId(other.buffId);
}
- if (other.hasCount()) {
- setCount(other.count);
+ if (other.hasBaseAvatarId()) {
+ setBaseAvatarId(other.baseAvatarId);
}
if (other.hasLevel()) {
setLevel(other.level);
@@ -411,9 +411,9 @@ public final class BuffInfoOuterClass {
bitField0_ = 0;
addTimeMs = 0L;
lifeTime = 0F;
- baseAvatarId = 0;
- buffId = 0;
count = 0;
+ buffId = 0;
+ baseAvatarId = 0;
level = 0;
dynamicValues.clear();
return this;
@@ -442,9 +442,9 @@ public final class BuffInfoOuterClass {
return bitField0_ == other.bitField0_
&& (!hasAddTimeMs() || addTimeMs == other.addTimeMs)
&& (!hasLifeTime() || ProtoUtil.isEqual(lifeTime, other.lifeTime))
- && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
- && (!hasBuffId() || buffId == other.buffId)
&& (!hasCount() || count == other.count)
+ && (!hasBuffId() || buffId == other.buffId)
+ && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
&& (!hasLevel() || level == other.level)
&& (!hasDynamicValues() || dynamicValues.equals(other.dynamicValues));
}
@@ -452,32 +452,32 @@ public final class BuffInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 64);
output.writeUInt64NoTag(addTimeMs);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 85);
+ output.writeRawByte((byte) 77);
output.writeFloatNoTag(lifeTime);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(baseAvatarId);
+ output.writeRawByte((byte) 8);
+ output.writeUInt32NoTag(count);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(buffId);
}
if ((bitField0_ & 0x00000010) != 0) {
output.writeRawByte((byte) 88);
- output.writeUInt32NoTag(count);
+ output.writeUInt32NoTag(baseAvatarId);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 112);
output.writeUInt32NoTag(level);
}
if ((bitField0_ & 0x00000040) != 0) {
for (int i = 0; i < dynamicValues.length(); i++) {
- output.writeRawByte((byte) 10);
+ output.writeRawByte((byte) 34);
output.writeMessageNoTag(dynamicValues.get(i));
}
}
@@ -493,13 +493,13 @@ public final class BuffInfoOuterClass {
size += 5;
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(count);
}
if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(count);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
}
if ((bitField0_ & 0x00000020) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
@@ -517,34 +517,34 @@ public final class BuffInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
+ case 64: {
// addTimeMs
addTimeMs = input.readUInt64();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 85) {
+ if (tag != 77) {
break;
}
}
- case 85: {
+ case 77: {
// lifeTime
lifeTime = input.readFloat();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 32) {
+ if (tag != 8) {
break;
}
}
- case 32: {
- // baseAvatarId
- baseAvatarId = input.readUInt32();
+ case 8: {
+ // count
+ count = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 64) {
+ if (tag != 40) {
break;
}
}
- case 64: {
+ case 40: {
// buffId
buffId = input.readUInt32();
bitField0_ |= 0x00000008;
@@ -554,24 +554,24 @@ public final class BuffInfoOuterClass {
}
}
case 88: {
- // count
- count = input.readUInt32();
+ // baseAvatarId
+ baseAvatarId = input.readUInt32();
bitField0_ |= 0x00000010;
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 112) {
break;
}
}
- case 104: {
+ case 112: {
// level
level = input.readUInt32();
bitField0_ |= 0x00000020;
tag = input.readTag();
- if (tag != 10) {
+ if (tag != 34) {
break;
}
}
- case 10: {
+ case 34: {
// dynamicValues
tag = input.readRepeatedMessage(dynamicValues, tag);
bitField0_ |= 0x00000040;
@@ -603,13 +603,13 @@ public final class BuffInfoOuterClass {
output.writeFloat(FieldNames.lifeTime, lifeTime);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
+ output.writeUInt32(FieldNames.count, count);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeUInt32(FieldNames.buffId, buffId);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeUInt32(FieldNames.count, count);
+ output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
}
if ((bitField0_ & 0x00000020) != 0) {
output.writeUInt32(FieldNames.level, level);
@@ -651,11 +651,10 @@ public final class BuffInfoOuterClass {
}
break;
}
- case 118022725:
- case -1756826157: {
- if (input.isAtField(FieldNames.baseAvatarId)) {
+ case 94851343: {
+ if (input.isAtField(FieldNames.count)) {
if (!input.trySkipNullValue()) {
- baseAvatarId = input.readUInt32();
+ count = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -675,10 +674,11 @@ public final class BuffInfoOuterClass {
}
break;
}
- case 94851343: {
- if (input.isAtField(FieldNames.count)) {
+ case 118022725:
+ case -1756826157: {
+ if (input.isAtField(FieldNames.baseAvatarId)) {
if (!input.trySkipNullValue()) {
- count = input.readUInt32();
+ baseAvatarId = input.readUInt32();
bitField0_ |= 0x00000010;
}
} else {
@@ -1119,11 +1119,11 @@ public final class BuffInfoOuterClass {
static final FieldName lifeTime = FieldName.forField("lifeTime", "life_time");
- static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
+ static final FieldName count = FieldName.forField("count");
static final FieldName buffId = FieldName.forField("buffId", "buff_id");
- static final FieldName count = FieldName.forField("count");
+ static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
static final FieldName level = FieldName.forField("level");
diff --git a/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java
index 93dd6d3..43c73da 100644
--- a/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java
@@ -19,24 +19,24 @@ public final class BuyGoodsCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 goods_num = 4;
+ * optional uint32 goods_num = 3;
*/
private int goodsNum;
/**
- * optional uint32 shop_id = 5;
+ * optional uint32 goods_id = 8;
*/
- private int shopId;
+ private int goodsId;
/**
- * optional uint32 item_id = 14;
+ * optional uint32 item_id = 9;
*/
private int itemId;
/**
- * optional uint32 goods_id = 15;
+ * optional uint32 shop_id = 11;
*/
- private int goodsId;
+ private int shopId;
private BuyGoodsCsReq() {
}
@@ -49,7 +49,7 @@ public final class BuyGoodsCsReqOuterClass {
}
/**
- * optional uint32 goods_num = 4;
+ * optional uint32 goods_num = 3;
* @return whether the goodsNum field is set
*/
public boolean hasGoodsNum() {
@@ -57,7 +57,7 @@ public final class BuyGoodsCsReqOuterClass {
}
/**
- * optional uint32 goods_num = 4;
+ * optional uint32 goods_num = 3;
* @return this
*/
public BuyGoodsCsReq clearGoodsNum() {
@@ -67,7 +67,7 @@ public final class BuyGoodsCsReqOuterClass {
}
/**
- * optional uint32 goods_num = 4;
+ * optional uint32 goods_num = 3;
* @return the goodsNum
*/
public int getGoodsNum() {
@@ -75,7 +75,7 @@ public final class BuyGoodsCsReqOuterClass {
}
/**
- * optional uint32 goods_num = 4;
+ * optional uint32 goods_num = 3;
* @param value the goodsNum to set
* @return this
*/
@@ -86,44 +86,44 @@ public final class BuyGoodsCsReqOuterClass {
}
/**
- * optional uint32 shop_id = 5;
- * @return whether the shopId field is set
+ * optional uint32 goods_id = 8;
+ * @return whether the goodsId field is set
*/
- public boolean hasShopId() {
+ public boolean hasGoodsId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 shop_id = 5;
+ * optional uint32 goods_id = 8;
* @return this
*/
- public BuyGoodsCsReq clearShopId() {
+ public BuyGoodsCsReq clearGoodsId() {
bitField0_ &= ~0x00000002;
- shopId = 0;
+ goodsId = 0;
return this;
}
/**
- * optional uint32 shop_id = 5;
- * @return the shopId
+ * optional uint32 goods_id = 8;
+ * @return the goodsId
*/
- public int getShopId() {
- return shopId;
+ public int getGoodsId() {
+ return goodsId;
}
/**
- * optional uint32 shop_id = 5;
- * @param value the shopId to set
+ * optional uint32 goods_id = 8;
+ * @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;
}
/**
- * optional uint32 item_id = 14;
+ * optional uint32 item_id = 9;
* @return whether the itemId field is set
*/
public boolean hasItemId() {
@@ -131,7 +131,7 @@ public final class BuyGoodsCsReqOuterClass {
}
/**
- * optional uint32 item_id = 14;
+ * optional uint32 item_id = 9;
* @return this
*/
public BuyGoodsCsReq clearItemId() {
@@ -141,7 +141,7 @@ public final class BuyGoodsCsReqOuterClass {
}
/**
- * optional uint32 item_id = 14;
+ * optional uint32 item_id = 9;
* @return the itemId
*/
public int getItemId() {
@@ -149,7 +149,7 @@ public final class BuyGoodsCsReqOuterClass {
}
/**
- * optional uint32 item_id = 14;
+ * optional uint32 item_id = 9;
* @param value the itemId to set
* @return this
*/
@@ -160,39 +160,39 @@ public final class BuyGoodsCsReqOuterClass {
}
/**
- * optional uint32 goods_id = 15;
- * @return whether the goodsId field is set
+ * optional uint32 shop_id = 11;
+ * @return whether the shopId field is set
*/
- public boolean hasGoodsId() {
+ public boolean hasShopId() {
return (bitField0_ & 0x00000008) != 0;
}
/**
- * optional uint32 goods_id = 15;
+ * optional uint32 shop_id = 11;
* @return this
*/
- public BuyGoodsCsReq clearGoodsId() {
+ public BuyGoodsCsReq clearShopId() {
bitField0_ &= ~0x00000008;
- goodsId = 0;
+ shopId = 0;
return this;
}
/**
- * optional uint32 goods_id = 15;
- * @return the goodsId
+ * optional uint32 shop_id = 11;
+ * @return the shopId
*/
- public int getGoodsId() {
- return goodsId;
+ public int getShopId() {
+ return shopId;
}
/**
- * optional uint32 goods_id = 15;
- * @param value the goodsId to set
+ * optional uint32 shop_id = 11;
+ * @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 final class BuyGoodsCsReqOuterClass {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
goodsNum = other.goodsNum;
- shopId = other.shopId;
- itemId = other.itemId;
goodsId = other.goodsId;
+ itemId = other.itemId;
+ shopId = other.shopId;
}
return this;
}
@@ -218,14 +218,14 @@ public final class BuyGoodsCsReqOuterClass {
if (other.hasGoodsNum()) {
setGoodsNum(other.goodsNum);
}
- if (other.hasShopId()) {
- setShopId(other.shopId);
+ if (other.hasGoodsId()) {
+ setGoodsId(other.goodsId);
}
if (other.hasItemId()) {
setItemId(other.itemId);
}
- if (other.hasGoodsId()) {
- setGoodsId(other.goodsId);
+ if (other.hasShopId()) {
+ setShopId(other.shopId);
}
return this;
}
@@ -238,9 +238,9 @@ public final class BuyGoodsCsReqOuterClass {
cachedSize = -1;
bitField0_ = 0;
goodsNum = 0;
- shopId = 0;
- itemId = 0;
goodsId = 0;
+ itemId = 0;
+ shopId = 0;
return this;
}
@@ -265,28 +265,28 @@ public final class BuyGoodsCsReqOuterClass {
BuyGoodsCsReq other = (BuyGoodsCsReq) o;
return bitField0_ == other.bitField0_
&& (!hasGoodsNum() || goodsNum == other.goodsNum)
- && (!hasShopId() || shopId == other.shopId)
+ && (!hasGoodsId() || goodsId == other.goodsId)
&& (!hasItemId() || itemId == other.itemId)
- && (!hasGoodsId() || goodsId == other.goodsId);
+ && (!hasShopId() || shopId == other.shopId);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(goodsNum);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 40);
- output.writeUInt32NoTag(shopId);
+ output.writeRawByte((byte) 64);
+ output.writeUInt32NoTag(goodsId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 72);
output.writeUInt32NoTag(itemId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 120);
- output.writeUInt32NoTag(goodsId);
+ output.writeRawByte((byte) 88);
+ output.writeUInt32NoTag(shopId);
}
}
@@ -297,13 +297,13 @@ public final class BuyGoodsCsReqOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsNum);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId);
}
return size;
}
@@ -315,36 +315,36 @@ public final class BuyGoodsCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
+ case 24: {
// goodsNum
goodsNum = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 40) {
+ if (tag != 64) {
break;
}
}
- case 40: {
- // shopId
- shopId = input.readUInt32();
+ case 64: {
+ // goodsId
+ goodsId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 112) {
+ if (tag != 72) {
break;
}
}
- case 112: {
+ case 72: {
// itemId
itemId = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 88) {
break;
}
}
- case 120: {
- // goodsId
- goodsId = input.readUInt32();
+ case 88: {
+ // shopId
+ shopId = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
if (tag != 0) {
@@ -372,13 +372,13 @@ public final class BuyGoodsCsReqOuterClass {
output.writeUInt32(FieldNames.goodsNum, goodsNum);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.shopId, shopId);
+ output.writeUInt32(FieldNames.goodsId, goodsId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.itemId, itemId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.goodsId, goodsId);
+ output.writeUInt32(FieldNames.shopId, shopId);
}
output.endObject();
}
@@ -402,11 +402,11 @@ public final class BuyGoodsCsReqOuterClass {
}
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 final class BuyGoodsCsReqOuterClass {
}
break;
}
- case 207037201:
- case 2123207332: {
- if (input.isAtField(FieldNames.goodsId)) {
+ case -903151951:
+ case 2067081988: {
+ if (input.isAtField(FieldNames.shopId)) {
if (!input.trySkipNullValue()) {
- goodsId = input.readUInt32();
+ shopId = input.readUInt32();
bitField0_ |= 0x00000008;
}
} else {
@@ -492,11 +492,11 @@ public final class BuyGoodsCsReqOuterClass {
static class FieldNames {
static final FieldName goodsNum = FieldName.forField("goodsNum", "goods_num");
- static final FieldName shopId = FieldName.forField("shopId", "shop_id");
+ static final FieldName goodsId = FieldName.forField("goodsId", "goods_id");
static final FieldName itemId = FieldName.forField("itemId", "item_id");
- 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 1059d26..9022990 100644
--- a/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java
@@ -19,27 +19,27 @@ public final class BuyGoodsScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 7;
- */
- private int retcode;
-
- /**
- * optional uint32 goods_buy_times = 9;
- */
- private int goodsBuyTimes;
-
- /**
- * optional uint32 shop_id = 11;
- */
- private int shopId;
-
- /**
- * optional uint32 goods_id = 12;
+ * optional uint32 goods_id = 1;
*/
private int goodsId;
/**
- * optional .ItemList return_item_list = 1;
+ * optional uint32 shop_id = 3;
+ */
+ private int shopId;
+
+ /**
+ * optional uint32 goods_buy_times = 8;
+ */
+ private int goodsBuyTimes;
+
+ /**
+ * optional uint32 retcode = 12;
+ */
+ private int retcode;
+
+ /**
+ * optional .ItemList return_item_list = 2;
*/
private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance();
@@ -54,136 +54,25 @@ public final class BuyGoodsScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
- * @return whether the retcode field is set
+ * optional uint32 goods_id = 1;
+ * @return whether the goodsId field is set
*/
- public boolean hasRetcode() {
+ public boolean hasGoodsId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 retcode = 7;
- * @return this
- */
- public BuyGoodsScRsp clearRetcode() {
- bitField0_ &= ~0x00000001;
- retcode = 0;
- return this;
- }
-
- /**
- * optional uint32 retcode = 7;
- * @return the retcode
- */
- public int getRetcode() {
- return retcode;
- }
-
- /**
- * optional uint32 retcode = 7;
- * @param value the retcode to set
- * @return this
- */
- public BuyGoodsScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000001;
- retcode = value;
- return this;
- }
-
- /**
- * optional uint32 goods_buy_times = 9;
- * @return whether the goodsBuyTimes field is set
- */
- public boolean hasGoodsBuyTimes() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 goods_buy_times = 9;
- * @return this
- */
- public BuyGoodsScRsp clearGoodsBuyTimes() {
- bitField0_ &= ~0x00000002;
- goodsBuyTimes = 0;
- return this;
- }
-
- /**
- * optional uint32 goods_buy_times = 9;
- * @return the goodsBuyTimes
- */
- public int getGoodsBuyTimes() {
- return goodsBuyTimes;
- }
-
- /**
- * optional uint32 goods_buy_times = 9;
- * @param value the goodsBuyTimes to set
- * @return this
- */
- public BuyGoodsScRsp setGoodsBuyTimes(final int value) {
- bitField0_ |= 0x00000002;
- goodsBuyTimes = value;
- return this;
- }
-
- /**
- * optional uint32 shop_id = 11;
- * @return whether the shopId field is set
- */
- public boolean hasShopId() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 shop_id = 11;
- * @return this
- */
- public BuyGoodsScRsp clearShopId() {
- bitField0_ &= ~0x00000004;
- shopId = 0;
- return this;
- }
-
- /**
- * optional uint32 shop_id = 11;
- * @return the shopId
- */
- public int getShopId() {
- return shopId;
- }
-
- /**
- * optional uint32 shop_id = 11;
- * @param value the shopId to set
- * @return this
- */
- public BuyGoodsScRsp setShopId(final int value) {
- bitField0_ |= 0x00000004;
- shopId = value;
- return this;
- }
-
- /**
- * optional uint32 goods_id = 12;
- * @return whether the goodsId field is set
- */
- public boolean hasGoodsId() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional uint32 goods_id = 12;
+ * optional uint32 goods_id = 1;
* @return this
*/
public BuyGoodsScRsp clearGoodsId() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000001;
goodsId = 0;
return this;
}
/**
- * optional uint32 goods_id = 12;
+ * optional uint32 goods_id = 1;
* @return the goodsId
*/
public int getGoodsId() {
@@ -191,18 +80,129 @@ public final class BuyGoodsScRspOuterClass {
}
/**
- * optional uint32 goods_id = 12;
+ * optional uint32 goods_id = 1;
* @param value the goodsId to set
* @return this
*/
public BuyGoodsScRsp setGoodsId(final int value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000001;
goodsId = value;
return this;
}
/**
- * optional .ItemList return_item_list = 1;
+ * optional uint32 shop_id = 3;
+ * @return whether the shopId field is set
+ */
+ public boolean hasShopId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 shop_id = 3;
+ * @return this
+ */
+ public BuyGoodsScRsp clearShopId() {
+ bitField0_ &= ~0x00000002;
+ shopId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 shop_id = 3;
+ * @return the shopId
+ */
+ public int getShopId() {
+ return shopId;
+ }
+
+ /**
+ * optional uint32 shop_id = 3;
+ * @param value the shopId to set
+ * @return this
+ */
+ public BuyGoodsScRsp setShopId(final int value) {
+ bitField0_ |= 0x00000002;
+ shopId = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 goods_buy_times = 8;
+ * @return whether the goodsBuyTimes field is set
+ */
+ public boolean hasGoodsBuyTimes() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 goods_buy_times = 8;
+ * @return this
+ */
+ public BuyGoodsScRsp clearGoodsBuyTimes() {
+ bitField0_ &= ~0x00000004;
+ goodsBuyTimes = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 goods_buy_times = 8;
+ * @return the goodsBuyTimes
+ */
+ public int getGoodsBuyTimes() {
+ return goodsBuyTimes;
+ }
+
+ /**
+ * optional uint32 goods_buy_times = 8;
+ * @param value the goodsBuyTimes to set
+ * @return this
+ */
+ public BuyGoodsScRsp setGoodsBuyTimes(final int value) {
+ bitField0_ |= 0x00000004;
+ goodsBuyTimes = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 retcode = 12;
+ * @return whether the retcode field is set
+ */
+ public boolean hasRetcode() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional uint32 retcode = 12;
+ * @return this
+ */
+ public BuyGoodsScRsp clearRetcode() {
+ bitField0_ &= ~0x00000008;
+ retcode = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 retcode = 12;
+ * @return the retcode
+ */
+ public int getRetcode() {
+ return retcode;
+ }
+
+ /**
+ * optional uint32 retcode = 12;
+ * @param value the retcode to set
+ * @return this
+ */
+ public BuyGoodsScRsp setRetcode(final int value) {
+ bitField0_ |= 0x00000008;
+ retcode = value;
+ return this;
+ }
+
+ /**
+ * optional .ItemList return_item_list = 2;
* @return whether the returnItemList field is set
*/
public boolean hasReturnItemList() {
@@ -210,7 +210,7 @@ public final class BuyGoodsScRspOuterClass {
}
/**
- * optional .ItemList return_item_list = 1;
+ * optional .ItemList return_item_list = 2;
* @return this
*/
public BuyGoodsScRsp clearReturnItemList() {
@@ -220,7 +220,7 @@ public final class BuyGoodsScRspOuterClass {
}
/**
- * optional .ItemList return_item_list = 1;
+ * 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.
@@ -234,7 +234,7 @@ public final class BuyGoodsScRspOuterClass {
}
/**
- * optional .ItemList return_item_list = 1;
+ * 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
@@ -248,7 +248,7 @@ public final class BuyGoodsScRspOuterClass {
}
/**
- * optional .ItemList return_item_list = 1;
+ * optional .ItemList return_item_list = 2;
* @param value the returnItemList to set
* @return this
*/
@@ -263,10 +263,10 @@ public final class BuyGoodsScRspOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- retcode = other.retcode;
- goodsBuyTimes = other.goodsBuyTimes;
- shopId = other.shopId;
goodsId = other.goodsId;
+ shopId = other.shopId;
+ goodsBuyTimes = other.goodsBuyTimes;
+ retcode = other.retcode;
returnItemList.copyFrom(other.returnItemList);
}
return this;
@@ -278,17 +278,17 @@ public final class BuyGoodsScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasRetcode()) {
- setRetcode(other.retcode);
- }
- if (other.hasGoodsBuyTimes()) {
- setGoodsBuyTimes(other.goodsBuyTimes);
+ if (other.hasGoodsId()) {
+ setGoodsId(other.goodsId);
}
if (other.hasShopId()) {
setShopId(other.shopId);
}
- if (other.hasGoodsId()) {
- setGoodsId(other.goodsId);
+ if (other.hasGoodsBuyTimes()) {
+ setGoodsBuyTimes(other.goodsBuyTimes);
+ }
+ if (other.hasRetcode()) {
+ setRetcode(other.retcode);
}
if (other.hasReturnItemList()) {
getMutableReturnItemList().mergeFrom(other.returnItemList);
@@ -303,10 +303,10 @@ public final class BuyGoodsScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- retcode = 0;
- goodsBuyTimes = 0;
- shopId = 0;
goodsId = 0;
+ shopId = 0;
+ goodsBuyTimes = 0;
+ retcode = 0;
returnItemList.clear();
return this;
}
@@ -332,33 +332,33 @@ public final class BuyGoodsScRspOuterClass {
}
BuyGoodsScRsp other = (BuyGoodsScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasRetcode() || retcode == other.retcode)
- && (!hasGoodsBuyTimes() || goodsBuyTimes == other.goodsBuyTimes)
- && (!hasShopId() || shopId == other.shopId)
&& (!hasGoodsId() || goodsId == other.goodsId)
+ && (!hasShopId() || shopId == other.shopId)
+ && (!hasGoodsBuyTimes() || goodsBuyTimes == other.goodsBuyTimes)
+ && (!hasRetcode() || retcode == other.retcode)
&& (!hasReturnItemList() || returnItemList.equals(other.returnItemList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
- output.writeUInt32NoTag(retcode);
+ output.writeRawByte((byte) 8);
+ output.writeUInt32NoTag(goodsId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 72);
- output.writeUInt32NoTag(goodsBuyTimes);
+ output.writeRawByte((byte) 24);
+ output.writeUInt32NoTag(shopId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 88);
- output.writeUInt32NoTag(shopId);
+ output.writeRawByte((byte) 64);
+ output.writeUInt32NoTag(goodsBuyTimes);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeRawByte((byte) 96);
- output.writeUInt32NoTag(goodsId);
+ output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 10);
+ output.writeRawByte((byte) 18);
output.writeMessageNoTag(returnItemList);
}
}
@@ -367,16 +367,16 @@ public final class BuyGoodsScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsBuyTimes);
- }
- if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsBuyTimes);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000010) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(returnItemList);
@@ -391,27 +391,27 @@ public final class BuyGoodsScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
- // retcode
- retcode = input.readUInt32();
+ case 8: {
+ // goodsId
+ goodsId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 72) {
+ if (tag != 24) {
break;
}
}
- case 72: {
- // goodsBuyTimes
- goodsBuyTimes = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 88) {
- break;
- }
- }
- case 88: {
+ case 24: {
// shopId
shopId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 64) {
+ break;
+ }
+ }
+ case 64: {
+ // goodsBuyTimes
+ goodsBuyTimes = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 96) {
@@ -419,15 +419,15 @@ public final class BuyGoodsScRspOuterClass {
}
}
case 96: {
- // goodsId
- goodsId = input.readUInt32();
+ // retcode
+ retcode = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 10) {
+ if (tag != 18) {
break;
}
}
- case 10: {
+ case 18: {
// returnItemList
input.readMessage(returnItemList);
bitField0_ |= 0x00000010;
@@ -454,16 +454,16 @@ public final class BuyGoodsScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.goodsId, goodsId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.goodsBuyTimes, goodsBuyTimes);
- }
- if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.shopId, shopId);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeUInt32(FieldNames.goodsBuyTimes, goodsBuyTimes);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.goodsId, goodsId);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000010) != 0) {
output.writeMessage(FieldNames.returnItemList, returnItemList);
@@ -478,10 +478,11 @@ public final class BuyGoodsScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case 207037201:
+ case 2123207332: {
+ if (input.isAtField(FieldNames.goodsId)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ goodsId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -489,23 +490,23 @@ public final class BuyGoodsScRspOuterClass {
}
break;
}
- case -1410858538:
- case -230536540: {
- if (input.isAtField(FieldNames.goodsBuyTimes)) {
- if (!input.trySkipNullValue()) {
- goodsBuyTimes = input.readUInt32();
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case -903151951:
case 2067081988: {
if (input.isAtField(FieldNames.shopId)) {
if (!input.trySkipNullValue()) {
shopId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -1410858538:
+ case -230536540: {
+ if (input.isAtField(FieldNames.goodsBuyTimes)) {
+ if (!input.trySkipNullValue()) {
+ goodsBuyTimes = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -513,11 +514,10 @@ public final class BuyGoodsScRspOuterClass {
}
break;
}
- case 207037201:
- case 2123207332: {
- if (input.isAtField(FieldNames.goodsId)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- goodsId = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000008;
}
} else {
@@ -589,13 +589,13 @@ public final class BuyGoodsScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName retcode = FieldName.forField("retcode");
-
- static final FieldName goodsBuyTimes = FieldName.forField("goodsBuyTimes", "goods_buy_times");
+ static final FieldName goodsId = FieldName.forField("goodsId", "goods_id");
static final FieldName shopId = FieldName.forField("shopId", "shop_id");
- static final FieldName goodsId = FieldName.forField("goodsId", "goods_id");
+ static final FieldName goodsBuyTimes = FieldName.forField("goodsBuyTimes", "goods_buy_times");
+
+ static final FieldName retcode = FieldName.forField("retcode");
static final FieldName returnItemList = FieldName.forField("returnItemList", "return_item_list");
}
diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java
index 2c76e98..0a3f0fe 100644
--- a/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java
@@ -18,38 +18,38 @@ public final class ChallengeInfoOuterClass {
public static final class ChallengeInfo extends ProtoMessageoptional uint32 score = 2;
+ */
+ private int score;
+
/**
* optional uint32 score_two = 4;
*/
private int scoreTwo;
- /**
- * optional uint32 challenge_id = 9;
- */
- private int challengeId;
-
- /**
- * optional uint32 score = 12;
- */
- private int score;
-
/**
* optional uint32 round_count = 13;
*/
private int roundCount;
/**
- * optional .ExtraLineupType extra_lineup_type = 1;
+ * optional uint32 challenge_id = 14;
*/
- private int extraLineupType;
+ private int challengeId;
/**
- * optional .ChallengeStatus status = 11;
+ * optional .ChallengeStatus status = 6;
*/
private int status;
/**
- * optional .ChallengeStoryInfo story_info = 3;
+ * optional .ExtraLineupType extra_lineup_type = 12;
+ */
+ private int extraLineupType;
+
+ /**
+ * optional .ChallengeStoryInfo story_info = 9;
*/
private final ChallengeStoryInfoOuterClass.ChallengeStoryInfo storyInfo = ChallengeStoryInfoOuterClass.ChallengeStoryInfo.newInstance();
@@ -63,12 +63,49 @@ public final class ChallengeInfoOuterClass {
return new ChallengeInfo();
}
+ /**
+ * optional uint32 score = 2;
+ * @return whether the score field is set
+ */
+ public boolean hasScore() {
+ return (bitField0_ & 0x00000001) != 0;
+ }
+
+ /**
+ * optional uint32 score = 2;
+ * @return this
+ */
+ public ChallengeInfo clearScore() {
+ bitField0_ &= ~0x00000001;
+ score = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 score = 2;
+ * @return the score
+ */
+ public int getScore() {
+ return score;
+ }
+
+ /**
+ * optional uint32 score = 2;
+ * @param value the score to set
+ * @return this
+ */
+ public ChallengeInfo setScore(final int value) {
+ bitField0_ |= 0x00000001;
+ score = value;
+ return this;
+ }
+
/**
* optional uint32 score_two = 4;
* @return whether the scoreTwo field is set
*/
public boolean hasScoreTwo() {
- return (bitField0_ & 0x00000001) != 0;
+ return (bitField0_ & 0x00000002) != 0;
}
/**
@@ -76,7 +113,7 @@ public final class ChallengeInfoOuterClass {
* @return this
*/
public ChallengeInfo clearScoreTwo() {
- bitField0_ &= ~0x00000001;
+ bitField0_ &= ~0x00000002;
scoreTwo = 0;
return this;
}
@@ -95,82 +132,8 @@ public final class ChallengeInfoOuterClass {
* @return this
*/
public ChallengeInfo setScoreTwo(final int value) {
- bitField0_ |= 0x00000001;
- scoreTwo = value;
- return this;
- }
-
- /**
- * optional uint32 challenge_id = 9;
- * @return whether the challengeId field is set
- */
- public boolean hasChallengeId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 challenge_id = 9;
- * @return this
- */
- public ChallengeInfo clearChallengeId() {
- bitField0_ &= ~0x00000002;
- challengeId = 0;
- return this;
- }
-
- /**
- * optional uint32 challenge_id = 9;
- * @return the challengeId
- */
- public int getChallengeId() {
- return challengeId;
- }
-
- /**
- * optional uint32 challenge_id = 9;
- * @param value the challengeId to set
- * @return this
- */
- public ChallengeInfo setChallengeId(final int value) {
bitField0_ |= 0x00000002;
- challengeId = value;
- return this;
- }
-
- /**
- * optional uint32 score = 12;
- * @return whether the score field is set
- */
- public boolean hasScore() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 score = 12;
- * @return this
- */
- public ChallengeInfo clearScore() {
- bitField0_ &= ~0x00000004;
- score = 0;
- return this;
- }
-
- /**
- * optional uint32 score = 12;
- * @return the score
- */
- public int getScore() {
- return score;
- }
-
- /**
- * optional uint32 score = 12;
- * @param value the score to set
- * @return this
- */
- public ChallengeInfo setScore(final int value) {
- bitField0_ |= 0x00000004;
- score = value;
+ scoreTwo = value;
return this;
}
@@ -179,7 +142,7 @@ public final class ChallengeInfoOuterClass {
* @return whether the roundCount field is set
*/
public boolean hasRoundCount() {
- return (bitField0_ & 0x00000008) != 0;
+ return (bitField0_ & 0x00000004) != 0;
}
/**
@@ -187,7 +150,7 @@ public final class ChallengeInfoOuterClass {
* @return this
*/
public ChallengeInfo clearRoundCount() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000004;
roundCount = 0;
return this;
}
@@ -206,93 +169,68 @@ public final class ChallengeInfoOuterClass {
* @return this
*/
public ChallengeInfo setRoundCount(final int value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
roundCount = value;
return this;
}
/**
- * optional .ExtraLineupType extra_lineup_type = 1;
- * @return whether the extraLineupType field is set
+ * optional uint32 challenge_id = 14;
+ * @return whether the challengeId field is set
*/
- public boolean hasExtraLineupType() {
+ public boolean hasChallengeId() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional uint32 challenge_id = 14;
+ * @return this
+ */
+ public ChallengeInfo clearChallengeId() {
+ bitField0_ &= ~0x00000008;
+ challengeId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 challenge_id = 14;
+ * @return the challengeId
+ */
+ public int getChallengeId() {
+ return challengeId;
+ }
+
+ /**
+ * optional uint32 challenge_id = 14;
+ * @param value the challengeId to set
+ * @return this
+ */
+ public ChallengeInfo setChallengeId(final int value) {
+ bitField0_ |= 0x00000008;
+ challengeId = value;
+ return this;
+ }
+
+ /**
+ * optional .ChallengeStatus status = 6;
+ * @return whether the status field is set
+ */
+ public boolean hasStatus() {
return (bitField0_ & 0x00000010) != 0;
}
/**
- * optional .ExtraLineupType extra_lineup_type = 1;
- * @return this
- */
- public ChallengeInfo clearExtraLineupType() {
- bitField0_ &= ~0x00000010;
- extraLineupType = 0;
- return this;
- }
-
- /**
- * optional .ExtraLineupType extra_lineup_type = 1;
- * @return the extraLineupType
- */
- public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() {
- return ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(extraLineupType);
- }
-
- /**
- * Gets the value of the internal enum store. The result is
- * equivalent to {@link ChallengeInfo#getExtraLineupType()}.getNumber().
- *
- * @return numeric wire representation
- */
- public int getExtraLineupTypeValue() {
- return extraLineupType;
- }
-
- /**
- * Sets the value of the internal enum store. This does not
- * do any validity checks, so be sure to use appropriate value
- * constants from {@link ExtraLineupTypeOuterClass.ExtraLineupType}. Setting an invalid value
- * can cause {@link ChallengeInfo#getExtraLineupType()} to return null
- *
- * @param value the numeric wire value to set
- * @return this
- */
- public ChallengeInfo setExtraLineupTypeValue(final int value) {
- bitField0_ |= 0x00000010;
- extraLineupType = value;
- return this;
- }
-
- /**
- * optional .ExtraLineupType extra_lineup_type = 1;
- * @param value the extraLineupType to set
- * @return this
- */
- public ChallengeInfo setExtraLineupType(final ExtraLineupTypeOuterClass.ExtraLineupType value) {
- bitField0_ |= 0x00000010;
- extraLineupType = value.getNumber();
- return this;
- }
-
- /**
- * optional .ChallengeStatus status = 11;
- * @return whether the status field is set
- */
- public boolean hasStatus() {
- return (bitField0_ & 0x00000020) != 0;
- }
-
- /**
- * optional .ChallengeStatus status = 11;
+ * optional .ChallengeStatus status = 6;
* @return this
*/
public ChallengeInfo clearStatus() {
- bitField0_ &= ~0x00000020;
+ bitField0_ &= ~0x00000010;
status = 0;
return this;
}
/**
- * optional .ChallengeStatus status = 11;
+ * optional .ChallengeStatus status = 6;
* @return the status
*/
public ChallengeStatusOuterClass.ChallengeStatus getStatus() {
@@ -319,24 +257,86 @@ public final class ChallengeInfoOuterClass {
* @return this
*/
public ChallengeInfo setStatusValue(final int value) {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
status = value;
return this;
}
/**
- * optional .ChallengeStatus status = 11;
+ * optional .ChallengeStatus status = 6;
* @param value the status to set
* @return this
*/
public ChallengeInfo setStatus(final ChallengeStatusOuterClass.ChallengeStatus value) {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
status = value.getNumber();
return this;
}
/**
- * optional .ChallengeStoryInfo story_info = 3;
+ * optional .ExtraLineupType extra_lineup_type = 12;
+ * @return whether the extraLineupType field is set
+ */
+ public boolean hasExtraLineupType() {
+ return (bitField0_ & 0x00000020) != 0;
+ }
+
+ /**
+ * optional .ExtraLineupType extra_lineup_type = 12;
+ * @return this
+ */
+ public ChallengeInfo clearExtraLineupType() {
+ bitField0_ &= ~0x00000020;
+ extraLineupType = 0;
+ return this;
+ }
+
+ /**
+ * optional .ExtraLineupType extra_lineup_type = 12;
+ * @return the extraLineupType
+ */
+ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() {
+ return ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(extraLineupType);
+ }
+
+ /**
+ * Gets the value of the internal enum store. The result is
+ * equivalent to {@link ChallengeInfo#getExtraLineupType()}.getNumber().
+ *
+ * @return numeric wire representation
+ */
+ public int getExtraLineupTypeValue() {
+ return extraLineupType;
+ }
+
+ /**
+ * Sets the value of the internal enum store. This does not
+ * do any validity checks, so be sure to use appropriate value
+ * constants from {@link ExtraLineupTypeOuterClass.ExtraLineupType}. Setting an invalid value
+ * can cause {@link ChallengeInfo#getExtraLineupType()} to return null
+ *
+ * @param value the numeric wire value to set
+ * @return this
+ */
+ public ChallengeInfo setExtraLineupTypeValue(final int value) {
+ bitField0_ |= 0x00000020;
+ extraLineupType = value;
+ return this;
+ }
+
+ /**
+ * optional .ExtraLineupType extra_lineup_type = 12;
+ * @param value the extraLineupType to set
+ * @return this
+ */
+ public ChallengeInfo setExtraLineupType(final ExtraLineupTypeOuterClass.ExtraLineupType value) {
+ bitField0_ |= 0x00000020;
+ extraLineupType = value.getNumber();
+ return this;
+ }
+
+ /**
+ * optional .ChallengeStoryInfo story_info = 9;
* @return whether the storyInfo field is set
*/
public boolean hasStoryInfo() {
@@ -344,7 +344,7 @@ public final class ChallengeInfoOuterClass {
}
/**
- * optional .ChallengeStoryInfo story_info = 3;
+ * optional .ChallengeStoryInfo story_info = 9;
* @return this
*/
public ChallengeInfo clearStoryInfo() {
@@ -354,7 +354,7 @@ public final class ChallengeInfoOuterClass {
}
/**
- * optional .ChallengeStoryInfo story_info = 3;
+ * optional .ChallengeStoryInfo story_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.
@@ -368,7 +368,7 @@ public final class ChallengeInfoOuterClass {
}
/**
- * optional .ChallengeStoryInfo story_info = 3;
+ * optional .ChallengeStoryInfo story_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
@@ -382,7 +382,7 @@ public final class ChallengeInfoOuterClass {
}
/**
- * optional .ChallengeStoryInfo story_info = 3;
+ * optional .ChallengeStoryInfo story_info = 9;
* @param value the storyInfo to set
* @return this
*/
@@ -397,12 +397,12 @@ public final class ChallengeInfoOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- scoreTwo = other.scoreTwo;
- challengeId = other.challengeId;
score = other.score;
+ scoreTwo = other.scoreTwo;
roundCount = other.roundCount;
- extraLineupType = other.extraLineupType;
+ challengeId = other.challengeId;
status = other.status;
+ extraLineupType = other.extraLineupType;
storyInfo.copyFrom(other.storyInfo);
}
return this;
@@ -414,24 +414,24 @@ public final class ChallengeInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasScoreTwo()) {
- setScoreTwo(other.scoreTwo);
- }
- if (other.hasChallengeId()) {
- setChallengeId(other.challengeId);
- }
if (other.hasScore()) {
setScore(other.score);
}
+ if (other.hasScoreTwo()) {
+ setScoreTwo(other.scoreTwo);
+ }
if (other.hasRoundCount()) {
setRoundCount(other.roundCount);
}
- if (other.hasExtraLineupType()) {
- setExtraLineupTypeValue(other.extraLineupType);
+ if (other.hasChallengeId()) {
+ setChallengeId(other.challengeId);
}
if (other.hasStatus()) {
setStatusValue(other.status);
}
+ if (other.hasExtraLineupType()) {
+ setExtraLineupTypeValue(other.extraLineupType);
+ }
if (other.hasStoryInfo()) {
getMutableStoryInfo().mergeFrom(other.storyInfo);
}
@@ -445,12 +445,12 @@ public final class ChallengeInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- scoreTwo = 0;
- challengeId = 0;
score = 0;
+ scoreTwo = 0;
roundCount = 0;
- extraLineupType = 0;
+ challengeId = 0;
status = 0;
+ extraLineupType = 0;
storyInfo.clear();
return this;
}
@@ -476,43 +476,43 @@ public final class ChallengeInfoOuterClass {
}
ChallengeInfo other = (ChallengeInfo) o;
return bitField0_ == other.bitField0_
- && (!hasScoreTwo() || scoreTwo == other.scoreTwo)
- && (!hasChallengeId() || challengeId == other.challengeId)
&& (!hasScore() || score == other.score)
+ && (!hasScoreTwo() || scoreTwo == other.scoreTwo)
&& (!hasRoundCount() || roundCount == other.roundCount)
- && (!hasExtraLineupType() || extraLineupType == other.extraLineupType)
+ && (!hasChallengeId() || challengeId == other.challengeId)
&& (!hasStatus() || status == other.status)
+ && (!hasExtraLineupType() || extraLineupType == other.extraLineupType)
&& (!hasStoryInfo() || storyInfo.equals(other.storyInfo));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
+ output.writeRawByte((byte) 16);
+ output.writeUInt32NoTag(score);
+ }
+ if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 32);
output.writeUInt32NoTag(scoreTwo);
}
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 72);
- output.writeUInt32NoTag(challengeId);
- }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 96);
- output.writeUInt32NoTag(score);
- }
- if ((bitField0_ & 0x00000008) != 0) {
output.writeRawByte((byte) 104);
output.writeUInt32NoTag(roundCount);
}
- if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 8);
- output.writeEnumNoTag(extraLineupType);
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeRawByte((byte) 112);
+ output.writeUInt32NoTag(challengeId);
}
- if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 88);
+ if ((bitField0_ & 0x00000010) != 0) {
+ output.writeRawByte((byte) 48);
output.writeEnumNoTag(status);
}
+ if ((bitField0_ & 0x00000020) != 0) {
+ output.writeRawByte((byte) 96);
+ output.writeEnumNoTag(extraLineupType);
+ }
if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawByte((byte) 26);
+ output.writeRawByte((byte) 74);
output.writeMessageNoTag(storyInfo);
}
}
@@ -521,22 +521,22 @@ public final class ChallengeInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId);
- }
- if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(score);
}
- if ((bitField0_ & 0x00000008) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(roundCount);
}
+ if ((bitField0_ & 0x00000008) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId);
+ }
if ((bitField0_ & 0x00000010) != 0) {
- size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType);
+ size += 1 + ProtoSink.computeEnumSizeNoTag(status);
}
if ((bitField0_ & 0x00000020) != 0) {
- size += 1 + ProtoSink.computeEnumSizeNoTag(status);
+ size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType);
}
if ((bitField0_ & 0x00000040) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(storyInfo);
@@ -551,29 +551,20 @@ public final class ChallengeInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
+ case 16: {
+ // score
+ score = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 32) {
+ break;
+ }
+ }
case 32: {
// scoreTwo
scoreTwo = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 72) {
- break;
- }
- }
- case 72: {
- // challengeId
- challengeId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 96) {
- break;
- }
- }
- case 96: {
- // score
- score = input.readUInt32();
- bitField0_ |= 0x00000004;
- tag = input.readTag();
if (tag != 104) {
break;
}
@@ -581,37 +572,46 @@ public final class ChallengeInfoOuterClass {
case 104: {
// roundCount
roundCount = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 112) {
+ break;
+ }
+ }
+ case 112: {
+ // challengeId
+ challengeId = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 8) {
+ if (tag != 48) {
break;
}
}
- case 8: {
- // extraLineupType
- final int value = input.readInt32();
- if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) {
- extraLineupType = value;
- bitField0_ |= 0x00000010;
- }
- tag = input.readTag();
- if (tag != 88) {
- break;
- }
- }
- case 88: {
+ case 48: {
// status
final int value = input.readInt32();
if (ChallengeStatusOuterClass.ChallengeStatus.forNumber(value) != null) {
status = value;
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
}
tag = input.readTag();
- if (tag != 26) {
+ if (tag != 96) {
break;
}
}
- case 26: {
+ case 96: {
+ // extraLineupType
+ final int value = input.readInt32();
+ if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) {
+ extraLineupType = value;
+ bitField0_ |= 0x00000020;
+ }
+ tag = input.readTag();
+ if (tag != 74) {
+ break;
+ }
+ }
+ case 74: {
// storyInfo
input.readMessage(storyInfo);
bitField0_ |= 0x00000040;
@@ -638,22 +638,22 @@ public final class ChallengeInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.scoreTwo, scoreTwo);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.challengeId, challengeId);
- }
- if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.score, score);
}
- if ((bitField0_ & 0x00000008) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeUInt32(FieldNames.scoreTwo, scoreTwo);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.roundCount, roundCount);
}
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeUInt32(FieldNames.challengeId, challengeId);
+ }
if ((bitField0_ & 0x00000010) != 0) {
- output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter());
+ output.writeEnum(FieldNames.status, status, ChallengeStatusOuterClass.ChallengeStatus.converter());
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeEnum(FieldNames.status, status, ChallengeStatusOuterClass.ChallengeStatus.converter());
+ output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter());
}
if ((bitField0_ & 0x00000040) != 0) {
output.writeMessage(FieldNames.storyInfo, storyInfo);
@@ -668,11 +668,10 @@ public final class ChallengeInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -485512614:
- case 2129303327: {
- if (input.isAtField(FieldNames.scoreTwo)) {
+ case 109264530: {
+ if (input.isAtField(FieldNames.score)) {
if (!input.trySkipNullValue()) {
- scoreTwo = input.readUInt32();
+ score = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -680,11 +679,11 @@ public final class ChallengeInfoOuterClass {
}
break;
}
- case -689112866:
- case 112359031: {
- if (input.isAtField(FieldNames.challengeId)) {
+ case -485512614:
+ case 2129303327: {
+ if (input.isAtField(FieldNames.scoreTwo)) {
if (!input.trySkipNullValue()) {
- challengeId = input.readUInt32();
+ scoreTwo = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -692,22 +691,23 @@ public final class ChallengeInfoOuterClass {
}
break;
}
- case 109264530: {
- if (input.isAtField(FieldNames.score)) {
- if (!input.trySkipNullValue()) {
- score = input.readUInt32();
- bitField0_ |= 0x00000004;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case -171935711:
case -244677858: {
if (input.isAtField(FieldNames.roundCount)) {
if (!input.trySkipNullValue()) {
roundCount = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -689112866:
+ case 112359031: {
+ if (input.isAtField(FieldNames.challengeId)) {
+ if (!input.trySkipNullValue()) {
+ challengeId = input.readUInt32();
bitField0_ |= 0x00000008;
}
} else {
@@ -715,6 +715,22 @@ public final class ChallengeInfoOuterClass {
}
break;
}
+ case -892481550: {
+ if (input.isAtField(FieldNames.status)) {
+ if (!input.trySkipNullValue()) {
+ final ChallengeStatusOuterClass.ChallengeStatus value = input.readEnum(ChallengeStatusOuterClass.ChallengeStatus.converter());
+ if (value != null) {
+ status = value.getNumber();
+ bitField0_ |= 0x00000010;
+ } else {
+ input.skipUnknownEnumValue();
+ }
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case -468135527:
case -1144475077: {
if (input.isAtField(FieldNames.extraLineupType)) {
@@ -722,22 +738,6 @@ public final class ChallengeInfoOuterClass {
final ExtraLineupTypeOuterClass.ExtraLineupType value = input.readEnum(ExtraLineupTypeOuterClass.ExtraLineupType.converter());
if (value != null) {
extraLineupType = value.getNumber();
- bitField0_ |= 0x00000010;
- } else {
- input.skipUnknownEnumValue();
- }
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case -892481550: {
- if (input.isAtField(FieldNames.status)) {
- if (!input.trySkipNullValue()) {
- final ChallengeStatusOuterClass.ChallengeStatus value = input.readEnum(ChallengeStatusOuterClass.ChallengeStatus.converter());
- if (value != null) {
- status = value.getNumber();
bitField0_ |= 0x00000020;
} else {
input.skipUnknownEnumValue();
@@ -812,18 +812,18 @@ public final class ChallengeInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two");
-
- static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id");
-
static final FieldName score = FieldName.forField("score");
+ static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two");
+
static final FieldName roundCount = FieldName.forField("roundCount", "round_count");
- static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type");
+ static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id");
static final FieldName status = FieldName.forField("status");
+ static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type");
+
static final FieldName storyInfo = FieldName.forField("storyInfo", "story_info");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java
index d9c1d21..d3c0134 100644
--- a/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java
@@ -19,7 +19,7 @@ public final class ChallengeLineupNotifyOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .ExtraLineupType extra_lineup_type = 12;
+ * optional .ExtraLineupType extra_lineup_type = 3;
*/
private int extraLineupType;
@@ -34,7 +34,7 @@ public final class ChallengeLineupNotifyOuterClass {
}
/**
- * optional .ExtraLineupType extra_lineup_type = 12;
+ * optional .ExtraLineupType extra_lineup_type = 3;
* @return whether the extraLineupType field is set
*/
public boolean hasExtraLineupType() {
@@ -42,7 +42,7 @@ public final class ChallengeLineupNotifyOuterClass {
}
/**
- * optional .ExtraLineupType extra_lineup_type = 12;
+ * optional .ExtraLineupType extra_lineup_type = 3;
* @return this
*/
public ChallengeLineupNotify clearExtraLineupType() {
@@ -52,7 +52,7 @@ public final class ChallengeLineupNotifyOuterClass {
}
/**
- * optional .ExtraLineupType extra_lineup_type = 12;
+ * optional .ExtraLineupType extra_lineup_type = 3;
* @return the extraLineupType
*/
public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() {
@@ -85,7 +85,7 @@ public final class ChallengeLineupNotifyOuterClass {
}
/**
- * optional .ExtraLineupType extra_lineup_type = 12;
+ * optional .ExtraLineupType extra_lineup_type = 3;
* @param value the extraLineupType to set
* @return this
*/
@@ -155,7 +155,7 @@ public final class ChallengeLineupNotifyOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 24);
output.writeEnumNoTag(extraLineupType);
}
}
@@ -176,7 +176,7 @@ public final class ChallengeLineupNotifyOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 96: {
+ case 24: {
// 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 4e1e42b..71be77c 100644
--- a/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java
@@ -19,25 +19,30 @@ public final class ChallengeOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 taken_reward = 7;
- */
- private int takenReward;
-
- /**
- * optional uint32 score = 9;
- */
- private int score;
-
- /**
- * optional uint32 challenge_id = 10;
+ * optional uint32 challenge_id = 1;
*/
private int challengeId;
/**
- * optional uint32 stars = 13;
+ * optional uint32 GEHGEGOFDDM = 5;
+ */
+ private int gEHGEGOFDDM;
+
+ /**
+ * optional uint32 score = 7;
+ */
+ private int score;
+
+ /**
+ * optional uint32 stars = 8;
*/
private int stars;
+ /**
+ * optional uint32 taken_reward = 13;
+ */
+ private int takenReward;
+
private Challenge() {
}
@@ -49,99 +54,25 @@ public final class ChallengeOuterClass {
}
/**
- * optional uint32 taken_reward = 7;
- * @return whether the takenReward field is set
+ * optional uint32 challenge_id = 1;
+ * @return whether the challengeId field is set
*/
- public boolean hasTakenReward() {
+ public boolean hasChallengeId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 taken_reward = 7;
- * @return this
- */
- public Challenge clearTakenReward() {
- bitField0_ &= ~0x00000001;
- takenReward = 0;
- return this;
- }
-
- /**
- * optional uint32 taken_reward = 7;
- * @return the takenReward
- */
- public int getTakenReward() {
- return takenReward;
- }
-
- /**
- * optional uint32 taken_reward = 7;
- * @param value the takenReward to set
- * @return this
- */
- public Challenge setTakenReward(final int value) {
- bitField0_ |= 0x00000001;
- takenReward = value;
- return this;
- }
-
- /**
- * optional uint32 score = 9;
- * @return whether the score field is set
- */
- public boolean hasScore() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 score = 9;
- * @return this
- */
- public Challenge clearScore() {
- bitField0_ &= ~0x00000002;
- score = 0;
- return this;
- }
-
- /**
- * optional uint32 score = 9;
- * @return the score
- */
- public int getScore() {
- return score;
- }
-
- /**
- * optional uint32 score = 9;
- * @param value the score to set
- * @return this
- */
- public Challenge setScore(final int value) {
- bitField0_ |= 0x00000002;
- score = value;
- return this;
- }
-
- /**
- * optional uint32 challenge_id = 10;
- * @return whether the challengeId field is set
- */
- public boolean hasChallengeId() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 challenge_id = 10;
+ * optional uint32 challenge_id = 1;
* @return this
*/
public Challenge clearChallengeId() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000001;
challengeId = 0;
return this;
}
/**
- * optional uint32 challenge_id = 10;
+ * optional uint32 challenge_id = 1;
* @return the challengeId
*/
public int getChallengeId() {
@@ -149,18 +80,92 @@ public final class ChallengeOuterClass {
}
/**
- * optional uint32 challenge_id = 10;
+ * optional uint32 challenge_id = 1;
* @param value the challengeId to set
* @return this
*/
public Challenge setChallengeId(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
challengeId = value;
return this;
}
/**
- * optional uint32 stars = 13;
+ * optional uint32 GEHGEGOFDDM = 5;
+ * @return whether the gEHGEGOFDDM field is set
+ */
+ public boolean hasGEHGEGOFDDM() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 GEHGEGOFDDM = 5;
+ * @return this
+ */
+ public Challenge clearGEHGEGOFDDM() {
+ bitField0_ &= ~0x00000002;
+ gEHGEGOFDDM = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 GEHGEGOFDDM = 5;
+ * @return the gEHGEGOFDDM
+ */
+ public int getGEHGEGOFDDM() {
+ return gEHGEGOFDDM;
+ }
+
+ /**
+ * optional uint32 GEHGEGOFDDM = 5;
+ * @param value the gEHGEGOFDDM to set
+ * @return this
+ */
+ public Challenge setGEHGEGOFDDM(final int value) {
+ bitField0_ |= 0x00000002;
+ gEHGEGOFDDM = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 score = 7;
+ * @return whether the score field is set
+ */
+ public boolean hasScore() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 score = 7;
+ * @return this
+ */
+ public Challenge clearScore() {
+ bitField0_ &= ~0x00000004;
+ score = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 score = 7;
+ * @return the score
+ */
+ public int getScore() {
+ return score;
+ }
+
+ /**
+ * optional uint32 score = 7;
+ * @param value the score to set
+ * @return this
+ */
+ public Challenge setScore(final int value) {
+ bitField0_ |= 0x00000004;
+ score = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 stars = 8;
* @return whether the stars field is set
*/
public boolean hasStars() {
@@ -168,7 +173,7 @@ public final class ChallengeOuterClass {
}
/**
- * optional uint32 stars = 13;
+ * optional uint32 stars = 8;
* @return this
*/
public Challenge clearStars() {
@@ -178,7 +183,7 @@ public final class ChallengeOuterClass {
}
/**
- * optional uint32 stars = 13;
+ * optional uint32 stars = 8;
* @return the stars
*/
public int getStars() {
@@ -186,7 +191,7 @@ public final class ChallengeOuterClass {
}
/**
- * optional uint32 stars = 13;
+ * optional uint32 stars = 8;
* @param value the stars to set
* @return this
*/
@@ -196,15 +201,53 @@ public final class ChallengeOuterClass {
return this;
}
+ /**
+ * optional uint32 taken_reward = 13;
+ * @return whether the takenReward field is set
+ */
+ public boolean hasTakenReward() {
+ return (bitField0_ & 0x00000010) != 0;
+ }
+
+ /**
+ * optional uint32 taken_reward = 13;
+ * @return this
+ */
+ public Challenge clearTakenReward() {
+ bitField0_ &= ~0x00000010;
+ takenReward = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 taken_reward = 13;
+ * @return the takenReward
+ */
+ public int getTakenReward() {
+ return takenReward;
+ }
+
+ /**
+ * optional uint32 taken_reward = 13;
+ * @param value the takenReward to set
+ * @return this
+ */
+ public Challenge setTakenReward(final int value) {
+ bitField0_ |= 0x00000010;
+ takenReward = value;
+ return this;
+ }
+
@Override
public Challenge copyFrom(final Challenge other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- takenReward = other.takenReward;
- score = other.score;
challengeId = other.challengeId;
+ gEHGEGOFDDM = other.gEHGEGOFDDM;
+ score = other.score;
stars = other.stars;
+ takenReward = other.takenReward;
}
return this;
}
@@ -215,18 +258,21 @@ public final class ChallengeOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasTakenReward()) {
- setTakenReward(other.takenReward);
+ if (other.hasChallengeId()) {
+ setChallengeId(other.challengeId);
+ }
+ if (other.hasGEHGEGOFDDM()) {
+ setGEHGEGOFDDM(other.gEHGEGOFDDM);
}
if (other.hasScore()) {
setScore(other.score);
}
- if (other.hasChallengeId()) {
- setChallengeId(other.challengeId);
- }
if (other.hasStars()) {
setStars(other.stars);
}
+ if (other.hasTakenReward()) {
+ setTakenReward(other.takenReward);
+ }
return this;
}
@@ -237,10 +283,11 @@ public final class ChallengeOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- takenReward = 0;
- score = 0;
challengeId = 0;
+ gEHGEGOFDDM = 0;
+ score = 0;
stars = 0;
+ takenReward = 0;
return this;
}
@@ -264,47 +311,55 @@ public final class ChallengeOuterClass {
}
Challenge other = (Challenge) o;
return bitField0_ == other.bitField0_
- && (!hasTakenReward() || takenReward == other.takenReward)
- && (!hasScore() || score == other.score)
&& (!hasChallengeId() || challengeId == other.challengeId)
- && (!hasStars() || stars == other.stars);
+ && (!hasGEHGEGOFDDM() || gEHGEGOFDDM == other.gEHGEGOFDDM)
+ && (!hasScore() || score == other.score)
+ && (!hasStars() || stars == other.stars)
+ && (!hasTakenReward() || takenReward == other.takenReward);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
- output.writeUInt32NoTag(takenReward);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 72);
- output.writeUInt32NoTag(score);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(challengeId);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 40);
+ output.writeUInt32NoTag(gEHGEGOFDDM);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 56);
+ output.writeUInt32NoTag(score);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(stars);
}
+ if ((bitField0_ & 0x00000010) != 0) {
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(takenReward);
+ }
}
@Override
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(takenReward);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(score);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(gEHGEGOFDDM);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(score);
}
if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(stars);
}
+ if ((bitField0_ & 0x00000010) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(takenReward);
+ }
return size;
}
@@ -315,37 +370,46 @@ public final class ChallengeOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
- // takenReward
- takenReward = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 72) {
- break;
- }
- }
- case 72: {
- // score
- score = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 80) {
- break;
- }
- }
- case 80: {
+ case 8: {
// challengeId
challengeId = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 40) {
+ break;
+ }
+ }
+ case 40: {
+ // gEHGEGOFDDM
+ gEHGEGOFDDM = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 56) {
+ break;
+ }
+ }
+ case 56: {
+ // score
+ score = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
+ if (tag != 64) {
+ break;
+ }
+ }
+ case 64: {
+ // stars
+ stars = input.readUInt32();
+ bitField0_ |= 0x00000008;
+ tag = input.readTag();
if (tag != 104) {
break;
}
}
case 104: {
- // stars
- stars = input.readUInt32();
- bitField0_ |= 0x00000008;
+ // takenReward
+ takenReward = input.readUInt32();
+ bitField0_ |= 0x00000010;
tag = input.readTag();
if (tag != 0) {
break;
@@ -369,17 +433,20 @@ public final class ChallengeOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.takenReward, takenReward);
+ output.writeUInt32(FieldNames.challengeId, challengeId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.score, score);
+ output.writeUInt32(FieldNames.gEHGEGOFDDM, gEHGEGOFDDM);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.challengeId, challengeId);
+ output.writeUInt32(FieldNames.score, score);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeUInt32(FieldNames.stars, stars);
}
+ if ((bitField0_ & 0x00000010) != 0) {
+ output.writeUInt32(FieldNames.takenReward, takenReward);
+ }
output.endObject();
}
@@ -390,11 +457,11 @@ public final class ChallengeOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 1216849622:
- case -1923526233: {
- if (input.isAtField(FieldNames.takenReward)) {
+ case -689112866:
+ case 112359031: {
+ if (input.isAtField(FieldNames.challengeId)) {
if (!input.trySkipNullValue()) {
- takenReward = input.readUInt32();
+ challengeId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -402,22 +469,21 @@ public final class ChallengeOuterClass {
}
break;
}
+ case 1704714807: {
+ if (input.isAtField(FieldNames.gEHGEGOFDDM)) {
+ if (!input.trySkipNullValue()) {
+ gEHGEGOFDDM = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case 109264530: {
if (input.isAtField(FieldNames.score)) {
if (!input.trySkipNullValue()) {
score = input.readUInt32();
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case -689112866:
- case 112359031: {
- if (input.isAtField(FieldNames.challengeId)) {
- if (!input.trySkipNullValue()) {
- challengeId = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -436,6 +502,18 @@ public final class ChallengeOuterClass {
}
break;
}
+ case 1216849622:
+ case -1923526233: {
+ if (input.isAtField(FieldNames.takenReward)) {
+ if (!input.trySkipNullValue()) {
+ takenReward = input.readUInt32();
+ bitField0_ |= 0x00000010;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
default: {
input.skipUnknownField();
break;
@@ -488,13 +566,15 @@ public final class ChallengeOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName takenReward = FieldName.forField("takenReward", "taken_reward");
+ static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id");
+
+ static final FieldName gEHGEGOFDDM = FieldName.forField("GEHGEGOFDDM");
static final FieldName score = FieldName.forField("score");
- static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id");
-
static final FieldName stars = FieldName.forField("stars");
+
+ static final FieldName takenReward = FieldName.forField("takenReward", "taken_reward");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeRewardOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeRewardOuterClass.java
index 2b962ab..9d12121 100644
--- a/src/generated/main/emu/lunarcore/proto/ChallengeRewardOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChallengeRewardOuterClass.java
@@ -19,12 +19,12 @@ public final class ChallengeRewardOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint64 taken_challenge_reward = 10;
+ * optional uint64 taken_challenge_reward = 11;
*/
private long takenChallengeReward;
/**
- * optional uint32 group_id = 12;
+ * optional uint32 group_id = 4;
*/
private int groupId;
@@ -39,7 +39,7 @@ public final class ChallengeRewardOuterClass {
}
/**
- * optional uint64 taken_challenge_reward = 10;
+ * optional uint64 taken_challenge_reward = 11;
* @return whether the takenChallengeReward field is set
*/
public boolean hasTakenChallengeReward() {
@@ -47,7 +47,7 @@ public final class ChallengeRewardOuterClass {
}
/**
- * optional uint64 taken_challenge_reward = 10;
+ * optional uint64 taken_challenge_reward = 11;
* @return this
*/
public ChallengeReward clearTakenChallengeReward() {
@@ -57,7 +57,7 @@ public final class ChallengeRewardOuterClass {
}
/**
- * optional uint64 taken_challenge_reward = 10;
+ * optional uint64 taken_challenge_reward = 11;
* @return the takenChallengeReward
*/
public long getTakenChallengeReward() {
@@ -65,7 +65,7 @@ public final class ChallengeRewardOuterClass {
}
/**
- * optional uint64 taken_challenge_reward = 10;
+ * optional uint64 taken_challenge_reward = 11;
* @param value the takenChallengeReward to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class ChallengeRewardOuterClass {
}
/**
- * optional uint32 group_id = 12;
+ * optional uint32 group_id = 4;
* @return whether the groupId field is set
*/
public boolean hasGroupId() {
@@ -84,7 +84,7 @@ public final class ChallengeRewardOuterClass {
}
/**
- * optional uint32 group_id = 12;
+ * optional uint32 group_id = 4;
* @return this
*/
public ChallengeReward clearGroupId() {
@@ -94,7 +94,7 @@ public final class ChallengeRewardOuterClass {
}
/**
- * optional uint32 group_id = 12;
+ * optional uint32 group_id = 4;
* @return the groupId
*/
public int getGroupId() {
@@ -102,7 +102,7 @@ public final class ChallengeRewardOuterClass {
}
/**
- * optional uint32 group_id = 12;
+ * optional uint32 group_id = 4;
* @param value the groupId to set
* @return this
*/
@@ -177,11 +177,11 @@ public final class ChallengeRewardOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 88);
output.writeUInt64NoTag(takenChallengeReward);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(groupId);
}
}
@@ -205,16 +205,16 @@ public final class ChallengeRewardOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 80: {
+ case 88: {
// takenChallengeReward
takenChallengeReward = input.readUInt64();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 32) {
break;
}
}
- case 96: {
+ case 32: {
// 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 e7300b3..2449b56 100644
--- a/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java
@@ -19,32 +19,32 @@ public final class ChallengeSettleNotifyOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 challenge_score = 2;
- */
- private int challengeScore;
-
- /**
- * optional uint32 challenge_id = 5;
- */
- private int challengeId;
-
- /**
- * optional uint32 score_two = 10;
- */
- private int scoreTwo;
-
- /**
- * optional uint32 stars = 14;
+ * optional uint32 stars = 1;
*/
private int stars;
/**
- * optional bool is_win = 11;
+ * optional uint32 challenge_id = 3;
+ */
+ private int challengeId;
+
+ /**
+ * optional uint32 challenge_score = 10;
+ */
+ private int challengeScore;
+
+ /**
+ * optional uint32 score_two = 12;
+ */
+ private int scoreTwo;
+
+ /**
+ * optional bool is_win = 5;
*/
private boolean isWin;
/**
- * optional .ItemList reward = 12;
+ * optional .ItemList reward = 14;
*/
private final ItemListOuterClass.ItemList reward = ItemListOuterClass.ItemList.newInstance();
@@ -59,44 +59,44 @@ public final class ChallengeSettleNotifyOuterClass {
}
/**
- * optional uint32 challenge_score = 2;
- * @return whether the challengeScore field is set
+ * optional uint32 stars = 1;
+ * @return whether the stars field is set
*/
- public boolean hasChallengeScore() {
+ public boolean hasStars() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 challenge_score = 2;
+ * optional uint32 stars = 1;
* @return this
*/
- public ChallengeSettleNotify clearChallengeScore() {
+ public ChallengeSettleNotify clearStars() {
bitField0_ &= ~0x00000001;
- challengeScore = 0;
+ stars = 0;
return this;
}
/**
- * optional uint32 challenge_score = 2;
- * @return the challengeScore
+ * optional uint32 stars = 1;
+ * @return the stars
*/
- public int getChallengeScore() {
- return challengeScore;
+ public int getStars() {
+ return stars;
}
/**
- * optional uint32 challenge_score = 2;
- * @param value the challengeScore to set
+ * optional uint32 stars = 1;
+ * @param value the stars to set
* @return this
*/
- public ChallengeSettleNotify setChallengeScore(final int value) {
+ public ChallengeSettleNotify setStars(final int value) {
bitField0_ |= 0x00000001;
- challengeScore = value;
+ stars = value;
return this;
}
/**
- * optional uint32 challenge_id = 5;
+ * optional uint32 challenge_id = 3;
* @return whether the challengeId field is set
*/
public boolean hasChallengeId() {
@@ -104,7 +104,7 @@ public final class ChallengeSettleNotifyOuterClass {
}
/**
- * optional uint32 challenge_id = 5;
+ * optional uint32 challenge_id = 3;
* @return this
*/
public ChallengeSettleNotify clearChallengeId() {
@@ -114,7 +114,7 @@ public final class ChallengeSettleNotifyOuterClass {
}
/**
- * optional uint32 challenge_id = 5;
+ * optional uint32 challenge_id = 3;
* @return the challengeId
*/
public int getChallengeId() {
@@ -122,7 +122,7 @@ public final class ChallengeSettleNotifyOuterClass {
}
/**
- * optional uint32 challenge_id = 5;
+ * optional uint32 challenge_id = 3;
* @param value the challengeId to set
* @return this
*/
@@ -133,25 +133,62 @@ public final class ChallengeSettleNotifyOuterClass {
}
/**
- * optional uint32 score_two = 10;
- * @return whether the scoreTwo field is set
+ * optional uint32 challenge_score = 10;
+ * @return whether the challengeScore field is set
*/
- public boolean hasScoreTwo() {
+ public boolean hasChallengeScore() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 score_two = 10;
+ * optional uint32 challenge_score = 10;
+ * @return this
+ */
+ public ChallengeSettleNotify clearChallengeScore() {
+ bitField0_ &= ~0x00000004;
+ challengeScore = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 challenge_score = 10;
+ * @return the challengeScore
+ */
+ public int getChallengeScore() {
+ return challengeScore;
+ }
+
+ /**
+ * optional uint32 challenge_score = 10;
+ * @param value the challengeScore to set
+ * @return this
+ */
+ public ChallengeSettleNotify setChallengeScore(final int value) {
+ bitField0_ |= 0x00000004;
+ challengeScore = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 score_two = 12;
+ * @return whether the scoreTwo field is set
+ */
+ public boolean hasScoreTwo() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional uint32 score_two = 12;
* @return this
*/
public ChallengeSettleNotify clearScoreTwo() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000008;
scoreTwo = 0;
return this;
}
/**
- * optional uint32 score_two = 10;
+ * optional uint32 score_two = 12;
* @return the scoreTwo
*/
public int getScoreTwo() {
@@ -159,55 +196,18 @@ public final class ChallengeSettleNotifyOuterClass {
}
/**
- * optional uint32 score_two = 10;
+ * optional uint32 score_two = 12;
* @param value the scoreTwo to set
* @return this
*/
public ChallengeSettleNotify setScoreTwo(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000008;
scoreTwo = value;
return this;
}
/**
- * optional uint32 stars = 14;
- * @return whether the stars field is set
- */
- public boolean hasStars() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional uint32 stars = 14;
- * @return this
- */
- public ChallengeSettleNotify clearStars() {
- bitField0_ &= ~0x00000008;
- stars = 0;
- return this;
- }
-
- /**
- * optional uint32 stars = 14;
- * @return the stars
- */
- public int getStars() {
- return stars;
- }
-
- /**
- * optional uint32 stars = 14;
- * @param value the stars to set
- * @return this
- */
- public ChallengeSettleNotify setStars(final int value) {
- bitField0_ |= 0x00000008;
- stars = value;
- return this;
- }
-
- /**
- * optional bool is_win = 11;
+ * optional bool is_win = 5;
* @return whether the isWin field is set
*/
public boolean hasIsWin() {
@@ -215,7 +215,7 @@ public final class ChallengeSettleNotifyOuterClass {
}
/**
- * optional bool is_win = 11;
+ * optional bool is_win = 5;
* @return this
*/
public ChallengeSettleNotify clearIsWin() {
@@ -225,7 +225,7 @@ public final class ChallengeSettleNotifyOuterClass {
}
/**
- * optional bool is_win = 11;
+ * optional bool is_win = 5;
* @return the isWin
*/
public boolean getIsWin() {
@@ -233,7 +233,7 @@ public final class ChallengeSettleNotifyOuterClass {
}
/**
- * optional bool is_win = 11;
+ * optional bool is_win = 5;
* @param value the isWin to set
* @return this
*/
@@ -244,7 +244,7 @@ public final class ChallengeSettleNotifyOuterClass {
}
/**
- * optional .ItemList reward = 12;
+ * optional .ItemList reward = 14;
* @return whether the reward field is set
*/
public boolean hasReward() {
@@ -252,7 +252,7 @@ public final class ChallengeSettleNotifyOuterClass {
}
/**
- * optional .ItemList reward = 12;
+ * optional .ItemList reward = 14;
* @return this
*/
public ChallengeSettleNotify clearReward() {
@@ -262,7 +262,7 @@ public final class ChallengeSettleNotifyOuterClass {
}
/**
- * optional .ItemList reward = 12;
+ * optional .ItemList reward = 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.
@@ -276,7 +276,7 @@ public final class ChallengeSettleNotifyOuterClass {
}
/**
- * optional .ItemList reward = 12;
+ * optional .ItemList reward = 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
@@ -290,7 +290,7 @@ public final class ChallengeSettleNotifyOuterClass {
}
/**
- * optional .ItemList reward = 12;
+ * optional .ItemList reward = 14;
* @param value the reward to set
* @return this
*/
@@ -305,10 +305,10 @@ public final class ChallengeSettleNotifyOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- challengeScore = other.challengeScore;
- challengeId = other.challengeId;
- scoreTwo = other.scoreTwo;
stars = other.stars;
+ challengeId = other.challengeId;
+ challengeScore = other.challengeScore;
+ scoreTwo = other.scoreTwo;
isWin = other.isWin;
reward.copyFrom(other.reward);
}
@@ -321,18 +321,18 @@ public final class ChallengeSettleNotifyOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasChallengeScore()) {
- setChallengeScore(other.challengeScore);
+ if (other.hasStars()) {
+ setStars(other.stars);
}
if (other.hasChallengeId()) {
setChallengeId(other.challengeId);
}
+ if (other.hasChallengeScore()) {
+ setChallengeScore(other.challengeScore);
+ }
if (other.hasScoreTwo()) {
setScoreTwo(other.scoreTwo);
}
- if (other.hasStars()) {
- setStars(other.stars);
- }
if (other.hasIsWin()) {
setIsWin(other.isWin);
}
@@ -349,10 +349,10 @@ public final class ChallengeSettleNotifyOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- challengeScore = 0;
- challengeId = 0;
- scoreTwo = 0;
stars = 0;
+ challengeId = 0;
+ challengeScore = 0;
+ scoreTwo = 0;
isWin = false;
reward.clear();
return this;
@@ -379,10 +379,10 @@ public final class ChallengeSettleNotifyOuterClass {
}
ChallengeSettleNotify other = (ChallengeSettleNotify) o;
return bitField0_ == other.bitField0_
- && (!hasChallengeScore() || challengeScore == other.challengeScore)
- && (!hasChallengeId() || challengeId == other.challengeId)
- && (!hasScoreTwo() || scoreTwo == other.scoreTwo)
&& (!hasStars() || stars == other.stars)
+ && (!hasChallengeId() || challengeId == other.challengeId)
+ && (!hasChallengeScore() || challengeScore == other.challengeScore)
+ && (!hasScoreTwo() || scoreTwo == other.scoreTwo)
&& (!hasIsWin() || isWin == other.isWin)
&& (!hasReward() || reward.equals(other.reward));
}
@@ -390,27 +390,27 @@ public final class ChallengeSettleNotifyOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(challengeScore);
+ output.writeRawByte((byte) 8);
+ output.writeUInt32NoTag(stars);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(challengeId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(scoreTwo);
+ output.writeUInt32NoTag(challengeScore);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 112);
- output.writeUInt32NoTag(stars);
+ output.writeRawByte((byte) 96);
+ output.writeUInt32NoTag(scoreTwo);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 40);
output.writeBoolNoTag(isWin);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 98);
+ output.writeRawByte((byte) 114);
output.writeMessageNoTag(reward);
}
}
@@ -419,16 +419,16 @@ public final class ChallengeSettleNotifyOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeScore);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(stars);
}
if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeScore);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(stars);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo);
}
if ((bitField0_ & 0x00000010) != 0) {
size += 2;
@@ -446,16 +446,16 @@ public final class ChallengeSettleNotifyOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
- // challengeScore
- challengeScore = input.readUInt32();
+ case 8: {
+ // stars
+ stars = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 40) {
+ if (tag != 24) {
break;
}
}
- case 40: {
+ case 24: {
// challengeId
challengeId = input.readUInt32();
bitField0_ |= 0x00000002;
@@ -465,33 +465,33 @@ public final class ChallengeSettleNotifyOuterClass {
}
}
case 80: {
- // scoreTwo
- scoreTwo = input.readUInt32();
+ // challengeScore
+ challengeScore = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 112) {
+ if (tag != 96) {
break;
}
}
- case 112: {
- // stars
- stars = input.readUInt32();
+ case 96: {
+ // scoreTwo
+ scoreTwo = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 88) {
+ if (tag != 40) {
break;
}
}
- case 88: {
+ case 40: {
// isWin
isWin = input.readBool();
bitField0_ |= 0x00000010;
tag = input.readTag();
- if (tag != 98) {
+ if (tag != 114) {
break;
}
}
- case 98: {
+ case 114: {
// reward
input.readMessage(reward);
bitField0_ |= 0x00000020;
@@ -518,16 +518,16 @@ public final class ChallengeSettleNotifyOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.challengeScore, challengeScore);
+ output.writeUInt32(FieldNames.stars, stars);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.challengeId, challengeId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.scoreTwo, scoreTwo);
+ output.writeUInt32(FieldNames.challengeScore, challengeScore);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.stars, stars);
+ output.writeUInt32(FieldNames.scoreTwo, scoreTwo);
}
if ((bitField0_ & 0x00000010) != 0) {
output.writeBool(FieldNames.isWin, isWin);
@@ -545,11 +545,10 @@ public final class ChallengeSettleNotifyOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 591599599:
- case 1517684662: {
- if (input.isAtField(FieldNames.challengeScore)) {
+ case 109757537: {
+ if (input.isAtField(FieldNames.stars)) {
if (!input.trySkipNullValue()) {
- challengeScore = input.readUInt32();
+ stars = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -569,11 +568,11 @@ public final class ChallengeSettleNotifyOuterClass {
}
break;
}
- case -485512614:
- case 2129303327: {
- if (input.isAtField(FieldNames.scoreTwo)) {
+ case 591599599:
+ case 1517684662: {
+ if (input.isAtField(FieldNames.challengeScore)) {
if (!input.trySkipNullValue()) {
- scoreTwo = input.readUInt32();
+ challengeScore = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -581,10 +580,11 @@ public final class ChallengeSettleNotifyOuterClass {
}
break;
}
- case 109757537: {
- if (input.isAtField(FieldNames.stars)) {
+ case -485512614:
+ case 2129303327: {
+ if (input.isAtField(FieldNames.scoreTwo)) {
if (!input.trySkipNullValue()) {
- stars = input.readUInt32();
+ scoreTwo = input.readUInt32();
bitField0_ |= 0x00000008;
}
} else {
@@ -668,13 +668,13 @@ public final class ChallengeSettleNotifyOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName challengeScore = FieldName.forField("challengeScore", "challenge_score");
+ static final FieldName stars = FieldName.forField("stars");
static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id");
- static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two");
+ static final FieldName challengeScore = FieldName.forField("challengeScore", "challenge_score");
- static final FieldName stars = FieldName.forField("stars");
+ static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two");
static final FieldName isWin = FieldName.forField("isWin", "is_win");
diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeStoryBuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeStoryBuffInfoOuterClass.java
index a394ef4..50a25e8 100644
--- a/src/generated/main/emu/lunarcore/proto/ChallengeStoryBuffInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChallengeStoryBuffInfoOuterClass.java
@@ -20,7 +20,7 @@ public final class ChallengeStoryBuffInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated uint32 buff_list = 6;
+ * repeated uint32 buff_list = 1;
*/
private final RepeatedInt buffList = RepeatedInt.newEmptyInstance();
@@ -35,7 +35,7 @@ public final class ChallengeStoryBuffInfoOuterClass {
}
/**
- * repeated uint32 buff_list = 6;
+ * repeated uint32 buff_list = 1;
* @return whether the buffList field is set
*/
public boolean hasBuffList() {
@@ -43,7 +43,7 @@ public final class ChallengeStoryBuffInfoOuterClass {
}
/**
- * repeated uint32 buff_list = 6;
+ * repeated uint32 buff_list = 1;
* @return this
*/
public ChallengeStoryBuffInfo clearBuffList() {
@@ -53,7 +53,7 @@ public final class ChallengeStoryBuffInfoOuterClass {
}
/**
- * repeated uint32 buff_list = 6;
+ * repeated uint32 buff_list = 1;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class ChallengeStoryBuffInfoOuterClass {
}
/**
- * repeated uint32 buff_list = 6;
+ * repeated uint32 buff_list = 1;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class ChallengeStoryBuffInfoOuterClass {
}
/**
- * repeated uint32 buff_list = 6;
+ * repeated uint32 buff_list = 1;
* @param value the buffList to add
* @return this
*/
@@ -92,7 +92,7 @@ public final class ChallengeStoryBuffInfoOuterClass {
}
/**
- * repeated uint32 buff_list = 6;
+ * repeated uint32 buff_list = 1;
* @param values the buffList to add
* @return this
*/
@@ -163,7 +163,7 @@ public final class ChallengeStoryBuffInfoOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < buffList.length(); i++) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(buffList.array()[i]);
}
}
@@ -185,7 +185,7 @@ public final class ChallengeStoryBuffInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 50: {
+ case 10: {
// buffList [packed=true]
input.readPackedUInt32(buffList, tag);
bitField0_ |= 0x00000001;
@@ -204,7 +204,7 @@ public final class ChallengeStoryBuffInfoOuterClass {
tag = input.readTag();
break;
}
- case 48: {
+ case 8: {
// buffList [packed=false]
tag = input.readRepeatedUInt32(buffList, tag);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeStoryInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeStoryInfoOuterClass.java
index 6cba04d..cd8883d 100644
--- a/src/generated/main/emu/lunarcore/proto/ChallengeStoryInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChallengeStoryInfoOuterClass.java
@@ -19,7 +19,7 @@ public final class ChallengeStoryInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .ChallengeStoryBuffInfo cur_story_buffs = 1;
+ * optional .ChallengeStoryBuffInfo cur_story_buffs = 5;
*/
private final ChallengeStoryBuffInfoOuterClass.ChallengeStoryBuffInfo curStoryBuffs = ChallengeStoryBuffInfoOuterClass.ChallengeStoryBuffInfo.newInstance();
@@ -45,7 +45,7 @@ public final class ChallengeStoryInfoOuterClass {
}
/**
- * optional .ChallengeStoryBuffInfo cur_story_buffs = 1;
+ * optional .ChallengeStoryBuffInfo cur_story_buffs = 5;
* @return whether the curStoryBuffs field is set
*/
public boolean hasCurStoryBuffs() {
@@ -53,7 +53,7 @@ public final class ChallengeStoryInfoOuterClass {
}
/**
- * optional .ChallengeStoryBuffInfo cur_story_buffs = 1;
+ * optional .ChallengeStoryBuffInfo cur_story_buffs = 5;
* @return this
*/
public ChallengeStoryInfo clearCurStoryBuffs() {
@@ -63,7 +63,7 @@ public final class ChallengeStoryInfoOuterClass {
}
/**
- * optional .ChallengeStoryBuffInfo cur_story_buffs = 1;
+ * optional .ChallengeStoryBuffInfo cur_story_buffs = 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.
@@ -77,7 +77,7 @@ public final class ChallengeStoryInfoOuterClass {
}
/**
- * optional .ChallengeStoryBuffInfo cur_story_buffs = 1;
+ * optional .ChallengeStoryBuffInfo cur_story_buffs = 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
@@ -91,7 +91,7 @@ public final class ChallengeStoryInfoOuterClass {
}
/**
- * optional .ChallengeStoryBuffInfo cur_story_buffs = 1;
+ * optional .ChallengeStoryBuffInfo cur_story_buffs = 5;
* @param value the curStoryBuffs to set
* @return this
*/
@@ -162,7 +162,7 @@ public final class ChallengeStoryInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 10);
+ output.writeRawByte((byte) 42);
output.writeMessageNoTag(curStoryBuffs);
}
}
@@ -183,7 +183,7 @@ public final class ChallengeStoryInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 10: {
+ case 42: {
// curStoryBuffs
input.readMessage(curStoryBuffs);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java
index 9f0632e..f2f3c62 100644
--- a/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class ChangeLineupLeaderCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 slot = 1;
+ * optional uint32 slot = 14;
*/
private int slot;
@@ -34,7 +34,7 @@ public final class ChangeLineupLeaderCsReqOuterClass {
}
/**
- * optional uint32 slot = 1;
+ * optional uint32 slot = 14;
* @return whether the slot field is set
*/
public boolean hasSlot() {
@@ -42,7 +42,7 @@ public final class ChangeLineupLeaderCsReqOuterClass {
}
/**
- * optional uint32 slot = 1;
+ * optional uint32 slot = 14;
* @return this
*/
public ChangeLineupLeaderCsReq clearSlot() {
@@ -52,7 +52,7 @@ public final class ChangeLineupLeaderCsReqOuterClass {
}
/**
- * optional uint32 slot = 1;
+ * optional uint32 slot = 14;
* @return the slot
*/
public int getSlot() {
@@ -60,7 +60,7 @@ public final class ChangeLineupLeaderCsReqOuterClass {
}
/**
- * optional uint32 slot = 1;
+ * optional uint32 slot = 14;
* @param value the slot to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class ChangeLineupLeaderCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 112);
output.writeUInt32NoTag(slot);
}
}
@@ -150,7 +150,7 @@ public final class ChangeLineupLeaderCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 112: {
// 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 db5e842..331c43c 100644
--- a/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderScRspOuterClass.java
@@ -19,15 +19,15 @@ public final class ChangeLineupLeaderScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 3;
- */
- private int retcode;
-
- /**
- * optional uint32 slot = 8;
+ * optional uint32 slot = 12;
*/
private int slot;
+ /**
+ * optional uint32 retcode = 14;
+ */
+ private int retcode;
+
private ChangeLineupLeaderScRsp() {
}
@@ -39,62 +39,25 @@ public final class ChangeLineupLeaderScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
- * @return whether the retcode field is set
+ * optional uint32 slot = 12;
+ * @return whether the slot field is set
*/
- public boolean hasRetcode() {
+ public boolean hasSlot() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 retcode = 3;
- * @return this
- */
- public ChangeLineupLeaderScRsp clearRetcode() {
- bitField0_ &= ~0x00000001;
- retcode = 0;
- return this;
- }
-
- /**
- * optional uint32 retcode = 3;
- * @return the retcode
- */
- public int getRetcode() {
- return retcode;
- }
-
- /**
- * optional uint32 retcode = 3;
- * @param value the retcode to set
- * @return this
- */
- public ChangeLineupLeaderScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000001;
- retcode = value;
- return this;
- }
-
- /**
- * optional uint32 slot = 8;
- * @return whether the slot field is set
- */
- public boolean hasSlot() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 slot = 8;
+ * optional uint32 slot = 12;
* @return this
*/
public ChangeLineupLeaderScRsp clearSlot() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
slot = 0;
return this;
}
/**
- * optional uint32 slot = 8;
+ * optional uint32 slot = 12;
* @return the slot
*/
public int getSlot() {
@@ -102,23 +65,60 @@ public final class ChangeLineupLeaderScRspOuterClass {
}
/**
- * optional uint32 slot = 8;
+ * optional uint32 slot = 12;
* @param value the slot to set
* @return this
*/
public ChangeLineupLeaderScRsp setSlot(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
slot = value;
return this;
}
+ /**
+ * optional uint32 retcode = 14;
+ * @return whether the retcode field is set
+ */
+ public boolean hasRetcode() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 retcode = 14;
+ * @return this
+ */
+ public ChangeLineupLeaderScRsp clearRetcode() {
+ bitField0_ &= ~0x00000002;
+ retcode = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 retcode = 14;
+ * @return the retcode
+ */
+ public int getRetcode() {
+ return retcode;
+ }
+
+ /**
+ * optional uint32 retcode = 14;
+ * @param value the retcode to set
+ * @return this
+ */
+ public ChangeLineupLeaderScRsp setRetcode(final int value) {
+ bitField0_ |= 0x00000002;
+ retcode = value;
+ return this;
+ }
+
@Override
public ChangeLineupLeaderScRsp copyFrom(final ChangeLineupLeaderScRsp other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- retcode = other.retcode;
slot = other.slot;
+ retcode = other.retcode;
}
return this;
}
@@ -129,12 +129,12 @@ public final class ChangeLineupLeaderScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasRetcode()) {
- setRetcode(other.retcode);
- }
if (other.hasSlot()) {
setSlot(other.slot);
}
+ if (other.hasRetcode()) {
+ setRetcode(other.retcode);
+ }
return this;
}
@@ -145,8 +145,8 @@ public final class ChangeLineupLeaderScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- retcode = 0;
slot = 0;
+ retcode = 0;
return this;
}
@@ -170,19 +170,19 @@ public final class ChangeLineupLeaderScRspOuterClass {
}
ChangeLineupLeaderScRsp other = (ChangeLineupLeaderScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasRetcode() || retcode == other.retcode)
- && (!hasSlot() || slot == other.slot);
+ && (!hasSlot() || slot == other.slot)
+ && (!hasRetcode() || retcode == other.retcode);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(retcode);
+ output.writeRawByte((byte) 96);
+ output.writeUInt32NoTag(slot);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 64);
- output.writeUInt32NoTag(slot);
+ output.writeRawByte((byte) 112);
+ output.writeUInt32NoTag(retcode);
}
}
@@ -190,10 +190,10 @@ public final class ChangeLineupLeaderScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(slot);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(slot);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
return size;
}
@@ -205,18 +205,18 @@ public final class ChangeLineupLeaderScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
- // retcode
- retcode = input.readUInt32();
+ case 96: {
+ // slot
+ slot = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 64) {
+ if (tag != 112) {
break;
}
}
- case 64: {
- // slot
- slot = input.readUInt32();
+ case 112: {
+ // retcode
+ retcode = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
@@ -241,10 +241,10 @@ public final class ChangeLineupLeaderScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.slot, slot);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.slot, slot);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
output.endObject();
}
@@ -256,10 +256,10 @@ public final class ChangeLineupLeaderScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case 3533310: {
+ if (input.isAtField(FieldNames.slot)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ slot = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -267,10 +267,10 @@ public final class ChangeLineupLeaderScRspOuterClass {
}
break;
}
- case 3533310: {
- if (input.isAtField(FieldNames.slot)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- slot = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -331,9 +331,9 @@ public final class ChangeLineupLeaderScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName retcode = FieldName.forField("retcode");
-
static final FieldName slot = FieldName.forField("slot");
+
+ static final FieldName retcode = FieldName.forField("retcode");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ChargerInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChargerInfoOuterClass.java
index 029cd30..ba9cb38 100644
--- a/src/generated/main/emu/lunarcore/proto/ChargerInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChargerInfoOuterClass.java
@@ -19,12 +19,12 @@ public final class ChargerInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 group_id = 6;
+ * optional uint32 group_id = 12;
*/
private int groupId;
/**
- * optional uint32 unk_int = 11;
+ * optional uint32 unk_int = 14;
*/
private int unkInt;
@@ -39,7 +39,7 @@ public final class ChargerInfoOuterClass {
}
/**
- * optional uint32 group_id = 6;
+ * optional uint32 group_id = 12;
* @return whether the groupId field is set
*/
public boolean hasGroupId() {
@@ -47,7 +47,7 @@ public final class ChargerInfoOuterClass {
}
/**
- * optional uint32 group_id = 6;
+ * optional uint32 group_id = 12;
* @return this
*/
public ChargerInfo clearGroupId() {
@@ -57,7 +57,7 @@ public final class ChargerInfoOuterClass {
}
/**
- * optional uint32 group_id = 6;
+ * optional uint32 group_id = 12;
* @return the groupId
*/
public int getGroupId() {
@@ -65,7 +65,7 @@ public final class ChargerInfoOuterClass {
}
/**
- * optional uint32 group_id = 6;
+ * optional uint32 group_id = 12;
* @param value the groupId to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class ChargerInfoOuterClass {
}
/**
- * optional uint32 unk_int = 11;
+ * optional uint32 unk_int = 14;
* @return whether the unkInt field is set
*/
public boolean hasUnkInt() {
@@ -84,7 +84,7 @@ public final class ChargerInfoOuterClass {
}
/**
- * optional uint32 unk_int = 11;
+ * optional uint32 unk_int = 14;
* @return this
*/
public ChargerInfo clearUnkInt() {
@@ -94,7 +94,7 @@ public final class ChargerInfoOuterClass {
}
/**
- * optional uint32 unk_int = 11;
+ * optional uint32 unk_int = 14;
* @return the unkInt
*/
public int getUnkInt() {
@@ -102,7 +102,7 @@ public final class ChargerInfoOuterClass {
}
/**
- * optional uint32 unk_int = 11;
+ * optional uint32 unk_int = 14;
* @param value the unkInt to set
* @return this
*/
@@ -177,11 +177,11 @@ public final class ChargerInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(groupId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 112);
output.writeUInt32NoTag(unkInt);
}
}
@@ -205,16 +205,16 @@ public final class ChargerInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 48: {
+ case 96: {
// groupId
groupId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 88) {
+ if (tag != 112) {
break;
}
}
- case 88: {
+ case 112: {
// unkInt
unkInt = 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 18240c4..804a0ac 100644
--- a/src/generated/main/emu/lunarcore/proto/ChatOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChatOuterClass.java
@@ -20,12 +20,12 @@ public final class ChatOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint64 sent_time = 15;
+ * optional uint64 sent_time = 1;
*/
private long sentTime;
/**
- * optional uint32 sender_uid = 4;
+ * optional uint32 sender_uid = 9;
*/
private int senderUid;
@@ -35,12 +35,12 @@ public final class ChatOuterClass {
private int emote;
/**
- * optional .MsgType msg_type = 10;
+ * optional .MsgType msg_type = 7;
*/
private int msgType;
/**
- * optional string text = 8;
+ * optional string text = 15;
*/
private final Utf8String text = Utf8String.newEmptyInstance();
@@ -55,7 +55,7 @@ public final class ChatOuterClass {
}
/**
- * optional uint64 sent_time = 15;
+ * optional uint64 sent_time = 1;
* @return whether the sentTime field is set
*/
public boolean hasSentTime() {
@@ -63,7 +63,7 @@ public final class ChatOuterClass {
}
/**
- * optional uint64 sent_time = 15;
+ * optional uint64 sent_time = 1;
* @return this
*/
public Chat clearSentTime() {
@@ -73,7 +73,7 @@ public final class ChatOuterClass {
}
/**
- * optional uint64 sent_time = 15;
+ * optional uint64 sent_time = 1;
* @return the sentTime
*/
public long getSentTime() {
@@ -81,7 +81,7 @@ public final class ChatOuterClass {
}
/**
- * optional uint64 sent_time = 15;
+ * optional uint64 sent_time = 1;
* @param value the sentTime to set
* @return this
*/
@@ -92,7 +92,7 @@ public final class ChatOuterClass {
}
/**
- * optional uint32 sender_uid = 4;
+ * optional uint32 sender_uid = 9;
* @return whether the senderUid field is set
*/
public boolean hasSenderUid() {
@@ -100,7 +100,7 @@ public final class ChatOuterClass {
}
/**
- * optional uint32 sender_uid = 4;
+ * optional uint32 sender_uid = 9;
* @return this
*/
public Chat clearSenderUid() {
@@ -110,7 +110,7 @@ public final class ChatOuterClass {
}
/**
- * optional uint32 sender_uid = 4;
+ * optional uint32 sender_uid = 9;
* @return the senderUid
*/
public int getSenderUid() {
@@ -118,7 +118,7 @@ public final class ChatOuterClass {
}
/**
- * optional uint32 sender_uid = 4;
+ * optional uint32 sender_uid = 9;
* @param value the senderUid to set
* @return this
*/
@@ -166,7 +166,7 @@ public final class ChatOuterClass {
}
/**
- * optional .MsgType msg_type = 10;
+ * optional .MsgType msg_type = 7;
* @return whether the msgType field is set
*/
public boolean hasMsgType() {
@@ -174,7 +174,7 @@ public final class ChatOuterClass {
}
/**
- * optional .MsgType msg_type = 10;
+ * optional .MsgType msg_type = 7;
* @return this
*/
public Chat clearMsgType() {
@@ -184,7 +184,7 @@ public final class ChatOuterClass {
}
/**
- * optional .MsgType msg_type = 10;
+ * optional .MsgType msg_type = 7;
* @return the msgType
*/
public MsgTypeOuterClass.MsgType getMsgType() {
@@ -217,7 +217,7 @@ public final class ChatOuterClass {
}
/**
- * optional .MsgType msg_type = 10;
+ * optional .MsgType msg_type = 7;
* @param value the msgType to set
* @return this
*/
@@ -228,7 +228,7 @@ public final class ChatOuterClass {
}
/**
- * optional string text = 8;
+ * optional string text = 15;
* @return whether the text field is set
*/
public boolean hasText() {
@@ -236,7 +236,7 @@ public final class ChatOuterClass {
}
/**
- * optional string text = 8;
+ * optional string text = 15;
* @return this
*/
public Chat clearText() {
@@ -246,7 +246,7 @@ public final class ChatOuterClass {
}
/**
- * optional string text = 8;
+ * optional string text = 15;
* @return the text
*/
public String getText() {
@@ -254,7 +254,7 @@ public final class ChatOuterClass {
}
/**
- * optional string text = 8;
+ * optional string text = 15;
* @return internal {@code Utf8String} representation of text for reading
*/
public Utf8String getTextBytes() {
@@ -262,7 +262,7 @@ public final class ChatOuterClass {
}
/**
- * optional string text = 8;
+ * optional string text = 15;
* @return internal {@code Utf8String} representation of text for modifications
*/
public Utf8String getMutableTextBytes() {
@@ -271,7 +271,7 @@ public final class ChatOuterClass {
}
/**
- * optional string text = 8;
+ * optional string text = 15;
* @param value the text to set
* @return this
*/
@@ -282,7 +282,7 @@ public final class ChatOuterClass {
}
/**
- * optional string text = 8;
+ * optional string text = 15;
* @param value the text to set
* @return this
*/
@@ -376,11 +376,11 @@ public final class ChatOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 8);
output.writeUInt64NoTag(sentTime);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 72);
output.writeUInt32NoTag(senderUid);
}
if ((bitField0_ & 0x00000004) != 0) {
@@ -388,11 +388,11 @@ public final class ChatOuterClass {
output.writeUInt32NoTag(emote);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 56);
output.writeEnumNoTag(msgType);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 66);
+ output.writeRawByte((byte) 122);
output.writeStringNoTag(text);
}
}
@@ -425,16 +425,16 @@ public final class ChatOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 120: {
+ case 8: {
// sentTime
sentTime = input.readUInt64();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 32) {
+ if (tag != 72) {
break;
}
}
- case 32: {
+ case 72: {
// senderUid
senderUid = input.readUInt32();
bitField0_ |= 0x00000002;
@@ -448,11 +448,11 @@ public final class ChatOuterClass {
emote = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 80) {
+ if (tag != 56) {
break;
}
}
- case 80: {
+ case 56: {
// msgType
final int value = input.readInt32();
if (MsgTypeOuterClass.MsgType.forNumber(value) != null) {
@@ -460,11 +460,11 @@ public final class ChatOuterClass {
bitField0_ |= 0x00000008;
}
tag = input.readTag();
- if (tag != 66) {
+ if (tag != 122) {
break;
}
}
- case 66: {
+ case 122: {
// text
input.readString(text);
bitField0_ |= 0x00000010;
diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueAvatarInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueAvatarInfoOuterClass.java
index 63f4bb9..1bcf5c7 100644
--- a/src/generated/main/emu/lunarcore/proto/ChessRogueAvatarInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChessRogueAvatarInfoOuterClass.java
@@ -20,12 +20,12 @@ public final class ChessRogueAvatarInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .RogueAvatarReviveCost revive_cost = 15;
+ * optional .RogueAvatarReviveCost revive_cost = 3;
*/
private final RogueAvatarReviveCostOuterClass.RogueAvatarReviveCost reviveCost = RogueAvatarReviveCostOuterClass.RogueAvatarReviveCost.newInstance();
/**
- * repeated .ChessRogueAvatar chess_rogue_avatar = 3;
+ * repeated .ChessRogueAvatar chess_rogue_avatar = 5;
*/
private final RepeatedMessageoptional .RogueAvatarReviveCost revive_cost = 15;
+ * optional .RogueAvatarReviveCost revive_cost = 3;
* @return whether the reviveCost field is set
*/
public boolean hasReviveCost() {
@@ -48,7 +48,7 @@ public final class ChessRogueAvatarInfoOuterClass {
}
/**
- * optional .RogueAvatarReviveCost revive_cost = 15;
+ * optional .RogueAvatarReviveCost revive_cost = 3;
* @return this
*/
public ChessRogueAvatarInfo clearReviveCost() {
@@ -58,7 +58,7 @@ public final class ChessRogueAvatarInfoOuterClass {
}
/**
- * optional .RogueAvatarReviveCost revive_cost = 15;
+ * optional .RogueAvatarReviveCost revive_cost = 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.
@@ -72,7 +72,7 @@ public final class ChessRogueAvatarInfoOuterClass {
}
/**
- * optional .RogueAvatarReviveCost revive_cost = 15;
+ * optional .RogueAvatarReviveCost revive_cost = 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
@@ -86,7 +86,7 @@ public final class ChessRogueAvatarInfoOuterClass {
}
/**
- * optional .RogueAvatarReviveCost revive_cost = 15;
+ * optional .RogueAvatarReviveCost revive_cost = 3;
* @param value the reviveCost to set
* @return this
*/
@@ -98,7 +98,7 @@ public final class ChessRogueAvatarInfoOuterClass {
}
/**
- * repeated .ChessRogueAvatar chess_rogue_avatar = 3;
+ * repeated .ChessRogueAvatar chess_rogue_avatar = 5;
* @return whether the chessRogueAvatar field is set
*/
public boolean hasChessRogueAvatar() {
@@ -106,7 +106,7 @@ public final class ChessRogueAvatarInfoOuterClass {
}
/**
- * repeated .ChessRogueAvatar chess_rogue_avatar = 3;
+ * repeated .ChessRogueAvatar chess_rogue_avatar = 5;
* @return this
*/
public ChessRogueAvatarInfo clearChessRogueAvatar() {
@@ -116,7 +116,7 @@ public final class ChessRogueAvatarInfoOuterClass {
}
/**
- * repeated .ChessRogueAvatar chess_rogue_avatar = 3;
+ * repeated .ChessRogueAvatar chess_rogue_avatar = 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.
@@ -130,7 +130,7 @@ public final class ChessRogueAvatarInfoOuterClass {
}
/**
- * repeated .ChessRogueAvatar chess_rogue_avatar = 3;
+ * repeated .ChessRogueAvatar chess_rogue_avatar = 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
@@ -145,7 +145,7 @@ public final class ChessRogueAvatarInfoOuterClass {
}
/**
- * repeated .ChessRogueAvatar chess_rogue_avatar = 3;
+ * repeated .ChessRogueAvatar chess_rogue_avatar = 5;
* @param value the chessRogueAvatar to add
* @return this
*/
@@ -157,7 +157,7 @@ public final class ChessRogueAvatarInfoOuterClass {
}
/**
- * repeated .ChessRogueAvatar chess_rogue_avatar = 3;
+ * repeated .ChessRogueAvatar chess_rogue_avatar = 5;
* @param values the chessRogueAvatar to add
* @return this
*/
@@ -235,12 +235,12 @@ public final class ChessRogueAvatarInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 122);
+ output.writeRawByte((byte) 26);
output.writeMessageNoTag(reviveCost);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < chessRogueAvatar.length(); i++) {
- output.writeRawByte((byte) 26);
+ output.writeRawByte((byte) 42);
output.writeMessageNoTag(chessRogueAvatar.get(i));
}
}
@@ -265,16 +265,16 @@ public final class ChessRogueAvatarInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 122: {
+ case 26: {
// reviveCost
input.readMessage(reviveCost);
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 26) {
+ if (tag != 42) {
break;
}
}
- case 26: {
+ case 42: {
// chessRogueAvatar
tag = input.readRepeatedMessage(chessRogueAvatar, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueAvatarOuterClass.java
index f2d2931..3cf710b 100644
--- a/src/generated/main/emu/lunarcore/proto/ChessRogueAvatarOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChessRogueAvatarOuterClass.java
@@ -19,7 +19,7 @@ public final class ChessRogueAvatarOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 avatar_id = 7;
+ * optional uint32 avatar_id = 6;
*/
private int avatarId;
@@ -34,7 +34,7 @@ public final class ChessRogueAvatarOuterClass {
}
/**
- * optional uint32 avatar_id = 7;
+ * optional uint32 avatar_id = 6;
* @return whether the avatarId field is set
*/
public boolean hasAvatarId() {
@@ -42,7 +42,7 @@ public final class ChessRogueAvatarOuterClass {
}
/**
- * optional uint32 avatar_id = 7;
+ * optional uint32 avatar_id = 6;
* @return this
*/
public ChessRogueAvatar clearAvatarId() {
@@ -52,7 +52,7 @@ public final class ChessRogueAvatarOuterClass {
}
/**
- * optional uint32 avatar_id = 7;
+ * optional uint32 avatar_id = 6;
* @return the avatarId
*/
public int getAvatarId() {
@@ -60,7 +60,7 @@ public final class ChessRogueAvatarOuterClass {
}
/**
- * optional uint32 avatar_id = 7;
+ * optional uint32 avatar_id = 6;
* @param value the avatarId to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class ChessRogueAvatarOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(avatarId);
}
}
@@ -150,7 +150,7 @@ public final class ChessRogueAvatarOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
+ case 48: {
// avatarId
avatarId = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueBuffDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueBuffDataOuterClass.java
index 6bc62be..ed07f03 100644
--- a/src/generated/main/emu/lunarcore/proto/ChessRogueBuffDataOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChessRogueBuffDataOuterClass.java
@@ -20,7 +20,7 @@ public final class ChessRogueBuffDataOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated .RogueBuffData buff_list = 13;
+ * repeated .RogueBuffData buff_list = 12;
*/
private final RepeatedMessagerepeated .RogueBuffData buff_list = 13;
+ * repeated .RogueBuffData buff_list = 12;
* @return whether the buffList field is set
*/
public boolean hasBuffList() {
@@ -43,7 +43,7 @@ public final class ChessRogueBuffDataOuterClass {
}
/**
- * repeated .RogueBuffData buff_list = 13;
+ * repeated .RogueBuffData buff_list = 12;
* @return this
*/
public ChessRogueBuffData clearBuffList() {
@@ -53,7 +53,7 @@ public final class ChessRogueBuffDataOuterClass {
}
/**
- * repeated .RogueBuffData buff_list = 13;
+ * repeated .RogueBuffData buff_list = 12;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class ChessRogueBuffDataOuterClass {
}
/**
- * repeated .RogueBuffData buff_list = 13;
+ * repeated .RogueBuffData buff_list = 12;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class ChessRogueBuffDataOuterClass {
}
/**
- * repeated .RogueBuffData buff_list = 13;
+ * repeated .RogueBuffData buff_list = 12;
* @param value the buffList to add
* @return this
*/
@@ -92,7 +92,7 @@ public final class ChessRogueBuffDataOuterClass {
}
/**
- * repeated .RogueBuffData buff_list = 13;
+ * repeated .RogueBuffData buff_list = 12;
* @param values the buffList to add
* @return this
*/
@@ -164,7 +164,7 @@ public final class ChessRogueBuffDataOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < buffList.length(); i++) {
- output.writeRawByte((byte) 106);
+ output.writeRawByte((byte) 98);
output.writeMessageNoTag(buffList.get(i));
}
}
@@ -186,7 +186,7 @@ public final class ChessRogueBuffDataOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 106: {
+ case 98: {
// buffList
tag = input.readRepeatedMessage(buffList, tag);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueBuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueBuffInfoOuterClass.java
index 05f78ea..ea6e0e8 100644
--- a/src/generated/main/emu/lunarcore/proto/ChessRogueBuffInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChessRogueBuffInfoOuterClass.java
@@ -19,7 +19,7 @@ public final class ChessRogueBuffInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .ChessRogueBuffData buff_data = 1;
+ * optional .ChessRogueBuffData buff_data = 12;
*/
private final ChessRogueBuffDataOuterClass.ChessRogueBuffData buffData = ChessRogueBuffDataOuterClass.ChessRogueBuffData.newInstance();
@@ -34,7 +34,7 @@ public final class ChessRogueBuffInfoOuterClass {
}
/**
- * optional .ChessRogueBuffData buff_data = 1;
+ * optional .ChessRogueBuffData buff_data = 12;
* @return whether the buffData field is set
*/
public boolean hasBuffData() {
@@ -42,7 +42,7 @@ public final class ChessRogueBuffInfoOuterClass {
}
/**
- * optional .ChessRogueBuffData buff_data = 1;
+ * optional .ChessRogueBuffData buff_data = 12;
* @return this
*/
public ChessRogueBuffInfo clearBuffData() {
@@ -52,7 +52,7 @@ public final class ChessRogueBuffInfoOuterClass {
}
/**
- * optional .ChessRogueBuffData buff_data = 1;
+ * optional .ChessRogueBuffData buff_data = 12;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -66,7 +66,7 @@ public final class ChessRogueBuffInfoOuterClass {
}
/**
- * optional .ChessRogueBuffData buff_data = 1;
+ * optional .ChessRogueBuffData buff_data = 12;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -80,7 +80,7 @@ public final class ChessRogueBuffInfoOuterClass {
}
/**
- * optional .ChessRogueBuffData buff_data = 1;
+ * optional .ChessRogueBuffData buff_data = 12;
* @param value the buffData to set
* @return this
*/
@@ -151,7 +151,7 @@ public final class ChessRogueBuffInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 10);
+ output.writeRawByte((byte) 98);
output.writeMessageNoTag(buffData);
}
}
@@ -172,7 +172,7 @@ public final class ChessRogueBuffInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 10: {
+ case 98: {
// buffData
input.readMessage(buffData);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueCellInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueCellInfoOuterClass.java
index 7086562..60de87d 100644
--- a/src/generated/main/emu/lunarcore/proto/ChessRogueCellInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChessRogueCellInfoOuterClass.java
@@ -24,12 +24,12 @@ public final class ChessRogueCellInfoOuterClass {
* 61
*
*
- * optional uint32 BIEJGDGAOBL = 1;
+ * optional uint32 BIEJGDGAOBL = 8;
*/
private int bIEJGDGAOBL;
/**
- * repeated .ChessRogueCell query = 7;
+ * repeated .ChessRogueCell query = 1;
*/
private final RepeatedMessageoptional uint32 BIEJGDGAOBL = 1;
+ * optional uint32 BIEJGDGAOBL = 8;
* @return whether the bIEJGDGAOBL field is set
*/
public boolean hasBIEJGDGAOBL() {
@@ -60,7 +60,7 @@ public final class ChessRogueCellInfoOuterClass {
* 61
*
*
- * optional uint32 BIEJGDGAOBL = 1;
+ * optional uint32 BIEJGDGAOBL = 8;
* @return this
*/
public ChessRogueCellInfo clearBIEJGDGAOBL() {
@@ -74,7 +74,7 @@ public final class ChessRogueCellInfoOuterClass {
* 61
*
*
- * optional uint32 BIEJGDGAOBL = 1;
+ * optional uint32 BIEJGDGAOBL = 8;
* @return the bIEJGDGAOBL
*/
public int getBIEJGDGAOBL() {
@@ -86,7 +86,7 @@ public final class ChessRogueCellInfoOuterClass {
* 61
*
*
- * optional uint32 BIEJGDGAOBL = 1;
+ * optional uint32 BIEJGDGAOBL = 8;
* @param value the bIEJGDGAOBL to set
* @return this
*/
@@ -97,7 +97,7 @@ public final class ChessRogueCellInfoOuterClass {
}
/**
- * repeated .ChessRogueCell query = 7;
+ * repeated .ChessRogueCell query = 1;
* @return whether the query field is set
*/
public boolean hasQuery() {
@@ -105,7 +105,7 @@ public final class ChessRogueCellInfoOuterClass {
}
/**
- * repeated .ChessRogueCell query = 7;
+ * repeated .ChessRogueCell query = 1;
* @return this
*/
public ChessRogueCellInfo clearQuery() {
@@ -115,7 +115,7 @@ public final class ChessRogueCellInfoOuterClass {
}
/**
- * repeated .ChessRogueCell query = 7;
+ * repeated .ChessRogueCell query = 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.
@@ -129,7 +129,7 @@ public final class ChessRogueCellInfoOuterClass {
}
/**
- * repeated .ChessRogueCell query = 7;
+ * repeated .ChessRogueCell query = 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
@@ -143,7 +143,7 @@ public final class ChessRogueCellInfoOuterClass {
}
/**
- * repeated .ChessRogueCell query = 7;
+ * repeated .ChessRogueCell query = 1;
* @param value the query to add
* @return this
*/
@@ -154,7 +154,7 @@ public final class ChessRogueCellInfoOuterClass {
}
/**
- * repeated .ChessRogueCell query = 7;
+ * repeated .ChessRogueCell query = 1;
* @param values the query to add
* @return this
*/
@@ -230,12 +230,12 @@ public final class ChessRogueCellInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(bIEJGDGAOBL);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < query.length(); i++) {
- output.writeRawByte((byte) 58);
+ output.writeRawByte((byte) 10);
output.writeMessageNoTag(query.get(i));
}
}
@@ -260,16 +260,16 @@ public final class ChessRogueCellInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 64: {
// bIEJGDGAOBL
bIEJGDGAOBL = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 58) {
+ if (tag != 10) {
break;
}
}
- case 58: {
+ case 10: {
// query
tag = input.readRepeatedMessage(query, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueCellUpdateNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueCellUpdateNotifyOuterClass.java
index 528fb6b..2a09aa4 100644
--- a/src/generated/main/emu/lunarcore/proto/ChessRogueCellUpdateNotifyOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChessRogueCellUpdateNotifyOuterClass.java
@@ -21,19 +21,19 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
/**
*
- * EOKIACEIBBD IFMNJMMMJCM = 8;
+ * LCMLACLKNDI HFBFDNEMJED = 6;
*
*
- * optional uint32 cell_room_id = 4;
+ * optional uint32 cell_room_id = 15;
*/
private int cellRoomId;
/**
*
- * MMKEKJCAHGP reason = 1;
+ * JGJCJHMAKKA reason = 11;
*
*
- * repeated .ChessRogueCell cell_info = 6;
+ * repeated .ChessRogueCell cell_info = 3;
*/
private final RepeatedMessage
- * EOKIACEIBBD IFMNJMMMJCM = 8;
+ * LCMLACLKNDI HFBFDNEMJED = 6;
*
*
- * optional uint32 cell_room_id = 4;
+ * optional uint32 cell_room_id = 15;
* @return whether the cellRoomId field is set
*/
public boolean hasCellRoomId() {
@@ -61,10 +61,10 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
/**
*
- * EOKIACEIBBD IFMNJMMMJCM = 8;
+ * LCMLACLKNDI HFBFDNEMJED = 6;
*
*
- * optional uint32 cell_room_id = 4;
+ * optional uint32 cell_room_id = 15;
* @return this
*/
public ChessRogueCellUpdateNotify clearCellRoomId() {
@@ -75,10 +75,10 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
/**
*
- * EOKIACEIBBD IFMNJMMMJCM = 8;
+ * LCMLACLKNDI HFBFDNEMJED = 6;
*
*
- * optional uint32 cell_room_id = 4;
+ * optional uint32 cell_room_id = 15;
* @return the cellRoomId
*/
public int getCellRoomId() {
@@ -87,10 +87,10 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
/**
*
- * EOKIACEIBBD IFMNJMMMJCM = 8;
+ * LCMLACLKNDI HFBFDNEMJED = 6;
*
*
- * optional uint32 cell_room_id = 4;
+ * optional uint32 cell_room_id = 15;
* @param value the cellRoomId to set
* @return this
*/
@@ -102,10 +102,10 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
/**
*
- * MMKEKJCAHGP reason = 1;
+ * JGJCJHMAKKA reason = 11;
*
*
- * repeated .ChessRogueCell cell_info = 6;
+ * repeated .ChessRogueCell cell_info = 3;
* @return whether the cellInfo field is set
*/
public boolean hasCellInfo() {
@@ -114,10 +114,10 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
/**
*
- * MMKEKJCAHGP reason = 1;
+ * JGJCJHMAKKA reason = 11;
*
*
- * repeated .ChessRogueCell cell_info = 6;
+ * repeated .ChessRogueCell cell_info = 3;
* @return this
*/
public ChessRogueCellUpdateNotify clearCellInfo() {
@@ -128,10 +128,10 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
/**
*
- * MMKEKJCAHGP reason = 1;
+ * JGJCJHMAKKA reason = 11;
*
*
- * repeated .ChessRogueCell cell_info = 6;
+ * repeated .ChessRogueCell cell_info = 3;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -146,10 +146,10 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
/**
*
- * MMKEKJCAHGP reason = 1;
+ * JGJCJHMAKKA reason = 11;
*
*
- * repeated .ChessRogueCell cell_info = 6;
+ * repeated .ChessRogueCell cell_info = 3;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -164,10 +164,10 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
/**
*
- * MMKEKJCAHGP reason = 1;
+ * JGJCJHMAKKA reason = 11;
*
*
- * repeated .ChessRogueCell cell_info = 6;
+ * repeated .ChessRogueCell cell_info = 3;
* @param value the cellInfo to add
* @return this
*/
@@ -180,10 +180,10 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
/**
*
- * MMKEKJCAHGP reason = 1;
+ * JGJCJHMAKKA reason = 11;
*
*
- * repeated .ChessRogueCell cell_info = 6;
+ * repeated .ChessRogueCell cell_info = 3;
* @param values the cellInfo to add
* @return this
*/
@@ -260,12 +260,12 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(cellRoomId);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < cellInfo.length(); i++) {
- output.writeRawByte((byte) 50);
+ output.writeRawByte((byte) 26);
output.writeMessageNoTag(cellInfo.get(i));
}
}
@@ -290,16 +290,16 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
+ case 120: {
// cellRoomId
cellRoomId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 50) {
+ if (tag != 26) {
break;
}
}
- case 50: {
+ case 26: {
// cellInfo
tag = input.readRepeatedMessage(cellInfo, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueConfirmRollScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueConfirmRollScRspOuterClass.java
index 429a026..b743f36 100644
--- a/src/generated/main/emu/lunarcore/proto/ChessRogueConfirmRollScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChessRogueConfirmRollScRspOuterClass.java
@@ -19,12 +19,12 @@ public final class ChessRogueConfirmRollScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 11;
*/
private int retcode;
/**
- * optional .ChessRogueNousDice nous_dice = 5;
+ * optional .ChessRogueNousDice nous_dice = 14;
*/
private final ChessRogueNousDiceOuterClass.ChessRogueNousDice nousDice = ChessRogueNousDiceOuterClass.ChessRogueNousDice.newInstance();
@@ -39,7 +39,7 @@ public final class ChessRogueConfirmRollScRspOuterClass {
}
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 11;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -47,7 +47,7 @@ public final class ChessRogueConfirmRollScRspOuterClass {
}
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 11;
* @return this
*/
public ChessRogueConfirmRollScRsp clearRetcode() {
@@ -57,7 +57,7 @@ public final class ChessRogueConfirmRollScRspOuterClass {
}
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 11;
* @return the retcode
*/
public int getRetcode() {
@@ -65,7 +65,7 @@ public final class ChessRogueConfirmRollScRspOuterClass {
}
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 11;
* @param value the retcode to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class ChessRogueConfirmRollScRspOuterClass {
}
/**
- * optional .ChessRogueNousDice nous_dice = 5;
+ * optional .ChessRogueNousDice nous_dice = 14;
* @return whether the nousDice field is set
*/
public boolean hasNousDice() {
@@ -84,7 +84,7 @@ public final class ChessRogueConfirmRollScRspOuterClass {
}
/**
- * optional .ChessRogueNousDice nous_dice = 5;
+ * optional .ChessRogueNousDice nous_dice = 14;
* @return this
*/
public ChessRogueConfirmRollScRsp clearNousDice() {
@@ -94,7 +94,7 @@ public final class ChessRogueConfirmRollScRspOuterClass {
}
/**
- * optional .ChessRogueNousDice nous_dice = 5;
+ * optional .ChessRogueNousDice nous_dice = 14;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class ChessRogueConfirmRollScRspOuterClass {
}
/**
- * optional .ChessRogueNousDice nous_dice = 5;
+ * optional .ChessRogueNousDice nous_dice = 14;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class ChessRogueConfirmRollScRspOuterClass {
}
/**
- * optional .ChessRogueNousDice nous_dice = 5;
+ * optional .ChessRogueNousDice nous_dice = 14;
* @param value the nousDice to set
* @return this
*/
@@ -199,11 +199,11 @@ public final class ChessRogueConfirmRollScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 42);
+ output.writeRawByte((byte) 114);
output.writeMessageNoTag(nousDice);
}
}
@@ -227,16 +227,16 @@ public final class ChessRogueConfirmRollScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 104: {
+ case 88: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 42) {
+ if (tag != 114) {
break;
}
}
- case 42: {
+ case 114: {
// nousDice
input.readMessage(nousDice);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueCurrentInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueCurrentInfoOuterClass.java
index 4765115..033a932 100644
--- a/src/generated/main/emu/lunarcore/proto/ChessRogueCurrentInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChessRogueCurrentInfoOuterClass.java
@@ -20,65 +20,47 @@ public final class ChessRogueCurrentInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * - * DKMCDMJGOIB CKJPPDKJIOH = 2; - *- * - *
optional uint32 rogue_version_id = 12;
+ * optional uint32 rogue_version_id = 6;
*/
private int rogueVersionId;
/**
- * - * NGKOOLFOHEM JNAGMIALOII = 522; - * LNJJGEAFJPH NMJAHFBMGDO = 7; - *- * - *
optional .ChessRogueBuffInfo buff_info = 1;
- */
- private final ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo buffInfo = ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo.newInstance();
-
- /**
- * - * JFGFEBLFGMG KJHGNMBOGHA = 9; - * CGAPFPHEJIA EEFGNNFCDNJ = 8; - *- * - *
optional .ChessRogueMiracleInfo miracle_info = 3;
- */
- private final ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo miracleInfo = ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo.newInstance();
-
- /**
- * optional .RogueCommonPendingAction pending_action = 4;
- */
- private final RogueCommonPendingActionOuterClass.RogueCommonPendingAction pendingAction = RogueCommonPendingActionOuterClass.RogueCommonPendingAction.newInstance();
-
- /**
- * optional .ChessRogueNousStoryInfo story_info = 5;
- */
- private final ChessRogueNousStoryInfoOuterClass.ChessRogueNousStoryInfo storyInfo = ChessRogueNousStoryInfoOuterClass.ChessRogueNousStoryInfo.newInstance();
-
- /**
- * - * BELMNIPGEDN LIJCHOCOPEK = 15; - *- * - *
optional .ChessRogueAvatarInfo rogue_avatar_info = 10;
- */
- private final ChessRogueAvatarInfoOuterClass.ChessRogueAvatarInfo rogueAvatarInfo = ChessRogueAvatarInfoOuterClass.ChessRogueAvatarInfo.newInstance();
-
- /**
- * optional .ChessRogueNousDice dice_info = 11;
- */
- private final ChessRogueNousDiceOuterClass.ChessRogueNousDice diceInfo = ChessRogueNousDiceOuterClass.ChessRogueNousDice.newInstance();
-
- /**
- * optional .ChessRogueNousValue nous_value = 14;
+ * optional .ChessRogueNousValue nous_value = 1;
*/
private final ChessRogueNousValueOuterClass.ChessRogueNousValue nousValue = ChessRogueNousValueOuterClass.ChessRogueNousValue.newInstance();
/**
- * repeated .ChessRogueVirtualItemInfo virtual_item_info = 13;
+ * optional .ChessRogueAvatarInfo rogue_avatar_info = 9;
+ */
+ private final ChessRogueAvatarInfoOuterClass.ChessRogueAvatarInfo rogueAvatarInfo = ChessRogueAvatarInfoOuterClass.ChessRogueAvatarInfo.newInstance();
+
+ /**
+ * optional .ChessRogueNousStoryInfo story_info = 10;
+ */
+ private final ChessRogueNousStoryInfoOuterClass.ChessRogueNousStoryInfo storyInfo = ChessRogueNousStoryInfoOuterClass.ChessRogueNousStoryInfo.newInstance();
+
+ /**
+ * optional .RogueCommonPendingAction pending_action = 11;
+ */
+ private final RogueCommonPendingActionOuterClass.RogueCommonPendingAction pendingAction = RogueCommonPendingActionOuterClass.RogueCommonPendingAction.newInstance();
+
+ /**
+ * optional .ChessRogueBuffInfo buff_info = 12;
+ */
+ private final ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo buffInfo = ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo.newInstance();
+
+ /**
+ * optional .ChessRogueMiracleInfo miracle_info = 14;
+ */
+ private final ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo miracleInfo = ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo.newInstance();
+
+ /**
+ * optional .ChessRogueNousDice dice_info = 15;
+ */
+ private final ChessRogueNousDiceOuterClass.ChessRogueNousDice diceInfo = ChessRogueNousDiceOuterClass.ChessRogueNousDice.newInstance();
+
+ /**
+ * repeated .ChessRogueVirtualItemInfo virtual_item_info = 4;
*/
private final RepeatedMessage- * DKMCDMJGOIB CKJPPDKJIOH = 2; - *- * - *
optional uint32 rogue_version_id = 12;
+ * optional uint32 rogue_version_id = 6;
* @return whether the rogueVersionId field is set
*/
public boolean hasRogueVersionId() {
@@ -105,11 +83,7 @@ public final class ChessRogueCurrentInfoOuterClass {
}
/**
- * - * DKMCDMJGOIB CKJPPDKJIOH = 2; - *- * - *
optional uint32 rogue_version_id = 12;
+ * optional uint32 rogue_version_id = 6;
* @return this
*/
public ChessRogueCurrentInfo clearRogueVersionId() {
@@ -119,11 +93,7 @@ public final class ChessRogueCurrentInfoOuterClass {
}
/**
- * - * DKMCDMJGOIB CKJPPDKJIOH = 2; - *- * - *
optional uint32 rogue_version_id = 12;
+ * optional uint32 rogue_version_id = 6;
* @return the rogueVersionId
*/
public int getRogueVersionId() {
@@ -131,11 +101,7 @@ public final class ChessRogueCurrentInfoOuterClass {
}
/**
- * - * DKMCDMJGOIB CKJPPDKJIOH = 2; - *- * - *
optional uint32 rogue_version_id = 12;
+ * optional uint32 rogue_version_id = 6;
* @param value the rogueVersionId to set
* @return this
*/
@@ -146,443 +112,25 @@ public final class ChessRogueCurrentInfoOuterClass {
}
/**
- * - * NGKOOLFOHEM JNAGMIALOII = 522; - * LNJJGEAFJPH NMJAHFBMGDO = 7; - *- * - *
optional .ChessRogueBuffInfo buff_info = 1;
- * @return whether the buffInfo field is set
+ * optional .ChessRogueNousValue nous_value = 1;
+ * @return whether the nousValue field is set
*/
- public boolean hasBuffInfo() {
+ public boolean hasNousValue() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * - * NGKOOLFOHEM JNAGMIALOII = 522; - * LNJJGEAFJPH NMJAHFBMGDO = 7; - *- * - *
optional .ChessRogueBuffInfo buff_info = 1;
- * @return this
- */
- public ChessRogueCurrentInfo clearBuffInfo() {
- bitField0_ &= ~0x00000002;
- buffInfo.clear();
- return this;
- }
-
- /**
- * - * NGKOOLFOHEM JNAGMIALOII = 522; - * LNJJGEAFJPH NMJAHFBMGDO = 7; - *- * - *
optional .ChessRogueBuffInfo buff_info = 1;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableBuffInfo()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo getBuffInfo() {
- return buffInfo;
- }
-
- /**
- * - * NGKOOLFOHEM JNAGMIALOII = 522; - * LNJJGEAFJPH NMJAHFBMGDO = 7; - *- * - *
optional .ChessRogueBuffInfo buff_info = 1;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo getMutableBuffInfo() {
- bitField0_ |= 0x00000002;
- return buffInfo;
- }
-
- /**
- * - * NGKOOLFOHEM JNAGMIALOII = 522; - * LNJJGEAFJPH NMJAHFBMGDO = 7; - *- * - *
optional .ChessRogueBuffInfo buff_info = 1;
- * @param value the buffInfo to set
- * @return this
- */
- public ChessRogueCurrentInfo setBuffInfo(
- final ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo value) {
- bitField0_ |= 0x00000002;
- buffInfo.copyFrom(value);
- return this;
- }
-
- /**
- * - * JFGFEBLFGMG KJHGNMBOGHA = 9; - * CGAPFPHEJIA EEFGNNFCDNJ = 8; - *- * - *
optional .ChessRogueMiracleInfo miracle_info = 3;
- * @return whether the miracleInfo field is set
- */
- public boolean hasMiracleInfo() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * - * JFGFEBLFGMG KJHGNMBOGHA = 9; - * CGAPFPHEJIA EEFGNNFCDNJ = 8; - *- * - *
optional .ChessRogueMiracleInfo miracle_info = 3;
- * @return this
- */
- public ChessRogueCurrentInfo clearMiracleInfo() {
- bitField0_ &= ~0x00000004;
- miracleInfo.clear();
- return this;
- }
-
- /**
- * - * JFGFEBLFGMG KJHGNMBOGHA = 9; - * CGAPFPHEJIA EEFGNNFCDNJ = 8; - *- * - *
optional .ChessRogueMiracleInfo miracle_info = 3;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableMiracleInfo()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo getMiracleInfo() {
- return miracleInfo;
- }
-
- /**
- * - * JFGFEBLFGMG KJHGNMBOGHA = 9; - * CGAPFPHEJIA EEFGNNFCDNJ = 8; - *- * - *
optional .ChessRogueMiracleInfo miracle_info = 3;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo getMutableMiracleInfo() {
- bitField0_ |= 0x00000004;
- return miracleInfo;
- }
-
- /**
- * - * JFGFEBLFGMG KJHGNMBOGHA = 9; - * CGAPFPHEJIA EEFGNNFCDNJ = 8; - *- * - *
optional .ChessRogueMiracleInfo miracle_info = 3;
- * @param value the miracleInfo to set
- * @return this
- */
- public ChessRogueCurrentInfo setMiracleInfo(
- final ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo value) {
- bitField0_ |= 0x00000004;
- miracleInfo.copyFrom(value);
- return this;
- }
-
- /**
- * optional .RogueCommonPendingAction pending_action = 4;
- * @return whether the pendingAction field is set
- */
- public boolean hasPendingAction() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional .RogueCommonPendingAction pending_action = 4;
- * @return this
- */
- public ChessRogueCurrentInfo clearPendingAction() {
- bitField0_ &= ~0x00000008;
- pendingAction.clear();
- return this;
- }
-
- /**
- * optional .RogueCommonPendingAction pending_action = 4;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutablePendingAction()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RogueCommonPendingActionOuterClass.RogueCommonPendingAction getPendingAction() {
- return pendingAction;
- }
-
- /**
- * optional .RogueCommonPendingAction pending_action = 4;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RogueCommonPendingActionOuterClass.RogueCommonPendingAction getMutablePendingAction() {
- bitField0_ |= 0x00000008;
- return pendingAction;
- }
-
- /**
- * optional .RogueCommonPendingAction pending_action = 4;
- * @param value the pendingAction to set
- * @return this
- */
- public ChessRogueCurrentInfo setPendingAction(
- final RogueCommonPendingActionOuterClass.RogueCommonPendingAction value) {
- bitField0_ |= 0x00000008;
- pendingAction.copyFrom(value);
- return this;
- }
-
- /**
- * optional .ChessRogueNousStoryInfo story_info = 5;
- * @return whether the storyInfo field is set
- */
- public boolean hasStoryInfo() {
- return (bitField0_ & 0x00000010) != 0;
- }
-
- /**
- * optional .ChessRogueNousStoryInfo story_info = 5;
- * @return this
- */
- public ChessRogueCurrentInfo clearStoryInfo() {
- bitField0_ &= ~0x00000010;
- storyInfo.clear();
- return this;
- }
-
- /**
- * optional .ChessRogueNousStoryInfo story_info = 5;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableStoryInfo()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public ChessRogueNousStoryInfoOuterClass.ChessRogueNousStoryInfo getStoryInfo() {
- return storyInfo;
- }
-
- /**
- * optional .ChessRogueNousStoryInfo story_info = 5;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public ChessRogueNousStoryInfoOuterClass.ChessRogueNousStoryInfo getMutableStoryInfo() {
- bitField0_ |= 0x00000010;
- return storyInfo;
- }
-
- /**
- * optional .ChessRogueNousStoryInfo story_info = 5;
- * @param value the storyInfo to set
- * @return this
- */
- public ChessRogueCurrentInfo setStoryInfo(
- final ChessRogueNousStoryInfoOuterClass.ChessRogueNousStoryInfo value) {
- bitField0_ |= 0x00000010;
- storyInfo.copyFrom(value);
- return this;
- }
-
- /**
- * - * BELMNIPGEDN LIJCHOCOPEK = 15; - *- * - *
optional .ChessRogueAvatarInfo rogue_avatar_info = 10;
- * @return whether the rogueAvatarInfo field is set
- */
- public boolean hasRogueAvatarInfo() {
- return (bitField0_ & 0x00000020) != 0;
- }
-
- /**
- * - * BELMNIPGEDN LIJCHOCOPEK = 15; - *- * - *
optional .ChessRogueAvatarInfo rogue_avatar_info = 10;
- * @return this
- */
- public ChessRogueCurrentInfo clearRogueAvatarInfo() {
- bitField0_ &= ~0x00000020;
- rogueAvatarInfo.clear();
- return this;
- }
-
- /**
- * - * BELMNIPGEDN LIJCHOCOPEK = 15; - *- * - *
optional .ChessRogueAvatarInfo rogue_avatar_info = 10;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableRogueAvatarInfo()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public ChessRogueAvatarInfoOuterClass.ChessRogueAvatarInfo getRogueAvatarInfo() {
- return rogueAvatarInfo;
- }
-
- /**
- * - * BELMNIPGEDN LIJCHOCOPEK = 15; - *- * - *
optional .ChessRogueAvatarInfo rogue_avatar_info = 10;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public ChessRogueAvatarInfoOuterClass.ChessRogueAvatarInfo getMutableRogueAvatarInfo() {
- bitField0_ |= 0x00000020;
- return rogueAvatarInfo;
- }
-
- /**
- * - * BELMNIPGEDN LIJCHOCOPEK = 15; - *- * - *
optional .ChessRogueAvatarInfo rogue_avatar_info = 10;
- * @param value the rogueAvatarInfo to set
- * @return this
- */
- public ChessRogueCurrentInfo setRogueAvatarInfo(
- final ChessRogueAvatarInfoOuterClass.ChessRogueAvatarInfo value) {
- bitField0_ |= 0x00000020;
- rogueAvatarInfo.copyFrom(value);
- return this;
- }
-
- /**
- * optional .ChessRogueNousDice dice_info = 11;
- * @return whether the diceInfo field is set
- */
- public boolean hasDiceInfo() {
- return (bitField0_ & 0x00000040) != 0;
- }
-
- /**
- * optional .ChessRogueNousDice dice_info = 11;
- * @return this
- */
- public ChessRogueCurrentInfo clearDiceInfo() {
- bitField0_ &= ~0x00000040;
- diceInfo.clear();
- return this;
- }
-
- /**
- * optional .ChessRogueNousDice dice_info = 11;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableDiceInfo()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public ChessRogueNousDiceOuterClass.ChessRogueNousDice getDiceInfo() {
- return diceInfo;
- }
-
- /**
- * optional .ChessRogueNousDice dice_info = 11;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public ChessRogueNousDiceOuterClass.ChessRogueNousDice getMutableDiceInfo() {
- bitField0_ |= 0x00000040;
- return diceInfo;
- }
-
- /**
- * optional .ChessRogueNousDice dice_info = 11;
- * @param value the diceInfo to set
- * @return this
- */
- public ChessRogueCurrentInfo setDiceInfo(
- final ChessRogueNousDiceOuterClass.ChessRogueNousDice value) {
- bitField0_ |= 0x00000040;
- diceInfo.copyFrom(value);
- return this;
- }
-
- /**
- * optional .ChessRogueNousValue nous_value = 14;
- * @return whether the nousValue field is set
- */
- public boolean hasNousValue() {
- return (bitField0_ & 0x00000080) != 0;
- }
-
- /**
- * optional .ChessRogueNousValue nous_value = 14;
+ * optional .ChessRogueNousValue nous_value = 1;
* @return this
*/
public ChessRogueCurrentInfo clearNousValue() {
- bitField0_ &= ~0x00000080;
+ bitField0_ &= ~0x00000002;
nousValue.clear();
return this;
}
/**
- * optional .ChessRogueNousValue nous_value = 14;
+ * optional .ChessRogueNousValue nous_value = 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.
@@ -596,7 +144,7 @@ public final class ChessRogueCurrentInfoOuterClass {
}
/**
- * optional .ChessRogueNousValue nous_value = 14;
+ * optional .ChessRogueNousValue nous_value = 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
@@ -605,24 +153,372 @@ public final class ChessRogueCurrentInfoOuterClass {
* @return internal storage object for modifications
*/
public ChessRogueNousValueOuterClass.ChessRogueNousValue getMutableNousValue() {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000002;
return nousValue;
}
/**
- * optional .ChessRogueNousValue nous_value = 14;
+ * optional .ChessRogueNousValue nous_value = 1;
* @param value the nousValue to set
* @return this
*/
public ChessRogueCurrentInfo setNousValue(
final ChessRogueNousValueOuterClass.ChessRogueNousValue value) {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000002;
nousValue.copyFrom(value);
return this;
}
/**
- * repeated .ChessRogueVirtualItemInfo virtual_item_info = 13;
+ * optional .ChessRogueAvatarInfo rogue_avatar_info = 9;
+ * @return whether the rogueAvatarInfo field is set
+ */
+ public boolean hasRogueAvatarInfo() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional .ChessRogueAvatarInfo rogue_avatar_info = 9;
+ * @return this
+ */
+ public ChessRogueCurrentInfo clearRogueAvatarInfo() {
+ bitField0_ &= ~0x00000004;
+ rogueAvatarInfo.clear();
+ return this;
+ }
+
+ /**
+ * optional .ChessRogueAvatarInfo rogue_avatar_info = 9;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableRogueAvatarInfo()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public ChessRogueAvatarInfoOuterClass.ChessRogueAvatarInfo getRogueAvatarInfo() {
+ return rogueAvatarInfo;
+ }
+
+ /**
+ * optional .ChessRogueAvatarInfo rogue_avatar_info = 9;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public ChessRogueAvatarInfoOuterClass.ChessRogueAvatarInfo getMutableRogueAvatarInfo() {
+ bitField0_ |= 0x00000004;
+ return rogueAvatarInfo;
+ }
+
+ /**
+ * optional .ChessRogueAvatarInfo rogue_avatar_info = 9;
+ * @param value the rogueAvatarInfo to set
+ * @return this
+ */
+ public ChessRogueCurrentInfo setRogueAvatarInfo(
+ final ChessRogueAvatarInfoOuterClass.ChessRogueAvatarInfo value) {
+ bitField0_ |= 0x00000004;
+ rogueAvatarInfo.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional .ChessRogueNousStoryInfo story_info = 10;
+ * @return whether the storyInfo field is set
+ */
+ public boolean hasStoryInfo() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional .ChessRogueNousStoryInfo story_info = 10;
+ * @return this
+ */
+ public ChessRogueCurrentInfo clearStoryInfo() {
+ bitField0_ &= ~0x00000008;
+ storyInfo.clear();
+ return this;
+ }
+
+ /**
+ * optional .ChessRogueNousStoryInfo story_info = 10;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableStoryInfo()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public ChessRogueNousStoryInfoOuterClass.ChessRogueNousStoryInfo getStoryInfo() {
+ return storyInfo;
+ }
+
+ /**
+ * optional .ChessRogueNousStoryInfo story_info = 10;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public ChessRogueNousStoryInfoOuterClass.ChessRogueNousStoryInfo getMutableStoryInfo() {
+ bitField0_ |= 0x00000008;
+ return storyInfo;
+ }
+
+ /**
+ * optional .ChessRogueNousStoryInfo story_info = 10;
+ * @param value the storyInfo to set
+ * @return this
+ */
+ public ChessRogueCurrentInfo setStoryInfo(
+ final ChessRogueNousStoryInfoOuterClass.ChessRogueNousStoryInfo value) {
+ bitField0_ |= 0x00000008;
+ storyInfo.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional .RogueCommonPendingAction pending_action = 11;
+ * @return whether the pendingAction field is set
+ */
+ public boolean hasPendingAction() {
+ return (bitField0_ & 0x00000010) != 0;
+ }
+
+ /**
+ * optional .RogueCommonPendingAction pending_action = 11;
+ * @return this
+ */
+ public ChessRogueCurrentInfo clearPendingAction() {
+ bitField0_ &= ~0x00000010;
+ pendingAction.clear();
+ return this;
+ }
+
+ /**
+ * optional .RogueCommonPendingAction pending_action = 11;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutablePendingAction()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RogueCommonPendingActionOuterClass.RogueCommonPendingAction getPendingAction() {
+ return pendingAction;
+ }
+
+ /**
+ * optional .RogueCommonPendingAction pending_action = 11;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RogueCommonPendingActionOuterClass.RogueCommonPendingAction getMutablePendingAction() {
+ bitField0_ |= 0x00000010;
+ return pendingAction;
+ }
+
+ /**
+ * optional .RogueCommonPendingAction pending_action = 11;
+ * @param value the pendingAction to set
+ * @return this
+ */
+ public ChessRogueCurrentInfo setPendingAction(
+ final RogueCommonPendingActionOuterClass.RogueCommonPendingAction value) {
+ bitField0_ |= 0x00000010;
+ pendingAction.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional .ChessRogueBuffInfo buff_info = 12;
+ * @return whether the buffInfo field is set
+ */
+ public boolean hasBuffInfo() {
+ return (bitField0_ & 0x00000020) != 0;
+ }
+
+ /**
+ * optional .ChessRogueBuffInfo buff_info = 12;
+ * @return this
+ */
+ public ChessRogueCurrentInfo clearBuffInfo() {
+ bitField0_ &= ~0x00000020;
+ buffInfo.clear();
+ return this;
+ }
+
+ /**
+ * optional .ChessRogueBuffInfo 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.
+ *
+ * Use {@link #getMutableBuffInfo()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo getBuffInfo() {
+ return buffInfo;
+ }
+
+ /**
+ * optional .ChessRogueBuffInfo 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
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo getMutableBuffInfo() {
+ bitField0_ |= 0x00000020;
+ return buffInfo;
+ }
+
+ /**
+ * optional .ChessRogueBuffInfo buff_info = 12;
+ * @param value the buffInfo to set
+ * @return this
+ */
+ public ChessRogueCurrentInfo setBuffInfo(
+ final ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo value) {
+ bitField0_ |= 0x00000020;
+ buffInfo.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional .ChessRogueMiracleInfo miracle_info = 14;
+ * @return whether the miracleInfo field is set
+ */
+ public boolean hasMiracleInfo() {
+ return (bitField0_ & 0x00000040) != 0;
+ }
+
+ /**
+ * optional .ChessRogueMiracleInfo miracle_info = 14;
+ * @return this
+ */
+ public ChessRogueCurrentInfo clearMiracleInfo() {
+ bitField0_ &= ~0x00000040;
+ miracleInfo.clear();
+ return this;
+ }
+
+ /**
+ * optional .ChessRogueMiracleInfo miracle_info = 14;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableMiracleInfo()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo getMiracleInfo() {
+ return miracleInfo;
+ }
+
+ /**
+ * optional .ChessRogueMiracleInfo miracle_info = 14;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo getMutableMiracleInfo() {
+ bitField0_ |= 0x00000040;
+ return miracleInfo;
+ }
+
+ /**
+ * optional .ChessRogueMiracleInfo miracle_info = 14;
+ * @param value the miracleInfo to set
+ * @return this
+ */
+ public ChessRogueCurrentInfo setMiracleInfo(
+ final ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo value) {
+ bitField0_ |= 0x00000040;
+ miracleInfo.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional .ChessRogueNousDice dice_info = 15;
+ * @return whether the diceInfo field is set
+ */
+ public boolean hasDiceInfo() {
+ return (bitField0_ & 0x00000080) != 0;
+ }
+
+ /**
+ * optional .ChessRogueNousDice dice_info = 15;
+ * @return this
+ */
+ public ChessRogueCurrentInfo clearDiceInfo() {
+ bitField0_ &= ~0x00000080;
+ diceInfo.clear();
+ return this;
+ }
+
+ /**
+ * optional .ChessRogueNousDice dice_info = 15;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableDiceInfo()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public ChessRogueNousDiceOuterClass.ChessRogueNousDice getDiceInfo() {
+ return diceInfo;
+ }
+
+ /**
+ * optional .ChessRogueNousDice dice_info = 15;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public ChessRogueNousDiceOuterClass.ChessRogueNousDice getMutableDiceInfo() {
+ bitField0_ |= 0x00000080;
+ return diceInfo;
+ }
+
+ /**
+ * optional .ChessRogueNousDice dice_info = 15;
+ * @param value the diceInfo to set
+ * @return this
+ */
+ public ChessRogueCurrentInfo setDiceInfo(
+ final ChessRogueNousDiceOuterClass.ChessRogueNousDice value) {
+ bitField0_ |= 0x00000080;
+ diceInfo.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * repeated .ChessRogueVirtualItemInfo virtual_item_info = 4;
* @return whether the virtualItemInfo field is set
*/
public boolean hasVirtualItemInfo() {
@@ -630,7 +526,7 @@ public final class ChessRogueCurrentInfoOuterClass {
}
/**
- * repeated .ChessRogueVirtualItemInfo virtual_item_info = 13;
+ * repeated .ChessRogueVirtualItemInfo virtual_item_info = 4;
* @return this
*/
public ChessRogueCurrentInfo clearVirtualItemInfo() {
@@ -640,7 +536,7 @@ public final class ChessRogueCurrentInfoOuterClass {
}
/**
- * repeated .ChessRogueVirtualItemInfo virtual_item_info = 13;
+ * repeated .ChessRogueVirtualItemInfo virtual_item_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.
@@ -655,7 +551,7 @@ public final class ChessRogueCurrentInfoOuterClass {
}
/**
- * repeated .ChessRogueVirtualItemInfo virtual_item_info = 13;
+ * repeated .ChessRogueVirtualItemInfo virtual_item_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
@@ -670,7 +566,7 @@ public final class ChessRogueCurrentInfoOuterClass {
}
/**
- * repeated .ChessRogueVirtualItemInfo virtual_item_info = 13;
+ * repeated .ChessRogueVirtualItemInfo virtual_item_info = 4;
* @param value the virtualItemInfo to add
* @return this
*/
@@ -682,7 +578,7 @@ public final class ChessRogueCurrentInfoOuterClass {
}
/**
- * repeated .ChessRogueVirtualItemInfo virtual_item_info = 13;
+ * repeated .ChessRogueVirtualItemInfo virtual_item_info = 4;
* @param values the virtualItemInfo to add
* @return this
*/
@@ -699,13 +595,13 @@ public final class ChessRogueCurrentInfoOuterClass {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
rogueVersionId = other.rogueVersionId;
+ nousValue.copyFrom(other.nousValue);
+ rogueAvatarInfo.copyFrom(other.rogueAvatarInfo);
+ storyInfo.copyFrom(other.storyInfo);
+ pendingAction.copyFrom(other.pendingAction);
buffInfo.copyFrom(other.buffInfo);
miracleInfo.copyFrom(other.miracleInfo);
- pendingAction.copyFrom(other.pendingAction);
- storyInfo.copyFrom(other.storyInfo);
- rogueAvatarInfo.copyFrom(other.rogueAvatarInfo);
diceInfo.copyFrom(other.diceInfo);
- nousValue.copyFrom(other.nousValue);
virtualItemInfo.copyFrom(other.virtualItemInfo);
}
return this;
@@ -720,27 +616,27 @@ public final class ChessRogueCurrentInfoOuterClass {
if (other.hasRogueVersionId()) {
setRogueVersionId(other.rogueVersionId);
}
+ if (other.hasNousValue()) {
+ getMutableNousValue().mergeFrom(other.nousValue);
+ }
+ if (other.hasRogueAvatarInfo()) {
+ getMutableRogueAvatarInfo().mergeFrom(other.rogueAvatarInfo);
+ }
+ if (other.hasStoryInfo()) {
+ getMutableStoryInfo().mergeFrom(other.storyInfo);
+ }
+ if (other.hasPendingAction()) {
+ getMutablePendingAction().mergeFrom(other.pendingAction);
+ }
if (other.hasBuffInfo()) {
getMutableBuffInfo().mergeFrom(other.buffInfo);
}
if (other.hasMiracleInfo()) {
getMutableMiracleInfo().mergeFrom(other.miracleInfo);
}
- if (other.hasPendingAction()) {
- getMutablePendingAction().mergeFrom(other.pendingAction);
- }
- if (other.hasStoryInfo()) {
- getMutableStoryInfo().mergeFrom(other.storyInfo);
- }
- if (other.hasRogueAvatarInfo()) {
- getMutableRogueAvatarInfo().mergeFrom(other.rogueAvatarInfo);
- }
if (other.hasDiceInfo()) {
getMutableDiceInfo().mergeFrom(other.diceInfo);
}
- if (other.hasNousValue()) {
- getMutableNousValue().mergeFrom(other.nousValue);
- }
if (other.hasVirtualItemInfo()) {
getMutableVirtualItemInfo().addAll(other.virtualItemInfo);
}
@@ -755,13 +651,13 @@ public final class ChessRogueCurrentInfoOuterClass {
cachedSize = -1;
bitField0_ = 0;
rogueVersionId = 0;
+ nousValue.clear();
+ rogueAvatarInfo.clear();
+ storyInfo.clear();
+ pendingAction.clear();
buffInfo.clear();
miracleInfo.clear();
- pendingAction.clear();
- storyInfo.clear();
- rogueAvatarInfo.clear();
diceInfo.clear();
- nousValue.clear();
virtualItemInfo.clear();
return this;
}
@@ -773,13 +669,13 @@ public final class ChessRogueCurrentInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
+ nousValue.clearQuick();
+ rogueAvatarInfo.clearQuick();
+ storyInfo.clearQuick();
+ pendingAction.clearQuick();
buffInfo.clearQuick();
miracleInfo.clearQuick();
- pendingAction.clearQuick();
- storyInfo.clearQuick();
- rogueAvatarInfo.clearQuick();
diceInfo.clearQuick();
- nousValue.clearQuick();
virtualItemInfo.clearQuick();
return this;
}
@@ -795,53 +691,53 @@ public final class ChessRogueCurrentInfoOuterClass {
ChessRogueCurrentInfo other = (ChessRogueCurrentInfo) o;
return bitField0_ == other.bitField0_
&& (!hasRogueVersionId() || rogueVersionId == other.rogueVersionId)
+ && (!hasNousValue() || nousValue.equals(other.nousValue))
+ && (!hasRogueAvatarInfo() || rogueAvatarInfo.equals(other.rogueAvatarInfo))
+ && (!hasStoryInfo() || storyInfo.equals(other.storyInfo))
+ && (!hasPendingAction() || pendingAction.equals(other.pendingAction))
&& (!hasBuffInfo() || buffInfo.equals(other.buffInfo))
&& (!hasMiracleInfo() || miracleInfo.equals(other.miracleInfo))
- && (!hasPendingAction() || pendingAction.equals(other.pendingAction))
- && (!hasStoryInfo() || storyInfo.equals(other.storyInfo))
- && (!hasRogueAvatarInfo() || rogueAvatarInfo.equals(other.rogueAvatarInfo))
&& (!hasDiceInfo() || diceInfo.equals(other.diceInfo))
- && (!hasNousValue() || nousValue.equals(other.nousValue))
&& (!hasVirtualItemInfo() || virtualItemInfo.equals(other.virtualItemInfo));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(rogueVersionId);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 10);
- output.writeMessageNoTag(buffInfo);
+ output.writeMessageNoTag(nousValue);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 26);
- output.writeMessageNoTag(miracleInfo);
- }
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 34);
- output.writeMessageNoTag(pendingAction);
- }
- if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 42);
- output.writeMessageNoTag(storyInfo);
- }
- if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 82);
+ output.writeRawByte((byte) 74);
output.writeMessageNoTag(rogueAvatarInfo);
}
- if ((bitField0_ & 0x00000040) != 0) {
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeRawByte((byte) 82);
+ output.writeMessageNoTag(storyInfo);
+ }
+ if ((bitField0_ & 0x00000010) != 0) {
output.writeRawByte((byte) 90);
- output.writeMessageNoTag(diceInfo);
+ output.writeMessageNoTag(pendingAction);
+ }
+ if ((bitField0_ & 0x00000020) != 0) {
+ output.writeRawByte((byte) 98);
+ output.writeMessageNoTag(buffInfo);
+ }
+ if ((bitField0_ & 0x00000040) != 0) {
+ output.writeRawByte((byte) 114);
+ output.writeMessageNoTag(miracleInfo);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRawByte((byte) 114);
- output.writeMessageNoTag(nousValue);
+ output.writeRawByte((byte) 122);
+ output.writeMessageNoTag(diceInfo);
}
if ((bitField0_ & 0x00000100) != 0) {
for (int i = 0; i < virtualItemInfo.length(); i++) {
- output.writeRawByte((byte) 106);
+ output.writeRawByte((byte) 34);
output.writeMessageNoTag(virtualItemInfo.get(i));
}
}
@@ -854,25 +750,25 @@ public final class ChessRogueCurrentInfoOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueVersionId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(buffInfo);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(nousValue);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(miracleInfo);
- }
- if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(pendingAction);
- }
- if ((bitField0_ & 0x00000010) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(storyInfo);
- }
- if ((bitField0_ & 0x00000020) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAvatarInfo);
}
+ if ((bitField0_ & 0x00000008) != 0) {
+ size += 1 + ProtoSink.computeMessageSizeNoTag(storyInfo);
+ }
+ if ((bitField0_ & 0x00000010) != 0) {
+ size += 1 + ProtoSink.computeMessageSizeNoTag(pendingAction);
+ }
+ if ((bitField0_ & 0x00000020) != 0) {
+ size += 1 + ProtoSink.computeMessageSizeNoTag(buffInfo);
+ }
if ((bitField0_ & 0x00000040) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(diceInfo);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(miracleInfo);
}
if ((bitField0_ & 0x00000080) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(nousValue);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(diceInfo);
}
if ((bitField0_ & 0x00000100) != 0) {
size += (1 * virtualItemInfo.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(virtualItemInfo);
@@ -887,7 +783,7 @@ public final class ChessRogueCurrentInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 96: {
+ case 48: {
// rogueVersionId
rogueVersionId = input.readUInt32();
bitField0_ |= 0x00000001;
@@ -897,69 +793,69 @@ public final class ChessRogueCurrentInfoOuterClass {
}
}
case 10: {
- // buffInfo
- input.readMessage(buffInfo);
+ // nousValue
+ input.readMessage(nousValue);
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 26) {
+ if (tag != 74) {
break;
}
}
- case 26: {
- // miracleInfo
- input.readMessage(miracleInfo);
+ case 74: {
+ // rogueAvatarInfo
+ input.readMessage(rogueAvatarInfo);
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 34) {
- break;
- }
- }
- case 34: {
- // pendingAction
- input.readMessage(pendingAction);
- bitField0_ |= 0x00000008;
- tag = input.readTag();
- if (tag != 42) {
- break;
- }
- }
- case 42: {
- // storyInfo
- input.readMessage(storyInfo);
- bitField0_ |= 0x00000010;
- tag = input.readTag();
if (tag != 82) {
break;
}
}
case 82: {
- // rogueAvatarInfo
- input.readMessage(rogueAvatarInfo);
- bitField0_ |= 0x00000020;
+ // storyInfo
+ input.readMessage(storyInfo);
+ bitField0_ |= 0x00000008;
tag = input.readTag();
if (tag != 90) {
break;
}
}
case 90: {
- // diceInfo
- input.readMessage(diceInfo);
- bitField0_ |= 0x00000040;
+ // pendingAction
+ input.readMessage(pendingAction);
+ bitField0_ |= 0x00000010;
+ tag = input.readTag();
+ if (tag != 98) {
+ break;
+ }
+ }
+ case 98: {
+ // buffInfo
+ input.readMessage(buffInfo);
+ bitField0_ |= 0x00000020;
tag = input.readTag();
if (tag != 114) {
break;
}
}
case 114: {
- // nousValue
- input.readMessage(nousValue);
- bitField0_ |= 0x00000080;
+ // miracleInfo
+ input.readMessage(miracleInfo);
+ bitField0_ |= 0x00000040;
tag = input.readTag();
- if (tag != 106) {
+ if (tag != 122) {
break;
}
}
- case 106: {
+ case 122: {
+ // diceInfo
+ input.readMessage(diceInfo);
+ bitField0_ |= 0x00000080;
+ tag = input.readTag();
+ if (tag != 34) {
+ break;
+ }
+ }
+ case 34: {
// virtualItemInfo
tag = input.readRepeatedMessage(virtualItemInfo, tag);
bitField0_ |= 0x00000100;
@@ -988,25 +884,25 @@ public final class ChessRogueCurrentInfoOuterClass {
output.writeUInt32(FieldNames.rogueVersionId, rogueVersionId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeMessage(FieldNames.buffInfo, buffInfo);
+ output.writeMessage(FieldNames.nousValue, nousValue);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeMessage(FieldNames.miracleInfo, miracleInfo);
- }
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeMessage(FieldNames.pendingAction, pendingAction);
- }
- if ((bitField0_ & 0x00000010) != 0) {
- output.writeMessage(FieldNames.storyInfo, storyInfo);
- }
- if ((bitField0_ & 0x00000020) != 0) {
output.writeMessage(FieldNames.rogueAvatarInfo, rogueAvatarInfo);
}
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeMessage(FieldNames.storyInfo, storyInfo);
+ }
+ if ((bitField0_ & 0x00000010) != 0) {
+ output.writeMessage(FieldNames.pendingAction, pendingAction);
+ }
+ if ((bitField0_ & 0x00000020) != 0) {
+ output.writeMessage(FieldNames.buffInfo, buffInfo);
+ }
if ((bitField0_ & 0x00000040) != 0) {
- output.writeMessage(FieldNames.diceInfo, diceInfo);
+ output.writeMessage(FieldNames.miracleInfo, miracleInfo);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeMessage(FieldNames.nousValue, nousValue);
+ output.writeMessage(FieldNames.diceInfo, diceInfo);
}
if ((bitField0_ & 0x00000100) != 0) {
output.writeRepeatedMessage(FieldNames.virtualItemInfo, virtualItemInfo);
@@ -1033,11 +929,11 @@ public final class ChessRogueCurrentInfoOuterClass {
}
break;
}
- case -1522874463:
- case 55707930: {
- if (input.isAtField(FieldNames.buffInfo)) {
+ case -1234555758:
+ case 660197713: {
+ if (input.isAtField(FieldNames.nousValue)) {
if (!input.trySkipNullValue()) {
- input.readMessage(buffInfo);
+ input.readMessage(nousValue);
bitField0_ |= 0x00000002;
}
} else {
@@ -1045,47 +941,47 @@ public final class ChessRogueCurrentInfoOuterClass {
}
break;
}
- case 760306879:
- case 2114852796: {
- if (input.isAtField(FieldNames.miracleInfo)) {
- if (!input.trySkipNullValue()) {
- input.readMessage(miracleInfo);
- bitField0_ |= 0x00000004;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case -110680403:
- case 1646545374: {
- if (input.isAtField(FieldNames.pendingAction)) {
- if (!input.trySkipNullValue()) {
- input.readMessage(pendingAction);
- bitField0_ |= 0x00000008;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 1710116675:
- case 1494185400: {
- if (input.isAtField(FieldNames.storyInfo)) {
- if (!input.trySkipNullValue()) {
- input.readMessage(storyInfo);
- bitField0_ |= 0x00000010;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case -1966631135:
case 667955439: {
if (input.isAtField(FieldNames.rogueAvatarInfo)) {
if (!input.trySkipNullValue()) {
input.readMessage(rogueAvatarInfo);
+ bitField0_ |= 0x00000004;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 1710116675:
+ case 1494185400: {
+ if (input.isAtField(FieldNames.storyInfo)) {
+ if (!input.trySkipNullValue()) {
+ input.readMessage(storyInfo);
+ bitField0_ |= 0x00000008;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -110680403:
+ case 1646545374: {
+ if (input.isAtField(FieldNames.pendingAction)) {
+ if (!input.trySkipNullValue()) {
+ input.readMessage(pendingAction);
+ bitField0_ |= 0x00000010;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -1522874463:
+ case 55707930: {
+ if (input.isAtField(FieldNames.buffInfo)) {
+ if (!input.trySkipNullValue()) {
+ input.readMessage(buffInfo);
bitField0_ |= 0x00000020;
}
} else {
@@ -1093,23 +989,23 @@ public final class ChessRogueCurrentInfoOuterClass {
}
break;
}
+ case 760306879:
+ case 2114852796: {
+ if (input.isAtField(FieldNames.miracleInfo)) {
+ if (!input.trySkipNullValue()) {
+ input.readMessage(miracleInfo);
+ bitField0_ |= 0x00000040;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case -184174347:
case -1394261434: {
if (input.isAtField(FieldNames.diceInfo)) {
if (!input.trySkipNullValue()) {
input.readMessage(diceInfo);
- bitField0_ |= 0x00000040;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case -1234555758:
- case 660197713: {
- if (input.isAtField(FieldNames.nousValue)) {
- if (!input.trySkipNullValue()) {
- input.readMessage(nousValue);
bitField0_ |= 0x00000080;
}
} else {
@@ -1184,20 +1080,20 @@ public final class ChessRogueCurrentInfoOuterClass {
static class FieldNames {
static final FieldName rogueVersionId = FieldName.forField("rogueVersionId", "rogue_version_id");
+ static final FieldName nousValue = FieldName.forField("nousValue", "nous_value");
+
+ static final FieldName rogueAvatarInfo = FieldName.forField("rogueAvatarInfo", "rogue_avatar_info");
+
+ static final FieldName storyInfo = FieldName.forField("storyInfo", "story_info");
+
+ static final FieldName pendingAction = FieldName.forField("pendingAction", "pending_action");
+
static final FieldName buffInfo = FieldName.forField("buffInfo", "buff_info");
static final FieldName miracleInfo = FieldName.forField("miracleInfo", "miracle_info");
- static final FieldName pendingAction = FieldName.forField("pendingAction", "pending_action");
-
- static final FieldName storyInfo = FieldName.forField("storyInfo", "story_info");
-
- static final FieldName rogueAvatarInfo = FieldName.forField("rogueAvatarInfo", "rogue_avatar_info");
-
static final FieldName diceInfo = FieldName.forField("diceInfo", "dice_info");
- static final FieldName nousValue = FieldName.forField("nousValue", "nous_value");
-
static final FieldName virtualItemInfo = FieldName.forField("virtualItemInfo", "virtual_item_info");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueInfoOuterClass.java
index dcb8db3..ecc7560 100644
--- a/src/generated/main/emu/lunarcore/proto/ChessRogueInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChessRogueInfoOuterClass.java
@@ -19,15 +19,15 @@ public final class ChessRogueInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .LineupInfo lineup = 4;
- */
- private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance();
-
- /**
- * optional .SceneInfo scene = 6;
+ * optional .SceneInfo scene = 5;
*/
private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance();
+ /**
+ * optional .LineupInfo lineup = 7;
+ */
+ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance();
+
private ChessRogueInfo() {
}
@@ -39,82 +39,25 @@ public final class ChessRogueInfoOuterClass {
}
/**
- * optional .LineupInfo lineup = 4;
- * @return whether the lineup field is set
+ * optional .SceneInfo scene = 5;
+ * @return whether the scene field is set
*/
- public boolean hasLineup() {
+ public boolean hasScene() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional .LineupInfo lineup = 4;
- * @return this
- */
- public ChessRogueInfo clearLineup() {
- bitField0_ &= ~0x00000001;
- lineup.clear();
- return this;
- }
-
- /**
- * optional .LineupInfo lineup = 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 #getMutableLineup()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public LineupInfoOuterClass.LineupInfo getLineup() {
- return lineup;
- }
-
- /**
- * optional .LineupInfo lineup = 4;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public LineupInfoOuterClass.LineupInfo getMutableLineup() {
- bitField0_ |= 0x00000001;
- return lineup;
- }
-
- /**
- * optional .LineupInfo lineup = 4;
- * @param value the lineup to set
- * @return this
- */
- public ChessRogueInfo setLineup(final LineupInfoOuterClass.LineupInfo value) {
- bitField0_ |= 0x00000001;
- lineup.copyFrom(value);
- return this;
- }
-
- /**
- * optional .SceneInfo scene = 6;
- * @return whether the scene field is set
- */
- public boolean hasScene() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional .SceneInfo scene = 6;
+ * optional .SceneInfo scene = 5;
* @return this
*/
public ChessRogueInfo clearScene() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
scene.clear();
return this;
}
/**
- * optional .SceneInfo scene = 6;
+ * optional .SceneInfo scene = 5;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -128,7 +71,7 @@ public final class ChessRogueInfoOuterClass {
}
/**
- * optional .SceneInfo scene = 6;
+ * optional .SceneInfo scene = 5;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -137,28 +80,85 @@ public final class ChessRogueInfoOuterClass {
* @return internal storage object for modifications
*/
public SceneInfoOuterClass.SceneInfo getMutableScene() {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
return scene;
}
/**
- * optional .SceneInfo scene = 6;
+ * optional .SceneInfo scene = 5;
* @param value the scene to set
* @return this
*/
public ChessRogueInfo setScene(final SceneInfoOuterClass.SceneInfo value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
scene.copyFrom(value);
return this;
}
+ /**
+ * optional .LineupInfo lineup = 7;
+ * @return whether the lineup field is set
+ */
+ public boolean hasLineup() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional .LineupInfo lineup = 7;
+ * @return this
+ */
+ public ChessRogueInfo clearLineup() {
+ bitField0_ &= ~0x00000002;
+ lineup.clear();
+ return this;
+ }
+
+ /**
+ * optional .LineupInfo lineup = 7;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableLineup()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public LineupInfoOuterClass.LineupInfo getLineup() {
+ return lineup;
+ }
+
+ /**
+ * optional .LineupInfo lineup = 7;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public LineupInfoOuterClass.LineupInfo getMutableLineup() {
+ bitField0_ |= 0x00000002;
+ return lineup;
+ }
+
+ /**
+ * optional .LineupInfo lineup = 7;
+ * @param value the lineup to set
+ * @return this
+ */
+ public ChessRogueInfo setLineup(final LineupInfoOuterClass.LineupInfo value) {
+ bitField0_ |= 0x00000002;
+ lineup.copyFrom(value);
+ return this;
+ }
+
@Override
public ChessRogueInfo copyFrom(final ChessRogueInfo other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- lineup.copyFrom(other.lineup);
scene.copyFrom(other.scene);
+ lineup.copyFrom(other.lineup);
}
return this;
}
@@ -169,12 +169,12 @@ public final class ChessRogueInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasLineup()) {
- getMutableLineup().mergeFrom(other.lineup);
- }
if (other.hasScene()) {
getMutableScene().mergeFrom(other.scene);
}
+ if (other.hasLineup()) {
+ getMutableLineup().mergeFrom(other.lineup);
+ }
return this;
}
@@ -185,8 +185,8 @@ public final class ChessRogueInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- lineup.clear();
scene.clear();
+ lineup.clear();
return this;
}
@@ -197,8 +197,8 @@ public final class ChessRogueInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- lineup.clearQuick();
scene.clearQuick();
+ lineup.clearQuick();
return this;
}
@@ -212,19 +212,19 @@ public final class ChessRogueInfoOuterClass {
}
ChessRogueInfo other = (ChessRogueInfo) o;
return bitField0_ == other.bitField0_
- && (!hasLineup() || lineup.equals(other.lineup))
- && (!hasScene() || scene.equals(other.scene));
+ && (!hasScene() || scene.equals(other.scene))
+ && (!hasLineup() || lineup.equals(other.lineup));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 34);
- output.writeMessageNoTag(lineup);
+ output.writeRawByte((byte) 42);
+ output.writeMessageNoTag(scene);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 50);
- output.writeMessageNoTag(scene);
+ output.writeRawByte((byte) 58);
+ output.writeMessageNoTag(lineup);
}
}
@@ -232,10 +232,10 @@ public final class ChessRogueInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(lineup);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(scene);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(scene);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(lineup);
}
return size;
}
@@ -247,18 +247,18 @@ public final class ChessRogueInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 34: {
- // lineup
- input.readMessage(lineup);
+ case 42: {
+ // scene
+ input.readMessage(scene);
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 50) {
+ if (tag != 58) {
break;
}
}
- case 50: {
- // scene
- input.readMessage(scene);
+ case 58: {
+ // lineup
+ input.readMessage(lineup);
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
@@ -283,10 +283,10 @@ public final class ChessRogueInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeMessage(FieldNames.lineup, lineup);
+ output.writeMessage(FieldNames.scene, scene);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeMessage(FieldNames.scene, scene);
+ output.writeMessage(FieldNames.lineup, lineup);
}
output.endObject();
}
@@ -298,10 +298,10 @@ public final class ChessRogueInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1102671473: {
- if (input.isAtField(FieldNames.lineup)) {
+ case 109254796: {
+ if (input.isAtField(FieldNames.scene)) {
if (!input.trySkipNullValue()) {
- input.readMessage(lineup);
+ input.readMessage(scene);
bitField0_ |= 0x00000001;
}
} else {
@@ -309,10 +309,10 @@ public final class ChessRogueInfoOuterClass {
}
break;
}
- case 109254796: {
- if (input.isAtField(FieldNames.scene)) {
+ case -1102671473: {
+ if (input.isAtField(FieldNames.lineup)) {
if (!input.trySkipNullValue()) {
- input.readMessage(scene);
+ input.readMessage(lineup);
bitField0_ |= 0x00000002;
}
} else {
@@ -373,9 +373,9 @@ public final class ChessRogueInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName lineup = FieldName.forField("lineup");
-
static final FieldName scene = FieldName.forField("scene");
+
+ static final FieldName lineup = FieldName.forField("lineup");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueMiracleDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueMiracleDataOuterClass.java
index 1c11865..17d2aa2 100644
--- a/src/generated/main/emu/lunarcore/proto/ChessRogueMiracleDataOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChessRogueMiracleDataOuterClass.java
@@ -20,7 +20,7 @@ public final class ChessRogueMiracleDataOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated .RogueMiracle miracle_list = 15;
+ * repeated .RogueMiracle miracle_list = 11;
*/
private final RepeatedMessagerepeated .RogueMiracle miracle_list = 15;
+ * repeated .RogueMiracle miracle_list = 11;
* @return whether the miracleList field is set
*/
public boolean hasMiracleList() {
@@ -43,7 +43,7 @@ public final class ChessRogueMiracleDataOuterClass {
}
/**
- * repeated .RogueMiracle miracle_list = 15;
+ * repeated .RogueMiracle miracle_list = 11;
* @return this
*/
public ChessRogueMiracleData clearMiracleList() {
@@ -53,7 +53,7 @@ public final class ChessRogueMiracleDataOuterClass {
}
/**
- * repeated .RogueMiracle miracle_list = 15;
+ * repeated .RogueMiracle miracle_list = 11;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class ChessRogueMiracleDataOuterClass {
}
/**
- * repeated .RogueMiracle miracle_list = 15;
+ * repeated .RogueMiracle miracle_list = 11;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class ChessRogueMiracleDataOuterClass {
}
/**
- * repeated .RogueMiracle miracle_list = 15;
+ * repeated .RogueMiracle miracle_list = 11;
* @param value the miracleList to add
* @return this
*/
@@ -92,7 +92,7 @@ public final class ChessRogueMiracleDataOuterClass {
}
/**
- * repeated .RogueMiracle miracle_list = 15;
+ * repeated .RogueMiracle miracle_list = 11;
* @param values the miracleList to add
* @return this
*/
@@ -164,7 +164,7 @@ public final class ChessRogueMiracleDataOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < miracleList.length(); i++) {
- output.writeRawByte((byte) 122);
+ output.writeRawByte((byte) 90);
output.writeMessageNoTag(miracleList.get(i));
}
}
@@ -186,7 +186,7 @@ public final class ChessRogueMiracleDataOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 122: {
+ case 90: {
// miracleList
tag = input.readRepeatedMessage(miracleList, tag);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueMiracleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueMiracleInfoOuterClass.java
index 4c6c9a0..f4cfa42 100644
--- a/src/generated/main/emu/lunarcore/proto/ChessRogueMiracleInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChessRogueMiracleInfoOuterClass.java
@@ -19,7 +19,7 @@ public final class ChessRogueMiracleInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .ChessRogueMiracleData miracle_data = 11;
+ * optional .ChessRogueMiracleData miracle_data = 13;
*/
private final ChessRogueMiracleDataOuterClass.ChessRogueMiracleData miracleData = ChessRogueMiracleDataOuterClass.ChessRogueMiracleData.newInstance();
@@ -34,7 +34,7 @@ public final class ChessRogueMiracleInfoOuterClass {
}
/**
- * optional .ChessRogueMiracleData miracle_data = 11;
+ * optional .ChessRogueMiracleData miracle_data = 13;
* @return whether the miracleData field is set
*/
public boolean hasMiracleData() {
@@ -42,7 +42,7 @@ public final class ChessRogueMiracleInfoOuterClass {
}
/**
- * optional .ChessRogueMiracleData miracle_data = 11;
+ * optional .ChessRogueMiracleData miracle_data = 13;
* @return this
*/
public ChessRogueMiracleInfo clearMiracleData() {
@@ -52,7 +52,7 @@ public final class ChessRogueMiracleInfoOuterClass {
}
/**
- * optional .ChessRogueMiracleData miracle_data = 11;
+ * optional .ChessRogueMiracleData miracle_data = 13;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -66,7 +66,7 @@ public final class ChessRogueMiracleInfoOuterClass {
}
/**
- * optional .ChessRogueMiracleData miracle_data = 11;
+ * optional .ChessRogueMiracleData miracle_data = 13;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -80,7 +80,7 @@ public final class ChessRogueMiracleInfoOuterClass {
}
/**
- * optional .ChessRogueMiracleData miracle_data = 11;
+ * optional .ChessRogueMiracleData miracle_data = 13;
* @param value the miracleData to set
* @return this
*/
@@ -151,7 +151,7 @@ public final class ChessRogueMiracleInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 90);
+ output.writeRawByte((byte) 106);
output.writeMessageNoTag(miracleData);
}
}
@@ -172,7 +172,7 @@ public final class ChessRogueMiracleInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 90: {
+ case 106: {
// miracleData
input.readMessage(miracleData);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueMoneyInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueMoneyInfoOuterClass.java
index 28b5788..ea6a485 100644
--- a/src/generated/main/emu/lunarcore/proto/ChessRogueMoneyInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChessRogueMoneyInfoOuterClass.java
@@ -19,7 +19,7 @@ public final class ChessRogueMoneyInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 money = 15;
+ * optional uint32 money = 14;
*/
private int money;
@@ -34,7 +34,7 @@ public final class ChessRogueMoneyInfoOuterClass {
}
/**
- * optional uint32 money = 15;
+ * optional uint32 money = 14;
* @return whether the money field is set
*/
public boolean hasMoney() {
@@ -42,7 +42,7 @@ public final class ChessRogueMoneyInfoOuterClass {
}
/**
- * optional uint32 money = 15;
+ * optional uint32 money = 14;
* @return this
*/
public ChessRogueMoneyInfo clearMoney() {
@@ -52,7 +52,7 @@ public final class ChessRogueMoneyInfoOuterClass {
}
/**
- * optional uint32 money = 15;
+ * optional uint32 money = 14;
* @return the money
*/
public int getMoney() {
@@ -60,7 +60,7 @@ public final class ChessRogueMoneyInfoOuterClass {
}
/**
- * optional uint32 money = 15;
+ * optional uint32 money = 14;
* @param value the money to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class ChessRogueMoneyInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 112);
output.writeUInt32NoTag(money);
}
}
@@ -150,7 +150,7 @@ public final class ChessRogueMoneyInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 120: {
+ case 112: {
// money
money = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueNousMainStoryInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueNousMainStoryInfoOuterClass.java
index 064402a..1ab85c5 100644
--- a/src/generated/main/emu/lunarcore/proto/ChessRogueNousMainStoryInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChessRogueNousMainStoryInfoOuterClass.java
@@ -19,7 +19,7 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 story_id = 10;
+ * optional uint32 story_id = 4;
*/
private int storyId;
@@ -28,7 +28,7 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
* 2 finished
*
*
- * optional uint32 status = 11;
+ * optional uint32 status = 5;
*/
private int status;
@@ -43,7 +43,7 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
}
/**
- * optional uint32 story_id = 10;
+ * optional uint32 story_id = 4;
* @return whether the storyId field is set
*/
public boolean hasStoryId() {
@@ -51,7 +51,7 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
}
/**
- * optional uint32 story_id = 10;
+ * optional uint32 story_id = 4;
* @return this
*/
public ChessRogueNousMainStoryInfo clearStoryId() {
@@ -61,7 +61,7 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
}
/**
- * optional uint32 story_id = 10;
+ * optional uint32 story_id = 4;
* @return the storyId
*/
public int getStoryId() {
@@ -69,7 +69,7 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
}
/**
- * optional uint32 story_id = 10;
+ * optional uint32 story_id = 4;
* @param value the storyId to set
* @return this
*/
@@ -84,7 +84,7 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
* 2 finished
*
*
- * optional uint32 status = 11;
+ * optional uint32 status = 5;
* @return whether the status field is set
*/
public boolean hasStatus() {
@@ -96,7 +96,7 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
* 2 finished
*
*
- * optional uint32 status = 11;
+ * optional uint32 status = 5;
* @return this
*/
public ChessRogueNousMainStoryInfo clearStatus() {
@@ -110,7 +110,7 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
* 2 finished
*
*
- * optional uint32 status = 11;
+ * optional uint32 status = 5;
* @return the status
*/
public int getStatus() {
@@ -122,7 +122,7 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
* 2 finished
*
*
- * optional uint32 status = 11;
+ * optional uint32 status = 5;
* @param value the status to set
* @return this
*/
@@ -197,11 +197,11 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(storyId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(status);
}
}
@@ -225,16 +225,16 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 80: {
+ case 32: {
// storyId
storyId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 88) {
+ if (tag != 40) {
break;
}
}
- case 88: {
+ case 40: {
// status
status = input.readUInt32();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueNousSubStoryInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueNousSubStoryInfoOuterClass.java
index 4a351d0..2d62595 100644
--- a/src/generated/main/emu/lunarcore/proto/ChessRogueNousSubStoryInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChessRogueNousSubStoryInfoOuterClass.java
@@ -19,7 +19,7 @@ public final class ChessRogueNousSubStoryInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 sub_story_id = 4;
+ * optional uint32 sub_story_id = 5;
*/
private int subStoryId;
@@ -34,7 +34,7 @@ public final class ChessRogueNousSubStoryInfoOuterClass {
}
/**
- * optional uint32 sub_story_id = 4;
+ * optional uint32 sub_story_id = 5;
* @return whether the subStoryId field is set
*/
public boolean hasSubStoryId() {
@@ -42,7 +42,7 @@ public final class ChessRogueNousSubStoryInfoOuterClass {
}
/**
- * optional uint32 sub_story_id = 4;
+ * optional uint32 sub_story_id = 5;
* @return this
*/
public ChessRogueNousSubStoryInfo clearSubStoryId() {
@@ -52,7 +52,7 @@ public final class ChessRogueNousSubStoryInfoOuterClass {
}
/**
- * optional uint32 sub_story_id = 4;
+ * optional uint32 sub_story_id = 5;
* @return the subStoryId
*/
public int getSubStoryId() {
@@ -60,7 +60,7 @@ public final class ChessRogueNousSubStoryInfoOuterClass {
}
/**
- * optional uint32 sub_story_id = 4;
+ * optional uint32 sub_story_id = 5;
* @param value the subStoryId to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class ChessRogueNousSubStoryInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(subStoryId);
}
}
@@ -150,7 +150,7 @@ public final class ChessRogueNousSubStoryInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
+ case 40: {
// subStoryId
subStoryId = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueNousValueOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueNousValueOuterClass.java
index 72131e6..92779f2 100644
--- a/src/generated/main/emu/lunarcore/proto/ChessRogueNousValueOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChessRogueNousValueOuterClass.java
@@ -19,7 +19,7 @@ public final class ChessRogueNousValueOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 value = 13;
+ * optional uint32 value = 6;
*/
private int value_;
@@ -34,7 +34,7 @@ public final class ChessRogueNousValueOuterClass {
}
/**
- * optional uint32 value = 13;
+ * optional uint32 value = 6;
* @return whether the value_ field is set
*/
public boolean hasValue() {
@@ -42,7 +42,7 @@ public final class ChessRogueNousValueOuterClass {
}
/**
- * optional uint32 value = 13;
+ * optional uint32 value = 6;
* @return this
*/
public ChessRogueNousValue clearValue() {
@@ -52,7 +52,7 @@ public final class ChessRogueNousValueOuterClass {
}
/**
- * optional uint32 value = 13;
+ * optional uint32 value = 6;
* @return the value_
*/
public int getValue() {
@@ -60,7 +60,7 @@ public final class ChessRogueNousValueOuterClass {
}
/**
- * optional uint32 value = 13;
+ * optional uint32 value = 6;
* @param value the value_ to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class ChessRogueNousValueOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(value_);
}
}
@@ -150,7 +150,7 @@ public final class ChessRogueNousValueOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 104: {
+ case 48: {
// value_
value_ = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueSelectCellScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueSelectCellScRspOuterClass.java
index a3fb409..718846c 100644
--- a/src/generated/main/emu/lunarcore/proto/ChessRogueSelectCellScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChessRogueSelectCellScRspOuterClass.java
@@ -19,25 +19,15 @@ public final class ChessRogueSelectCellScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 JNBHLHFBBBJ = 5;
- */
- private int jNBHLHFBBBJ;
-
- /**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 2;
*/
private int retcode;
/**
- * optional uint32 cell_id = 13;
+ * optional uint32 cell_id = 12;
*/
private int cellId;
- /**
- * optional .LLJFPKKLGAK NDGOHDPDKAD = 10;
- */
- private final LLJFPKKLGAKOuterClass.LLJFPKKLGAK nDGOHDPDKAD = LLJFPKKLGAKOuterClass.LLJFPKKLGAK.newInstance();
-
private ChessRogueSelectCellScRsp() {
}
@@ -49,62 +39,25 @@ public final class ChessRogueSelectCellScRspOuterClass {
}
/**
- * optional uint32 JNBHLHFBBBJ = 5;
- * @return whether the jNBHLHFBBBJ field is set
+ * optional uint32 retcode = 2;
+ * @return whether the retcode field is set
*/
- public boolean hasJNBHLHFBBBJ() {
+ public boolean hasRetcode() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 JNBHLHFBBBJ = 5;
- * @return this
- */
- public ChessRogueSelectCellScRsp clearJNBHLHFBBBJ() {
- bitField0_ &= ~0x00000001;
- jNBHLHFBBBJ = 0;
- return this;
- }
-
- /**
- * optional uint32 JNBHLHFBBBJ = 5;
- * @return the jNBHLHFBBBJ
- */
- public int getJNBHLHFBBBJ() {
- return jNBHLHFBBBJ;
- }
-
- /**
- * optional uint32 JNBHLHFBBBJ = 5;
- * @param value the jNBHLHFBBBJ to set
- * @return this
- */
- public ChessRogueSelectCellScRsp setJNBHLHFBBBJ(final int value) {
- bitField0_ |= 0x00000001;
- jNBHLHFBBBJ = value;
- return this;
- }
-
- /**
- * optional uint32 retcode = 7;
- * @return whether the retcode field is set
- */
- public boolean hasRetcode() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 2;
* @return this
*/
public ChessRogueSelectCellScRsp clearRetcode() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
retcode = 0;
return this;
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 2;
* @return the retcode
*/
public int getRetcode() {
@@ -112,36 +65,36 @@ public final class ChessRogueSelectCellScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 2;
* @param value the retcode to set
* @return this
*/
public ChessRogueSelectCellScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
retcode = value;
return this;
}
/**
- * optional uint32 cell_id = 13;
+ * optional uint32 cell_id = 12;
* @return whether the cellId field is set
*/
public boolean hasCellId() {
- return (bitField0_ & 0x00000004) != 0;
+ return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 cell_id = 13;
+ * optional uint32 cell_id = 12;
* @return this
*/
public ChessRogueSelectCellScRsp clearCellId() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
cellId = 0;
return this;
}
/**
- * optional uint32 cell_id = 13;
+ * optional uint32 cell_id = 12;
* @return the cellId
*/
public int getCellId() {
@@ -149,82 +102,23 @@ public final class ChessRogueSelectCellScRspOuterClass {
}
/**
- * optional uint32 cell_id = 13;
+ * optional uint32 cell_id = 12;
* @param value the cellId to set
* @return this
*/
public ChessRogueSelectCellScRsp setCellId(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
cellId = value;
return this;
}
- /**
- * optional .LLJFPKKLGAK NDGOHDPDKAD = 10;
- * @return whether the nDGOHDPDKAD field is set
- */
- public boolean hasNDGOHDPDKAD() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional .LLJFPKKLGAK NDGOHDPDKAD = 10;
- * @return this
- */
- public ChessRogueSelectCellScRsp clearNDGOHDPDKAD() {
- bitField0_ &= ~0x00000008;
- nDGOHDPDKAD.clear();
- return this;
- }
-
- /**
- * optional .LLJFPKKLGAK NDGOHDPDKAD = 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 #getMutableNDGOHDPDKAD()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public LLJFPKKLGAKOuterClass.LLJFPKKLGAK getNDGOHDPDKAD() {
- return nDGOHDPDKAD;
- }
-
- /**
- * optional .LLJFPKKLGAK NDGOHDPDKAD = 10;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public LLJFPKKLGAKOuterClass.LLJFPKKLGAK getMutableNDGOHDPDKAD() {
- bitField0_ |= 0x00000008;
- return nDGOHDPDKAD;
- }
-
- /**
- * optional .LLJFPKKLGAK NDGOHDPDKAD = 10;
- * @param value the nDGOHDPDKAD to set
- * @return this
- */
- public ChessRogueSelectCellScRsp setNDGOHDPDKAD(final LLJFPKKLGAKOuterClass.LLJFPKKLGAK value) {
- bitField0_ |= 0x00000008;
- nDGOHDPDKAD.copyFrom(value);
- return this;
- }
-
@Override
public ChessRogueSelectCellScRsp copyFrom(final ChessRogueSelectCellScRsp other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- jNBHLHFBBBJ = other.jNBHLHFBBBJ;
retcode = other.retcode;
cellId = other.cellId;
- nDGOHDPDKAD.copyFrom(other.nDGOHDPDKAD);
}
return this;
}
@@ -235,18 +129,12 @@ public final class ChessRogueSelectCellScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasJNBHLHFBBBJ()) {
- setJNBHLHFBBBJ(other.jNBHLHFBBBJ);
- }
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
if (other.hasCellId()) {
setCellId(other.cellId);
}
- if (other.hasNDGOHDPDKAD()) {
- getMutableNDGOHDPDKAD().mergeFrom(other.nDGOHDPDKAD);
- }
return this;
}
@@ -257,10 +145,8 @@ public final class ChessRogueSelectCellScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- jNBHLHFBBBJ = 0;
retcode = 0;
cellId = 0;
- nDGOHDPDKAD.clear();
return this;
}
@@ -271,7 +157,6 @@ public final class ChessRogueSelectCellScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- nDGOHDPDKAD.clearQuick();
return this;
}
@@ -285,47 +170,31 @@ public final class ChessRogueSelectCellScRspOuterClass {
}
ChessRogueSelectCellScRsp other = (ChessRogueSelectCellScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasJNBHLHFBBBJ() || jNBHLHFBBBJ == other.jNBHLHFBBBJ)
&& (!hasRetcode() || retcode == other.retcode)
- && (!hasCellId() || cellId == other.cellId)
- && (!hasNDGOHDPDKAD() || nDGOHDPDKAD.equals(other.nDGOHDPDKAD));
+ && (!hasCellId() || cellId == other.cellId);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
- output.writeUInt32NoTag(jNBHLHFBBBJ);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(retcode);
}
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 104);
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(cellId);
}
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 82);
- output.writeMessageNoTag(nDGOHDPDKAD);
- }
}
@Override
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(jNBHLHFBBBJ);
- }
- if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(cellId);
}
- if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(nDGOHDPDKAD);
- }
return size;
}
@@ -336,37 +205,19 @@ public final class ChessRogueSelectCellScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
- // jNBHLHFBBBJ
- jNBHLHFBBBJ = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 56) {
- break;
- }
- }
- case 56: {
+ case 16: {
// retcode
retcode = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 96) {
break;
}
}
- case 104: {
+ case 96: {
// cellId
cellId = input.readUInt32();
- bitField0_ |= 0x00000004;
- tag = input.readTag();
- if (tag != 82) {
- break;
- }
- }
- case 82: {
- // nDGOHDPDKAD
- input.readMessage(nDGOHDPDKAD);
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
break;
@@ -390,17 +241,11 @@ public final class ChessRogueSelectCellScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.jNBHLHFBBBJ, jNBHLHFBBBJ);
- }
- if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.retcode, retcode);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.cellId, cellId);
}
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeMessage(FieldNames.nDGOHDPDKAD, nDGOHDPDKAD);
- }
output.endObject();
}
@@ -411,22 +256,11 @@ public final class ChessRogueSelectCellScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 480596488: {
- if (input.isAtField(FieldNames.jNBHLHFBBBJ)) {
- if (!input.trySkipNullValue()) {
- jNBHLHFBBBJ = input.readUInt32();
- bitField0_ |= 0x00000001;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 1097936398: {
if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
retcode = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
}
} else {
input.skipUnknownField();
@@ -438,18 +272,7 @@ public final class ChessRogueSelectCellScRspOuterClass {
if (input.isAtField(FieldNames.cellId)) {
if (!input.trySkipNullValue()) {
cellId = input.readUInt32();
- bitField0_ |= 0x00000004;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case -939934496: {
- if (input.isAtField(FieldNames.nDGOHDPDKAD)) {
- if (!input.trySkipNullValue()) {
- input.readMessage(nDGOHDPDKAD);
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000002;
}
} else {
input.skipUnknownField();
@@ -509,13 +332,9 @@ public final class ChessRogueSelectCellScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName jNBHLHFBBBJ = FieldName.forField("JNBHLHFBBBJ");
-
static final FieldName retcode = FieldName.forField("retcode");
static final FieldName cellId = FieldName.forField("cellId", "cell_id");
-
- static final FieldName nDGOHDPDKAD = FieldName.forField("NDGOHDPDKAD");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueStartScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueStartScRspOuterClass.java
index 76c1264..da1169c 100644
--- a/src/generated/main/emu/lunarcore/proto/ChessRogueStartScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChessRogueStartScRspOuterClass.java
@@ -24,34 +24,34 @@ public final class ChessRogueStartScRspOuterClass {
private int retcode;
/**
- * optional .LineupInfo lineup = 1;
- */
- private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance();
-
- /**
- * optional .SceneInfo scene = 4;
- */
- private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance();
-
- /**
- * optional .ChessRogueCellInfo cell_info = 7;
- */
- private final ChessRogueCellInfoOuterClass.ChessRogueCellInfo cellInfo = ChessRogueCellInfoOuterClass.ChessRogueCellInfo.newInstance();
-
- /**
- * optional .ChessRogueCurrentInfo current_info = 10;
+ * optional .ChessRogueCurrentInfo current_info = 1;
*/
private final ChessRogueCurrentInfoOuterClass.ChessRogueCurrentInfo currentInfo = ChessRogueCurrentInfoOuterClass.ChessRogueCurrentInfo.newInstance();
+ /**
+ * optional .LineupInfo lineup = 8;
+ */
+ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance();
+
+ /**
+ * optional .ChessRogueCellInfo cell_info = 13;
+ */
+ private final ChessRogueCellInfoOuterClass.ChessRogueCellInfo cellInfo = ChessRogueCellInfoOuterClass.ChessRogueCellInfo.newInstance();
+
/**
*
- * HLODEEONDBF OBGFEMEOJCE = 13;
+ * PEEHMMLEDMP build_query = 3;
*
*
- * optional .ChessRogueInfo chess_rogue_info = 11;
+ * optional .ChessRogueInfo chess_rogue_info = 14;
*/
private final ChessRogueInfoOuterClass.ChessRogueInfo chessRogueInfo = ChessRogueInfoOuterClass.ChessRogueInfo.newInstance();
+ /**
+ * optional .SceneInfo scene = 15;
+ */
+ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance();
+
private ChessRogueStartScRsp() {
}
@@ -100,197 +100,25 @@ public final class ChessRogueStartScRspOuterClass {
}
/**
- * optional .LineupInfo lineup = 1;
- * @return whether the lineup field is set
+ * optional .ChessRogueCurrentInfo current_info = 1;
+ * @return whether the currentInfo field is set
*/
- public boolean hasLineup() {
+ public boolean hasCurrentInfo() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional .LineupInfo lineup = 1;
- * @return this
- */
- public ChessRogueStartScRsp clearLineup() {
- bitField0_ &= ~0x00000002;
- lineup.clear();
- return this;
- }
-
- /**
- * optional .LineupInfo lineup = 1;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableLineup()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public LineupInfoOuterClass.LineupInfo getLineup() {
- return lineup;
- }
-
- /**
- * optional .LineupInfo lineup = 1;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public LineupInfoOuterClass.LineupInfo getMutableLineup() {
- bitField0_ |= 0x00000002;
- return lineup;
- }
-
- /**
- * optional .LineupInfo lineup = 1;
- * @param value the lineup to set
- * @return this
- */
- public ChessRogueStartScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) {
- bitField0_ |= 0x00000002;
- lineup.copyFrom(value);
- return this;
- }
-
- /**
- * optional .SceneInfo scene = 4;
- * @return whether the scene field is set
- */
- public boolean hasScene() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional .SceneInfo scene = 4;
- * @return this
- */
- public ChessRogueStartScRsp clearScene() {
- bitField0_ &= ~0x00000004;
- scene.clear();
- return this;
- }
-
- /**
- * 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.
- *
- * Use {@link #getMutableScene()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public SceneInfoOuterClass.SceneInfo getScene() {
- return scene;
- }
-
- /**
- * 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
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public SceneInfoOuterClass.SceneInfo getMutableScene() {
- bitField0_ |= 0x00000004;
- return scene;
- }
-
- /**
- * optional .SceneInfo scene = 4;
- * @param value the scene to set
- * @return this
- */
- public ChessRogueStartScRsp setScene(final SceneInfoOuterClass.SceneInfo value) {
- bitField0_ |= 0x00000004;
- scene.copyFrom(value);
- return this;
- }
-
- /**
- * optional .ChessRogueCellInfo cell_info = 7;
- * @return whether the cellInfo field is set
- */
- public boolean hasCellInfo() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional .ChessRogueCellInfo cell_info = 7;
- * @return this
- */
- public ChessRogueStartScRsp clearCellInfo() {
- bitField0_ &= ~0x00000008;
- cellInfo.clear();
- return this;
- }
-
- /**
- * optional .ChessRogueCellInfo cell_info = 7;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableCellInfo()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public ChessRogueCellInfoOuterClass.ChessRogueCellInfo getCellInfo() {
- return cellInfo;
- }
-
- /**
- * optional .ChessRogueCellInfo cell_info = 7;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public ChessRogueCellInfoOuterClass.ChessRogueCellInfo getMutableCellInfo() {
- bitField0_ |= 0x00000008;
- return cellInfo;
- }
-
- /**
- * optional .ChessRogueCellInfo cell_info = 7;
- * @param value the cellInfo to set
- * @return this
- */
- public ChessRogueStartScRsp setCellInfo(
- final ChessRogueCellInfoOuterClass.ChessRogueCellInfo value) {
- bitField0_ |= 0x00000008;
- cellInfo.copyFrom(value);
- return this;
- }
-
- /**
- * optional .ChessRogueCurrentInfo current_info = 10;
- * @return whether the currentInfo field is set
- */
- public boolean hasCurrentInfo() {
- return (bitField0_ & 0x00000010) != 0;
- }
-
- /**
- * optional .ChessRogueCurrentInfo current_info = 10;
+ * optional .ChessRogueCurrentInfo current_info = 1;
* @return this
*/
public ChessRogueStartScRsp clearCurrentInfo() {
- bitField0_ &= ~0x00000010;
+ bitField0_ &= ~0x00000002;
currentInfo.clear();
return this;
}
/**
- * optional .ChessRogueCurrentInfo current_info = 10;
+ * optional .ChessRogueCurrentInfo current_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.
@@ -304,7 +132,7 @@ public final class ChessRogueStartScRspOuterClass {
}
/**
- * optional .ChessRogueCurrentInfo current_info = 10;
+ * optional .ChessRogueCurrentInfo current_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
@@ -313,54 +141,169 @@ public final class ChessRogueStartScRspOuterClass {
* @return internal storage object for modifications
*/
public ChessRogueCurrentInfoOuterClass.ChessRogueCurrentInfo getMutableCurrentInfo() {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000002;
return currentInfo;
}
/**
- * optional .ChessRogueCurrentInfo current_info = 10;
+ * optional .ChessRogueCurrentInfo current_info = 1;
* @param value the currentInfo to set
* @return this
*/
public ChessRogueStartScRsp setCurrentInfo(
final ChessRogueCurrentInfoOuterClass.ChessRogueCurrentInfo value) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000002;
currentInfo.copyFrom(value);
return this;
}
/**
- * - * HLODEEONDBF OBGFEMEOJCE = 13; - *- * - *
optional .ChessRogueInfo chess_rogue_info = 11;
- * @return whether the chessRogueInfo field is set
+ * optional .LineupInfo lineup = 8;
+ * @return whether the lineup field is set
*/
- public boolean hasChessRogueInfo() {
- return (bitField0_ & 0x00000020) != 0;
+ public boolean hasLineup() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional .LineupInfo lineup = 8;
+ * @return this
+ */
+ public ChessRogueStartScRsp clearLineup() {
+ bitField0_ &= ~0x00000004;
+ lineup.clear();
+ return this;
+ }
+
+ /**
+ * optional .LineupInfo lineup = 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 #getMutableLineup()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public LineupInfoOuterClass.LineupInfo getLineup() {
+ return lineup;
+ }
+
+ /**
+ * optional .LineupInfo lineup = 8;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public LineupInfoOuterClass.LineupInfo getMutableLineup() {
+ bitField0_ |= 0x00000004;
+ return lineup;
+ }
+
+ /**
+ * optional .LineupInfo lineup = 8;
+ * @param value the lineup to set
+ * @return this
+ */
+ public ChessRogueStartScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) {
+ bitField0_ |= 0x00000004;
+ lineup.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional .ChessRogueCellInfo cell_info = 13;
+ * @return whether the cellInfo field is set
+ */
+ public boolean hasCellInfo() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional .ChessRogueCellInfo cell_info = 13;
+ * @return this
+ */
+ public ChessRogueStartScRsp clearCellInfo() {
+ bitField0_ &= ~0x00000008;
+ cellInfo.clear();
+ return this;
+ }
+
+ /**
+ * optional .ChessRogueCellInfo cell_info = 13;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableCellInfo()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public ChessRogueCellInfoOuterClass.ChessRogueCellInfo getCellInfo() {
+ return cellInfo;
+ }
+
+ /**
+ * optional .ChessRogueCellInfo cell_info = 13;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public ChessRogueCellInfoOuterClass.ChessRogueCellInfo getMutableCellInfo() {
+ bitField0_ |= 0x00000008;
+ return cellInfo;
+ }
+
+ /**
+ * optional .ChessRogueCellInfo cell_info = 13;
+ * @param value the cellInfo to set
+ * @return this
+ */
+ public ChessRogueStartScRsp setCellInfo(
+ final ChessRogueCellInfoOuterClass.ChessRogueCellInfo value) {
+ bitField0_ |= 0x00000008;
+ cellInfo.copyFrom(value);
+ return this;
}
/**
*
- * HLODEEONDBF OBGFEMEOJCE = 13;
+ * PEEHMMLEDMP build_query = 3;
*
*
- * optional .ChessRogueInfo chess_rogue_info = 11;
+ * optional .ChessRogueInfo chess_rogue_info = 14;
+ * @return whether the chessRogueInfo field is set
+ */
+ public boolean hasChessRogueInfo() {
+ return (bitField0_ & 0x00000010) != 0;
+ }
+
+ /**
+ * + * PEEHMMLEDMP build_query = 3; + *+ * + *
optional .ChessRogueInfo chess_rogue_info = 14;
* @return this
*/
public ChessRogueStartScRsp clearChessRogueInfo() {
- bitField0_ &= ~0x00000020;
+ bitField0_ &= ~0x00000010;
chessRogueInfo.clear();
return this;
}
/**
*
- * HLODEEONDBF OBGFEMEOJCE = 13;
+ * PEEHMMLEDMP build_query = 3;
*
*
- * optional .ChessRogueInfo chess_rogue_info = 11;
+ * optional .ChessRogueInfo chess_rogue_info = 14;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -375,10 +318,10 @@ public final class ChessRogueStartScRspOuterClass {
/**
*
- * HLODEEONDBF OBGFEMEOJCE = 13;
+ * PEEHMMLEDMP build_query = 3;
*
*
- * optional .ChessRogueInfo chess_rogue_info = 11;
+ * optional .ChessRogueInfo chess_rogue_info = 14;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -387,37 +330,94 @@ public final class ChessRogueStartScRspOuterClass {
* @return internal storage object for modifications
*/
public ChessRogueInfoOuterClass.ChessRogueInfo getMutableChessRogueInfo() {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
return chessRogueInfo;
}
/**
*
- * HLODEEONDBF OBGFEMEOJCE = 13;
+ * PEEHMMLEDMP build_query = 3;
*
*
- * optional .ChessRogueInfo chess_rogue_info = 11;
+ * optional .ChessRogueInfo chess_rogue_info = 14;
* @param value the chessRogueInfo to set
* @return this
*/
public ChessRogueStartScRsp setChessRogueInfo(
final ChessRogueInfoOuterClass.ChessRogueInfo value) {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
chessRogueInfo.copyFrom(value);
return this;
}
+ /**
+ * optional .SceneInfo scene = 15;
+ * @return whether the scene field is set
+ */
+ public boolean hasScene() {
+ return (bitField0_ & 0x00000020) != 0;
+ }
+
+ /**
+ * optional .SceneInfo scene = 15;
+ * @return this
+ */
+ public ChessRogueStartScRsp clearScene() {
+ bitField0_ &= ~0x00000020;
+ scene.clear();
+ return this;
+ }
+
+ /**
+ * 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.
+ *
+ * Use {@link #getMutableScene()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public SceneInfoOuterClass.SceneInfo getScene() {
+ return scene;
+ }
+
+ /**
+ * 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
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public SceneInfoOuterClass.SceneInfo getMutableScene() {
+ bitField0_ |= 0x00000020;
+ return scene;
+ }
+
+ /**
+ * optional .SceneInfo scene = 15;
+ * @param value the scene to set
+ * @return this
+ */
+ public ChessRogueStartScRsp setScene(final SceneInfoOuterClass.SceneInfo value) {
+ bitField0_ |= 0x00000020;
+ scene.copyFrom(value);
+ return this;
+ }
+
@Override
public ChessRogueStartScRsp copyFrom(final ChessRogueStartScRsp other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
retcode = other.retcode;
- lineup.copyFrom(other.lineup);
- scene.copyFrom(other.scene);
- cellInfo.copyFrom(other.cellInfo);
currentInfo.copyFrom(other.currentInfo);
+ lineup.copyFrom(other.lineup);
+ cellInfo.copyFrom(other.cellInfo);
chessRogueInfo.copyFrom(other.chessRogueInfo);
+ scene.copyFrom(other.scene);
}
return this;
}
@@ -431,21 +431,21 @@ public final class ChessRogueStartScRspOuterClass {
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
+ if (other.hasCurrentInfo()) {
+ getMutableCurrentInfo().mergeFrom(other.currentInfo);
+ }
if (other.hasLineup()) {
getMutableLineup().mergeFrom(other.lineup);
}
- if (other.hasScene()) {
- getMutableScene().mergeFrom(other.scene);
- }
if (other.hasCellInfo()) {
getMutableCellInfo().mergeFrom(other.cellInfo);
}
- if (other.hasCurrentInfo()) {
- getMutableCurrentInfo().mergeFrom(other.currentInfo);
- }
if (other.hasChessRogueInfo()) {
getMutableChessRogueInfo().mergeFrom(other.chessRogueInfo);
}
+ if (other.hasScene()) {
+ getMutableScene().mergeFrom(other.scene);
+ }
return this;
}
@@ -457,11 +457,11 @@ public final class ChessRogueStartScRspOuterClass {
cachedSize = -1;
bitField0_ = 0;
retcode = 0;
- lineup.clear();
- scene.clear();
- cellInfo.clear();
currentInfo.clear();
+ lineup.clear();
+ cellInfo.clear();
chessRogueInfo.clear();
+ scene.clear();
return this;
}
@@ -472,11 +472,11 @@ public final class ChessRogueStartScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- lineup.clearQuick();
- scene.clearQuick();
- cellInfo.clearQuick();
currentInfo.clearQuick();
+ lineup.clearQuick();
+ cellInfo.clearQuick();
chessRogueInfo.clearQuick();
+ scene.clearQuick();
return this;
}
@@ -491,11 +491,11 @@ public final class ChessRogueStartScRspOuterClass {
ChessRogueStartScRsp other = (ChessRogueStartScRsp) o;
return bitField0_ == other.bitField0_
&& (!hasRetcode() || retcode == other.retcode)
- && (!hasLineup() || lineup.equals(other.lineup))
- && (!hasScene() || scene.equals(other.scene))
- && (!hasCellInfo() || cellInfo.equals(other.cellInfo))
&& (!hasCurrentInfo() || currentInfo.equals(other.currentInfo))
- && (!hasChessRogueInfo() || chessRogueInfo.equals(other.chessRogueInfo));
+ && (!hasLineup() || lineup.equals(other.lineup))
+ && (!hasCellInfo() || cellInfo.equals(other.cellInfo))
+ && (!hasChessRogueInfo() || chessRogueInfo.equals(other.chessRogueInfo))
+ && (!hasScene() || scene.equals(other.scene));
}
@Override
@@ -506,23 +506,23 @@ public final class ChessRogueStartScRspOuterClass {
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 10);
- output.writeMessageNoTag(lineup);
+ output.writeMessageNoTag(currentInfo);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 34);
- output.writeMessageNoTag(scene);
+ output.writeRawByte((byte) 66);
+ output.writeMessageNoTag(lineup);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 58);
+ output.writeRawByte((byte) 106);
output.writeMessageNoTag(cellInfo);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 82);
- output.writeMessageNoTag(currentInfo);
+ output.writeRawByte((byte) 114);
+ output.writeMessageNoTag(chessRogueInfo);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 90);
- output.writeMessageNoTag(chessRogueInfo);
+ output.writeRawByte((byte) 122);
+ output.writeMessageNoTag(scene);
}
}
@@ -533,19 +533,19 @@ public final class ChessRogueStartScRspOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(lineup);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(currentInfo);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(scene);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(lineup);
}
if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(cellInfo);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(currentInfo);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(chessRogueInfo);
}
if ((bitField0_ & 0x00000020) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(chessRogueInfo);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(scene);
}
return size;
}
@@ -567,44 +567,44 @@ public final class ChessRogueStartScRspOuterClass {
}
}
case 10: {
- // lineup
- input.readMessage(lineup);
+ // currentInfo
+ input.readMessage(currentInfo);
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 34) {
+ if (tag != 66) {
break;
}
}
- case 34: {
- // scene
- input.readMessage(scene);
+ case 66: {
+ // lineup
+ input.readMessage(lineup);
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 58) {
+ if (tag != 106) {
break;
}
}
- case 58: {
+ case 106: {
// cellInfo
input.readMessage(cellInfo);
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 82) {
+ if (tag != 114) {
break;
}
}
- case 82: {
- // currentInfo
- input.readMessage(currentInfo);
- bitField0_ |= 0x00000010;
- tag = input.readTag();
- if (tag != 90) {
- break;
- }
- }
- case 90: {
+ case 114: {
// chessRogueInfo
input.readMessage(chessRogueInfo);
+ bitField0_ |= 0x00000010;
+ tag = input.readTag();
+ if (tag != 122) {
+ break;
+ }
+ }
+ case 122: {
+ // scene
+ input.readMessage(scene);
bitField0_ |= 0x00000020;
tag = input.readTag();
if (tag != 0) {
@@ -632,19 +632,19 @@ public final class ChessRogueStartScRspOuterClass {
output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeMessage(FieldNames.lineup, lineup);
+ output.writeMessage(FieldNames.currentInfo, currentInfo);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeMessage(FieldNames.scene, scene);
+ output.writeMessage(FieldNames.lineup, lineup);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeMessage(FieldNames.cellInfo, cellInfo);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeMessage(FieldNames.currentInfo, currentInfo);
+ output.writeMessage(FieldNames.chessRogueInfo, chessRogueInfo);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeMessage(FieldNames.chessRogueInfo, chessRogueInfo);
+ output.writeMessage(FieldNames.scene, scene);
}
output.endObject();
}
@@ -667,10 +667,11 @@ public final class ChessRogueStartScRspOuterClass {
}
break;
}
- case -1102671473: {
- if (input.isAtField(FieldNames.lineup)) {
+ case 600912327:
+ case 1468588980: {
+ if (input.isAtField(FieldNames.currentInfo)) {
if (!input.trySkipNullValue()) {
- input.readMessage(lineup);
+ input.readMessage(currentInfo);
bitField0_ |= 0x00000002;
}
} else {
@@ -678,10 +679,10 @@ public final class ChessRogueStartScRspOuterClass {
}
break;
}
- case 109254796: {
- if (input.isAtField(FieldNames.scene)) {
+ case -1102671473: {
+ if (input.isAtField(FieldNames.lineup)) {
if (!input.trySkipNullValue()) {
- input.readMessage(scene);
+ input.readMessage(lineup);
bitField0_ |= 0x00000004;
}
} else {
@@ -701,11 +702,11 @@ public final class ChessRogueStartScRspOuterClass {
}
break;
}
- case 600912327:
- case 1468588980: {
- if (input.isAtField(FieldNames.currentInfo)) {
+ case -2057768312:
+ case 1888241298: {
+ if (input.isAtField(FieldNames.chessRogueInfo)) {
if (!input.trySkipNullValue()) {
- input.readMessage(currentInfo);
+ input.readMessage(chessRogueInfo);
bitField0_ |= 0x00000010;
}
} else {
@@ -713,11 +714,10 @@ public final class ChessRogueStartScRspOuterClass {
}
break;
}
- case -2057768312:
- case 1888241298: {
- if (input.isAtField(FieldNames.chessRogueInfo)) {
+ case 109254796: {
+ if (input.isAtField(FieldNames.scene)) {
if (!input.trySkipNullValue()) {
- input.readMessage(chessRogueInfo);
+ input.readMessage(scene);
bitField0_ |= 0x00000020;
}
} else {
@@ -780,15 +780,15 @@ public final class ChessRogueStartScRspOuterClass {
static class FieldNames {
static final FieldName retcode = FieldName.forField("retcode");
- static final FieldName lineup = FieldName.forField("lineup");
+ static final FieldName currentInfo = FieldName.forField("currentInfo", "current_info");
- static final FieldName scene = FieldName.forField("scene");
+ static final FieldName lineup = FieldName.forField("lineup");
static final FieldName cellInfo = FieldName.forField("cellInfo", "cell_info");
- static final FieldName currentInfo = FieldName.forField("currentInfo", "current_info");
-
static final FieldName chessRogueInfo = FieldName.forField("chessRogueInfo", "chess_rogue_info");
+
+ static final FieldName scene = FieldName.forField("scene");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueVirtualItemInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueVirtualItemInfoOuterClass.java
index 35bc282..210663a 100644
--- a/src/generated/main/emu/lunarcore/proto/ChessRogueVirtualItemInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChessRogueVirtualItemInfoOuterClass.java
@@ -19,25 +19,25 @@ public final class ChessRogueVirtualItemInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * - * LNGAAJMILOC CKJPPDKJIOH = 8; - * NNGLIKCIBCA JNAGMIALOII = 14; - *- * - *
optional .ChessRogueItemInfo item_info = 6;
- */
- private final ChessRogueItemInfoOuterClass.ChessRogueItemInfo itemInfo = ChessRogueItemInfoOuterClass.ChessRogueItemInfo.newInstance();
-
- /**
- * optional .ChessRogueBuffInfo buff_info = 9;
+ * optional .ChessRogueBuffInfo buff_info = 6;
*/
private final ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo buffInfo = ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo.newInstance();
/**
- * optional .ChessRogueMiracleInfo miracle_info = 13;
+ * optional .ChessRogueMiracleInfo miracle_info = 10;
*/
private final ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo miracleInfo = ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo.newInstance();
+ /**
+ * + * HMLCJCGOEHI rogue_aeon_info = 3; + * MBGNHFBIIHJ GEOIJKDCIOI = 12; + *+ * + *
optional .ChessRogueItemInfo item_info = 11;
+ */
+ private final ChessRogueItemInfoOuterClass.ChessRogueItemInfo itemInfo = ChessRogueItemInfoOuterClass.ChessRogueItemInfo.newInstance();
+
private ChessRogueVirtualItemInfo() {
}
@@ -49,40 +49,156 @@ public final class ChessRogueVirtualItemInfoOuterClass {
}
/**
- * - * LNGAAJMILOC CKJPPDKJIOH = 8; - * NNGLIKCIBCA JNAGMIALOII = 14; - *- * - *
optional .ChessRogueItemInfo item_info = 6;
- * @return whether the itemInfo field is set
+ * optional .ChessRogueBuffInfo buff_info = 6;
+ * @return whether the buffInfo field is set
*/
- public boolean hasItemInfo() {
+ public boolean hasBuffInfo() {
return (bitField0_ & 0x00000001) != 0;
}
+ /**
+ * optional .ChessRogueBuffInfo buff_info = 6;
+ * @return this
+ */
+ public ChessRogueVirtualItemInfo clearBuffInfo() {
+ bitField0_ &= ~0x00000001;
+ buffInfo.clear();
+ return this;
+ }
+
+ /**
+ * optional .ChessRogueBuffInfo buff_info = 6;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableBuffInfo()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo getBuffInfo() {
+ return buffInfo;
+ }
+
+ /**
+ * optional .ChessRogueBuffInfo buff_info = 6;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo getMutableBuffInfo() {
+ bitField0_ |= 0x00000001;
+ return buffInfo;
+ }
+
+ /**
+ * optional .ChessRogueBuffInfo buff_info = 6;
+ * @param value the buffInfo to set
+ * @return this
+ */
+ public ChessRogueVirtualItemInfo setBuffInfo(
+ final ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo value) {
+ bitField0_ |= 0x00000001;
+ buffInfo.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional .ChessRogueMiracleInfo miracle_info = 10;
+ * @return whether the miracleInfo field is set
+ */
+ public boolean hasMiracleInfo() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional .ChessRogueMiracleInfo miracle_info = 10;
+ * @return this
+ */
+ public ChessRogueVirtualItemInfo clearMiracleInfo() {
+ bitField0_ &= ~0x00000002;
+ miracleInfo.clear();
+ return this;
+ }
+
+ /**
+ * optional .ChessRogueMiracleInfo miracle_info = 10;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableMiracleInfo()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo getMiracleInfo() {
+ return miracleInfo;
+ }
+
+ /**
+ * optional .ChessRogueMiracleInfo miracle_info = 10;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo getMutableMiracleInfo() {
+ bitField0_ |= 0x00000002;
+ return miracleInfo;
+ }
+
+ /**
+ * optional .ChessRogueMiracleInfo miracle_info = 10;
+ * @param value the miracleInfo to set
+ * @return this
+ */
+ public ChessRogueVirtualItemInfo setMiracleInfo(
+ final ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo value) {
+ bitField0_ |= 0x00000002;
+ miracleInfo.copyFrom(value);
+ return this;
+ }
+
/**
*
- * LNGAAJMILOC CKJPPDKJIOH = 8;
- * NNGLIKCIBCA JNAGMIALOII = 14;
+ * HMLCJCGOEHI rogue_aeon_info = 3;
+ * MBGNHFBIIHJ GEOIJKDCIOI = 12;
*
*
- * optional .ChessRogueItemInfo item_info = 6;
+ * optional .ChessRogueItemInfo item_info = 11;
+ * @return whether the itemInfo field is set
+ */
+ public boolean hasItemInfo() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * + * HMLCJCGOEHI rogue_aeon_info = 3; + * MBGNHFBIIHJ GEOIJKDCIOI = 12; + *+ * + *
optional .ChessRogueItemInfo item_info = 11;
* @return this
*/
public ChessRogueVirtualItemInfo clearItemInfo() {
- bitField0_ &= ~0x00000001;
+ bitField0_ &= ~0x00000004;
itemInfo.clear();
return this;
}
/**
*
- * LNGAAJMILOC CKJPPDKJIOH = 8;
- * NNGLIKCIBCA JNAGMIALOII = 14;
+ * HMLCJCGOEHI rogue_aeon_info = 3;
+ * MBGNHFBIIHJ GEOIJKDCIOI = 12;
*
*
- * optional .ChessRogueItemInfo item_info = 6;
+ * optional .ChessRogueItemInfo item_info = 11;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -97,11 +213,11 @@ public final class ChessRogueVirtualItemInfoOuterClass {
/**
*
- * LNGAAJMILOC CKJPPDKJIOH = 8;
- * NNGLIKCIBCA JNAGMIALOII = 14;
+ * HMLCJCGOEHI rogue_aeon_info = 3;
+ * MBGNHFBIIHJ GEOIJKDCIOI = 12;
*
*
- * optional .ChessRogueItemInfo item_info = 6;
+ * optional .ChessRogueItemInfo item_info = 11;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -110,151 +226,35 @@ public final class ChessRogueVirtualItemInfoOuterClass {
* @return internal storage object for modifications
*/
public ChessRogueItemInfoOuterClass.ChessRogueItemInfo getMutableItemInfo() {
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000004;
return itemInfo;
}
/**
*
- * LNGAAJMILOC CKJPPDKJIOH = 8;
- * NNGLIKCIBCA JNAGMIALOII = 14;
+ * HMLCJCGOEHI rogue_aeon_info = 3;
+ * MBGNHFBIIHJ GEOIJKDCIOI = 12;
*
*
- * optional .ChessRogueItemInfo item_info = 6;
+ * optional .ChessRogueItemInfo item_info = 11;
* @param value the itemInfo to set
* @return this
*/
public ChessRogueVirtualItemInfo setItemInfo(
final ChessRogueItemInfoOuterClass.ChessRogueItemInfo value) {
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000004;
itemInfo.copyFrom(value);
return this;
}
- /**
- * optional .ChessRogueBuffInfo buff_info = 9;
- * @return whether the buffInfo field is set
- */
- public boolean hasBuffInfo() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional .ChessRogueBuffInfo buff_info = 9;
- * @return this
- */
- public ChessRogueVirtualItemInfo clearBuffInfo() {
- bitField0_ &= ~0x00000002;
- buffInfo.clear();
- return this;
- }
-
- /**
- * optional .ChessRogueBuffInfo buff_info = 9;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableBuffInfo()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo getBuffInfo() {
- return buffInfo;
- }
-
- /**
- * optional .ChessRogueBuffInfo buff_info = 9;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo getMutableBuffInfo() {
- bitField0_ |= 0x00000002;
- return buffInfo;
- }
-
- /**
- * optional .ChessRogueBuffInfo buff_info = 9;
- * @param value the buffInfo to set
- * @return this
- */
- public ChessRogueVirtualItemInfo setBuffInfo(
- final ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo value) {
- bitField0_ |= 0x00000002;
- buffInfo.copyFrom(value);
- return this;
- }
-
- /**
- * optional .ChessRogueMiracleInfo miracle_info = 13;
- * @return whether the miracleInfo field is set
- */
- public boolean hasMiracleInfo() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional .ChessRogueMiracleInfo miracle_info = 13;
- * @return this
- */
- public ChessRogueVirtualItemInfo clearMiracleInfo() {
- bitField0_ &= ~0x00000004;
- miracleInfo.clear();
- return this;
- }
-
- /**
- * optional .ChessRogueMiracleInfo miracle_info = 13;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableMiracleInfo()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo getMiracleInfo() {
- return miracleInfo;
- }
-
- /**
- * optional .ChessRogueMiracleInfo miracle_info = 13;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo getMutableMiracleInfo() {
- bitField0_ |= 0x00000004;
- return miracleInfo;
- }
-
- /**
- * optional .ChessRogueMiracleInfo miracle_info = 13;
- * @param value the miracleInfo to set
- * @return this
- */
- public ChessRogueVirtualItemInfo setMiracleInfo(
- final ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo value) {
- bitField0_ |= 0x00000004;
- miracleInfo.copyFrom(value);
- return this;
- }
-
@Override
public ChessRogueVirtualItemInfo copyFrom(final ChessRogueVirtualItemInfo other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- itemInfo.copyFrom(other.itemInfo);
buffInfo.copyFrom(other.buffInfo);
miracleInfo.copyFrom(other.miracleInfo);
+ itemInfo.copyFrom(other.itemInfo);
}
return this;
}
@@ -265,15 +265,15 @@ public final class ChessRogueVirtualItemInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasItemInfo()) {
- getMutableItemInfo().mergeFrom(other.itemInfo);
- }
if (other.hasBuffInfo()) {
getMutableBuffInfo().mergeFrom(other.buffInfo);
}
if (other.hasMiracleInfo()) {
getMutableMiracleInfo().mergeFrom(other.miracleInfo);
}
+ if (other.hasItemInfo()) {
+ getMutableItemInfo().mergeFrom(other.itemInfo);
+ }
return this;
}
@@ -284,9 +284,9 @@ public final class ChessRogueVirtualItemInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- itemInfo.clear();
buffInfo.clear();
miracleInfo.clear();
+ itemInfo.clear();
return this;
}
@@ -297,9 +297,9 @@ public final class ChessRogueVirtualItemInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- itemInfo.clearQuick();
buffInfo.clearQuick();
miracleInfo.clearQuick();
+ itemInfo.clearQuick();
return this;
}
@@ -313,39 +313,39 @@ public final class ChessRogueVirtualItemInfoOuterClass {
}
ChessRogueVirtualItemInfo other = (ChessRogueVirtualItemInfo) o;
return bitField0_ == other.bitField0_
- && (!hasItemInfo() || itemInfo.equals(other.itemInfo))
&& (!hasBuffInfo() || buffInfo.equals(other.buffInfo))
- && (!hasMiracleInfo() || miracleInfo.equals(other.miracleInfo));
+ && (!hasMiracleInfo() || miracleInfo.equals(other.miracleInfo))
+ && (!hasItemInfo() || itemInfo.equals(other.itemInfo));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 50);
- output.writeMessageNoTag(itemInfo);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 74);
output.writeMessageNoTag(buffInfo);
}
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 106);
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 82);
output.writeMessageNoTag(miracleInfo);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 90);
+ output.writeMessageNoTag(itemInfo);
+ }
}
@Override
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(itemInfo);
- }
- if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(buffInfo);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(miracleInfo);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += 1 + ProtoSink.computeMessageSizeNoTag(itemInfo);
+ }
return size;
}
@@ -357,26 +357,26 @@ public final class ChessRogueVirtualItemInfoOuterClass {
while (true) {
switch (tag) {
case 50: {
- // itemInfo
- input.readMessage(itemInfo);
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 74) {
- break;
- }
- }
- case 74: {
// buffInfo
input.readMessage(buffInfo);
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 106) {
+ if (tag != 82) {
break;
}
}
- case 106: {
+ case 82: {
// miracleInfo
input.readMessage(miracleInfo);
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 90) {
+ break;
+ }
+ }
+ case 90: {
+ // itemInfo
+ input.readMessage(itemInfo);
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 0) {
@@ -401,14 +401,14 @@ public final class ChessRogueVirtualItemInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeMessage(FieldNames.itemInfo, itemInfo);
- }
- if ((bitField0_ & 0x00000002) != 0) {
output.writeMessage(FieldNames.buffInfo, buffInfo);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
output.writeMessage(FieldNames.miracleInfo, miracleInfo);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeMessage(FieldNames.itemInfo, itemInfo);
+ }
output.endObject();
}
@@ -419,24 +419,12 @@ public final class ChessRogueVirtualItemInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 1177195105:
- case -2141481382: {
- if (input.isAtField(FieldNames.itemInfo)) {
- if (!input.trySkipNullValue()) {
- input.readMessage(itemInfo);
- bitField0_ |= 0x00000001;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case -1522874463:
case 55707930: {
if (input.isAtField(FieldNames.buffInfo)) {
if (!input.trySkipNullValue()) {
input.readMessage(buffInfo);
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
}
} else {
input.skipUnknownField();
@@ -448,6 +436,18 @@ public final class ChessRogueVirtualItemInfoOuterClass {
if (input.isAtField(FieldNames.miracleInfo)) {
if (!input.trySkipNullValue()) {
input.readMessage(miracleInfo);
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 1177195105:
+ case -2141481382: {
+ if (input.isAtField(FieldNames.itemInfo)) {
+ if (!input.trySkipNullValue()) {
+ input.readMessage(itemInfo);
bitField0_ |= 0x00000004;
}
} else {
@@ -508,11 +508,11 @@ public final class ChessRogueVirtualItemInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName itemInfo = FieldName.forField("itemInfo", "item_info");
-
static final FieldName buffInfo = FieldName.forField("buffInfo", "buff_info");
static final FieldName miracleInfo = FieldName.forField("miracleInfo", "miracle_info");
+
+ static final FieldName itemInfo = FieldName.forField("itemInfo", "item_info");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java b/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java
index 653f007..1e5a015 100644
--- a/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java
@@ -21,52 +21,52 @@ public final class ClientMailOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional int64 time = 2;
- */
- private long time;
-
- /**
- * optional int64 expire_time = 4;
+ * optional int64 expire_time = 7;
*/
private long expireTime;
/**
- * optional uint32 id = 3;
+ * optional int64 time = 9;
+ */
+ private long time;
+
+ /**
+ * optional uint32 id = 4;
*/
private int id;
/**
- * optional uint32 template_id = 12;
+ * optional uint32 template_id = 15;
*/
private int templateId;
/**
- * optional bool is_read = 14;
+ * optional bool is_read = 6;
*/
private boolean isRead;
/**
- * optional .ItemList attachment = 15;
+ * optional .ItemList attachment = 2;
*/
private final ItemListOuterClass.ItemList attachment = ItemListOuterClass.ItemList.newInstance();
/**
- * optional string title = 1;
- */
- private final Utf8String title = Utf8String.newEmptyInstance();
-
- /**
- * optional string sender = 7;
+ * optional string sender = 5;
*/
private final Utf8String sender = Utf8String.newEmptyInstance();
/**
- * optional string content = 10;
+ * optional string content = 11;
*/
private final Utf8String content = Utf8String.newEmptyInstance();
/**
- * repeated string para_list = 6;
+ * optional string title = 14;
+ */
+ private final Utf8String title = Utf8String.newEmptyInstance();
+
+ /**
+ * repeated string para_list = 1;
*/
private final RepeatedString paraList = RepeatedString.newEmptyInstance();
@@ -81,62 +81,25 @@ public final class ClientMailOuterClass {
}
/**
- * optional int64 time = 2;
- * @return whether the time field is set
+ * optional int64 expire_time = 7;
+ * @return whether the expireTime field is set
*/
- public boolean hasTime() {
+ public boolean hasExpireTime() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional int64 time = 2;
- * @return this
- */
- public ClientMail clearTime() {
- bitField0_ &= ~0x00000001;
- time = 0L;
- return this;
- }
-
- /**
- * optional int64 time = 2;
- * @return the time
- */
- public long getTime() {
- return time;
- }
-
- /**
- * optional int64 time = 2;
- * @param value the time to set
- * @return this
- */
- public ClientMail setTime(final long value) {
- bitField0_ |= 0x00000001;
- time = value;
- return this;
- }
-
- /**
- * optional int64 expire_time = 4;
- * @return whether the expireTime field is set
- */
- public boolean hasExpireTime() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional int64 expire_time = 4;
+ * optional int64 expire_time = 7;
* @return this
*/
public ClientMail clearExpireTime() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
expireTime = 0L;
return this;
}
/**
- * optional int64 expire_time = 4;
+ * optional int64 expire_time = 7;
* @return the expireTime
*/
public long getExpireTime() {
@@ -144,18 +107,55 @@ public final class ClientMailOuterClass {
}
/**
- * optional int64 expire_time = 4;
+ * optional int64 expire_time = 7;
* @param value the expireTime to set
* @return this
*/
public ClientMail setExpireTime(final long value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
expireTime = value;
return this;
}
/**
- * optional uint32 id = 3;
+ * optional int64 time = 9;
+ * @return whether the time field is set
+ */
+ public boolean hasTime() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional int64 time = 9;
+ * @return this
+ */
+ public ClientMail clearTime() {
+ bitField0_ &= ~0x00000002;
+ time = 0L;
+ return this;
+ }
+
+ /**
+ * optional int64 time = 9;
+ * @return the time
+ */
+ public long getTime() {
+ return time;
+ }
+
+ /**
+ * optional int64 time = 9;
+ * @param value the time to set
+ * @return this
+ */
+ public ClientMail setTime(final long value) {
+ bitField0_ |= 0x00000002;
+ time = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 id = 4;
* @return whether the id field is set
*/
public boolean hasId() {
@@ -163,7 +163,7 @@ public final class ClientMailOuterClass {
}
/**
- * optional uint32 id = 3;
+ * optional uint32 id = 4;
* @return this
*/
public ClientMail clearId() {
@@ -173,7 +173,7 @@ public final class ClientMailOuterClass {
}
/**
- * optional uint32 id = 3;
+ * optional uint32 id = 4;
* @return the id
*/
public int getId() {
@@ -181,7 +181,7 @@ public final class ClientMailOuterClass {
}
/**
- * optional uint32 id = 3;
+ * optional uint32 id = 4;
* @param value the id to set
* @return this
*/
@@ -192,7 +192,7 @@ public final class ClientMailOuterClass {
}
/**
- * optional uint32 template_id = 12;
+ * optional uint32 template_id = 15;
* @return whether the templateId field is set
*/
public boolean hasTemplateId() {
@@ -200,7 +200,7 @@ public final class ClientMailOuterClass {
}
/**
- * optional uint32 template_id = 12;
+ * optional uint32 template_id = 15;
* @return this
*/
public ClientMail clearTemplateId() {
@@ -210,7 +210,7 @@ public final class ClientMailOuterClass {
}
/**
- * optional uint32 template_id = 12;
+ * optional uint32 template_id = 15;
* @return the templateId
*/
public int getTemplateId() {
@@ -218,7 +218,7 @@ public final class ClientMailOuterClass {
}
/**
- * optional uint32 template_id = 12;
+ * optional uint32 template_id = 15;
* @param value the templateId to set
* @return this
*/
@@ -229,7 +229,7 @@ public final class ClientMailOuterClass {
}
/**
- * optional bool is_read = 14;
+ * optional bool is_read = 6;
* @return whether the isRead field is set
*/
public boolean hasIsRead() {
@@ -237,7 +237,7 @@ public final class ClientMailOuterClass {
}
/**
- * optional bool is_read = 14;
+ * optional bool is_read = 6;
* @return this
*/
public ClientMail clearIsRead() {
@@ -247,7 +247,7 @@ public final class ClientMailOuterClass {
}
/**
- * optional bool is_read = 14;
+ * optional bool is_read = 6;
* @return the isRead
*/
public boolean getIsRead() {
@@ -255,7 +255,7 @@ public final class ClientMailOuterClass {
}
/**
- * optional bool is_read = 14;
+ * optional bool is_read = 6;
* @param value the isRead to set
* @return this
*/
@@ -266,7 +266,7 @@ public final class ClientMailOuterClass {
}
/**
- * optional .ItemList attachment = 15;
+ * optional .ItemList attachment = 2;
* @return whether the attachment field is set
*/
public boolean hasAttachment() {
@@ -274,7 +274,7 @@ public final class ClientMailOuterClass {
}
/**
- * optional .ItemList attachment = 15;
+ * optional .ItemList attachment = 2;
* @return this
*/
public ClientMail clearAttachment() {
@@ -284,7 +284,7 @@ public final class ClientMailOuterClass {
}
/**
- * optional .ItemList attachment = 15;
+ * optional .ItemList attachment = 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.
@@ -298,7 +298,7 @@ public final class ClientMailOuterClass {
}
/**
- * optional .ItemList attachment = 15;
+ * optional .ItemList attachment = 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
@@ -312,7 +312,7 @@ public final class ClientMailOuterClass {
}
/**
- * optional .ItemList attachment = 15;
+ * optional .ItemList attachment = 2;
* @param value the attachment to set
* @return this
*/
@@ -323,90 +323,25 @@ public final class ClientMailOuterClass {
}
/**
- * optional string title = 1;
- * @return whether the title field is set
+ * optional string sender = 5;
+ * @return whether the sender field is set
*/
- public boolean hasTitle() {
+ public boolean hasSender() {
return (bitField0_ & 0x00000040) != 0;
}
/**
- * optional string title = 1;
- * @return this
- */
- public ClientMail clearTitle() {
- bitField0_ &= ~0x00000040;
- title.clear();
- return this;
- }
-
- /**
- * optional string title = 1;
- * @return the title
- */
- public String getTitle() {
- return title.getString();
- }
-
- /**
- * optional string title = 1;
- * @return internal {@code Utf8String} representation of title for reading
- */
- public Utf8String getTitleBytes() {
- return this.title;
- }
-
- /**
- * optional string title = 1;
- * @return internal {@code Utf8String} representation of title for modifications
- */
- public Utf8String getMutableTitleBytes() {
- bitField0_ |= 0x00000040;
- return this.title;
- }
-
- /**
- * optional string title = 1;
- * @param value the title to set
- * @return this
- */
- public ClientMail setTitle(final CharSequence value) {
- bitField0_ |= 0x00000040;
- title.copyFrom(value);
- return this;
- }
-
- /**
- * optional string title = 1;
- * @param value the title to set
- * @return this
- */
- public ClientMail setTitle(final Utf8String value) {
- bitField0_ |= 0x00000040;
- title.copyFrom(value);
- return this;
- }
-
- /**
- * optional string sender = 7;
- * @return whether the sender field is set
- */
- public boolean hasSender() {
- return (bitField0_ & 0x00000080) != 0;
- }
-
- /**
- * optional string sender = 7;
+ * optional string sender = 5;
* @return this
*/
public ClientMail clearSender() {
- bitField0_ &= ~0x00000080;
+ bitField0_ &= ~0x00000040;
sender.clear();
return this;
}
/**
- * optional string sender = 7;
+ * optional string sender = 5;
* @return the sender
*/
public String getSender() {
@@ -414,7 +349,7 @@ public final class ClientMailOuterClass {
}
/**
- * optional string sender = 7;
+ * optional string sender = 5;
* @return internal {@code Utf8String} representation of sender for reading
*/
public Utf8String getSenderBytes() {
@@ -422,56 +357,56 @@ public final class ClientMailOuterClass {
}
/**
- * optional string sender = 7;
+ * optional string sender = 5;
* @return internal {@code Utf8String} representation of sender for modifications
*/
public Utf8String getMutableSenderBytes() {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000040;
return this.sender;
}
/**
- * optional string sender = 7;
+ * optional string sender = 5;
* @param value the sender to set
* @return this
*/
public ClientMail setSender(final CharSequence value) {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000040;
sender.copyFrom(value);
return this;
}
/**
- * optional string sender = 7;
+ * optional string sender = 5;
* @param value the sender to set
* @return this
*/
public ClientMail setSender(final Utf8String value) {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000040;
sender.copyFrom(value);
return this;
}
/**
- * optional string content = 10;
+ * optional string content = 11;
* @return whether the content field is set
*/
public boolean hasContent() {
- return (bitField0_ & 0x00000100) != 0;
+ return (bitField0_ & 0x00000080) != 0;
}
/**
- * optional string content = 10;
+ * optional string content = 11;
* @return this
*/
public ClientMail clearContent() {
- bitField0_ &= ~0x00000100;
+ bitField0_ &= ~0x00000080;
content.clear();
return this;
}
/**
- * optional string content = 10;
+ * optional string content = 11;
* @return the content
*/
public String getContent() {
@@ -479,7 +414,7 @@ public final class ClientMailOuterClass {
}
/**
- * optional string content = 10;
+ * optional string content = 11;
* @return internal {@code Utf8String} representation of content for reading
*/
public Utf8String getContentBytes() {
@@ -487,38 +422,103 @@ public final class ClientMailOuterClass {
}
/**
- * optional string content = 10;
+ * optional string content = 11;
* @return internal {@code Utf8String} representation of content for modifications
*/
public Utf8String getMutableContentBytes() {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000080;
return this.content;
}
/**
- * optional string content = 10;
+ * optional string content = 11;
* @param value the content to set
* @return this
*/
public ClientMail setContent(final CharSequence value) {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000080;
content.copyFrom(value);
return this;
}
/**
- * optional string content = 10;
+ * optional string content = 11;
* @param value the content to set
* @return this
*/
public ClientMail setContent(final Utf8String value) {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000080;
content.copyFrom(value);
return this;
}
/**
- * repeated string para_list = 6;
+ * optional string title = 14;
+ * @return whether the title field is set
+ */
+ public boolean hasTitle() {
+ return (bitField0_ & 0x00000100) != 0;
+ }
+
+ /**
+ * optional string title = 14;
+ * @return this
+ */
+ public ClientMail clearTitle() {
+ bitField0_ &= ~0x00000100;
+ title.clear();
+ return this;
+ }
+
+ /**
+ * optional string title = 14;
+ * @return the title
+ */
+ public String getTitle() {
+ return title.getString();
+ }
+
+ /**
+ * optional string title = 14;
+ * @return internal {@code Utf8String} representation of title for reading
+ */
+ public Utf8String getTitleBytes() {
+ return this.title;
+ }
+
+ /**
+ * optional string title = 14;
+ * @return internal {@code Utf8String} representation of title for modifications
+ */
+ public Utf8String getMutableTitleBytes() {
+ bitField0_ |= 0x00000100;
+ return this.title;
+ }
+
+ /**
+ * optional string title = 14;
+ * @param value the title to set
+ * @return this
+ */
+ public ClientMail setTitle(final CharSequence value) {
+ bitField0_ |= 0x00000100;
+ title.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional string title = 14;
+ * @param value the title to set
+ * @return this
+ */
+ public ClientMail setTitle(final Utf8String value) {
+ bitField0_ |= 0x00000100;
+ title.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * repeated string para_list = 1;
* @return whether the paraList field is set
*/
public boolean hasParaList() {
@@ -526,7 +526,7 @@ public final class ClientMailOuterClass {
}
/**
- * repeated string para_list = 6;
+ * repeated string para_list = 1;
* @return this
*/
public ClientMail clearParaList() {
@@ -536,7 +536,7 @@ public final class ClientMailOuterClass {
}
/**
- * repeated string para_list = 6;
+ * 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 final class ClientMailOuterClass {
}
/**
- * repeated string para_list = 6;
+ * 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 final class ClientMailOuterClass {
}
/**
- * repeated string para_list = 6;
+ * repeated string para_list = 1;
* @param value the paraList to add
* @return this
*/
@@ -575,7 +575,7 @@ public final class ClientMailOuterClass {
}
/**
- * repeated string para_list = 6;
+ * repeated string para_list = 1;
* @param values the paraList to add
* @return this
*/
@@ -590,15 +590,15 @@ public final class ClientMailOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- time = other.time;
expireTime = other.expireTime;
+ time = other.time;
id = other.id;
templateId = other.templateId;
isRead = other.isRead;
attachment.copyFrom(other.attachment);
- title.copyFrom(other.title);
sender.copyFrom(other.sender);
content.copyFrom(other.content);
+ title.copyFrom(other.title);
paraList.copyFrom(other.paraList);
}
return this;
@@ -610,12 +610,12 @@ public final class ClientMailOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasTime()) {
- setTime(other.time);
- }
if (other.hasExpireTime()) {
setExpireTime(other.expireTime);
}
+ if (other.hasTime()) {
+ setTime(other.time);
+ }
if (other.hasId()) {
setId(other.id);
}
@@ -628,15 +628,15 @@ public final class ClientMailOuterClass {
if (other.hasAttachment()) {
getMutableAttachment().mergeFrom(other.attachment);
}
- if (other.hasTitle()) {
- getMutableTitleBytes().copyFrom(other.title);
- }
if (other.hasSender()) {
getMutableSenderBytes().copyFrom(other.sender);
}
if (other.hasContent()) {
getMutableContentBytes().copyFrom(other.content);
}
+ if (other.hasTitle()) {
+ getMutableTitleBytes().copyFrom(other.title);
+ }
if (other.hasParaList()) {
getMutableParaList().addAll(other.paraList);
}
@@ -650,15 +650,15 @@ public final class ClientMailOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- time = 0L;
expireTime = 0L;
+ time = 0L;
id = 0;
templateId = 0;
isRead = false;
attachment.clear();
- title.clear();
sender.clear();
content.clear();
+ title.clear();
paraList.clear();
return this;
}
@@ -671,9 +671,9 @@ public final class ClientMailOuterClass {
cachedSize = -1;
bitField0_ = 0;
attachment.clearQuick();
- title.clear();
sender.clear();
content.clear();
+ title.clear();
paraList.clear();
return this;
}
@@ -688,59 +688,59 @@ public final class ClientMailOuterClass {
}
ClientMail other = (ClientMail) o;
return bitField0_ == other.bitField0_
- && (!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))
- && (!hasTitle() || title.equals(other.title))
&& (!hasSender() || sender.equals(other.sender))
&& (!hasContent() || content.equals(other.content))
+ && (!hasTitle() || title.equals(other.title))
&& (!hasParaList() || paraList.equals(other.paraList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
- output.writeInt64NoTag(time);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 56);
output.writeInt64NoTag(expireTime);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 72);
+ output.writeInt64NoTag(time);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(id);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(templateId);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 48);
output.writeBoolNoTag(isRead);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 122);
+ output.writeRawByte((byte) 18);
output.writeMessageNoTag(attachment);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawByte((byte) 10);
- output.writeStringNoTag(title);
- }
- if ((bitField0_ & 0x00000080) != 0) {
- output.writeRawByte((byte) 58);
+ output.writeRawByte((byte) 42);
output.writeStringNoTag(sender);
}
- if ((bitField0_ & 0x00000100) != 0) {
- output.writeRawByte((byte) 82);
+ if ((bitField0_ & 0x00000080) != 0) {
+ output.writeRawByte((byte) 90);
output.writeStringNoTag(content);
}
+ if ((bitField0_ & 0x00000100) != 0) {
+ output.writeRawByte((byte) 114);
+ output.writeStringNoTag(title);
+ }
if ((bitField0_ & 0x00000200) != 0) {
for (int i = 0; i < paraList.length(); i++) {
- output.writeRawByte((byte) 50);
+ output.writeRawByte((byte) 10);
output.writeStringNoTag(paraList.get(i));
}
}
@@ -750,10 +750,10 @@ public final class ClientMailOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeInt64SizeNoTag(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,14 +768,14 @@ public final class ClientMailOuterClass {
size += 1 + ProtoSink.computeMessageSizeNoTag(attachment);
}
if ((bitField0_ & 0x00000040) != 0) {
- size += 1 + ProtoSink.computeStringSizeNoTag(title);
- }
- if ((bitField0_ & 0x00000080) != 0) {
size += 1 + ProtoSink.computeStringSizeNoTag(sender);
}
- if ((bitField0_ & 0x00000100) != 0) {
+ if ((bitField0_ & 0x00000080) != 0) {
size += 1 + ProtoSink.computeStringSizeNoTag(content);
}
+ if ((bitField0_ & 0x00000100) != 0) {
+ size += 1 + ProtoSink.computeStringSizeNoTag(title);
+ }
if ((bitField0_ & 0x00000200) != 0) {
size += (1 * paraList.length()) + ProtoSink.computeRepeatedStringSizeNoTag(paraList);
}
@@ -789,88 +789,88 @@ public final class ClientMailOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
+ case 56: {
+ // expireTime
+ expireTime = input.readInt64();
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 72) {
+ break;
+ }
+ }
+ case 72: {
// time
time = input.readInt64();
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 32) {
break;
}
}
case 32: {
- // expireTime
- expireTime = input.readInt64();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 24) {
- break;
- }
- }
- case 24: {
// id
id = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 120) {
break;
}
}
- case 96: {
+ case 120: {
// templateId
templateId = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 112) {
+ if (tag != 48) {
break;
}
}
- case 112: {
+ case 48: {
// isRead
isRead = input.readBool();
bitField0_ |= 0x00000010;
tag = input.readTag();
- if (tag != 122) {
+ if (tag != 18) {
break;
}
}
- case 122: {
+ case 18: {
// attachment
input.readMessage(attachment);
bitField0_ |= 0x00000020;
tag = input.readTag();
+ if (tag != 42) {
+ break;
+ }
+ }
+ case 42: {
+ // sender
+ input.readString(sender);
+ bitField0_ |= 0x00000040;
+ tag = input.readTag();
+ if (tag != 90) {
+ break;
+ }
+ }
+ case 90: {
+ // content
+ input.readString(content);
+ bitField0_ |= 0x00000080;
+ tag = input.readTag();
+ if (tag != 114) {
+ break;
+ }
+ }
+ case 114: {
+ // title
+ input.readString(title);
+ bitField0_ |= 0x00000100;
+ tag = input.readTag();
if (tag != 10) {
break;
}
}
case 10: {
- // title
- input.readString(title);
- bitField0_ |= 0x00000040;
- tag = input.readTag();
- if (tag != 58) {
- break;
- }
- }
- case 58: {
- // sender
- input.readString(sender);
- bitField0_ |= 0x00000080;
- tag = input.readTag();
- if (tag != 82) {
- break;
- }
- }
- case 82: {
- // content
- input.readString(content);
- bitField0_ |= 0x00000100;
- tag = input.readTag();
- if (tag != 50) {
- break;
- }
- }
- case 50: {
// paraList
tag = input.readRepeatedString(paraList, tag);
bitField0_ |= 0x00000200;
@@ -896,10 +896,10 @@ public final class ClientMailOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeInt64(FieldNames.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,14 +914,14 @@ public final class ClientMailOuterClass {
output.writeMessage(FieldNames.attachment, attachment);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeString(FieldNames.title, title);
- }
- if ((bitField0_ & 0x00000080) != 0) {
output.writeString(FieldNames.sender, sender);
}
- if ((bitField0_ & 0x00000100) != 0) {
+ if ((bitField0_ & 0x00000080) != 0) {
output.writeString(FieldNames.content, content);
}
+ if ((bitField0_ & 0x00000100) != 0) {
+ output.writeString(FieldNames.title, title);
+ }
if ((bitField0_ & 0x00000200) != 0) {
output.writeRepeatedString(FieldNames.paraList, paraList);
}
@@ -935,10 +935,11 @@ public final class ClientMailOuterClass {
}
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 final class ClientMailOuterClass {
}
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,22 +1004,11 @@ public final class ClientMailOuterClass {
}
break;
}
- case 110371416: {
- if (input.isAtField(FieldNames.title)) {
- if (!input.trySkipNullValue()) {
- input.readString(title);
- bitField0_ |= 0x00000040;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case -905962955: {
if (input.isAtField(FieldNames.sender)) {
if (!input.trySkipNullValue()) {
input.readString(sender);
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000040;
}
} else {
input.skipUnknownField();
@@ -1030,6 +1019,17 @@ public final class ClientMailOuterClass {
if (input.isAtField(FieldNames.content)) {
if (!input.trySkipNullValue()) {
input.readString(content);
+ bitField0_ |= 0x00000080;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 110371416: {
+ if (input.isAtField(FieldNames.title)) {
+ if (!input.trySkipNullValue()) {
+ input.readString(title);
bitField0_ |= 0x00000100;
}
} else {
@@ -1101,10 +1101,10 @@ public final class ClientMailOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName 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,12 +1113,12 @@ public final class ClientMailOuterClass {
static final FieldName attachment = FieldName.forField("attachment");
- static final FieldName title = FieldName.forField("title");
-
static final FieldName sender = FieldName.forField("sender");
static final FieldName content = FieldName.forField("content");
+ static final FieldName title = FieldName.forField("title");
+
static final FieldName paraList = FieldName.forField("paraList", "para_list");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java
index cba9dc2..bf7b10b 100644
--- a/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java
@@ -19,17 +19,17 @@ public final class ComposeItemCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 count = 1;
- */
- private int count;
-
- /**
- * optional uint32 compose_id = 6;
+ * optional uint32 compose_id = 1;
*/
private int composeId;
/**
- * optional .ItemCostList compose_item_list = 14;
+ * optional uint32 count = 8;
+ */
+ private int count;
+
+ /**
+ * optional .ItemCostList compose_item_list = 3;
*/
private final ItemCostListOuterClass.ItemCostList composeItemList = ItemCostListOuterClass.ItemCostList.newInstance();
@@ -44,62 +44,25 @@ public final class ComposeItemCsReqOuterClass {
}
/**
- * optional uint32 count = 1;
- * @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 = 1;
- * @return this
- */
- public ComposeItemCsReq clearCount() {
- bitField0_ &= ~0x00000001;
- count = 0;
- return this;
- }
-
- /**
- * optional uint32 count = 1;
- * @return the count
- */
- public int getCount() {
- return count;
- }
-
- /**
- * optional uint32 count = 1;
- * @param value the count to set
- * @return this
- */
- public ComposeItemCsReq setCount(final int value) {
- bitField0_ |= 0x00000001;
- count = value;
- return this;
- }
-
- /**
- * optional uint32 compose_id = 6;
- * @return whether the composeId field is set
- */
- public boolean hasComposeId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 compose_id = 6;
+ * optional uint32 compose_id = 1;
* @return this
*/
public ComposeItemCsReq clearComposeId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
composeId = 0;
return this;
}
/**
- * optional uint32 compose_id = 6;
+ * optional uint32 compose_id = 1;
* @return the composeId
*/
public int getComposeId() {
@@ -107,18 +70,55 @@ public final class ComposeItemCsReqOuterClass {
}
/**
- * optional uint32 compose_id = 6;
+ * optional uint32 compose_id = 1;
* @param value the composeId to set
* @return this
*/
public ComposeItemCsReq setComposeId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
composeId = value;
return this;
}
/**
- * optional .ItemCostList compose_item_list = 14;
+ * optional uint32 count = 8;
+ * @return whether the count field is set
+ */
+ public boolean hasCount() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 count = 8;
+ * @return this
+ */
+ public ComposeItemCsReq clearCount() {
+ bitField0_ &= ~0x00000002;
+ count = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 count = 8;
+ * @return the count
+ */
+ public int getCount() {
+ return count;
+ }
+
+ /**
+ * optional uint32 count = 8;
+ * @param value the count to set
+ * @return this
+ */
+ public ComposeItemCsReq setCount(final int value) {
+ bitField0_ |= 0x00000002;
+ count = value;
+ return this;
+ }
+
+ /**
+ * optional .ItemCostList compose_item_list = 3;
* @return whether the composeItemList field is set
*/
public boolean hasComposeItemList() {
@@ -126,7 +126,7 @@ public final class ComposeItemCsReqOuterClass {
}
/**
- * optional .ItemCostList compose_item_list = 14;
+ * optional .ItemCostList compose_item_list = 3;
* @return this
*/
public ComposeItemCsReq clearComposeItemList() {
@@ -136,7 +136,7 @@ public final class ComposeItemCsReqOuterClass {
}
/**
- * optional .ItemCostList compose_item_list = 14;
+ * optional .ItemCostList compose_item_list = 3;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -150,7 +150,7 @@ public final class ComposeItemCsReqOuterClass {
}
/**
- * optional .ItemCostList compose_item_list = 14;
+ * optional .ItemCostList compose_item_list = 3;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -164,7 +164,7 @@ public final class ComposeItemCsReqOuterClass {
}
/**
- * optional .ItemCostList compose_item_list = 14;
+ * optional .ItemCostList compose_item_list = 3;
* @param value the composeItemList to set
* @return this
*/
@@ -179,8 +179,8 @@ public final class ComposeItemCsReqOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- count = other.count;
composeId = other.composeId;
+ count = other.count;
composeItemList.copyFrom(other.composeItemList);
}
return this;
@@ -192,12 +192,12 @@ public final class ComposeItemCsReqOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasCount()) {
- setCount(other.count);
- }
if (other.hasComposeId()) {
setComposeId(other.composeId);
}
+ if (other.hasCount()) {
+ setCount(other.count);
+ }
if (other.hasComposeItemList()) {
getMutableComposeItemList().mergeFrom(other.composeItemList);
}
@@ -211,8 +211,8 @@ public final class ComposeItemCsReqOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- count = 0;
composeId = 0;
+ count = 0;
composeItemList.clear();
return this;
}
@@ -238,8 +238,8 @@ public final class ComposeItemCsReqOuterClass {
}
ComposeItemCsReq other = (ComposeItemCsReq) o;
return bitField0_ == other.bitField0_
- && (!hasCount() || count == other.count)
&& (!hasComposeId() || composeId == other.composeId)
+ && (!hasCount() || count == other.count)
&& (!hasComposeItemList() || composeItemList.equals(other.composeItemList));
}
@@ -247,14 +247,14 @@ public final class ComposeItemCsReqOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(count);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 48);
output.writeUInt32NoTag(composeId);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 64);
+ output.writeUInt32NoTag(count);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 114);
+ output.writeRawByte((byte) 26);
output.writeMessageNoTag(composeItemList);
}
}
@@ -263,10 +263,10 @@ public final class ComposeItemCsReqOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(count);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(count);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(composeItemList);
@@ -282,24 +282,24 @@ public final class ComposeItemCsReqOuterClass {
while (true) {
switch (tag) {
case 8: {
- // count
- count = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 48) {
- break;
- }
- }
- case 48: {
// composeId
composeId = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 114) {
+ if (tag != 64) {
break;
}
}
- case 114: {
+ case 64: {
+ // count
+ count = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 26) {
+ break;
+ }
+ }
+ case 26: {
// composeItemList
input.readMessage(composeItemList);
bitField0_ |= 0x00000004;
@@ -326,10 +326,10 @@ public final class ComposeItemCsReqOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.count, count);
+ output.writeUInt32(FieldNames.composeId, composeId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.composeId, composeId);
+ output.writeUInt32(FieldNames.count, count);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeMessage(FieldNames.composeItemList, composeItemList);
@@ -344,10 +344,11 @@ public final class ComposeItemCsReqOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 94851343: {
- if (input.isAtField(FieldNames.count)) {
+ case -1399759283:
+ case -442843416: {
+ if (input.isAtField(FieldNames.composeId)) {
if (!input.trySkipNullValue()) {
- count = input.readUInt32();
+ composeId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -355,11 +356,10 @@ public final class ComposeItemCsReqOuterClass {
}
break;
}
- case -1399759283:
- case -442843416: {
- if (input.isAtField(FieldNames.composeId)) {
+ case 94851343: {
+ if (input.isAtField(FieldNames.count)) {
if (!input.trySkipNullValue()) {
- composeId = input.readUInt32();
+ count = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -432,10 +432,10 @@ public final class ComposeItemCsReqOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName count = FieldName.forField("count");
-
static final FieldName composeId = FieldName.forField("composeId", "compose_id");
+ static final FieldName count = FieldName.forField("count");
+
static final FieldName composeItemList = FieldName.forField("composeItemList", "compose_item_list");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java
index 8340572..935a57f 100644
--- a/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java
@@ -19,22 +19,22 @@ public final class ComposeItemScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 count = 4;
+ * optional uint32 count = 3;
*/
private int count;
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 4;
*/
private int retcode;
/**
- * optional uint32 compose_id = 11;
+ * optional uint32 compose_id = 8;
*/
private int composeId;
/**
- * optional .ItemList return_item_list = 13;
+ * optional .ItemList return_item_list = 15;
*/
private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance();
@@ -49,7 +49,7 @@ public final class ComposeItemScRspOuterClass {
}
/**
- * optional uint32 count = 4;
+ * optional uint32 count = 3;
* @return whether the count field is set
*/
public boolean hasCount() {
@@ -57,7 +57,7 @@ public final class ComposeItemScRspOuterClass {
}
/**
- * optional uint32 count = 4;
+ * optional uint32 count = 3;
* @return this
*/
public ComposeItemScRsp clearCount() {
@@ -67,7 +67,7 @@ public final class ComposeItemScRspOuterClass {
}
/**
- * optional uint32 count = 4;
+ * optional uint32 count = 3;
* @return the count
*/
public int getCount() {
@@ -75,7 +75,7 @@ public final class ComposeItemScRspOuterClass {
}
/**
- * optional uint32 count = 4;
+ * optional uint32 count = 3;
* @param value the count to set
* @return this
*/
@@ -86,7 +86,7 @@ public final class ComposeItemScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 4;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -94,7 +94,7 @@ public final class ComposeItemScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 4;
* @return this
*/
public ComposeItemScRsp clearRetcode() {
@@ -104,7 +104,7 @@ public final class ComposeItemScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 4;
* @return the retcode
*/
public int getRetcode() {
@@ -112,7 +112,7 @@ public final class ComposeItemScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 4;
* @param value the retcode to set
* @return this
*/
@@ -123,7 +123,7 @@ public final class ComposeItemScRspOuterClass {
}
/**
- * optional uint32 compose_id = 11;
+ * optional uint32 compose_id = 8;
* @return whether the composeId field is set
*/
public boolean hasComposeId() {
@@ -131,7 +131,7 @@ public final class ComposeItemScRspOuterClass {
}
/**
- * optional uint32 compose_id = 11;
+ * optional uint32 compose_id = 8;
* @return this
*/
public ComposeItemScRsp clearComposeId() {
@@ -141,7 +141,7 @@ public final class ComposeItemScRspOuterClass {
}
/**
- * optional uint32 compose_id = 11;
+ * optional uint32 compose_id = 8;
* @return the composeId
*/
public int getComposeId() {
@@ -149,7 +149,7 @@ public final class ComposeItemScRspOuterClass {
}
/**
- * optional uint32 compose_id = 11;
+ * optional uint32 compose_id = 8;
* @param value the composeId to set
* @return this
*/
@@ -160,7 +160,7 @@ public final class ComposeItemScRspOuterClass {
}
/**
- * optional .ItemList return_item_list = 13;
+ * optional .ItemList return_item_list = 15;
* @return whether the returnItemList field is set
*/
public boolean hasReturnItemList() {
@@ -168,7 +168,7 @@ public final class ComposeItemScRspOuterClass {
}
/**
- * optional .ItemList return_item_list = 13;
+ * optional .ItemList return_item_list = 15;
* @return this
*/
public ComposeItemScRsp clearReturnItemList() {
@@ -178,7 +178,7 @@ public final class ComposeItemScRspOuterClass {
}
/**
- * optional .ItemList return_item_list = 13;
+ * optional .ItemList return_item_list = 15;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -192,7 +192,7 @@ public final class ComposeItemScRspOuterClass {
}
/**
- * optional .ItemList return_item_list = 13;
+ * optional .ItemList return_item_list = 15;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -206,7 +206,7 @@ public final class ComposeItemScRspOuterClass {
}
/**
- * optional .ItemList return_item_list = 13;
+ * optional .ItemList return_item_list = 15;
* @param value the returnItemList to set
* @return this
*/
@@ -294,19 +294,19 @@ public final class ComposeItemScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(count);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(composeId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 106);
+ output.writeRawByte((byte) 122);
output.writeMessageNoTag(returnItemList);
}
}
@@ -336,34 +336,34 @@ public final class ComposeItemScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
+ case 24: {
// count
count = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 56) {
+ if (tag != 32) {
break;
}
}
- case 56: {
+ case 32: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 88) {
+ if (tag != 64) {
break;
}
}
- case 88: {
+ case 64: {
// composeId
composeId = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 106) {
+ if (tag != 122) {
break;
}
}
- case 106: {
+ case 122: {
// returnItemList
input.readMessage(returnItemList);
bitField0_ |= 0x00000008;
diff --git a/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicCsReqOuterClass.java
index ee7a5bb..82d657e 100644
--- a/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicCsReqOuterClass.java
@@ -19,27 +19,27 @@ public final class ComposeSelectedRelicCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 compose_relic_id = 6;
- */
- private int composeRelicId;
-
- /**
- * optional uint32 compose_id = 8;
+ * optional uint32 compose_id = 3;
*/
private int composeId;
/**
- * optional uint32 count = 12;
+ * optional uint32 compose_relic_id = 4;
+ */
+ private int composeRelicId;
+
+ /**
+ * optional uint32 count = 10;
*/
private int count;
/**
- * optional uint32 main_affix_id = 13;
+ * optional uint32 main_affix_id = 11;
*/
private int mainAffixId;
/**
- * optional .ItemCostList compose_item_list = 11;
+ * optional .ItemCostList compose_item_list = 13;
*/
private final ItemCostListOuterClass.ItemCostList composeItemList = ItemCostListOuterClass.ItemCostList.newInstance();
@@ -54,62 +54,25 @@ public final class ComposeSelectedRelicCsReqOuterClass {
}
/**
- * optional uint32 compose_relic_id = 6;
- * @return whether the composeRelicId field is set
+ * optional uint32 compose_id = 3;
+ * @return whether the composeId field is set
*/
- public boolean hasComposeRelicId() {
+ public boolean hasComposeId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 compose_relic_id = 6;
- * @return this
- */
- public ComposeSelectedRelicCsReq clearComposeRelicId() {
- bitField0_ &= ~0x00000001;
- composeRelicId = 0;
- return this;
- }
-
- /**
- * optional uint32 compose_relic_id = 6;
- * @return the composeRelicId
- */
- public int getComposeRelicId() {
- return composeRelicId;
- }
-
- /**
- * optional uint32 compose_relic_id = 6;
- * @param value the composeRelicId to set
- * @return this
- */
- public ComposeSelectedRelicCsReq setComposeRelicId(final int value) {
- bitField0_ |= 0x00000001;
- composeRelicId = value;
- return this;
- }
-
- /**
- * optional uint32 compose_id = 8;
- * @return whether the composeId field is set
- */
- public boolean hasComposeId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 compose_id = 8;
+ * optional uint32 compose_id = 3;
* @return this
*/
public ComposeSelectedRelicCsReq clearComposeId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
composeId = 0;
return this;
}
/**
- * optional uint32 compose_id = 8;
+ * optional uint32 compose_id = 3;
* @return the composeId
*/
public int getComposeId() {
@@ -117,18 +80,55 @@ public final class ComposeSelectedRelicCsReqOuterClass {
}
/**
- * optional uint32 compose_id = 8;
+ * optional uint32 compose_id = 3;
* @param value the composeId to set
* @return this
*/
public ComposeSelectedRelicCsReq setComposeId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
composeId = value;
return this;
}
/**
- * optional uint32 count = 12;
+ * optional uint32 compose_relic_id = 4;
+ * @return whether the composeRelicId field is set
+ */
+ public boolean hasComposeRelicId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 compose_relic_id = 4;
+ * @return this
+ */
+ public ComposeSelectedRelicCsReq clearComposeRelicId() {
+ bitField0_ &= ~0x00000002;
+ composeRelicId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 compose_relic_id = 4;
+ * @return the composeRelicId
+ */
+ public int getComposeRelicId() {
+ return composeRelicId;
+ }
+
+ /**
+ * optional uint32 compose_relic_id = 4;
+ * @param value the composeRelicId to set
+ * @return this
+ */
+ public ComposeSelectedRelicCsReq setComposeRelicId(final int value) {
+ bitField0_ |= 0x00000002;
+ composeRelicId = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 count = 10;
* @return whether the count field is set
*/
public boolean hasCount() {
@@ -136,7 +136,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
}
/**
- * optional uint32 count = 12;
+ * optional uint32 count = 10;
* @return this
*/
public ComposeSelectedRelicCsReq clearCount() {
@@ -146,7 +146,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
}
/**
- * optional uint32 count = 12;
+ * optional uint32 count = 10;
* @return the count
*/
public int getCount() {
@@ -154,7 +154,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
}
/**
- * optional uint32 count = 12;
+ * optional uint32 count = 10;
* @param value the count to set
* @return this
*/
@@ -165,7 +165,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
}
/**
- * optional uint32 main_affix_id = 13;
+ * optional uint32 main_affix_id = 11;
* @return whether the mainAffixId field is set
*/
public boolean hasMainAffixId() {
@@ -173,7 +173,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
}
/**
- * optional uint32 main_affix_id = 13;
+ * optional uint32 main_affix_id = 11;
* @return this
*/
public ComposeSelectedRelicCsReq clearMainAffixId() {
@@ -183,7 +183,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
}
/**
- * optional uint32 main_affix_id = 13;
+ * optional uint32 main_affix_id = 11;
* @return the mainAffixId
*/
public int getMainAffixId() {
@@ -191,7 +191,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
}
/**
- * optional uint32 main_affix_id = 13;
+ * optional uint32 main_affix_id = 11;
* @param value the mainAffixId to set
* @return this
*/
@@ -202,7 +202,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
}
/**
- * optional .ItemCostList compose_item_list = 11;
+ * optional .ItemCostList compose_item_list = 13;
* @return whether the composeItemList field is set
*/
public boolean hasComposeItemList() {
@@ -210,7 +210,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
}
/**
- * optional .ItemCostList compose_item_list = 11;
+ * optional .ItemCostList compose_item_list = 13;
* @return this
*/
public ComposeSelectedRelicCsReq clearComposeItemList() {
@@ -220,7 +220,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
}
/**
- * optional .ItemCostList compose_item_list = 11;
+ * optional .ItemCostList compose_item_list = 13;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -234,7 +234,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
}
/**
- * optional .ItemCostList compose_item_list = 11;
+ * optional .ItemCostList compose_item_list = 13;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -248,7 +248,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
}
/**
- * optional .ItemCostList compose_item_list = 11;
+ * optional .ItemCostList compose_item_list = 13;
* @param value the composeItemList to set
* @return this
*/
@@ -264,8 +264,8 @@ public final class ComposeSelectedRelicCsReqOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- composeRelicId = other.composeRelicId;
composeId = other.composeId;
+ composeRelicId = other.composeRelicId;
count = other.count;
mainAffixId = other.mainAffixId;
composeItemList.copyFrom(other.composeItemList);
@@ -279,12 +279,12 @@ public final class ComposeSelectedRelicCsReqOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasComposeRelicId()) {
- setComposeRelicId(other.composeRelicId);
- }
if (other.hasComposeId()) {
setComposeId(other.composeId);
}
+ if (other.hasComposeRelicId()) {
+ setComposeRelicId(other.composeRelicId);
+ }
if (other.hasCount()) {
setCount(other.count);
}
@@ -304,8 +304,8 @@ public final class ComposeSelectedRelicCsReqOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- composeRelicId = 0;
composeId = 0;
+ composeRelicId = 0;
count = 0;
mainAffixId = 0;
composeItemList.clear();
@@ -333,8 +333,8 @@ public final class ComposeSelectedRelicCsReqOuterClass {
}
ComposeSelectedRelicCsReq other = (ComposeSelectedRelicCsReq) o;
return bitField0_ == other.bitField0_
- && (!hasComposeRelicId() || composeRelicId == other.composeRelicId)
&& (!hasComposeId() || composeId == other.composeId)
+ && (!hasComposeRelicId() || composeRelicId == other.composeRelicId)
&& (!hasCount() || count == other.count)
&& (!hasMainAffixId() || mainAffixId == other.mainAffixId)
&& (!hasComposeItemList() || composeItemList.equals(other.composeItemList));
@@ -343,23 +343,23 @@ public final class ComposeSelectedRelicCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 48);
- output.writeUInt32NoTag(composeRelicId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(composeId);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 32);
+ output.writeUInt32NoTag(composeRelicId);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(count);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(mainAffixId);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 90);
+ output.writeRawByte((byte) 106);
output.writeMessageNoTag(composeItemList);
}
}
@@ -368,10 +368,10 @@ public final class ComposeSelectedRelicCsReqOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(composeRelicId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(composeRelicId);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(count);
@@ -392,43 +392,43 @@ public final class ComposeSelectedRelicCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 48: {
- // composeRelicId
- composeRelicId = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 64) {
- break;
- }
- }
- case 64: {
+ case 24: {
// composeId
composeId = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 32) {
break;
}
}
- case 96: {
+ case 32: {
+ // composeRelicId
+ composeRelicId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 80) {
+ break;
+ }
+ }
+ case 80: {
// count
count = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 88) {
break;
}
}
- case 104: {
+ case 88: {
// mainAffixId
mainAffixId = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 90) {
+ if (tag != 106) {
break;
}
}
- case 90: {
+ case 106: {
// composeItemList
input.readMessage(composeItemList);
bitField0_ |= 0x00000010;
@@ -455,10 +455,10 @@ public final class ComposeSelectedRelicCsReqOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.composeRelicId, composeRelicId);
+ output.writeUInt32(FieldNames.composeId, composeId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.composeId, composeId);
+ output.writeUInt32(FieldNames.composeRelicId, composeRelicId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.count, count);
@@ -479,11 +479,11 @@ public final class ComposeSelectedRelicCsReqOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- 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_ |= 0x00000001;
}
} else {
@@ -491,11 +491,11 @@ public final class ComposeSelectedRelicCsReqOuterClass {
}
break;
}
- 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_ |= 0x00000002;
}
} else {
@@ -591,10 +591,10 @@ public final class ComposeSelectedRelicCsReqOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName composeRelicId = FieldName.forField("composeRelicId", "compose_relic_id");
-
static final FieldName composeId = FieldName.forField("composeId", "compose_id");
+ static final FieldName composeRelicId = FieldName.forField("composeRelicId", "compose_relic_id");
+
static final FieldName count = FieldName.forField("count");
static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id");
diff --git a/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicScRspOuterClass.java
index cfe7ef1..f946934 100644
--- a/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicScRspOuterClass.java
@@ -19,17 +19,17 @@ public final class ComposeSelectedRelicScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 1;
+ * optional uint32 retcode = 3;
*/
private int retcode;
/**
- * optional uint32 compose_id = 4;
+ * optional uint32 compose_id = 13;
*/
private int composeId;
/**
- * optional .ItemList return_item_list = 13;
+ * optional .ItemList return_item_list = 1;
*/
private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance();
@@ -44,7 +44,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
}
/**
- * optional uint32 retcode = 1;
+ * optional uint32 retcode = 3;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -52,7 +52,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
}
/**
- * optional uint32 retcode = 1;
+ * optional uint32 retcode = 3;
* @return this
*/
public ComposeSelectedRelicScRsp clearRetcode() {
@@ -62,7 +62,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
}
/**
- * optional uint32 retcode = 1;
+ * optional uint32 retcode = 3;
* @return the retcode
*/
public int getRetcode() {
@@ -70,7 +70,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
}
/**
- * optional uint32 retcode = 1;
+ * optional uint32 retcode = 3;
* @param value the retcode to set
* @return this
*/
@@ -81,7 +81,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
}
/**
- * optional uint32 compose_id = 4;
+ * optional uint32 compose_id = 13;
* @return whether the composeId field is set
*/
public boolean hasComposeId() {
@@ -89,7 +89,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
}
/**
- * optional uint32 compose_id = 4;
+ * optional uint32 compose_id = 13;
* @return this
*/
public ComposeSelectedRelicScRsp clearComposeId() {
@@ -99,7 +99,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
}
/**
- * optional uint32 compose_id = 4;
+ * optional uint32 compose_id = 13;
* @return the composeId
*/
public int getComposeId() {
@@ -107,7 +107,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
}
/**
- * optional uint32 compose_id = 4;
+ * optional uint32 compose_id = 13;
* @param value the composeId to set
* @return this
*/
@@ -118,7 +118,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
}
/**
- * optional .ItemList return_item_list = 13;
+ * optional .ItemList return_item_list = 1;
* @return whether the returnItemList field is set
*/
public boolean hasReturnItemList() {
@@ -126,7 +126,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
}
/**
- * optional .ItemList return_item_list = 13;
+ * optional .ItemList return_item_list = 1;
* @return this
*/
public ComposeSelectedRelicScRsp clearReturnItemList() {
@@ -136,7 +136,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
}
/**
- * optional .ItemList return_item_list = 13;
+ * optional .ItemList return_item_list = 1;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -150,7 +150,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
}
/**
- * optional .ItemList return_item_list = 13;
+ * optional .ItemList return_item_list = 1;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -164,7 +164,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
}
/**
- * optional .ItemList return_item_list = 13;
+ * optional .ItemList return_item_list = 1;
* @param value the returnItemList to set
* @return this
*/
@@ -246,15 +246,15 @@ public final class ComposeSelectedRelicScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 104);
output.writeUInt32NoTag(composeId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 106);
+ output.writeRawByte((byte) 10);
output.writeMessageNoTag(returnItemList);
}
}
@@ -281,25 +281,25 @@ public final class ComposeSelectedRelicScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 24: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 32) {
+ if (tag != 104) {
break;
}
}
- case 32: {
+ case 104: {
// composeId
composeId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 106) {
+ if (tag != 10) {
break;
}
}
- case 106: {
+ case 10: {
// returnItemList
input.readMessage(returnItemList);
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/DailyActiveInfoNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/DailyActiveInfoNotifyOuterClass.java
index 4508bc0..dcf8f07 100644
--- a/src/generated/main/emu/lunarcore/proto/DailyActiveInfoNotifyOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/DailyActiveInfoNotifyOuterClass.java
@@ -26,12 +26,12 @@ public final class DailyActiveInfoNotifyOuterClass {
private int dailyActivePoint;
/**
- * repeated uint32 daily_active_quest_id_list = 15;
+ * repeated uint32 daily_active_quest_id_list = 1;
*/
private final RepeatedInt dailyActiveQuestIdList = RepeatedInt.newEmptyInstance();
/**
- * repeated .DailyActivityInfo daily_active_level_list = 4;
+ * repeated .DailyActivityInfo daily_active_level_list = 3;
*/
private final RepeatedMessagerepeated uint32 daily_active_quest_id_list = 15;
+ * repeated uint32 daily_active_quest_id_list = 1;
* @return whether the dailyActiveQuestIdList field is set
*/
public boolean hasDailyActiveQuestIdList() {
@@ -91,7 +91,7 @@ public final class DailyActiveInfoNotifyOuterClass {
}
/**
- * repeated uint32 daily_active_quest_id_list = 15;
+ * repeated uint32 daily_active_quest_id_list = 1;
* @return this
*/
public DailyActiveInfoNotify clearDailyActiveQuestIdList() {
@@ -101,7 +101,7 @@ public final class DailyActiveInfoNotifyOuterClass {
}
/**
- * repeated uint32 daily_active_quest_id_list = 15;
+ * repeated uint32 daily_active_quest_id_list = 1;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -115,7 +115,7 @@ public final class DailyActiveInfoNotifyOuterClass {
}
/**
- * repeated uint32 daily_active_quest_id_list = 15;
+ * repeated uint32 daily_active_quest_id_list = 1;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -129,7 +129,7 @@ public final class DailyActiveInfoNotifyOuterClass {
}
/**
- * repeated uint32 daily_active_quest_id_list = 15;
+ * repeated uint32 daily_active_quest_id_list = 1;
* @param value the dailyActiveQuestIdList to add
* @return this
*/
@@ -140,7 +140,7 @@ public final class DailyActiveInfoNotifyOuterClass {
}
/**
- * repeated uint32 daily_active_quest_id_list = 15;
+ * repeated uint32 daily_active_quest_id_list = 1;
* @param values the dailyActiveQuestIdList to add
* @return this
*/
@@ -151,7 +151,7 @@ public final class DailyActiveInfoNotifyOuterClass {
}
/**
- * repeated .DailyActivityInfo daily_active_level_list = 4;
+ * repeated .DailyActivityInfo daily_active_level_list = 3;
* @return whether the dailyActiveLevelList field is set
*/
public boolean hasDailyActiveLevelList() {
@@ -159,7 +159,7 @@ public final class DailyActiveInfoNotifyOuterClass {
}
/**
- * repeated .DailyActivityInfo daily_active_level_list = 4;
+ * repeated .DailyActivityInfo daily_active_level_list = 3;
* @return this
*/
public DailyActiveInfoNotify clearDailyActiveLevelList() {
@@ -169,7 +169,7 @@ public final class DailyActiveInfoNotifyOuterClass {
}
/**
- * repeated .DailyActivityInfo daily_active_level_list = 4;
+ * repeated .DailyActivityInfo daily_active_level_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.
@@ -184,7 +184,7 @@ public final class DailyActiveInfoNotifyOuterClass {
}
/**
- * repeated .DailyActivityInfo daily_active_level_list = 4;
+ * repeated .DailyActivityInfo daily_active_level_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
@@ -199,7 +199,7 @@ public final class DailyActiveInfoNotifyOuterClass {
}
/**
- * repeated .DailyActivityInfo daily_active_level_list = 4;
+ * repeated .DailyActivityInfo daily_active_level_list = 3;
* @param value the dailyActiveLevelList to add
* @return this
*/
@@ -211,7 +211,7 @@ public final class DailyActiveInfoNotifyOuterClass {
}
/**
- * repeated .DailyActivityInfo daily_active_level_list = 4;
+ * repeated .DailyActivityInfo daily_active_level_list = 3;
* @param values the dailyActiveLevelList to add
* @return this
*/
@@ -300,13 +300,13 @@ public final class DailyActiveInfoNotifyOuterClass {
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < dailyActiveQuestIdList.length(); i++) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(dailyActiveQuestIdList.array()[i]);
}
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < dailyActiveLevelList.length(); i++) {
- output.writeRawByte((byte) 34);
+ output.writeRawByte((byte) 26);
output.writeMessageNoTag(dailyActiveLevelList.get(i));
}
}
@@ -339,20 +339,20 @@ public final class DailyActiveInfoNotifyOuterClass {
dailyActivePoint = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 122) {
+ if (tag != 10) {
break;
}
}
- case 122: {
+ case 10: {
// dailyActiveQuestIdList [packed=true]
input.readPackedUInt32(dailyActiveQuestIdList, tag);
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 34) {
+ if (tag != 26) {
break;
}
}
- case 34: {
+ case 26: {
// dailyActiveLevelList
tag = input.readRepeatedMessage(dailyActiveLevelList, tag);
bitField0_ |= 0x00000004;
@@ -370,7 +370,7 @@ public final class DailyActiveInfoNotifyOuterClass {
tag = input.readTag();
break;
}
- case 120: {
+ case 8: {
// dailyActiveQuestIdList [packed=false]
tag = input.readRepeatedUInt32(dailyActiveQuestIdList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java
index 1ce47d6..98c0476 100644
--- a/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java
@@ -19,22 +19,22 @@ public final class DailyActivityInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 world_level = 4;
- */
- private int worldLevel;
-
- /**
- * optional uint32 daily_active_point = 5;
+ * optional uint32 daily_active_point = 1;
*/
private int dailyActivePoint;
/**
- * optional uint32 level = 10;
+ * optional uint32 level = 2;
*/
private int level;
/**
- * optional bool is_has_taken = 2;
+ * optional uint32 world_level = 5;
+ */
+ private int worldLevel;
+
+ /**
+ * optional bool is_has_taken = 4;
*/
private boolean isHasTaken;
@@ -49,62 +49,25 @@ public final class DailyActivityInfoOuterClass {
}
/**
- * optional uint32 world_level = 4;
- * @return whether the worldLevel field is set
+ * optional uint32 daily_active_point = 1;
+ * @return whether the dailyActivePoint field is set
*/
- public boolean hasWorldLevel() {
+ public boolean hasDailyActivePoint() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 world_level = 4;
- * @return this
- */
- public DailyActivityInfo clearWorldLevel() {
- bitField0_ &= ~0x00000001;
- worldLevel = 0;
- return this;
- }
-
- /**
- * optional uint32 world_level = 4;
- * @return the worldLevel
- */
- public int getWorldLevel() {
- return worldLevel;
- }
-
- /**
- * optional uint32 world_level = 4;
- * @param value the worldLevel to set
- * @return this
- */
- public DailyActivityInfo setWorldLevel(final int value) {
- bitField0_ |= 0x00000001;
- worldLevel = value;
- return this;
- }
-
- /**
- * optional uint32 daily_active_point = 5;
- * @return whether the dailyActivePoint field is set
- */
- public boolean hasDailyActivePoint() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 daily_active_point = 5;
+ * optional uint32 daily_active_point = 1;
* @return this
*/
public DailyActivityInfo clearDailyActivePoint() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
dailyActivePoint = 0;
return this;
}
/**
- * optional uint32 daily_active_point = 5;
+ * optional uint32 daily_active_point = 1;
* @return the dailyActivePoint
*/
public int getDailyActivePoint() {
@@ -112,36 +75,36 @@ public final class DailyActivityInfoOuterClass {
}
/**
- * optional uint32 daily_active_point = 5;
+ * optional uint32 daily_active_point = 1;
* @param value the dailyActivePoint to set
* @return this
*/
public DailyActivityInfo setDailyActivePoint(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
dailyActivePoint = value;
return this;
}
/**
- * optional uint32 level = 10;
+ * optional uint32 level = 2;
* @return whether the level field is set
*/
public boolean hasLevel() {
- return (bitField0_ & 0x00000004) != 0;
+ return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 level = 10;
+ * optional uint32 level = 2;
* @return this
*/
public DailyActivityInfo clearLevel() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
level = 0;
return this;
}
/**
- * optional uint32 level = 10;
+ * optional uint32 level = 2;
* @return the level
*/
public int getLevel() {
@@ -149,18 +112,55 @@ public final class DailyActivityInfoOuterClass {
}
/**
- * optional uint32 level = 10;
+ * optional uint32 level = 2;
* @param value the level to set
* @return this
*/
public DailyActivityInfo setLevel(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
level = value;
return this;
}
/**
- * optional bool is_has_taken = 2;
+ * optional uint32 world_level = 5;
+ * @return whether the worldLevel field is set
+ */
+ public boolean hasWorldLevel() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 world_level = 5;
+ * @return this
+ */
+ public DailyActivityInfo clearWorldLevel() {
+ bitField0_ &= ~0x00000004;
+ worldLevel = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 world_level = 5;
+ * @return the worldLevel
+ */
+ public int getWorldLevel() {
+ return worldLevel;
+ }
+
+ /**
+ * optional uint32 world_level = 5;
+ * @param value the worldLevel to set
+ * @return this
+ */
+ public DailyActivityInfo setWorldLevel(final int value) {
+ bitField0_ |= 0x00000004;
+ worldLevel = value;
+ return this;
+ }
+
+ /**
+ * optional bool is_has_taken = 4;
* @return whether the isHasTaken field is set
*/
public boolean hasIsHasTaken() {
@@ -168,7 +168,7 @@ public final class DailyActivityInfoOuterClass {
}
/**
- * optional bool is_has_taken = 2;
+ * optional bool is_has_taken = 4;
* @return this
*/
public DailyActivityInfo clearIsHasTaken() {
@@ -178,7 +178,7 @@ public final class DailyActivityInfoOuterClass {
}
/**
- * optional bool is_has_taken = 2;
+ * optional bool is_has_taken = 4;
* @return the isHasTaken
*/
public boolean getIsHasTaken() {
@@ -186,7 +186,7 @@ public final class DailyActivityInfoOuterClass {
}
/**
- * optional bool is_has_taken = 2;
+ * optional bool is_has_taken = 4;
* @param value the isHasTaken to set
* @return this
*/
@@ -201,9 +201,9 @@ public final class DailyActivityInfoOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- worldLevel = other.worldLevel;
dailyActivePoint = other.dailyActivePoint;
level = other.level;
+ worldLevel = other.worldLevel;
isHasTaken = other.isHasTaken;
}
return this;
@@ -215,15 +215,15 @@ public final class DailyActivityInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasWorldLevel()) {
- setWorldLevel(other.worldLevel);
- }
if (other.hasDailyActivePoint()) {
setDailyActivePoint(other.dailyActivePoint);
}
if (other.hasLevel()) {
setLevel(other.level);
}
+ if (other.hasWorldLevel()) {
+ setWorldLevel(other.worldLevel);
+ }
if (other.hasIsHasTaken()) {
setIsHasTaken(other.isHasTaken);
}
@@ -237,9 +237,9 @@ public final class DailyActivityInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- worldLevel = 0;
dailyActivePoint = 0;
level = 0;
+ worldLevel = 0;
isHasTaken = false;
return this;
}
@@ -264,28 +264,28 @@ public final class DailyActivityInfoOuterClass {
}
DailyActivityInfo other = (DailyActivityInfo) o;
return bitField0_ == other.bitField0_
- && (!hasWorldLevel() || worldLevel == other.worldLevel)
&& (!hasDailyActivePoint() || dailyActivePoint == other.dailyActivePoint)
&& (!hasLevel() || level == other.level)
+ && (!hasWorldLevel() || worldLevel == other.worldLevel)
&& (!hasIsHasTaken() || isHasTaken == other.isHasTaken);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(worldLevel);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(dailyActivePoint);
}
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 80);
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(level);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 40);
+ output.writeUInt32NoTag(worldLevel);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 32);
output.writeBoolNoTag(isHasTaken);
}
}
@@ -294,14 +294,14 @@ public final class DailyActivityInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel);
- }
- if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(dailyActivePoint);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel);
+ }
if ((bitField0_ & 0x00000008) != 0) {
size += 2;
}
@@ -315,34 +315,34 @@ public final class DailyActivityInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
- // worldLevel
- worldLevel = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 40) {
- break;
- }
- }
- case 40: {
+ case 8: {
// dailyActivePoint
dailyActivePoint = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 80) {
- break;
- }
- }
- case 80: {
- // level
- level = input.readUInt32();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
if (tag != 16) {
break;
}
}
case 16: {
+ // level
+ level = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 40) {
+ break;
+ }
+ }
+ case 40: {
+ // worldLevel
+ worldLevel = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 32) {
+ break;
+ }
+ }
+ case 32: {
// isHasTaken
isHasTaken = input.readBool();
bitField0_ |= 0x00000008;
@@ -369,14 +369,14 @@ public final class DailyActivityInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.worldLevel, worldLevel);
- }
- if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.dailyActivePoint, dailyActivePoint);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.level, level);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeUInt32(FieldNames.worldLevel, worldLevel);
+ }
if ((bitField0_ & 0x00000008) != 0) {
output.writeBool(FieldNames.isHasTaken, isHasTaken);
}
@@ -390,24 +390,12 @@ public final class DailyActivityInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 440007442:
- case 1305257111: {
- if (input.isAtField(FieldNames.worldLevel)) {
- if (!input.trySkipNullValue()) {
- worldLevel = input.readUInt32();
- bitField0_ |= 0x00000001;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 859671121:
case 1952864125: {
if (input.isAtField(FieldNames.dailyActivePoint)) {
if (!input.trySkipNullValue()) {
dailyActivePoint = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
}
} else {
input.skipUnknownField();
@@ -418,6 +406,18 @@ public final class DailyActivityInfoOuterClass {
if (input.isAtField(FieldNames.level)) {
if (!input.trySkipNullValue()) {
level = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 440007442:
+ case 1305257111: {
+ if (input.isAtField(FieldNames.worldLevel)) {
+ if (!input.trySkipNullValue()) {
+ worldLevel = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -490,12 +490,12 @@ public final class DailyActivityInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level");
-
static final FieldName dailyActivePoint = FieldName.forField("dailyActivePoint", "daily_active_point");
static final FieldName level = FieldName.forField("level");
+ static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level");
+
static final FieldName isHasTaken = FieldName.forField("isHasTaken", "is_has_taken");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementCsReqOuterClass.java
index c5a581e..c00cbe4 100644
--- a/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class DeactivateFarmElementCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 entity_id = 9;
+ * optional uint32 entity_id = 10;
*/
private int entityId;
@@ -34,7 +34,7 @@ public final class DeactivateFarmElementCsReqOuterClass {
}
/**
- * optional uint32 entity_id = 9;
+ * optional uint32 entity_id = 10;
* @return whether the entityId field is set
*/
public boolean hasEntityId() {
@@ -42,7 +42,7 @@ public final class DeactivateFarmElementCsReqOuterClass {
}
/**
- * optional uint32 entity_id = 9;
+ * optional uint32 entity_id = 10;
* @return this
*/
public DeactivateFarmElementCsReq clearEntityId() {
@@ -52,7 +52,7 @@ public final class DeactivateFarmElementCsReqOuterClass {
}
/**
- * optional uint32 entity_id = 9;
+ * optional uint32 entity_id = 10;
* @return the entityId
*/
public int getEntityId() {
@@ -60,7 +60,7 @@ public final class DeactivateFarmElementCsReqOuterClass {
}
/**
- * optional uint32 entity_id = 9;
+ * optional uint32 entity_id = 10;
* @param value the entityId to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class DeactivateFarmElementCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(entityId);
}
}
@@ -150,7 +150,7 @@ public final class DeactivateFarmElementCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 72: {
+ case 80: {
// entityId
entityId = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementScRspOuterClass.java
index 7d67c9b..16cb0ea 100644
--- a/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementScRspOuterClass.java
@@ -19,15 +19,15 @@ public final class DeactivateFarmElementScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 entity_id = 5;
- */
- private int entityId;
-
- /**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 3;
*/
private int retcode;
+ /**
+ * optional uint32 entity_id = 8;
+ */
+ private int entityId;
+
private DeactivateFarmElementScRsp() {
}
@@ -39,62 +39,25 @@ public final class DeactivateFarmElementScRspOuterClass {
}
/**
- * optional uint32 entity_id = 5;
- * @return whether the entityId field is set
+ * optional uint32 retcode = 3;
+ * @return whether the retcode field is set
*/
- public boolean hasEntityId() {
+ public boolean hasRetcode() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 entity_id = 5;
- * @return this
- */
- public DeactivateFarmElementScRsp clearEntityId() {
- bitField0_ &= ~0x00000001;
- entityId = 0;
- return this;
- }
-
- /**
- * optional uint32 entity_id = 5;
- * @return the entityId
- */
- public int getEntityId() {
- return entityId;
- }
-
- /**
- * optional uint32 entity_id = 5;
- * @param value the entityId to set
- * @return this
- */
- public DeactivateFarmElementScRsp setEntityId(final int value) {
- bitField0_ |= 0x00000001;
- entityId = value;
- return this;
- }
-
- /**
- * optional uint32 retcode = 15;
- * @return whether the retcode field is set
- */
- public boolean hasRetcode() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 3;
* @return this
*/
public DeactivateFarmElementScRsp clearRetcode() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
retcode = 0;
return this;
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 3;
* @return the retcode
*/
public int getRetcode() {
@@ -102,23 +65,60 @@ public final class DeactivateFarmElementScRspOuterClass {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 3;
* @param value the retcode to set
* @return this
*/
public DeactivateFarmElementScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
retcode = value;
return this;
}
+ /**
+ * optional uint32 entity_id = 8;
+ * @return whether the entityId field is set
+ */
+ public boolean hasEntityId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 entity_id = 8;
+ * @return this
+ */
+ public DeactivateFarmElementScRsp clearEntityId() {
+ bitField0_ &= ~0x00000002;
+ entityId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 entity_id = 8;
+ * @return the entityId
+ */
+ public int getEntityId() {
+ return entityId;
+ }
+
+ /**
+ * optional uint32 entity_id = 8;
+ * @param value the entityId to set
+ * @return this
+ */
+ public DeactivateFarmElementScRsp setEntityId(final int value) {
+ bitField0_ |= 0x00000002;
+ entityId = value;
+ return this;
+ }
+
@Override
public DeactivateFarmElementScRsp copyFrom(final DeactivateFarmElementScRsp other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- entityId = other.entityId;
retcode = other.retcode;
+ entityId = other.entityId;
}
return this;
}
@@ -129,12 +129,12 @@ public final class DeactivateFarmElementScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasEntityId()) {
- setEntityId(other.entityId);
- }
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
+ if (other.hasEntityId()) {
+ setEntityId(other.entityId);
+ }
return this;
}
@@ -145,8 +145,8 @@ public final class DeactivateFarmElementScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- entityId = 0;
retcode = 0;
+ entityId = 0;
return this;
}
@@ -170,19 +170,19 @@ public final class DeactivateFarmElementScRspOuterClass {
}
DeactivateFarmElementScRsp other = (DeactivateFarmElementScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasEntityId() || entityId == other.entityId)
- && (!hasRetcode() || retcode == other.retcode);
+ && (!hasRetcode() || retcode == other.retcode)
+ && (!hasEntityId() || entityId == other.entityId);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
- output.writeUInt32NoTag(entityId);
+ output.writeRawByte((byte) 24);
+ output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 120);
- output.writeUInt32NoTag(retcode);
+ output.writeRawByte((byte) 64);
+ output.writeUInt32NoTag(entityId);
}
}
@@ -190,10 +190,10 @@ public final class DeactivateFarmElementScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId);
}
return size;
}
@@ -205,18 +205,18 @@ public final class DeactivateFarmElementScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
- // entityId
- entityId = input.readUInt32();
+ case 24: {
+ // retcode
+ retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 64) {
break;
}
}
- case 120: {
- // retcode
- retcode = input.readUInt32();
+ case 64: {
+ // entityId
+ entityId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
@@ -241,10 +241,10 @@ public final class DeactivateFarmElementScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.entityId, entityId);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.entityId, entityId);
}
output.endObject();
}
@@ -256,11 +256,10 @@ public final class DeactivateFarmElementScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -2102099874:
- case -740565257: {
- if (input.isAtField(FieldNames.entityId)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- entityId = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -268,10 +267,11 @@ public final class DeactivateFarmElementScRspOuterClass {
}
break;
}
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case -2102099874:
+ case -740565257: {
+ if (input.isAtField(FieldNames.entityId)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ entityId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -332,9 +332,9 @@ public final class DeactivateFarmElementScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName entityId = FieldName.forField("entityId", "entity_id");
-
static final FieldName retcode = FieldName.forField("retcode");
+
+ static final FieldName entityId = FieldName.forField("entityId", "entity_id");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/DelMailCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DelMailCsReqOuterClass.java
index fe622de..fedc816 100644
--- a/src/generated/main/emu/lunarcore/proto/DelMailCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/DelMailCsReqOuterClass.java
@@ -20,7 +20,7 @@ public final class DelMailCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated uint32 id_list = 13;
+ * repeated uint32 id_list = 9;
*/
private final RepeatedInt idList = RepeatedInt.newEmptyInstance();
@@ -35,7 +35,7 @@ public final class DelMailCsReqOuterClass {
}
/**
- * repeated uint32 id_list = 13;
+ * repeated uint32 id_list = 9;
* @return whether the idList field is set
*/
public boolean hasIdList() {
@@ -43,7 +43,7 @@ public final class DelMailCsReqOuterClass {
}
/**
- * repeated uint32 id_list = 13;
+ * repeated uint32 id_list = 9;
* @return this
*/
public DelMailCsReq clearIdList() {
@@ -53,7 +53,7 @@ public final class DelMailCsReqOuterClass {
}
/**
- * repeated uint32 id_list = 13;
+ * repeated uint32 id_list = 9;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class DelMailCsReqOuterClass {
}
/**
- * repeated uint32 id_list = 13;
+ * repeated uint32 id_list = 9;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class DelMailCsReqOuterClass {
}
/**
- * repeated uint32 id_list = 13;
+ * repeated uint32 id_list = 9;
* @param value the idList to add
* @return this
*/
@@ -92,7 +92,7 @@ public final class DelMailCsReqOuterClass {
}
/**
- * repeated uint32 id_list = 13;
+ * repeated uint32 id_list = 9;
* @param values the idList to add
* @return this
*/
@@ -163,7 +163,7 @@ public final class DelMailCsReqOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < idList.length(); i++) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 72);
output.writeUInt32NoTag(idList.array()[i]);
}
}
@@ -185,7 +185,7 @@ public final class DelMailCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 106: {
+ case 74: {
// idList [packed=true]
input.readPackedUInt32(idList, tag);
bitField0_ |= 0x00000001;
@@ -204,7 +204,7 @@ public final class DelMailCsReqOuterClass {
tag = input.readTag();
break;
}
- case 104: {
+ case 72: {
// idList [packed=false]
tag = input.readRepeatedUInt32(idList, tag);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/DelMailScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DelMailScRspOuterClass.java
index 5b3d398..cb74ded 100644
--- a/src/generated/main/emu/lunarcore/proto/DelMailScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/DelMailScRspOuterClass.java
@@ -20,12 +20,12 @@ public final class DelMailScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 12;
*/
private int retcode;
/**
- * repeated uint32 id_list = 6;
+ * repeated uint32 id_list = 3;
*/
private final RepeatedInt idList = RepeatedInt.newEmptyInstance();
@@ -40,7 +40,7 @@ public final class DelMailScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 12;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public final class DelMailScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 12;
* @return this
*/
public DelMailScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public final class DelMailScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 12;
* @return the retcode
*/
public int getRetcode() {
@@ -66,7 +66,7 @@ public final class DelMailScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 12;
* @param value the retcode to set
* @return this
*/
@@ -77,7 +77,7 @@ public final class DelMailScRspOuterClass {
}
/**
- * repeated uint32 id_list = 6;
+ * repeated uint32 id_list = 3;
* @return whether the idList field is set
*/
public boolean hasIdList() {
@@ -85,7 +85,7 @@ public final class DelMailScRspOuterClass {
}
/**
- * repeated uint32 id_list = 6;
+ * repeated uint32 id_list = 3;
* @return this
*/
public DelMailScRsp clearIdList() {
@@ -95,7 +95,7 @@ public final class DelMailScRspOuterClass {
}
/**
- * repeated uint32 id_list = 6;
+ * repeated uint32 id_list = 3;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class DelMailScRspOuterClass {
}
/**
- * repeated uint32 id_list = 6;
+ * repeated uint32 id_list = 3;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public final class DelMailScRspOuterClass {
}
/**
- * repeated uint32 id_list = 6;
+ * repeated uint32 id_list = 3;
* @param value the idList to add
* @return this
*/
@@ -134,7 +134,7 @@ public final class DelMailScRspOuterClass {
}
/**
- * repeated uint32 id_list = 6;
+ * repeated uint32 id_list = 3;
* @param values the idList to add
* @return this
*/
@@ -210,12 +210,12 @@ public final class DelMailScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < idList.length(); i++) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(idList.array()[i]);
}
}
@@ -240,16 +240,16 @@ public final class DelMailScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
+ case 96: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 50) {
+ if (tag != 26) {
break;
}
}
- case 50: {
+ case 26: {
// idList [packed=true]
input.readPackedUInt32(idList, tag);
bitField0_ |= 0x00000002;
@@ -268,7 +268,7 @@ public final class DelMailScRspOuterClass {
tag = input.readTag();
break;
}
- case 48: {
+ case 24: {
// idList [packed=false]
tag = input.readRepeatedUInt32(idList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/DeleteFriendCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeleteFriendCsReqOuterClass.java
index 1550ccf..cb981b9 100644
--- a/src/generated/main/emu/lunarcore/proto/DeleteFriendCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/DeleteFriendCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class DeleteFriendCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 uid = 5;
+ * optional uint32 uid = 3;
*/
private int uid;
@@ -34,7 +34,7 @@ public final class DeleteFriendCsReqOuterClass {
}
/**
- * optional uint32 uid = 5;
+ * optional uint32 uid = 3;
* @return whether the uid field is set
*/
public boolean hasUid() {
@@ -42,7 +42,7 @@ public final class DeleteFriendCsReqOuterClass {
}
/**
- * optional uint32 uid = 5;
+ * optional uint32 uid = 3;
* @return this
*/
public DeleteFriendCsReq clearUid() {
@@ -52,7 +52,7 @@ public final class DeleteFriendCsReqOuterClass {
}
/**
- * optional uint32 uid = 5;
+ * optional uint32 uid = 3;
* @return the uid
*/
public int getUid() {
@@ -60,7 +60,7 @@ public final class DeleteFriendCsReqOuterClass {
}
/**
- * optional uint32 uid = 5;
+ * optional uint32 uid = 3;
* @param value the uid to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class DeleteFriendCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(uid);
}
}
@@ -150,7 +150,7 @@ public final class DeleteFriendCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
+ case 24: {
// uid
uid = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/DeployRotaterCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeployRotaterCsReqOuterClass.java
index 1d28ed3..8e96361 100644
--- a/src/generated/main/emu/lunarcore/proto/DeployRotaterCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/DeployRotaterCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class DeployRotaterCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .RotaterData rotater_data = 2;
+ * optional .RotaterData rotater_data = 11;
*/
private final RotaterDataOuterClass.RotaterData rotaterData = RotaterDataOuterClass.RotaterData.newInstance();
@@ -34,7 +34,7 @@ public final class DeployRotaterCsReqOuterClass {
}
/**
- * optional .RotaterData rotater_data = 2;
+ * optional .RotaterData rotater_data = 11;
* @return whether the rotaterData field is set
*/
public boolean hasRotaterData() {
@@ -42,7 +42,7 @@ public final class DeployRotaterCsReqOuterClass {
}
/**
- * optional .RotaterData rotater_data = 2;
+ * optional .RotaterData rotater_data = 11;
* @return this
*/
public DeployRotaterCsReq clearRotaterData() {
@@ -52,7 +52,7 @@ public final class DeployRotaterCsReqOuterClass {
}
/**
- * optional .RotaterData rotater_data = 2;
+ * optional .RotaterData rotater_data = 11;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -66,7 +66,7 @@ public final class DeployRotaterCsReqOuterClass {
}
/**
- * optional .RotaterData rotater_data = 2;
+ * optional .RotaterData rotater_data = 11;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -80,7 +80,7 @@ public final class DeployRotaterCsReqOuterClass {
}
/**
- * optional .RotaterData rotater_data = 2;
+ * optional .RotaterData rotater_data = 11;
* @param value the rotaterData to set
* @return this
*/
@@ -150,7 +150,7 @@ public final class DeployRotaterCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 18);
+ output.writeRawByte((byte) 90);
output.writeMessageNoTag(rotaterData);
}
}
@@ -171,7 +171,7 @@ public final class DeployRotaterCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 18: {
+ case 90: {
// rotaterData
input.readMessage(rotaterData);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/DeployRotaterScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeployRotaterScRspOuterClass.java
index 029a49d..c4b087a 100644
--- a/src/generated/main/emu/lunarcore/proto/DeployRotaterScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/DeployRotaterScRspOuterClass.java
@@ -19,17 +19,17 @@ public final class DeployRotaterScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 11;
+ * optional uint32 retcode = 5;
*/
private int retcode;
/**
- * optional .RotatorEnergyInfo energy_info = 5;
+ * optional .RotatorEnergyInfo energy_info = 6;
*/
private final RotatorEnergyInfoOuterClass.RotatorEnergyInfo energyInfo = RotatorEnergyInfoOuterClass.RotatorEnergyInfo.newInstance();
/**
- * optional .RotaterData rotater_data = 9;
+ * optional .RotaterData rotater_data = 7;
*/
private final RotaterDataOuterClass.RotaterData rotaterData = RotaterDataOuterClass.RotaterData.newInstance();
@@ -44,7 +44,7 @@ public final class DeployRotaterScRspOuterClass {
}
/**
- * optional uint32 retcode = 11;
+ * optional uint32 retcode = 5;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -52,7 +52,7 @@ public final class DeployRotaterScRspOuterClass {
}
/**
- * optional uint32 retcode = 11;
+ * optional uint32 retcode = 5;
* @return this
*/
public DeployRotaterScRsp clearRetcode() {
@@ -62,7 +62,7 @@ public final class DeployRotaterScRspOuterClass {
}
/**
- * optional uint32 retcode = 11;
+ * optional uint32 retcode = 5;
* @return the retcode
*/
public int getRetcode() {
@@ -70,7 +70,7 @@ public final class DeployRotaterScRspOuterClass {
}
/**
- * optional uint32 retcode = 11;
+ * optional uint32 retcode = 5;
* @param value the retcode to set
* @return this
*/
@@ -81,7 +81,7 @@ public final class DeployRotaterScRspOuterClass {
}
/**
- * optional .RotatorEnergyInfo energy_info = 5;
+ * optional .RotatorEnergyInfo energy_info = 6;
* @return whether the energyInfo field is set
*/
public boolean hasEnergyInfo() {
@@ -89,7 +89,7 @@ public final class DeployRotaterScRspOuterClass {
}
/**
- * optional .RotatorEnergyInfo energy_info = 5;
+ * optional .RotatorEnergyInfo energy_info = 6;
* @return this
*/
public DeployRotaterScRsp clearEnergyInfo() {
@@ -99,7 +99,7 @@ public final class DeployRotaterScRspOuterClass {
}
/**
- * optional .RotatorEnergyInfo energy_info = 5;
+ * optional .RotatorEnergyInfo energy_info = 6;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -113,7 +113,7 @@ public final class DeployRotaterScRspOuterClass {
}
/**
- * optional .RotatorEnergyInfo energy_info = 5;
+ * optional .RotatorEnergyInfo energy_info = 6;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -127,7 +127,7 @@ public final class DeployRotaterScRspOuterClass {
}
/**
- * optional .RotatorEnergyInfo energy_info = 5;
+ * optional .RotatorEnergyInfo energy_info = 6;
* @param value the energyInfo to set
* @return this
*/
@@ -139,7 +139,7 @@ public final class DeployRotaterScRspOuterClass {
}
/**
- * optional .RotaterData rotater_data = 9;
+ * optional .RotaterData rotater_data = 7;
* @return whether the rotaterData field is set
*/
public boolean hasRotaterData() {
@@ -147,7 +147,7 @@ public final class DeployRotaterScRspOuterClass {
}
/**
- * optional .RotaterData rotater_data = 9;
+ * optional .RotaterData rotater_data = 7;
* @return this
*/
public DeployRotaterScRsp clearRotaterData() {
@@ -157,7 +157,7 @@ public final class DeployRotaterScRspOuterClass {
}
/**
- * optional .RotaterData rotater_data = 9;
+ * optional .RotaterData rotater_data = 7;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -171,7 +171,7 @@ public final class DeployRotaterScRspOuterClass {
}
/**
- * optional .RotaterData rotater_data = 9;
+ * optional .RotaterData rotater_data = 7;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -185,7 +185,7 @@ public final class DeployRotaterScRspOuterClass {
}
/**
- * optional .RotaterData rotater_data = 9;
+ * optional .RotaterData rotater_data = 7;
* @param value the rotaterData to set
* @return this
*/
@@ -268,15 +268,15 @@ public final class DeployRotaterScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 42);
+ output.writeRawByte((byte) 50);
output.writeMessageNoTag(energyInfo);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 74);
+ output.writeRawByte((byte) 58);
output.writeMessageNoTag(rotaterData);
}
}
@@ -303,25 +303,25 @@ public final class DeployRotaterScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 88: {
+ case 40: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 42) {
+ if (tag != 50) {
break;
}
}
- case 42: {
+ case 50: {
// energyInfo
input.readMessage(energyInfo);
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 74) {
+ if (tag != 58) {
break;
}
}
- case 74: {
+ case 58: {
// rotaterData
input.readMessage(rotaterData);
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/DevelopmentTypeOuterClass.java b/src/generated/main/emu/lunarcore/proto/DevelopmentTypeOuterClass.java
new file mode 100644
index 0000000..855e7c2
--- /dev/null
+++ b/src/generated/main/emu/lunarcore/proto/DevelopmentTypeOuterClass.java
@@ -0,0 +1,247 @@
+// Code generated by protocol buffer compiler. Do not edit!
+package emu.lunarcore.proto;
+
+import us.hebi.quickbuf.ProtoEnum;
+import us.hebi.quickbuf.ProtoUtil;
+
+public final class DevelopmentTypeOuterClass {
+ /**
+ * Protobuf enum {@code DevelopmentType}
+ */
+ public enum DevelopmentType implements ProtoEnumDEVELOPMENT_NONE = 0;
+ */
+ DEVELOPMENT_NONE("DEVELOPMENT_NONE", 0),
+
+ /**
+ * DEVELOPMENT_ROGUE_COSMOS = 1;
+ */
+ DEVELOPMENT_ROGUE_COSMOS("DEVELOPMENT_ROGUE_COSMOS", 1),
+
+ /**
+ * DEVELOPMENT_ROGUE_CHESS = 2;
+ */
+ DEVELOPMENT_ROGUE_CHESS("DEVELOPMENT_ROGUE_CHESS", 2),
+
+ /**
+ * DEVELOPMENT_ROGUE_CHESS_NOUS = 3;
+ */
+ DEVELOPMENT_ROGUE_CHESS_NOUS("DEVELOPMENT_ROGUE_CHESS_NOUS", 3),
+
+ /**
+ * DEVELOPMENT_MEMORY_CHALLENGE = 4;
+ */
+ DEVELOPMENT_MEMORY_CHALLENGE("DEVELOPMENT_MEMORY_CHALLENGE", 4),
+
+ /**
+ * DEVELOPMENT_STORY_CHALLENGE = 5;
+ */
+ DEVELOPMENT_STORY_CHALLENGE("DEVELOPMENT_STORY_CHALLENGE", 5),
+
+ /**
+ * DEVELOPMENT_UNLOCK_AVATAR = 6;
+ */
+ DEVELOPMENT_UNLOCK_AVATAR("DEVELOPMENT_UNLOCK_AVATAR", 6),
+
+ /**
+ * DEVELOPMENT_UNLOCK_EQUIPMENT = 7;
+ */
+ DEVELOPMENT_UNLOCK_EQUIPMENT("DEVELOPMENT_UNLOCK_EQUIPMENT", 7),
+
+ /**
+ * DEVELOPMENT_ACTIVITY_START = 8;
+ */
+ DEVELOPMENT_ACTIVITY_START("DEVELOPMENT_ACTIVITY_START", 8),
+
+ /**
+ * DEVELOPMENT_ACTIVITY_END = 9;
+ */
+ DEVELOPMENT_ACTIVITY_END("DEVELOPMENT_ACTIVITY_END", 9);
+
+ /**
+ * DEVELOPMENT_NONE = 0;
+ */
+ public static final int DEVELOPMENT_NONE_VALUE = 0;
+
+ /**
+ * DEVELOPMENT_ROGUE_COSMOS = 1;
+ */
+ public static final int DEVELOPMENT_ROGUE_COSMOS_VALUE = 1;
+
+ /**
+ * DEVELOPMENT_ROGUE_CHESS = 2;
+ */
+ public static final int DEVELOPMENT_ROGUE_CHESS_VALUE = 2;
+
+ /**
+ * DEVELOPMENT_ROGUE_CHESS_NOUS = 3;
+ */
+ public static final int DEVELOPMENT_ROGUE_CHESS_NOUS_VALUE = 3;
+
+ /**
+ * DEVELOPMENT_MEMORY_CHALLENGE = 4;
+ */
+ public static final int DEVELOPMENT_MEMORY_CHALLENGE_VALUE = 4;
+
+ /**
+ * DEVELOPMENT_STORY_CHALLENGE = 5;
+ */
+ public static final int DEVELOPMENT_STORY_CHALLENGE_VALUE = 5;
+
+ /**
+ * DEVELOPMENT_UNLOCK_AVATAR = 6;
+ */
+ public static final int DEVELOPMENT_UNLOCK_AVATAR_VALUE = 6;
+
+ /**
+ * DEVELOPMENT_UNLOCK_EQUIPMENT = 7;
+ */
+ public static final int DEVELOPMENT_UNLOCK_EQUIPMENT_VALUE = 7;
+
+ /**
+ * DEVELOPMENT_ACTIVITY_START = 8;
+ */
+ public static final int DEVELOPMENT_ACTIVITY_START_VALUE = 8;
+
+ /**
+ * DEVELOPMENT_ACTIVITY_END = 9;
+ */
+ public static final int DEVELOPMENT_ACTIVITY_END_VALUE = 9;
+
+ private final String name;
+
+ private final int number;
+
+ private DevelopmentType(String name, int number) {
+ this.name = name;
+ this.number = number;
+ }
+
+ /**
+ * @return the string representation of enum entry
+ */
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @return the numeric wire value of this enum entry
+ */
+ @Override
+ public int getNumber() {
+ return number;
+ }
+
+ /**
+ * @return a converter that maps between this enum's numeric and text representations
+ */
+ public static ProtoEnum.EnumConverteroptional .ItemList item_result = 5;
+ * optional .ItemList item_result = 13;
*/
private final ItemListOuterClass.ItemList itemResult = ItemListOuterClass.ItemList.newInstance();
/**
- * repeated uint32 event_ids = 15;
+ * repeated uint32 event_ids = 10;
*/
private final RepeatedInt eventIds = RepeatedInt.newEmptyInstance();
@@ -82,7 +82,7 @@ public final class DialogueResultOuterClass {
}
/**
- * optional .ItemList item_result = 5;
+ * optional .ItemList item_result = 13;
* @return whether the itemResult field is set
*/
public boolean hasItemResult() {
@@ -90,7 +90,7 @@ public final class DialogueResultOuterClass {
}
/**
- * optional .ItemList item_result = 5;
+ * optional .ItemList item_result = 13;
* @return this
*/
public DialogueResult clearItemResult() {
@@ -100,7 +100,7 @@ public final class DialogueResultOuterClass {
}
/**
- * optional .ItemList item_result = 5;
+ * optional .ItemList item_result = 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.
@@ -114,7 +114,7 @@ public final class DialogueResultOuterClass {
}
/**
- * optional .ItemList item_result = 5;
+ * optional .ItemList item_result = 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
@@ -128,7 +128,7 @@ public final class DialogueResultOuterClass {
}
/**
- * optional .ItemList item_result = 5;
+ * optional .ItemList item_result = 13;
* @param value the itemResult to set
* @return this
*/
@@ -139,7 +139,7 @@ public final class DialogueResultOuterClass {
}
/**
- * repeated uint32 event_ids = 15;
+ * repeated uint32 event_ids = 10;
* @return whether the eventIds field is set
*/
public boolean hasEventIds() {
@@ -147,7 +147,7 @@ public final class DialogueResultOuterClass {
}
/**
- * repeated uint32 event_ids = 15;
+ * repeated uint32 event_ids = 10;
* @return this
*/
public DialogueResult clearEventIds() {
@@ -157,7 +157,7 @@ public final class DialogueResultOuterClass {
}
/**
- * repeated uint32 event_ids = 15;
+ * repeated uint32 event_ids = 10;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -171,7 +171,7 @@ public final class DialogueResultOuterClass {
}
/**
- * repeated uint32 event_ids = 15;
+ * repeated uint32 event_ids = 10;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -185,7 +185,7 @@ public final class DialogueResultOuterClass {
}
/**
- * repeated uint32 event_ids = 15;
+ * repeated uint32 event_ids = 10;
* @param value the eventIds to add
* @return this
*/
@@ -196,7 +196,7 @@ public final class DialogueResultOuterClass {
}
/**
- * repeated uint32 event_ids = 15;
+ * repeated uint32 event_ids = 10;
* @param values the eventIds to add
* @return this
*/
@@ -283,12 +283,12 @@ public final class DialogueResultOuterClass {
output.writeUInt32NoTag(hFHKBMGBJAN);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 42);
+ output.writeRawByte((byte) 106);
output.writeMessageNoTag(itemResult);
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < eventIds.length(); i++) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(eventIds.array()[i]);
}
}
@@ -321,20 +321,20 @@ public final class DialogueResultOuterClass {
hFHKBMGBJAN = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 42) {
+ if (tag != 106) {
break;
}
}
- case 42: {
+ case 106: {
// itemResult
input.readMessage(itemResult);
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 122) {
+ if (tag != 82) {
break;
}
}
- case 122: {
+ case 82: {
// eventIds [packed=true]
input.readPackedUInt32(eventIds, tag);
bitField0_ |= 0x00000004;
@@ -353,7 +353,7 @@ public final class DialogueResultOuterClass {
tag = input.readTag();
break;
}
- case 120: {
+ case 80: {
// eventIds [packed=false]
tag = input.readRepeatedUInt32(eventIds, tag);
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/DiscardRelicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DiscardRelicCsReqOuterClass.java
index 67c4fca..24b936c 100644
--- a/src/generated/main/emu/lunarcore/proto/DiscardRelicCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/DiscardRelicCsReqOuterClass.java
@@ -24,7 +24,7 @@ public final class DiscardRelicCsReqOuterClass {
private int relicUniqueId;
/**
- * optional bool is_discard = 3;
+ * optional bool is_discard = 4;
*/
private boolean isDiscard;
@@ -76,7 +76,7 @@ public final class DiscardRelicCsReqOuterClass {
}
/**
- * optional bool is_discard = 3;
+ * optional bool is_discard = 4;
* @return whether the isDiscard field is set
*/
public boolean hasIsDiscard() {
@@ -84,7 +84,7 @@ public final class DiscardRelicCsReqOuterClass {
}
/**
- * optional bool is_discard = 3;
+ * optional bool is_discard = 4;
* @return this
*/
public DiscardRelicCsReq clearIsDiscard() {
@@ -94,7 +94,7 @@ public final class DiscardRelicCsReqOuterClass {
}
/**
- * optional bool is_discard = 3;
+ * optional bool is_discard = 4;
* @return the isDiscard
*/
public boolean getIsDiscard() {
@@ -102,7 +102,7 @@ public final class DiscardRelicCsReqOuterClass {
}
/**
- * optional bool is_discard = 3;
+ * optional bool is_discard = 4;
* @param value the isDiscard to set
* @return this
*/
@@ -181,7 +181,7 @@ public final class DiscardRelicCsReqOuterClass {
output.writeUInt32NoTag(relicUniqueId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 32);
output.writeBoolNoTag(isDiscard);
}
}
@@ -210,11 +210,11 @@ public final class DiscardRelicCsReqOuterClass {
relicUniqueId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 24) {
+ if (tag != 32) {
break;
}
}
- case 24: {
+ case 32: {
// isDiscard
isDiscard = input.readBool();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java
index f7f0a80..3a0260a 100644
--- a/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java
@@ -19,12 +19,12 @@ public final class DisplayAvatarOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 pos = 2;
+ * optional uint32 pos = 7;
*/
private int pos;
/**
- * optional uint32 avatar_id = 13;
+ * optional uint32 avatar_id = 15;
*/
private int avatarId;
@@ -39,7 +39,7 @@ public final class DisplayAvatarOuterClass {
}
/**
- * optional uint32 pos = 2;
+ * optional uint32 pos = 7;
* @return whether the pos field is set
*/
public boolean hasPos() {
@@ -47,7 +47,7 @@ public final class DisplayAvatarOuterClass {
}
/**
- * optional uint32 pos = 2;
+ * optional uint32 pos = 7;
* @return this
*/
public DisplayAvatar clearPos() {
@@ -57,7 +57,7 @@ public final class DisplayAvatarOuterClass {
}
/**
- * optional uint32 pos = 2;
+ * optional uint32 pos = 7;
* @return the pos
*/
public int getPos() {
@@ -65,7 +65,7 @@ public final class DisplayAvatarOuterClass {
}
/**
- * optional uint32 pos = 2;
+ * optional uint32 pos = 7;
* @param value the pos to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class DisplayAvatarOuterClass {
}
/**
- * optional uint32 avatar_id = 13;
+ * optional uint32 avatar_id = 15;
* @return whether the avatarId field is set
*/
public boolean hasAvatarId() {
@@ -84,7 +84,7 @@ public final class DisplayAvatarOuterClass {
}
/**
- * optional uint32 avatar_id = 13;
+ * optional uint32 avatar_id = 15;
* @return this
*/
public DisplayAvatar clearAvatarId() {
@@ -94,7 +94,7 @@ public final class DisplayAvatarOuterClass {
}
/**
- * optional uint32 avatar_id = 13;
+ * optional uint32 avatar_id = 15;
* @return the avatarId
*/
public int getAvatarId() {
@@ -102,7 +102,7 @@ public final class DisplayAvatarOuterClass {
}
/**
- * optional uint32 avatar_id = 13;
+ * optional uint32 avatar_id = 15;
* @param value the avatarId to set
* @return this
*/
@@ -177,11 +177,11 @@ public final class DisplayAvatarOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(pos);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(avatarId);
}
}
@@ -205,16 +205,16 @@ public final class DisplayAvatarOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
+ case 56: {
// pos
pos = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 120) {
break;
}
}
- case 104: {
+ case 120: {
// avatarId
avatarId = input.readUInt32();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/DisplayAvatarVecOuterClass.java b/src/generated/main/emu/lunarcore/proto/DisplayAvatarVecOuterClass.java
index fad5bc0..7210bb4 100644
--- a/src/generated/main/emu/lunarcore/proto/DisplayAvatarVecOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/DisplayAvatarVecOuterClass.java
@@ -20,12 +20,12 @@ public final class DisplayAvatarVecOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional bool is_display = 2;
+ * optional bool is_display = 5;
*/
private boolean isDisplay;
/**
- * repeated .DisplayAvatar display_avatar_list = 15;
+ * repeated .DisplayAvatar display_avatar_list = 14;
*/
private final RepeatedMessageoptional bool is_display = 2;
+ * optional bool is_display = 5;
* @return whether the isDisplay field is set
*/
public boolean hasIsDisplay() {
@@ -48,7 +48,7 @@ public final class DisplayAvatarVecOuterClass {
}
/**
- * optional bool is_display = 2;
+ * optional bool is_display = 5;
* @return this
*/
public DisplayAvatarVec clearIsDisplay() {
@@ -58,7 +58,7 @@ public final class DisplayAvatarVecOuterClass {
}
/**
- * optional bool is_display = 2;
+ * optional bool is_display = 5;
* @return the isDisplay
*/
public boolean getIsDisplay() {
@@ -66,7 +66,7 @@ public final class DisplayAvatarVecOuterClass {
}
/**
- * optional bool is_display = 2;
+ * optional bool is_display = 5;
* @param value the isDisplay to set
* @return this
*/
@@ -77,7 +77,7 @@ public final class DisplayAvatarVecOuterClass {
}
/**
- * repeated .DisplayAvatar display_avatar_list = 15;
+ * repeated .DisplayAvatar display_avatar_list = 14;
* @return whether the displayAvatarList field is set
*/
public boolean hasDisplayAvatarList() {
@@ -85,7 +85,7 @@ public final class DisplayAvatarVecOuterClass {
}
/**
- * repeated .DisplayAvatar display_avatar_list = 15;
+ * repeated .DisplayAvatar display_avatar_list = 14;
* @return this
*/
public DisplayAvatarVec clearDisplayAvatarList() {
@@ -95,7 +95,7 @@ public final class DisplayAvatarVecOuterClass {
}
/**
- * repeated .DisplayAvatar display_avatar_list = 15;
+ * 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.
@@ -109,7 +109,7 @@ public final class DisplayAvatarVecOuterClass {
}
/**
- * repeated .DisplayAvatar display_avatar_list = 15;
+ * 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
@@ -123,7 +123,7 @@ public final class DisplayAvatarVecOuterClass {
}
/**
- * repeated .DisplayAvatar display_avatar_list = 15;
+ * repeated .DisplayAvatar display_avatar_list = 14;
* @param value the displayAvatarList to add
* @return this
*/
@@ -135,7 +135,7 @@ public final class DisplayAvatarVecOuterClass {
}
/**
- * repeated .DisplayAvatar display_avatar_list = 15;
+ * repeated .DisplayAvatar display_avatar_list = 14;
* @param values the displayAvatarList to add
* @return this
*/
@@ -212,12 +212,12 @@ public final class DisplayAvatarVecOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 40);
output.writeBoolNoTag(isDisplay);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < displayAvatarList.length(); i++) {
- output.writeRawByte((byte) 122);
+ output.writeRawByte((byte) 114);
output.writeMessageNoTag(displayAvatarList.get(i));
}
}
@@ -242,16 +242,16 @@ public final class DisplayAvatarVecOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
+ case 40: {
// isDisplay
isDisplay = input.readBool();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 122) {
+ if (tag != 114) {
break;
}
}
- case 122: {
+ case 114: {
// displayAvatarList
tag = input.readRepeatedMessage(displayAvatarList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/DisplayRecordTypeOuterClass.java b/src/generated/main/emu/lunarcore/proto/DisplayRecordTypeOuterClass.java
new file mode 100644
index 0000000..08f4731
--- /dev/null
+++ b/src/generated/main/emu/lunarcore/proto/DisplayRecordTypeOuterClass.java
@@ -0,0 +1,132 @@
+// Code generated by protocol buffer compiler. Do not edit!
+package emu.lunarcore.proto;
+
+import us.hebi.quickbuf.ProtoEnum;
+import us.hebi.quickbuf.ProtoUtil;
+
+public final class DisplayRecordTypeOuterClass {
+ /**
+ * Protobuf enum {@code DisplayRecordType}
+ */
+ public enum DisplayRecordType implements ProtoEnumBATTLE_RECORD_NONE = 0;
+ */
+ BATTLE_RECORD_NONE("BATTLE_RECORD_NONE", 0),
+
+ /**
+ * BATTLE_RECORD_CHALLENGE = 1;
+ */
+ BATTLE_RECORD_CHALLENGE("BATTLE_RECORD_CHALLENGE", 1),
+
+ /**
+ * BATTLE_RECORD_ROGUE = 2;
+ */
+ BATTLE_RECORD_ROGUE("BATTLE_RECORD_ROGUE", 2);
+
+ /**
+ * BATTLE_RECORD_NONE = 0;
+ */
+ public static final int BATTLE_RECORD_NONE_VALUE = 0;
+
+ /**
+ * BATTLE_RECORD_CHALLENGE = 1;
+ */
+ public static final int BATTLE_RECORD_CHALLENGE_VALUE = 1;
+
+ /**
+ * BATTLE_RECORD_ROGUE = 2;
+ */
+ public static final int BATTLE_RECORD_ROGUE_VALUE = 2;
+
+ private final String name;
+
+ private final int number;
+
+ private DisplayRecordType(String name, int number) {
+ this.name = name;
+ this.number = number;
+ }
+
+ /**
+ * @return the string representation of enum entry
+ */
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @return the numeric wire value of this enum entry
+ */
+ @Override
+ public int getNumber() {
+ return number;
+ }
+
+ /**
+ * @return a converter that maps between this enum's numeric and text representations
+ */
+ public static ProtoEnum.EnumConverteroptional uint32 gacha_id = 4;
- */
- private int gachaId;
-
- /**
- * optional uint32 simulate_magic = 7;
- */
- private int simulateMagic;
-
- /**
- * optional uint32 gacha_random = 11;
+ * optional uint32 gacha_random = 4;
*/
private int gachaRandom;
/**
- * optional uint32 gacha_num = 12;
+ * optional uint32 gacha_id = 5;
+ */
+ private int gachaId;
+
+ /**
+ * optional uint32 simulate_magic = 9;
+ */
+ private int simulateMagic;
+
+ /**
+ * optional uint32 gacha_num = 10;
*/
private int gachaNum;
@@ -49,99 +49,25 @@ public final class DoGachaCsReqOuterClass {
}
/**
- * optional uint32 gacha_id = 4;
- * @return whether the gachaId field is set
+ * optional uint32 gacha_random = 4;
+ * @return whether the gachaRandom field is set
*/
- public boolean hasGachaId() {
+ public boolean hasGachaRandom() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 gacha_id = 4;
- * @return this
- */
- public DoGachaCsReq clearGachaId() {
- bitField0_ &= ~0x00000001;
- gachaId = 0;
- return this;
- }
-
- /**
- * optional uint32 gacha_id = 4;
- * @return the gachaId
- */
- public int getGachaId() {
- return gachaId;
- }
-
- /**
- * optional uint32 gacha_id = 4;
- * @param value the gachaId to set
- * @return this
- */
- public DoGachaCsReq setGachaId(final int value) {
- bitField0_ |= 0x00000001;
- gachaId = value;
- return this;
- }
-
- /**
- * optional uint32 simulate_magic = 7;
- * @return whether the simulateMagic field is set
- */
- public boolean hasSimulateMagic() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 simulate_magic = 7;
- * @return this
- */
- public DoGachaCsReq clearSimulateMagic() {
- bitField0_ &= ~0x00000002;
- simulateMagic = 0;
- return this;
- }
-
- /**
- * optional uint32 simulate_magic = 7;
- * @return the simulateMagic
- */
- public int getSimulateMagic() {
- return simulateMagic;
- }
-
- /**
- * optional uint32 simulate_magic = 7;
- * @param value the simulateMagic to set
- * @return this
- */
- public DoGachaCsReq setSimulateMagic(final int value) {
- bitField0_ |= 0x00000002;
- simulateMagic = value;
- return this;
- }
-
- /**
- * optional uint32 gacha_random = 11;
- * @return whether the gachaRandom field is set
- */
- public boolean hasGachaRandom() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 gacha_random = 11;
+ * optional uint32 gacha_random = 4;
* @return this
*/
public DoGachaCsReq clearGachaRandom() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000001;
gachaRandom = 0;
return this;
}
/**
- * optional uint32 gacha_random = 11;
+ * optional uint32 gacha_random = 4;
* @return the gachaRandom
*/
public int getGachaRandom() {
@@ -149,18 +75,92 @@ public final class DoGachaCsReqOuterClass {
}
/**
- * optional uint32 gacha_random = 11;
+ * optional uint32 gacha_random = 4;
* @param value the gachaRandom to set
* @return this
*/
public DoGachaCsReq setGachaRandom(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
gachaRandom = value;
return this;
}
/**
- * optional uint32 gacha_num = 12;
+ * optional uint32 gacha_id = 5;
+ * @return whether the gachaId field is set
+ */
+ public boolean hasGachaId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 gacha_id = 5;
+ * @return this
+ */
+ public DoGachaCsReq clearGachaId() {
+ bitField0_ &= ~0x00000002;
+ gachaId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 gacha_id = 5;
+ * @return the gachaId
+ */
+ public int getGachaId() {
+ return gachaId;
+ }
+
+ /**
+ * optional uint32 gacha_id = 5;
+ * @param value the gachaId to set
+ * @return this
+ */
+ public DoGachaCsReq setGachaId(final int value) {
+ bitField0_ |= 0x00000002;
+ gachaId = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 simulate_magic = 9;
+ * @return whether the simulateMagic field is set
+ */
+ public boolean hasSimulateMagic() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 simulate_magic = 9;
+ * @return this
+ */
+ public DoGachaCsReq clearSimulateMagic() {
+ bitField0_ &= ~0x00000004;
+ simulateMagic = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 simulate_magic = 9;
+ * @return the simulateMagic
+ */
+ public int getSimulateMagic() {
+ return simulateMagic;
+ }
+
+ /**
+ * optional uint32 simulate_magic = 9;
+ * @param value the simulateMagic to set
+ * @return this
+ */
+ public DoGachaCsReq setSimulateMagic(final int value) {
+ bitField0_ |= 0x00000004;
+ simulateMagic = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 gacha_num = 10;
* @return whether the gachaNum field is set
*/
public boolean hasGachaNum() {
@@ -168,7 +168,7 @@ public final class DoGachaCsReqOuterClass {
}
/**
- * optional uint32 gacha_num = 12;
+ * optional uint32 gacha_num = 10;
* @return this
*/
public DoGachaCsReq clearGachaNum() {
@@ -178,7 +178,7 @@ public final class DoGachaCsReqOuterClass {
}
/**
- * optional uint32 gacha_num = 12;
+ * optional uint32 gacha_num = 10;
* @return the gachaNum
*/
public int getGachaNum() {
@@ -186,7 +186,7 @@ public final class DoGachaCsReqOuterClass {
}
/**
- * optional uint32 gacha_num = 12;
+ * optional uint32 gacha_num = 10;
* @param value the gachaNum to set
* @return this
*/
@@ -201,9 +201,9 @@ public final class DoGachaCsReqOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
+ gachaRandom = other.gachaRandom;
gachaId = other.gachaId;
simulateMagic = other.simulateMagic;
- gachaRandom = other.gachaRandom;
gachaNum = other.gachaNum;
}
return this;
@@ -215,15 +215,15 @@ public final class DoGachaCsReqOuterClass {
return this;
}
cachedSize = -1;
+ if (other.hasGachaRandom()) {
+ setGachaRandom(other.gachaRandom);
+ }
if (other.hasGachaId()) {
setGachaId(other.gachaId);
}
if (other.hasSimulateMagic()) {
setSimulateMagic(other.simulateMagic);
}
- if (other.hasGachaRandom()) {
- setGachaRandom(other.gachaRandom);
- }
if (other.hasGachaNum()) {
setGachaNum(other.gachaNum);
}
@@ -237,9 +237,9 @@ public final class DoGachaCsReqOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
+ gachaRandom = 0;
gachaId = 0;
simulateMagic = 0;
- gachaRandom = 0;
gachaNum = 0;
return this;
}
@@ -264,9 +264,9 @@ public final class DoGachaCsReqOuterClass {
}
DoGachaCsReq other = (DoGachaCsReq) o;
return bitField0_ == other.bitField0_
+ && (!hasGachaRandom() || gachaRandom == other.gachaRandom)
&& (!hasGachaId() || gachaId == other.gachaId)
&& (!hasSimulateMagic() || simulateMagic == other.simulateMagic)
- && (!hasGachaRandom() || gachaRandom == other.gachaRandom)
&& (!hasGachaNum() || gachaNum == other.gachaNum);
}
@@ -274,18 +274,18 @@ public final class DoGachaCsReqOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(gachaId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 56);
- output.writeUInt32NoTag(simulateMagic);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 88);
output.writeUInt32NoTag(gachaRandom);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 40);
+ output.writeUInt32NoTag(gachaId);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 72);
+ output.writeUInt32NoTag(simulateMagic);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(gachaNum);
}
}
@@ -294,13 +294,13 @@ public final class DoGachaCsReqOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom);
}
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);
@@ -316,33 +316,33 @@ public final class DoGachaCsReqOuterClass {
while (true) {
switch (tag) {
case 32: {
- // gachaId
- gachaId = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 56) {
- break;
- }
- }
- case 56: {
- // simulateMagic
- simulateMagic = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 88) {
- break;
- }
- }
- case 88: {
// gachaRandom
gachaRandom = input.readUInt32();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 40) {
break;
}
}
- case 96: {
+ case 40: {
+ // gachaId
+ gachaId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 72) {
+ break;
+ }
+ }
+ case 72: {
+ // simulateMagic
+ simulateMagic = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 80) {
+ break;
+ }
+ }
+ case 80: {
// gachaNum
gachaNum = input.readUInt32();
bitField0_ |= 0x00000008;
@@ -369,13 +369,13 @@ public final class DoGachaCsReqOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.gachaId, gachaId);
+ output.writeUInt32(FieldNames.gachaRandom, gachaRandom);
}
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);
@@ -390,12 +390,24 @@ public final class DoGachaCsReqOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
+ case -1635961627:
+ case -47579616: {
+ if (input.isAtField(FieldNames.gachaRandom)) {
+ if (!input.trySkipNullValue()) {
+ gachaRandom = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case -204751299:
case -2052301576: {
if (input.isAtField(FieldNames.gachaId)) {
if (!input.trySkipNullValue()) {
gachaId = input.readUInt32();
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
}
} else {
input.skipUnknownField();
@@ -407,18 +419,6 @@ public final class DoGachaCsReqOuterClass {
if (input.isAtField(FieldNames.simulateMagic)) {
if (!input.trySkipNullValue()) {
simulateMagic = input.readUInt32();
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case -1635961627:
- case -47579616: {
- if (input.isAtField(FieldNames.gachaRandom)) {
- if (!input.trySkipNullValue()) {
- gachaRandom = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -490,12 +490,12 @@ public final class DoGachaCsReqOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
+ static final FieldName gachaRandom = FieldName.forField("gachaRandom", "gacha_random");
+
static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id");
static final FieldName simulateMagic = FieldName.forField("simulateMagic", "simulate_magic");
- static final FieldName gachaRandom = FieldName.forField("gachaRandom", "gacha_random");
-
static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/DoGachaInRollShopCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DoGachaInRollShopCsReqOuterClass.java
index 5b802fe..c3307d2 100644
--- a/src/generated/main/emu/lunarcore/proto/DoGachaInRollShopCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/DoGachaInRollShopCsReqOuterClass.java
@@ -19,15 +19,20 @@ public final class DoGachaInRollShopCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 BBJIJINJAFK = 5;
+ * optional uint32 BBJIJINJAFK = 6;
*/
private int bBJIJINJAFK;
/**
- * optional uint32 roll_shop_id = 10;
+ * optional uint32 roll_shop_id = 13;
*/
private int rollShopId;
+ /**
+ * optional uint32 gacha_random = 14;
+ */
+ private int gachaRandom;
+
private DoGachaInRollShopCsReq() {
}
@@ -39,7 +44,7 @@ public final class DoGachaInRollShopCsReqOuterClass {
}
/**
- * optional uint32 BBJIJINJAFK = 5;
+ * optional uint32 BBJIJINJAFK = 6;
* @return whether the bBJIJINJAFK field is set
*/
public boolean hasBBJIJINJAFK() {
@@ -47,7 +52,7 @@ public final class DoGachaInRollShopCsReqOuterClass {
}
/**
- * optional uint32 BBJIJINJAFK = 5;
+ * optional uint32 BBJIJINJAFK = 6;
* @return this
*/
public DoGachaInRollShopCsReq clearBBJIJINJAFK() {
@@ -57,7 +62,7 @@ public final class DoGachaInRollShopCsReqOuterClass {
}
/**
- * optional uint32 BBJIJINJAFK = 5;
+ * optional uint32 BBJIJINJAFK = 6;
* @return the bBJIJINJAFK
*/
public int getBBJIJINJAFK() {
@@ -65,7 +70,7 @@ public final class DoGachaInRollShopCsReqOuterClass {
}
/**
- * optional uint32 BBJIJINJAFK = 5;
+ * optional uint32 BBJIJINJAFK = 6;
* @param value the bBJIJINJAFK to set
* @return this
*/
@@ -76,7 +81,7 @@ public final class DoGachaInRollShopCsReqOuterClass {
}
/**
- * optional uint32 roll_shop_id = 10;
+ * optional uint32 roll_shop_id = 13;
* @return whether the rollShopId field is set
*/
public boolean hasRollShopId() {
@@ -84,7 +89,7 @@ public final class DoGachaInRollShopCsReqOuterClass {
}
/**
- * optional uint32 roll_shop_id = 10;
+ * optional uint32 roll_shop_id = 13;
* @return this
*/
public DoGachaInRollShopCsReq clearRollShopId() {
@@ -94,7 +99,7 @@ public final class DoGachaInRollShopCsReqOuterClass {
}
/**
- * optional uint32 roll_shop_id = 10;
+ * optional uint32 roll_shop_id = 13;
* @return the rollShopId
*/
public int getRollShopId() {
@@ -102,7 +107,7 @@ public final class DoGachaInRollShopCsReqOuterClass {
}
/**
- * optional uint32 roll_shop_id = 10;
+ * optional uint32 roll_shop_id = 13;
* @param value the rollShopId to set
* @return this
*/
@@ -112,6 +117,43 @@ public final class DoGachaInRollShopCsReqOuterClass {
return this;
}
+ /**
+ * optional uint32 gacha_random = 14;
+ * @return whether the gachaRandom field is set
+ */
+ public boolean hasGachaRandom() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 gacha_random = 14;
+ * @return this
+ */
+ public DoGachaInRollShopCsReq clearGachaRandom() {
+ bitField0_ &= ~0x00000004;
+ gachaRandom = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 gacha_random = 14;
+ * @return the gachaRandom
+ */
+ public int getGachaRandom() {
+ return gachaRandom;
+ }
+
+ /**
+ * optional uint32 gacha_random = 14;
+ * @param value the gachaRandom to set
+ * @return this
+ */
+ public DoGachaInRollShopCsReq setGachaRandom(final int value) {
+ bitField0_ |= 0x00000004;
+ gachaRandom = value;
+ return this;
+ }
+
@Override
public DoGachaInRollShopCsReq copyFrom(final DoGachaInRollShopCsReq other) {
cachedSize = other.cachedSize;
@@ -119,6 +161,7 @@ public final class DoGachaInRollShopCsReqOuterClass {
bitField0_ = other.bitField0_;
bBJIJINJAFK = other.bBJIJINJAFK;
rollShopId = other.rollShopId;
+ gachaRandom = other.gachaRandom;
}
return this;
}
@@ -135,6 +178,9 @@ public final class DoGachaInRollShopCsReqOuterClass {
if (other.hasRollShopId()) {
setRollShopId(other.rollShopId);
}
+ if (other.hasGachaRandom()) {
+ setGachaRandom(other.gachaRandom);
+ }
return this;
}
@@ -147,6 +193,7 @@ public final class DoGachaInRollShopCsReqOuterClass {
bitField0_ = 0;
bBJIJINJAFK = 0;
rollShopId = 0;
+ gachaRandom = 0;
return this;
}
@@ -171,19 +218,24 @@ public final class DoGachaInRollShopCsReqOuterClass {
DoGachaInRollShopCsReq other = (DoGachaInRollShopCsReq) o;
return bitField0_ == other.bitField0_
&& (!hasBBJIJINJAFK() || bBJIJINJAFK == other.bBJIJINJAFK)
- && (!hasRollShopId() || rollShopId == other.rollShopId);
+ && (!hasRollShopId() || rollShopId == other.rollShopId)
+ && (!hasGachaRandom() || gachaRandom == other.gachaRandom);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(bBJIJINJAFK);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 104);
output.writeUInt32NoTag(rollShopId);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 112);
+ output.writeUInt32NoTag(gachaRandom);
+ }
}
@Override
@@ -195,6 +247,9 @@ public final class DoGachaInRollShopCsReqOuterClass {
if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(rollShopId);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom);
+ }
return size;
}
@@ -205,20 +260,29 @@ public final class DoGachaInRollShopCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
+ case 48: {
// bBJIJINJAFK
bBJIJINJAFK = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 80) {
+ if (tag != 104) {
break;
}
}
- case 80: {
+ case 104: {
// rollShopId
rollShopId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
+ if (tag != 112) {
+ break;
+ }
+ }
+ case 112: {
+ // gachaRandom
+ gachaRandom = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
if (tag != 0) {
break;
}
@@ -246,6 +310,9 @@ public final class DoGachaInRollShopCsReqOuterClass {
if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.rollShopId, rollShopId);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeUInt32(FieldNames.gachaRandom, gachaRandom);
+ }
output.endObject();
}
@@ -279,6 +346,18 @@ public final class DoGachaInRollShopCsReqOuterClass {
}
break;
}
+ case -1635961627:
+ case -47579616: {
+ if (input.isAtField(FieldNames.gachaRandom)) {
+ if (!input.trySkipNullValue()) {
+ gachaRandom = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
default: {
input.skipUnknownField();
break;
@@ -335,6 +414,8 @@ public final class DoGachaInRollShopCsReqOuterClass {
static final FieldName bBJIJINJAFK = FieldName.forField("BBJIJINJAFK");
static final FieldName rollShopId = FieldName.forField("rollShopId", "roll_shop_id");
+
+ static final FieldName gachaRandom = FieldName.forField("gachaRandom", "gacha_random");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/DoGachaInRollShopScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DoGachaInRollShopScRspOuterClass.java
index e6394bd..86da20c 100644
--- a/src/generated/main/emu/lunarcore/proto/DoGachaInRollShopScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/DoGachaInRollShopScRspOuterClass.java
@@ -24,22 +24,22 @@ public final class DoGachaInRollShopScRspOuterClass {
private int aFMPDBBHCHM;
/**
- * optional uint32 LEJJOJGNIHK = 4;
- */
- private int lEJJOJGNIHK;
-
- /**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 9;
*/
private int retcode;
/**
- * optional uint32 roll_shop_id = 8;
+ * optional uint32 LEJJOJGNIHK = 12;
+ */
+ private int lEJJOJGNIHK;
+
+ /**
+ * optional uint32 roll_shop_id = 15;
*/
private int rollShopId;
/**
- * optional .ItemList reward = 9;
+ * optional .ItemList reward = 13;
*/
private final ItemListOuterClass.ItemList reward = ItemListOuterClass.ItemList.newInstance();
@@ -91,62 +91,25 @@ public final class DoGachaInRollShopScRspOuterClass {
}
/**
- * optional uint32 LEJJOJGNIHK = 4;
- * @return whether the lEJJOJGNIHK field is set
+ * optional uint32 retcode = 9;
+ * @return whether the retcode field is set
*/
- public boolean hasLEJJOJGNIHK() {
+ public boolean hasRetcode() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 LEJJOJGNIHK = 4;
- * @return this
- */
- public DoGachaInRollShopScRsp clearLEJJOJGNIHK() {
- bitField0_ &= ~0x00000002;
- lEJJOJGNIHK = 0;
- return this;
- }
-
- /**
- * optional uint32 LEJJOJGNIHK = 4;
- * @return the lEJJOJGNIHK
- */
- public int getLEJJOJGNIHK() {
- return lEJJOJGNIHK;
- }
-
- /**
- * optional uint32 LEJJOJGNIHK = 4;
- * @param value the lEJJOJGNIHK to set
- * @return this
- */
- public DoGachaInRollShopScRsp setLEJJOJGNIHK(final int value) {
- bitField0_ |= 0x00000002;
- lEJJOJGNIHK = value;
- return this;
- }
-
- /**
- * optional uint32 retcode = 7;
- * @return whether the retcode field is set
- */
- public boolean hasRetcode() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 9;
* @return this
*/
public DoGachaInRollShopScRsp clearRetcode() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
retcode = 0;
return this;
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 9;
* @return the retcode
*/
public int getRetcode() {
@@ -154,18 +117,55 @@ public final class DoGachaInRollShopScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 9;
* @param value the retcode to set
* @return this
*/
public DoGachaInRollShopScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
retcode = value;
return this;
}
/**
- * optional uint32 roll_shop_id = 8;
+ * optional uint32 LEJJOJGNIHK = 12;
+ * @return whether the lEJJOJGNIHK field is set
+ */
+ public boolean hasLEJJOJGNIHK() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 LEJJOJGNIHK = 12;
+ * @return this
+ */
+ public DoGachaInRollShopScRsp clearLEJJOJGNIHK() {
+ bitField0_ &= ~0x00000004;
+ lEJJOJGNIHK = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 LEJJOJGNIHK = 12;
+ * @return the lEJJOJGNIHK
+ */
+ public int getLEJJOJGNIHK() {
+ return lEJJOJGNIHK;
+ }
+
+ /**
+ * optional uint32 LEJJOJGNIHK = 12;
+ * @param value the lEJJOJGNIHK to set
+ * @return this
+ */
+ public DoGachaInRollShopScRsp setLEJJOJGNIHK(final int value) {
+ bitField0_ |= 0x00000004;
+ lEJJOJGNIHK = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 roll_shop_id = 15;
* @return whether the rollShopId field is set
*/
public boolean hasRollShopId() {
@@ -173,7 +173,7 @@ public final class DoGachaInRollShopScRspOuterClass {
}
/**
- * optional uint32 roll_shop_id = 8;
+ * optional uint32 roll_shop_id = 15;
* @return this
*/
public DoGachaInRollShopScRsp clearRollShopId() {
@@ -183,7 +183,7 @@ public final class DoGachaInRollShopScRspOuterClass {
}
/**
- * optional uint32 roll_shop_id = 8;
+ * optional uint32 roll_shop_id = 15;
* @return the rollShopId
*/
public int getRollShopId() {
@@ -191,7 +191,7 @@ public final class DoGachaInRollShopScRspOuterClass {
}
/**
- * optional uint32 roll_shop_id = 8;
+ * optional uint32 roll_shop_id = 15;
* @param value the rollShopId to set
* @return this
*/
@@ -202,7 +202,7 @@ public final class DoGachaInRollShopScRspOuterClass {
}
/**
- * optional .ItemList reward = 9;
+ * optional .ItemList reward = 13;
* @return whether the reward field is set
*/
public boolean hasReward() {
@@ -210,7 +210,7 @@ public final class DoGachaInRollShopScRspOuterClass {
}
/**
- * optional .ItemList reward = 9;
+ * optional .ItemList reward = 13;
* @return this
*/
public DoGachaInRollShopScRsp clearReward() {
@@ -220,7 +220,7 @@ public final class DoGachaInRollShopScRspOuterClass {
}
/**
- * optional .ItemList reward = 9;
+ * optional .ItemList reward = 13;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -234,7 +234,7 @@ public final class DoGachaInRollShopScRspOuterClass {
}
/**
- * optional .ItemList reward = 9;
+ * optional .ItemList reward = 13;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -248,7 +248,7 @@ public final class DoGachaInRollShopScRspOuterClass {
}
/**
- * optional .ItemList reward = 9;
+ * optional .ItemList reward = 13;
* @param value the reward to set
* @return this
*/
@@ -264,8 +264,8 @@ public final class DoGachaInRollShopScRspOuterClass {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
aFMPDBBHCHM = other.aFMPDBBHCHM;
- lEJJOJGNIHK = other.lEJJOJGNIHK;
retcode = other.retcode;
+ lEJJOJGNIHK = other.lEJJOJGNIHK;
rollShopId = other.rollShopId;
reward.copyFrom(other.reward);
}
@@ -281,12 +281,12 @@ public final class DoGachaInRollShopScRspOuterClass {
if (other.hasAFMPDBBHCHM()) {
setAFMPDBBHCHM(other.aFMPDBBHCHM);
}
- if (other.hasLEJJOJGNIHK()) {
- setLEJJOJGNIHK(other.lEJJOJGNIHK);
- }
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
+ if (other.hasLEJJOJGNIHK()) {
+ setLEJJOJGNIHK(other.lEJJOJGNIHK);
+ }
if (other.hasRollShopId()) {
setRollShopId(other.rollShopId);
}
@@ -304,8 +304,8 @@ public final class DoGachaInRollShopScRspOuterClass {
cachedSize = -1;
bitField0_ = 0;
aFMPDBBHCHM = 0;
- lEJJOJGNIHK = 0;
retcode = 0;
+ lEJJOJGNIHK = 0;
rollShopId = 0;
reward.clear();
return this;
@@ -333,8 +333,8 @@ public final class DoGachaInRollShopScRspOuterClass {
DoGachaInRollShopScRsp other = (DoGachaInRollShopScRsp) o;
return bitField0_ == other.bitField0_
&& (!hasAFMPDBBHCHM() || aFMPDBBHCHM == other.aFMPDBBHCHM)
- && (!hasLEJJOJGNIHK() || lEJJOJGNIHK == other.lEJJOJGNIHK)
&& (!hasRetcode() || retcode == other.retcode)
+ && (!hasLEJJOJGNIHK() || lEJJOJGNIHK == other.lEJJOJGNIHK)
&& (!hasRollShopId() || rollShopId == other.rollShopId)
&& (!hasReward() || reward.equals(other.reward));
}
@@ -346,19 +346,19 @@ public final class DoGachaInRollShopScRspOuterClass {
output.writeUInt32NoTag(aFMPDBBHCHM);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(lEJJOJGNIHK);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 72);
output.writeUInt32NoTag(retcode);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 96);
+ output.writeUInt32NoTag(lEJJOJGNIHK);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(rollShopId);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 74);
+ output.writeRawByte((byte) 106);
output.writeMessageNoTag(reward);
}
}
@@ -370,10 +370,10 @@ public final class DoGachaInRollShopScRspOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(aFMPDBBHCHM);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(lEJJOJGNIHK);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(lEJJOJGNIHK);
}
if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(rollShopId);
@@ -396,38 +396,38 @@ public final class DoGachaInRollShopScRspOuterClass {
aFMPDBBHCHM = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 32) {
+ if (tag != 72) {
break;
}
}
- case 32: {
- // lEJJOJGNIHK
- lEJJOJGNIHK = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 56) {
- break;
- }
- }
- case 56: {
+ case 72: {
// retcode
retcode = input.readUInt32();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 64) {
+ if (tag != 96) {
break;
}
}
- case 64: {
+ case 96: {
+ // lEJJOJGNIHK
+ lEJJOJGNIHK = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 120) {
+ break;
+ }
+ }
+ case 120: {
// rollShopId
rollShopId = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 74) {
+ if (tag != 106) {
break;
}
}
- case 74: {
+ case 106: {
// reward
input.readMessage(reward);
bitField0_ |= 0x00000010;
@@ -457,10 +457,10 @@ public final class DoGachaInRollShopScRspOuterClass {
output.writeUInt32(FieldNames.aFMPDBBHCHM, aFMPDBBHCHM);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.lEJJOJGNIHK, lEJJOJGNIHK);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.lEJJOJGNIHK, lEJJOJGNIHK);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeUInt32(FieldNames.rollShopId, rollShopId);
@@ -489,10 +489,10 @@ public final class DoGachaInRollShopScRspOuterClass {
}
break;
}
- case -1007707855: {
- if (input.isAtField(FieldNames.lEJJOJGNIHK)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- lEJJOJGNIHK = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -500,10 +500,10 @@ public final class DoGachaInRollShopScRspOuterClass {
}
break;
}
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case -1007707855: {
+ if (input.isAtField(FieldNames.lEJJOJGNIHK)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ lEJJOJGNIHK = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -589,10 +589,10 @@ public final class DoGachaInRollShopScRspOuterClass {
static class FieldNames {
static final FieldName aFMPDBBHCHM = FieldName.forField("AFMPDBBHCHM");
- static final FieldName lEJJOJGNIHK = FieldName.forField("LEJJOJGNIHK");
-
static final FieldName retcode = FieldName.forField("retcode");
+ static final FieldName lEJJOJGNIHK = FieldName.forField("LEJJOJGNIHK");
+
static final FieldName rollShopId = FieldName.forField("rollShopId", "roll_shop_id");
static final FieldName reward = FieldName.forField("reward");
diff --git a/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java
index 0873abd..c88d6a3 100644
--- a/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java
@@ -20,19 +20,19 @@ public final class DoGachaScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 gacha_id = 3;
+ * optional uint32 gacha_num = 4;
*/
- private int gachaId;
+ private int gachaNum;
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 11;
*/
private int retcode;
/**
- * optional uint32 gacha_num = 12;
+ * optional uint32 gacha_id = 12;
*/
- private int gachaNum;
+ private int gachaId;
/**
* optional uint32 ceiling_num = 15;
@@ -40,7 +40,7 @@ public final class DoGachaScRspOuterClass {
private int ceilingNum;
/**
- * repeated .GachaItem gacha_item_list = 5;
+ * repeated .GachaItem gacha_item_list = 9;
*/
private final RepeatedMessageoptional uint32 gacha_id = 3;
- * @return whether the gachaId field is set
+ * optional uint32 gacha_num = 4;
+ * @return whether the gachaNum field is set
*/
- public boolean hasGachaId() {
+ public boolean hasGachaNum() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 gacha_id = 3;
+ * optional uint32 gacha_num = 4;
* @return this
*/
- public DoGachaScRsp clearGachaId() {
+ public DoGachaScRsp clearGachaNum() {
bitField0_ &= ~0x00000001;
- gachaId = 0;
+ gachaNum = 0;
return this;
}
/**
- * optional uint32 gacha_id = 3;
- * @return the gachaId
+ * optional uint32 gacha_num = 4;
+ * @return the gachaNum
*/
- public int getGachaId() {
- return gachaId;
+ public int getGachaNum() {
+ return gachaNum;
}
/**
- * optional uint32 gacha_id = 3;
- * @param value the gachaId to set
+ * optional uint32 gacha_num = 4;
+ * @param value the gachaNum to set
* @return this
*/
- public DoGachaScRsp setGachaId(final int value) {
+ public DoGachaScRsp setGachaNum(final int value) {
bitField0_ |= 0x00000001;
- gachaId = value;
+ gachaNum = value;
return this;
}
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 11;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -100,7 +100,7 @@ public final class DoGachaScRspOuterClass {
}
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 11;
* @return this
*/
public DoGachaScRsp clearRetcode() {
@@ -110,7 +110,7 @@ public final class DoGachaScRspOuterClass {
}
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 11;
* @return the retcode
*/
public int getRetcode() {
@@ -118,7 +118,7 @@ public final class DoGachaScRspOuterClass {
}
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 11;
* @param value the retcode to set
* @return this
*/
@@ -129,39 +129,39 @@ public final class DoGachaScRspOuterClass {
}
/**
- * optional uint32 gacha_num = 12;
- * @return whether the gachaNum field is set
+ * optional uint32 gacha_id = 12;
+ * @return whether the gachaId field is set
*/
- public boolean hasGachaNum() {
+ public boolean hasGachaId() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 gacha_num = 12;
+ * optional uint32 gacha_id = 12;
* @return this
*/
- public DoGachaScRsp clearGachaNum() {
+ public DoGachaScRsp clearGachaId() {
bitField0_ &= ~0x00000004;
- gachaNum = 0;
+ gachaId = 0;
return this;
}
/**
- * optional uint32 gacha_num = 12;
- * @return the gachaNum
+ * optional uint32 gacha_id = 12;
+ * @return the gachaId
*/
- public int getGachaNum() {
- return gachaNum;
+ public int getGachaId() {
+ return gachaId;
}
/**
- * optional uint32 gacha_num = 12;
- * @param value the gachaNum to set
+ * optional uint32 gacha_id = 12;
+ * @param value the gachaId to set
* @return this
*/
- public DoGachaScRsp setGachaNum(final int value) {
+ public DoGachaScRsp setGachaId(final int value) {
bitField0_ |= 0x00000004;
- gachaNum = value;
+ gachaId = value;
return this;
}
@@ -203,7 +203,7 @@ public final class DoGachaScRspOuterClass {
}
/**
- * repeated .GachaItem gacha_item_list = 5;
+ * repeated .GachaItem gacha_item_list = 9;
* @return whether the gachaItemList field is set
*/
public boolean hasGachaItemList() {
@@ -211,7 +211,7 @@ public final class DoGachaScRspOuterClass {
}
/**
- * repeated .GachaItem gacha_item_list = 5;
+ * repeated .GachaItem gacha_item_list = 9;
* @return this
*/
public DoGachaScRsp clearGachaItemList() {
@@ -221,7 +221,7 @@ public final class DoGachaScRspOuterClass {
}
/**
- * repeated .GachaItem gacha_item_list = 5;
+ * repeated .GachaItem gacha_item_list = 9;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -235,7 +235,7 @@ public final class DoGachaScRspOuterClass {
}
/**
- * repeated .GachaItem gacha_item_list = 5;
+ * repeated .GachaItem gacha_item_list = 9;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -249,7 +249,7 @@ public final class DoGachaScRspOuterClass {
}
/**
- * repeated .GachaItem gacha_item_list = 5;
+ * repeated .GachaItem gacha_item_list = 9;
* @param value the gachaItemList to add
* @return this
*/
@@ -260,7 +260,7 @@ public final class DoGachaScRspOuterClass {
}
/**
- * repeated .GachaItem gacha_item_list = 5;
+ * repeated .GachaItem gacha_item_list = 9;
* @param values the gachaItemList to add
* @return this
*/
@@ -275,9 +275,9 @@ public final class DoGachaScRspOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- gachaId = other.gachaId;
- retcode = other.retcode;
gachaNum = other.gachaNum;
+ retcode = other.retcode;
+ gachaId = other.gachaId;
ceilingNum = other.ceilingNum;
gachaItemList.copyFrom(other.gachaItemList);
}
@@ -290,14 +290,14 @@ public final class DoGachaScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasGachaId()) {
- setGachaId(other.gachaId);
+ if (other.hasGachaNum()) {
+ setGachaNum(other.gachaNum);
}
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
- if (other.hasGachaNum()) {
- setGachaNum(other.gachaNum);
+ if (other.hasGachaId()) {
+ setGachaId(other.gachaId);
}
if (other.hasCeilingNum()) {
setCeilingNum(other.ceilingNum);
@@ -315,9 +315,9 @@ public final class DoGachaScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- gachaId = 0;
- retcode = 0;
gachaNum = 0;
+ retcode = 0;
+ gachaId = 0;
ceilingNum = 0;
gachaItemList.clear();
return this;
@@ -344,9 +344,9 @@ public final class DoGachaScRspOuterClass {
}
DoGachaScRsp other = (DoGachaScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasGachaId() || gachaId == other.gachaId)
- && (!hasRetcode() || retcode == other.retcode)
&& (!hasGachaNum() || gachaNum == other.gachaNum)
+ && (!hasRetcode() || retcode == other.retcode)
+ && (!hasGachaId() || gachaId == other.gachaId)
&& (!hasCeilingNum() || ceilingNum == other.ceilingNum)
&& (!hasGachaItemList() || gachaItemList.equals(other.gachaItemList));
}
@@ -354,16 +354,16 @@ public final class DoGachaScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(gachaId);
+ output.writeRawByte((byte) 32);
+ output.writeUInt32NoTag(gachaNum);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 96);
- output.writeUInt32NoTag(gachaNum);
+ output.writeUInt32NoTag(gachaId);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeRawByte((byte) 120);
@@ -371,7 +371,7 @@ public final class DoGachaScRspOuterClass {
}
if ((bitField0_ & 0x00000010) != 0) {
for (int i = 0; i < gachaItemList.length(); i++) {
- output.writeRawByte((byte) 42);
+ output.writeRawByte((byte) 74);
output.writeMessageNoTag(gachaItemList.get(i));
}
}
@@ -381,13 +381,13 @@ public final class DoGachaScRspOuterClass {
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(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId);
}
if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(ceilingNum);
@@ -405,16 +405,16 @@ public final class DoGachaScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
- // gachaId
- gachaId = input.readUInt32();
+ case 32: {
+ // gachaNum
+ gachaNum = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 32) {
+ if (tag != 88) {
break;
}
}
- case 32: {
+ case 88: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000002;
@@ -424,8 +424,8 @@ public final class DoGachaScRspOuterClass {
}
}
case 96: {
- // gachaNum
- gachaNum = input.readUInt32();
+ // gachaId
+ gachaId = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 120) {
@@ -437,11 +437,11 @@ public final class DoGachaScRspOuterClass {
ceilingNum = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 42) {
+ if (tag != 74) {
break;
}
}
- case 42: {
+ case 74: {
// gachaItemList
tag = input.readRepeatedMessage(gachaItemList, tag);
bitField0_ |= 0x00000010;
@@ -467,13 +467,13 @@ public final class DoGachaScRspOuterClass {
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.retcode, retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.gachaNum, gachaNum);
+ output.writeUInt32(FieldNames.gachaId, gachaId);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeUInt32(FieldNames.ceilingNum, ceilingNum);
@@ -491,11 +491,11 @@ public final class DoGachaScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -204751299:
- case -2052301576: {
- if (input.isAtField(FieldNames.gachaId)) {
+ case -2052317532:
+ case 803166025: {
+ if (input.isAtField(FieldNames.gachaNum)) {
if (!input.trySkipNullValue()) {
- gachaId = input.readUInt32();
+ gachaNum = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -514,11 +514,11 @@ public final class DoGachaScRspOuterClass {
}
break;
}
- case -2052317532:
- case 803166025: {
- if (input.isAtField(FieldNames.gachaNum)) {
+ case -204751299:
+ case -2052301576: {
+ if (input.isAtField(FieldNames.gachaId)) {
if (!input.trySkipNullValue()) {
- gachaNum = input.readUInt32();
+ gachaId = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -602,11 +602,11 @@ public final class DoGachaScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id");
+ static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num");
static final FieldName retcode = FieldName.forField("retcode");
- static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num");
+ static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id");
static final FieldName ceilingNum = FieldName.forField("ceilingNum", "ceiling_num");
diff --git a/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java
index 2012854..abe3849 100644
--- a/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java
@@ -19,15 +19,20 @@ public final class DressAvatarCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 equipment_unique_id = 6;
+ * optional uint32 equipment_unique_id = 3;
*/
private int equipmentUniqueId;
/**
- * optional uint32 base_avatar_id = 9;
+ * optional uint32 base_avatar_id = 4;
*/
private int baseAvatarId;
+ /**
+ * optional uint32 equip_avatar_id = 10;
+ */
+ private int equipAvatarId;
+
private DressAvatarCsReq() {
}
@@ -39,7 +44,7 @@ public final class DressAvatarCsReqOuterClass {
}
/**
- * optional uint32 equipment_unique_id = 6;
+ * optional uint32 equipment_unique_id = 3;
* @return whether the equipmentUniqueId field is set
*/
public boolean hasEquipmentUniqueId() {
@@ -47,7 +52,7 @@ public final class DressAvatarCsReqOuterClass {
}
/**
- * optional uint32 equipment_unique_id = 6;
+ * optional uint32 equipment_unique_id = 3;
* @return this
*/
public DressAvatarCsReq clearEquipmentUniqueId() {
@@ -57,7 +62,7 @@ public final class DressAvatarCsReqOuterClass {
}
/**
- * optional uint32 equipment_unique_id = 6;
+ * optional uint32 equipment_unique_id = 3;
* @return the equipmentUniqueId
*/
public int getEquipmentUniqueId() {
@@ -65,7 +70,7 @@ public final class DressAvatarCsReqOuterClass {
}
/**
- * optional uint32 equipment_unique_id = 6;
+ * optional uint32 equipment_unique_id = 3;
* @param value the equipmentUniqueId to set
* @return this
*/
@@ -76,7 +81,7 @@ public final class DressAvatarCsReqOuterClass {
}
/**
- * optional uint32 base_avatar_id = 9;
+ * optional uint32 base_avatar_id = 4;
* @return whether the baseAvatarId field is set
*/
public boolean hasBaseAvatarId() {
@@ -84,7 +89,7 @@ public final class DressAvatarCsReqOuterClass {
}
/**
- * optional uint32 base_avatar_id = 9;
+ * optional uint32 base_avatar_id = 4;
* @return this
*/
public DressAvatarCsReq clearBaseAvatarId() {
@@ -94,7 +99,7 @@ public final class DressAvatarCsReqOuterClass {
}
/**
- * optional uint32 base_avatar_id = 9;
+ * optional uint32 base_avatar_id = 4;
* @return the baseAvatarId
*/
public int getBaseAvatarId() {
@@ -102,7 +107,7 @@ public final class DressAvatarCsReqOuterClass {
}
/**
- * optional uint32 base_avatar_id = 9;
+ * optional uint32 base_avatar_id = 4;
* @param value the baseAvatarId to set
* @return this
*/
@@ -112,6 +117,43 @@ public final class DressAvatarCsReqOuterClass {
return this;
}
+ /**
+ * optional uint32 equip_avatar_id = 10;
+ * @return whether the equipAvatarId field is set
+ */
+ public boolean hasEquipAvatarId() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 equip_avatar_id = 10;
+ * @return this
+ */
+ public DressAvatarCsReq clearEquipAvatarId() {
+ bitField0_ &= ~0x00000004;
+ equipAvatarId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 equip_avatar_id = 10;
+ * @return the equipAvatarId
+ */
+ public int getEquipAvatarId() {
+ return equipAvatarId;
+ }
+
+ /**
+ * optional uint32 equip_avatar_id = 10;
+ * @param value the equipAvatarId to set
+ * @return this
+ */
+ public DressAvatarCsReq setEquipAvatarId(final int value) {
+ bitField0_ |= 0x00000004;
+ equipAvatarId = value;
+ return this;
+ }
+
@Override
public DressAvatarCsReq copyFrom(final DressAvatarCsReq other) {
cachedSize = other.cachedSize;
@@ -119,6 +161,7 @@ public final class DressAvatarCsReqOuterClass {
bitField0_ = other.bitField0_;
equipmentUniqueId = other.equipmentUniqueId;
baseAvatarId = other.baseAvatarId;
+ equipAvatarId = other.equipAvatarId;
}
return this;
}
@@ -135,6 +178,9 @@ public final class DressAvatarCsReqOuterClass {
if (other.hasBaseAvatarId()) {
setBaseAvatarId(other.baseAvatarId);
}
+ if (other.hasEquipAvatarId()) {
+ setEquipAvatarId(other.equipAvatarId);
+ }
return this;
}
@@ -147,6 +193,7 @@ public final class DressAvatarCsReqOuterClass {
bitField0_ = 0;
equipmentUniqueId = 0;
baseAvatarId = 0;
+ equipAvatarId = 0;
return this;
}
@@ -171,19 +218,24 @@ public final class DressAvatarCsReqOuterClass {
DressAvatarCsReq other = (DressAvatarCsReq) o;
return bitField0_ == other.bitField0_
&& (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId)
- && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId);
+ && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
+ && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(equipmentUniqueId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(baseAvatarId);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 80);
+ output.writeUInt32NoTag(equipAvatarId);
+ }
}
@Override
@@ -195,6 +247,9 @@ public final class DressAvatarCsReqOuterClass {
if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId);
+ }
return size;
}
@@ -205,20 +260,29 @@ public final class DressAvatarCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 48: {
+ case 24: {
// equipmentUniqueId
equipmentUniqueId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 72) {
+ if (tag != 32) {
break;
}
}
- case 72: {
+ case 32: {
// baseAvatarId
baseAvatarId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
+ if (tag != 80) {
+ break;
+ }
+ }
+ case 80: {
+ // equipAvatarId
+ equipAvatarId = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
if (tag != 0) {
break;
}
@@ -246,6 +310,9 @@ public final class DressAvatarCsReqOuterClass {
if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId);
+ }
output.endObject();
}
@@ -280,6 +347,18 @@ public final class DressAvatarCsReqOuterClass {
}
break;
}
+ case 169047204:
+ case 33057906: {
+ if (input.isAtField(FieldNames.equipAvatarId)) {
+ if (!input.trySkipNullValue()) {
+ equipAvatarId = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
default: {
input.skipUnknownField();
break;
@@ -336,6 +415,8 @@ public final class DressAvatarCsReqOuterClass {
static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id");
static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
+
+ static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_avatar_id");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java
index fc2fa47..7ee8c62 100644
--- a/src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java
@@ -20,12 +20,17 @@ public final class DressRelicAvatarCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 base_avatar_id = 12;
+ * optional uint32 base_avatar_id = 6;
*/
private int baseAvatarId;
/**
- * repeated .RelicParam param_list = 11;
+ * optional uint32 equip_avatar_id = 13;
+ */
+ private int equipAvatarId;
+
+ /**
+ * repeated .RelicParam param_list = 12;
*/
private final RepeatedMessageoptional uint32 base_avatar_id = 12;
+ * optional uint32 base_avatar_id = 6;
* @return whether the baseAvatarId field is set
*/
public boolean hasBaseAvatarId() {
@@ -48,7 +53,7 @@ public final class DressRelicAvatarCsReqOuterClass {
}
/**
- * optional uint32 base_avatar_id = 12;
+ * optional uint32 base_avatar_id = 6;
* @return this
*/
public DressRelicAvatarCsReq clearBaseAvatarId() {
@@ -58,7 +63,7 @@ public final class DressRelicAvatarCsReqOuterClass {
}
/**
- * optional uint32 base_avatar_id = 12;
+ * optional uint32 base_avatar_id = 6;
* @return the baseAvatarId
*/
public int getBaseAvatarId() {
@@ -66,7 +71,7 @@ public final class DressRelicAvatarCsReqOuterClass {
}
/**
- * optional uint32 base_avatar_id = 12;
+ * optional uint32 base_avatar_id = 6;
* @param value the baseAvatarId to set
* @return this
*/
@@ -77,25 +82,62 @@ public final class DressRelicAvatarCsReqOuterClass {
}
/**
- * repeated .RelicParam param_list = 11;
- * @return whether the paramList field is set
+ * optional uint32 equip_avatar_id = 13;
+ * @return whether the equipAvatarId field is set
*/
- public boolean hasParamList() {
+ public boolean hasEquipAvatarId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * repeated .RelicParam param_list = 11;
+ * optional uint32 equip_avatar_id = 13;
+ * @return this
+ */
+ public DressRelicAvatarCsReq clearEquipAvatarId() {
+ bitField0_ &= ~0x00000002;
+ equipAvatarId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 equip_avatar_id = 13;
+ * @return the equipAvatarId
+ */
+ public int getEquipAvatarId() {
+ return equipAvatarId;
+ }
+
+ /**
+ * optional uint32 equip_avatar_id = 13;
+ * @param value the equipAvatarId to set
+ * @return this
+ */
+ public DressRelicAvatarCsReq setEquipAvatarId(final int value) {
+ bitField0_ |= 0x00000002;
+ equipAvatarId = value;
+ return this;
+ }
+
+ /**
+ * repeated .RelicParam param_list = 12;
+ * @return whether the paramList field is set
+ */
+ public boolean hasParamList() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * repeated .RelicParam param_list = 12;
* @return this
*/
public DressRelicAvatarCsReq clearParamList() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000004;
paramList.clear();
return this;
}
/**
- * repeated .RelicParam param_list = 11;
+ * repeated .RelicParam param_list = 12;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +151,7 @@ public final class DressRelicAvatarCsReqOuterClass {
}
/**
- * repeated .RelicParam param_list = 11;
+ * repeated .RelicParam param_list = 12;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -118,28 +160,28 @@ public final class DressRelicAvatarCsReqOuterClass {
* @return internal storage object for modifications
*/
public RepeatedMessagerepeated .RelicParam param_list = 11;
+ * repeated .RelicParam param_list = 12;
* @param value the paramList to add
* @return this
*/
public DressRelicAvatarCsReq addParamList(final RelicParamOuterClass.RelicParam value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
paramList.add(value);
return this;
}
/**
- * repeated .RelicParam param_list = 11;
+ * repeated .RelicParam param_list = 12;
* @param values the paramList to add
* @return this
*/
public DressRelicAvatarCsReq addAllParamList(final RelicParamOuterClass.RelicParam... values) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
paramList.addAll(values);
return this;
}
@@ -150,6 +192,7 @@ public final class DressRelicAvatarCsReqOuterClass {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
baseAvatarId = other.baseAvatarId;
+ equipAvatarId = other.equipAvatarId;
paramList.copyFrom(other.paramList);
}
return this;
@@ -164,6 +207,9 @@ public final class DressRelicAvatarCsReqOuterClass {
if (other.hasBaseAvatarId()) {
setBaseAvatarId(other.baseAvatarId);
}
+ if (other.hasEquipAvatarId()) {
+ setEquipAvatarId(other.equipAvatarId);
+ }
if (other.hasParamList()) {
getMutableParamList().addAll(other.paramList);
}
@@ -178,6 +224,7 @@ public final class DressRelicAvatarCsReqOuterClass {
cachedSize = -1;
bitField0_ = 0;
baseAvatarId = 0;
+ equipAvatarId = 0;
paramList.clear();
return this;
}
@@ -204,18 +251,23 @@ public final class DressRelicAvatarCsReqOuterClass {
DressRelicAvatarCsReq other = (DressRelicAvatarCsReq) o;
return bitField0_ == other.bitField0_
&& (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
+ && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId)
&& (!hasParamList() || paramList.equals(other.paramList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(baseAvatarId);
}
if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(equipAvatarId);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < paramList.length(); i++) {
- output.writeRawByte((byte) 90);
+ output.writeRawByte((byte) 98);
output.writeMessageNoTag(paramList.get(i));
}
}
@@ -228,6 +280,9 @@ public final class DressRelicAvatarCsReqOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
}
if ((bitField0_ & 0x00000002) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
size += (1 * paramList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(paramList);
}
return size;
@@ -240,19 +295,28 @@ public final class DressRelicAvatarCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 96: {
+ case 48: {
// baseAvatarId
baseAvatarId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 90) {
+ if (tag != 104) {
break;
}
}
- case 90: {
+ case 104: {
+ // equipAvatarId
+ equipAvatarId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 98) {
+ break;
+ }
+ }
+ case 98: {
// paramList
tag = input.readRepeatedMessage(paramList, tag);
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
if (tag != 0) {
break;
}
@@ -278,6 +342,9 @@ public final class DressRelicAvatarCsReqOuterClass {
output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
}
if ((bitField0_ & 0x00000002) != 0) {
+ output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
output.writeRepeatedMessage(FieldNames.paramList, paramList);
}
output.endObject();
@@ -302,12 +369,24 @@ public final class DressRelicAvatarCsReqOuterClass {
}
break;
}
+ case 169047204:
+ case 33057906: {
+ if (input.isAtField(FieldNames.equipAvatarId)) {
+ if (!input.trySkipNullValue()) {
+ equipAvatarId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case 1953705675:
case 452960528: {
if (input.isAtField(FieldNames.paramList)) {
if (!input.trySkipNullValue()) {
input.readRepeatedMessage(paramList);
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
}
} else {
input.skipUnknownField();
@@ -369,6 +448,8 @@ public final class DressRelicAvatarCsReqOuterClass {
static class FieldNames {
static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
+ static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_avatar_id");
+
static final FieldName paramList = FieldName.forField("paramList", "param_list");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/EnableRogueTalentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnableRogueTalentCsReqOuterClass.java
index 911d797..48c7885 100644
--- a/src/generated/main/emu/lunarcore/proto/EnableRogueTalentCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EnableRogueTalentCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class EnableRogueTalentCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 talent_id = 7;
+ * optional uint32 talent_id = 1;
*/
private int talentId;
@@ -34,7 +34,7 @@ public final class EnableRogueTalentCsReqOuterClass {
}
/**
- * optional uint32 talent_id = 7;
+ * optional uint32 talent_id = 1;
* @return whether the talentId field is set
*/
public boolean hasTalentId() {
@@ -42,7 +42,7 @@ public final class EnableRogueTalentCsReqOuterClass {
}
/**
- * optional uint32 talent_id = 7;
+ * optional uint32 talent_id = 1;
* @return this
*/
public EnableRogueTalentCsReq clearTalentId() {
@@ -52,7 +52,7 @@ public final class EnableRogueTalentCsReqOuterClass {
}
/**
- * optional uint32 talent_id = 7;
+ * optional uint32 talent_id = 1;
* @return the talentId
*/
public int getTalentId() {
@@ -60,7 +60,7 @@ public final class EnableRogueTalentCsReqOuterClass {
}
/**
- * optional uint32 talent_id = 7;
+ * optional uint32 talent_id = 1;
* @param value the talentId to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class EnableRogueTalentCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(talentId);
}
}
@@ -150,7 +150,7 @@ public final class EnableRogueTalentCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
+ case 8: {
// 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 b4466ff..b45079b 100644
--- a/src/generated/main/emu/lunarcore/proto/EnableRogueTalentScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EnableRogueTalentScRspOuterClass.java
@@ -19,12 +19,12 @@ public final class EnableRogueTalentScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 4;
*/
private int retcode;
/**
- * optional .RogueTalentInfo talent_info = 11;
+ * optional .RogueTalentInfo talent_info = 1;
*/
private final RogueTalentInfoOuterClass.RogueTalentInfo talentInfo = RogueTalentInfoOuterClass.RogueTalentInfo.newInstance();
@@ -39,7 +39,7 @@ public final class EnableRogueTalentScRspOuterClass {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 4;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -47,7 +47,7 @@ public final class EnableRogueTalentScRspOuterClass {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 4;
* @return this
*/
public EnableRogueTalentScRsp clearRetcode() {
@@ -57,7 +57,7 @@ public final class EnableRogueTalentScRspOuterClass {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 4;
* @return the retcode
*/
public int getRetcode() {
@@ -65,7 +65,7 @@ public final class EnableRogueTalentScRspOuterClass {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 4;
* @param value the retcode to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class EnableRogueTalentScRspOuterClass {
}
/**
- * optional .RogueTalentInfo talent_info = 11;
+ * optional .RogueTalentInfo talent_info = 1;
* @return whether the talentInfo field is set
*/
public boolean hasTalentInfo() {
@@ -84,7 +84,7 @@ public final class EnableRogueTalentScRspOuterClass {
}
/**
- * optional .RogueTalentInfo talent_info = 11;
+ * optional .RogueTalentInfo talent_info = 1;
* @return this
*/
public EnableRogueTalentScRsp clearTalentInfo() {
@@ -94,7 +94,7 @@ public final class EnableRogueTalentScRspOuterClass {
}
/**
- * optional .RogueTalentInfo talent_info = 11;
+ * 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 final class EnableRogueTalentScRspOuterClass {
}
/**
- * optional .RogueTalentInfo talent_info = 11;
+ * 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 final class EnableRogueTalentScRspOuterClass {
}
/**
- * optional .RogueTalentInfo talent_info = 11;
+ * optional .RogueTalentInfo talent_info = 1;
* @param value the talentInfo to set
* @return this
*/
@@ -199,11 +199,11 @@ public final class EnableRogueTalentScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 90);
+ output.writeRawByte((byte) 10);
output.writeMessageNoTag(talentInfo);
}
}
@@ -227,16 +227,16 @@ public final class EnableRogueTalentScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 120: {
+ case 32: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 90) {
+ if (tag != 10) {
break;
}
}
- case 90: {
+ case 10: {
// talentInfo
input.readMessage(talentInfo);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffCsReqOuterClass.java
index c86e5c1..26cc072 100644
--- a/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class EnhanceRogueBuffCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 buff_id = 11;
+ * optional uint32 buff_id = 12;
*/
private int buffId;
@@ -34,7 +34,7 @@ public final class EnhanceRogueBuffCsReqOuterClass {
}
/**
- * optional uint32 buff_id = 11;
+ * optional uint32 buff_id = 12;
* @return whether the buffId field is set
*/
public boolean hasBuffId() {
@@ -42,7 +42,7 @@ public final class EnhanceRogueBuffCsReqOuterClass {
}
/**
- * optional uint32 buff_id = 11;
+ * optional uint32 buff_id = 12;
* @return this
*/
public EnhanceRogueBuffCsReq clearBuffId() {
@@ -52,7 +52,7 @@ public final class EnhanceRogueBuffCsReqOuterClass {
}
/**
- * optional uint32 buff_id = 11;
+ * optional uint32 buff_id = 12;
* @return the buffId
*/
public int getBuffId() {
@@ -60,7 +60,7 @@ public final class EnhanceRogueBuffCsReqOuterClass {
}
/**
- * optional uint32 buff_id = 11;
+ * optional uint32 buff_id = 12;
* @param value the buffId to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class EnhanceRogueBuffCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(buffId);
}
}
@@ -150,7 +150,7 @@ public final class EnhanceRogueBuffCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 88: {
+ case 96: {
// buffId
buffId = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffScRspOuterClass.java
index 30e58c3..d55dea5 100644
--- a/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffScRspOuterClass.java
@@ -19,17 +19,17 @@ public final class EnhanceRogueBuffScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 2;
*/
private int retcode;
/**
- * optional bool is_success = 7;
+ * optional bool is_success = 13;
*/
private boolean isSuccess;
/**
- * optional .RogueBuff rogue_buff = 3;
+ * optional .RogueBuff rogue_buff = 15;
*/
private final RogueBuffOuterClass.RogueBuff rogueBuff = RogueBuffOuterClass.RogueBuff.newInstance();
@@ -44,7 +44,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 2;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -52,7 +52,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 2;
* @return this
*/
public EnhanceRogueBuffScRsp clearRetcode() {
@@ -62,7 +62,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 2;
* @return the retcode
*/
public int getRetcode() {
@@ -70,7 +70,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 2;
* @param value the retcode to set
* @return this
*/
@@ -81,7 +81,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
}
/**
- * optional bool is_success = 7;
+ * optional bool is_success = 13;
* @return whether the isSuccess field is set
*/
public boolean hasIsSuccess() {
@@ -89,7 +89,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
}
/**
- * optional bool is_success = 7;
+ * optional bool is_success = 13;
* @return this
*/
public EnhanceRogueBuffScRsp clearIsSuccess() {
@@ -99,7 +99,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
}
/**
- * optional bool is_success = 7;
+ * optional bool is_success = 13;
* @return the isSuccess
*/
public boolean getIsSuccess() {
@@ -107,7 +107,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
}
/**
- * optional bool is_success = 7;
+ * optional bool is_success = 13;
* @param value the isSuccess to set
* @return this
*/
@@ -118,7 +118,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
}
/**
- * optional .RogueBuff rogue_buff = 3;
+ * optional .RogueBuff rogue_buff = 15;
* @return whether the rogueBuff field is set
*/
public boolean hasRogueBuff() {
@@ -126,7 +126,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
}
/**
- * optional .RogueBuff rogue_buff = 3;
+ * optional .RogueBuff rogue_buff = 15;
* @return this
*/
public EnhanceRogueBuffScRsp clearRogueBuff() {
@@ -136,7 +136,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
}
/**
- * optional .RogueBuff rogue_buff = 3;
+ * optional .RogueBuff rogue_buff = 15;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -150,7 +150,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
}
/**
- * optional .RogueBuff rogue_buff = 3;
+ * optional .RogueBuff rogue_buff = 15;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -164,7 +164,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
}
/**
- * optional .RogueBuff rogue_buff = 3;
+ * optional .RogueBuff rogue_buff = 15;
* @param value the rogueBuff to set
* @return this
*/
@@ -246,15 +246,15 @@ public final class EnhanceRogueBuffScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 104);
output.writeBoolNoTag(isSuccess);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 26);
+ output.writeRawByte((byte) 122);
output.writeMessageNoTag(rogueBuff);
}
}
@@ -281,25 +281,25 @@ public final class EnhanceRogueBuffScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 120: {
+ case 16: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 56) {
+ if (tag != 104) {
break;
}
}
- case 56: {
+ case 104: {
// isSuccess
isSuccess = input.readBool();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 26) {
+ if (tag != 122) {
break;
}
}
- case 26: {
+ case 122: {
// rogueBuff
input.readMessage(rogueBuff);
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionCsReqOuterClass.java
index 3dd92be..a1a136f 100644
--- a/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class EnterMapRotationRegionCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .MotionInfo motion = 4;
+ * optional .MotionInfo motion = 7;
*/
private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance();
@@ -34,7 +34,7 @@ public final class EnterMapRotationRegionCsReqOuterClass {
}
/**
- * optional .MotionInfo motion = 4;
+ * optional .MotionInfo motion = 7;
* @return whether the motion field is set
*/
public boolean hasMotion() {
@@ -42,7 +42,7 @@ public final class EnterMapRotationRegionCsReqOuterClass {
}
/**
- * optional .MotionInfo motion = 4;
+ * optional .MotionInfo motion = 7;
* @return this
*/
public EnterMapRotationRegionCsReq clearMotion() {
@@ -52,7 +52,7 @@ public final class EnterMapRotationRegionCsReqOuterClass {
}
/**
- * optional .MotionInfo motion = 4;
+ * optional .MotionInfo motion = 7;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -66,7 +66,7 @@ public final class EnterMapRotationRegionCsReqOuterClass {
}
/**
- * optional .MotionInfo motion = 4;
+ * optional .MotionInfo motion = 7;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -80,7 +80,7 @@ public final class EnterMapRotationRegionCsReqOuterClass {
}
/**
- * optional .MotionInfo motion = 4;
+ * optional .MotionInfo motion = 7;
* @param value the motion to set
* @return this
*/
@@ -150,7 +150,7 @@ public final class EnterMapRotationRegionCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 34);
+ output.writeRawByte((byte) 58);
output.writeMessageNoTag(motion);
}
}
@@ -171,7 +171,7 @@ public final class EnterMapRotationRegionCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 34: {
+ case 58: {
// motion
input.readMessage(motion);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionScRspOuterClass.java
index 92b2ea2..5c7a629 100644
--- a/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionScRspOuterClass.java
@@ -19,12 +19,12 @@ public final class EnterMapRotationRegionScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 2;
+ * optional uint32 retcode = 5;
*/
private int retcode;
/**
- * optional uint32 client_pos_version = 15;
+ * optional uint32 client_pos_version = 14;
*/
private int clientPosVersion;
@@ -44,7 +44,7 @@ public final class EnterMapRotationRegionScRspOuterClass {
}
/**
- * optional uint32 retcode = 2;
+ * optional uint32 retcode = 5;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -52,7 +52,7 @@ public final class EnterMapRotationRegionScRspOuterClass {
}
/**
- * optional uint32 retcode = 2;
+ * optional uint32 retcode = 5;
* @return this
*/
public EnterMapRotationRegionScRsp clearRetcode() {
@@ -62,7 +62,7 @@ public final class EnterMapRotationRegionScRspOuterClass {
}
/**
- * optional uint32 retcode = 2;
+ * optional uint32 retcode = 5;
* @return the retcode
*/
public int getRetcode() {
@@ -70,7 +70,7 @@ public final class EnterMapRotationRegionScRspOuterClass {
}
/**
- * optional uint32 retcode = 2;
+ * optional uint32 retcode = 5;
* @param value the retcode to set
* @return this
*/
@@ -81,7 +81,7 @@ public final class EnterMapRotationRegionScRspOuterClass {
}
/**
- * optional uint32 client_pos_version = 15;
+ * optional uint32 client_pos_version = 14;
* @return whether the clientPosVersion field is set
*/
public boolean hasClientPosVersion() {
@@ -89,7 +89,7 @@ public final class EnterMapRotationRegionScRspOuterClass {
}
/**
- * optional uint32 client_pos_version = 15;
+ * optional uint32 client_pos_version = 14;
* @return this
*/
public EnterMapRotationRegionScRsp clearClientPosVersion() {
@@ -99,7 +99,7 @@ public final class EnterMapRotationRegionScRspOuterClass {
}
/**
- * optional uint32 client_pos_version = 15;
+ * optional uint32 client_pos_version = 14;
* @return the clientPosVersion
*/
public int getClientPosVersion() {
@@ -107,7 +107,7 @@ public final class EnterMapRotationRegionScRspOuterClass {
}
/**
- * optional uint32 client_pos_version = 15;
+ * optional uint32 client_pos_version = 14;
* @param value the clientPosVersion to set
* @return this
*/
@@ -246,11 +246,11 @@ public final class EnterMapRotationRegionScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 112);
output.writeUInt32NoTag(clientPosVersion);
}
if ((bitField0_ & 0x00000004) != 0) {
@@ -281,16 +281,16 @@ public final class EnterMapRotationRegionScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
+ case 40: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 112) {
break;
}
}
- case 120: {
+ case 112: {
// clientPosVersion
clientPosVersion = input.readUInt32();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomCsReqOuterClass.java
index 56267a2..e13190d 100644
--- a/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomCsReqOuterClass.java
@@ -19,15 +19,15 @@ public final class EnterRogueMapRoomCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 room_id = 4;
- */
- private int roomId;
-
- /**
- * optional uint32 site_id = 12;
+ * optional uint32 site_id = 7;
*/
private int siteId;
+ /**
+ * optional uint32 room_id = 10;
+ */
+ private int roomId;
+
private EnterRogueMapRoomCsReq() {
}
@@ -39,62 +39,25 @@ public final class EnterRogueMapRoomCsReqOuterClass {
}
/**
- * optional uint32 room_id = 4;
- * @return whether the roomId field is set
+ * optional uint32 site_id = 7;
+ * @return whether the siteId field is set
*/
- public boolean hasRoomId() {
+ public boolean hasSiteId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 room_id = 4;
- * @return this
- */
- public EnterRogueMapRoomCsReq clearRoomId() {
- bitField0_ &= ~0x00000001;
- roomId = 0;
- return this;
- }
-
- /**
- * optional uint32 room_id = 4;
- * @return the roomId
- */
- public int getRoomId() {
- return roomId;
- }
-
- /**
- * optional uint32 room_id = 4;
- * @param value the roomId to set
- * @return this
- */
- public EnterRogueMapRoomCsReq setRoomId(final int value) {
- bitField0_ |= 0x00000001;
- roomId = value;
- return this;
- }
-
- /**
- * optional uint32 site_id = 12;
- * @return whether the siteId field is set
- */
- public boolean hasSiteId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 site_id = 12;
+ * optional uint32 site_id = 7;
* @return this
*/
public EnterRogueMapRoomCsReq clearSiteId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
siteId = 0;
return this;
}
/**
- * optional uint32 site_id = 12;
+ * optional uint32 site_id = 7;
* @return the siteId
*/
public int getSiteId() {
@@ -102,23 +65,60 @@ public final class EnterRogueMapRoomCsReqOuterClass {
}
/**
- * optional uint32 site_id = 12;
+ * optional uint32 site_id = 7;
* @param value the siteId to set
* @return this
*/
public EnterRogueMapRoomCsReq setSiteId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
siteId = value;
return this;
}
+ /**
+ * optional uint32 room_id = 10;
+ * @return whether the roomId field is set
+ */
+ public boolean hasRoomId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 room_id = 10;
+ * @return this
+ */
+ public EnterRogueMapRoomCsReq clearRoomId() {
+ bitField0_ &= ~0x00000002;
+ roomId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 room_id = 10;
+ * @return the roomId
+ */
+ public int getRoomId() {
+ return roomId;
+ }
+
+ /**
+ * optional uint32 room_id = 10;
+ * @param value the roomId to set
+ * @return this
+ */
+ public EnterRogueMapRoomCsReq setRoomId(final int value) {
+ bitField0_ |= 0x00000002;
+ roomId = value;
+ return this;
+ }
+
@Override
public EnterRogueMapRoomCsReq copyFrom(final EnterRogueMapRoomCsReq other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- roomId = other.roomId;
siteId = other.siteId;
+ roomId = other.roomId;
}
return this;
}
@@ -129,12 +129,12 @@ public final class EnterRogueMapRoomCsReqOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasRoomId()) {
- setRoomId(other.roomId);
- }
if (other.hasSiteId()) {
setSiteId(other.siteId);
}
+ if (other.hasRoomId()) {
+ setRoomId(other.roomId);
+ }
return this;
}
@@ -145,8 +145,8 @@ public final class EnterRogueMapRoomCsReqOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- roomId = 0;
siteId = 0;
+ roomId = 0;
return this;
}
@@ -170,19 +170,19 @@ public final class EnterRogueMapRoomCsReqOuterClass {
}
EnterRogueMapRoomCsReq other = (EnterRogueMapRoomCsReq) o;
return bitField0_ == other.bitField0_
- && (!hasRoomId() || roomId == other.roomId)
- && (!hasSiteId() || siteId == other.siteId);
+ && (!hasSiteId() || siteId == other.siteId)
+ && (!hasRoomId() || roomId == other.roomId);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(roomId);
+ output.writeRawByte((byte) 56);
+ output.writeUInt32NoTag(siteId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 96);
- output.writeUInt32NoTag(siteId);
+ output.writeRawByte((byte) 80);
+ output.writeUInt32NoTag(roomId);
}
}
@@ -190,10 +190,10 @@ public final class EnterRogueMapRoomCsReqOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(roomId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(siteId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(siteId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(roomId);
}
return size;
}
@@ -205,18 +205,18 @@ public final class EnterRogueMapRoomCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
- // roomId
- roomId = input.readUInt32();
+ case 56: {
+ // siteId
+ siteId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 80) {
break;
}
}
- case 96: {
- // siteId
- siteId = input.readUInt32();
+ case 80: {
+ // roomId
+ roomId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
@@ -241,10 +241,10 @@ public final class EnterRogueMapRoomCsReqOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.roomId, roomId);
+ output.writeUInt32(FieldNames.siteId, siteId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.siteId, siteId);
+ output.writeUInt32(FieldNames.roomId, roomId);
}
output.endObject();
}
@@ -256,11 +256,11 @@ public final class EnterRogueMapRoomCsReqOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -925319338:
- case 1379892991: {
- if (input.isAtField(FieldNames.roomId)) {
+ case -902090046:
+ case 2100001043: {
+ if (input.isAtField(FieldNames.siteId)) {
if (!input.trySkipNullValue()) {
- roomId = input.readUInt32();
+ siteId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -268,11 +268,11 @@ public final class EnterRogueMapRoomCsReqOuterClass {
}
break;
}
- case -902090046:
- case 2100001043: {
- if (input.isAtField(FieldNames.siteId)) {
+ case -925319338:
+ case 1379892991: {
+ if (input.isAtField(FieldNames.roomId)) {
if (!input.trySkipNullValue()) {
- siteId = input.readUInt32();
+ roomId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -333,9 +333,9 @@ public final class EnterRogueMapRoomCsReqOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName roomId = FieldName.forField("roomId", "room_id");
-
static final FieldName siteId = FieldName.forField("siteId", "site_id");
+
+ static final FieldName roomId = FieldName.forField("roomId", "room_id");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomScRspOuterClass.java
index 34e5f66..87da8fb 100644
--- a/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomScRspOuterClass.java
@@ -19,25 +19,25 @@ public final class EnterRogueMapRoomScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 cur_site_id = 1;
- */
- private int curSiteId;
-
- /**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 10;
*/
private int retcode;
/**
- * optional .LineupInfo lineup = 5;
+ * optional uint32 cur_site_id = 15;
*/
- private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance();
+ private int curSiteId;
/**
- * optional .SceneInfo scene = 10;
+ * optional .SceneInfo scene = 5;
*/
private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance();
+ /**
+ * optional .LineupInfo lineup = 6;
+ */
+ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance();
+
private EnterRogueMapRoomScRsp() {
}
@@ -49,62 +49,25 @@ public final class EnterRogueMapRoomScRspOuterClass {
}
/**
- * optional uint32 cur_site_id = 1;
- * @return whether the curSiteId field is set
+ * optional uint32 retcode = 10;
+ * @return whether the retcode field is set
*/
- public boolean hasCurSiteId() {
+ public boolean hasRetcode() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 cur_site_id = 1;
- * @return this
- */
- public EnterRogueMapRoomScRsp clearCurSiteId() {
- bitField0_ &= ~0x00000001;
- curSiteId = 0;
- return this;
- }
-
- /**
- * optional uint32 cur_site_id = 1;
- * @return the curSiteId
- */
- public int getCurSiteId() {
- return curSiteId;
- }
-
- /**
- * optional uint32 cur_site_id = 1;
- * @param value the curSiteId to set
- * @return this
- */
- public EnterRogueMapRoomScRsp setCurSiteId(final int value) {
- bitField0_ |= 0x00000001;
- curSiteId = value;
- return this;
- }
-
- /**
- * optional uint32 retcode = 6;
- * @return whether the retcode field is set
- */
- public boolean hasRetcode() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 10;
* @return this
*/
public EnterRogueMapRoomScRsp clearRetcode() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
retcode = 0;
return this;
}
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 10;
* @return the retcode
*/
public int getRetcode() {
@@ -112,93 +75,73 @@ public final class EnterRogueMapRoomScRspOuterClass {
}
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 10;
* @param value the retcode to set
* @return this
*/
public EnterRogueMapRoomScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
retcode = value;
return this;
}
/**
- * optional .LineupInfo lineup = 5;
- * @return whether the lineup field is set
+ * optional uint32 cur_site_id = 15;
+ * @return whether the curSiteId field is set
*/
- public boolean hasLineup() {
+ public boolean hasCurSiteId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 cur_site_id = 15;
+ * @return this
+ */
+ public EnterRogueMapRoomScRsp clearCurSiteId() {
+ bitField0_ &= ~0x00000002;
+ curSiteId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 cur_site_id = 15;
+ * @return the curSiteId
+ */
+ public int getCurSiteId() {
+ return curSiteId;
+ }
+
+ /**
+ * optional uint32 cur_site_id = 15;
+ * @param value the curSiteId to set
+ * @return this
+ */
+ public EnterRogueMapRoomScRsp setCurSiteId(final int value) {
+ bitField0_ |= 0x00000002;
+ curSiteId = value;
+ return this;
+ }
+
+ /**
+ * optional .SceneInfo scene = 5;
+ * @return whether the scene field is set
+ */
+ public boolean hasScene() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional .LineupInfo lineup = 5;
- * @return this
- */
- public EnterRogueMapRoomScRsp clearLineup() {
- bitField0_ &= ~0x00000004;
- lineup.clear();
- return this;
- }
-
- /**
- * optional .LineupInfo lineup = 5;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableLineup()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public LineupInfoOuterClass.LineupInfo getLineup() {
- return lineup;
- }
-
- /**
- * optional .LineupInfo lineup = 5;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public LineupInfoOuterClass.LineupInfo getMutableLineup() {
- bitField0_ |= 0x00000004;
- return lineup;
- }
-
- /**
- * optional .LineupInfo lineup = 5;
- * @param value the lineup to set
- * @return this
- */
- public EnterRogueMapRoomScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) {
- bitField0_ |= 0x00000004;
- lineup.copyFrom(value);
- return this;
- }
-
- /**
- * optional .SceneInfo scene = 10;
- * @return whether the scene field is set
- */
- public boolean hasScene() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional .SceneInfo scene = 10;
+ * optional .SceneInfo scene = 5;
* @return this
*/
public EnterRogueMapRoomScRsp clearScene() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000004;
scene.clear();
return this;
}
/**
- * optional .SceneInfo scene = 10;
+ * optional .SceneInfo scene = 5;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -212,7 +155,7 @@ public final class EnterRogueMapRoomScRspOuterClass {
}
/**
- * optional .SceneInfo scene = 10;
+ * optional .SceneInfo scene = 5;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -221,30 +164,87 @@ public final class EnterRogueMapRoomScRspOuterClass {
* @return internal storage object for modifications
*/
public SceneInfoOuterClass.SceneInfo getMutableScene() {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
return scene;
}
/**
- * optional .SceneInfo scene = 10;
+ * optional .SceneInfo scene = 5;
* @param value the scene to set
* @return this
*/
public EnterRogueMapRoomScRsp setScene(final SceneInfoOuterClass.SceneInfo value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
scene.copyFrom(value);
return this;
}
+ /**
+ * optional .LineupInfo lineup = 6;
+ * @return whether the lineup field is set
+ */
+ public boolean hasLineup() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional .LineupInfo lineup = 6;
+ * @return this
+ */
+ public EnterRogueMapRoomScRsp clearLineup() {
+ bitField0_ &= ~0x00000008;
+ lineup.clear();
+ return this;
+ }
+
+ /**
+ * optional .LineupInfo lineup = 6;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableLineup()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public LineupInfoOuterClass.LineupInfo getLineup() {
+ return lineup;
+ }
+
+ /**
+ * optional .LineupInfo lineup = 6;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public LineupInfoOuterClass.LineupInfo getMutableLineup() {
+ bitField0_ |= 0x00000008;
+ return lineup;
+ }
+
+ /**
+ * optional .LineupInfo lineup = 6;
+ * @param value the lineup to set
+ * @return this
+ */
+ public EnterRogueMapRoomScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) {
+ bitField0_ |= 0x00000008;
+ lineup.copyFrom(value);
+ return this;
+ }
+
@Override
public EnterRogueMapRoomScRsp copyFrom(final EnterRogueMapRoomScRsp other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- curSiteId = other.curSiteId;
retcode = other.retcode;
- lineup.copyFrom(other.lineup);
+ curSiteId = other.curSiteId;
scene.copyFrom(other.scene);
+ lineup.copyFrom(other.lineup);
}
return this;
}
@@ -255,18 +255,18 @@ public final class EnterRogueMapRoomScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasCurSiteId()) {
- setCurSiteId(other.curSiteId);
- }
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
- if (other.hasLineup()) {
- getMutableLineup().mergeFrom(other.lineup);
+ if (other.hasCurSiteId()) {
+ setCurSiteId(other.curSiteId);
}
if (other.hasScene()) {
getMutableScene().mergeFrom(other.scene);
}
+ if (other.hasLineup()) {
+ getMutableLineup().mergeFrom(other.lineup);
+ }
return this;
}
@@ -277,10 +277,10 @@ public final class EnterRogueMapRoomScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- curSiteId = 0;
retcode = 0;
- lineup.clear();
+ curSiteId = 0;
scene.clear();
+ lineup.clear();
return this;
}
@@ -291,8 +291,8 @@ public final class EnterRogueMapRoomScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- lineup.clearQuick();
scene.clearQuick();
+ lineup.clearQuick();
return this;
}
@@ -306,29 +306,29 @@ public final class EnterRogueMapRoomScRspOuterClass {
}
EnterRogueMapRoomScRsp other = (EnterRogueMapRoomScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasCurSiteId() || curSiteId == other.curSiteId)
&& (!hasRetcode() || retcode == other.retcode)
- && (!hasLineup() || lineup.equals(other.lineup))
- && (!hasScene() || scene.equals(other.scene));
+ && (!hasCurSiteId() || curSiteId == other.curSiteId)
+ && (!hasScene() || scene.equals(other.scene))
+ && (!hasLineup() || lineup.equals(other.lineup));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(curSiteId);
+ output.writeRawByte((byte) 80);
+ output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 48);
- output.writeUInt32NoTag(retcode);
+ output.writeRawByte((byte) 120);
+ output.writeUInt32NoTag(curSiteId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 42);
- output.writeMessageNoTag(lineup);
+ output.writeMessageNoTag(scene);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 82);
- output.writeMessageNoTag(scene);
+ output.writeRawByte((byte) 50);
+ output.writeMessageNoTag(lineup);
}
}
@@ -336,16 +336,16 @@ public final class EnterRogueMapRoomScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(curSiteId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(curSiteId);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(lineup);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(scene);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(scene);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(lineup);
}
return size;
}
@@ -357,18 +357,18 @@ public final class EnterRogueMapRoomScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
- // curSiteId
- curSiteId = input.readUInt32();
+ case 80: {
+ // retcode
+ retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 48) {
+ if (tag != 120) {
break;
}
}
- case 48: {
- // retcode
- retcode = input.readUInt32();
+ case 120: {
+ // curSiteId
+ curSiteId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 42) {
@@ -376,17 +376,17 @@ public final class EnterRogueMapRoomScRspOuterClass {
}
}
case 42: {
- // lineup
- input.readMessage(lineup);
+ // scene
+ input.readMessage(scene);
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 82) {
+ if (tag != 50) {
break;
}
}
- case 82: {
- // scene
- input.readMessage(scene);
+ case 50: {
+ // lineup
+ input.readMessage(lineup);
bitField0_ |= 0x00000008;
tag = input.readTag();
if (tag != 0) {
@@ -411,16 +411,16 @@ public final class EnterRogueMapRoomScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.curSiteId, curSiteId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.retcode, retcode);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeUInt32(FieldNames.curSiteId, curSiteId);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeMessage(FieldNames.lineup, lineup);
+ output.writeMessage(FieldNames.scene, scene);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeMessage(FieldNames.scene, scene);
+ output.writeMessage(FieldNames.lineup, lineup);
}
output.endObject();
}
@@ -432,11 +432,10 @@ public final class EnterRogueMapRoomScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -226037470:
- case 1245078036: {
- if (input.isAtField(FieldNames.curSiteId)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- curSiteId = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -444,10 +443,11 @@ public final class EnterRogueMapRoomScRspOuterClass {
}
break;
}
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case -226037470:
+ case 1245078036: {
+ if (input.isAtField(FieldNames.curSiteId)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ curSiteId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -455,21 +455,21 @@ public final class EnterRogueMapRoomScRspOuterClass {
}
break;
}
- case -1102671473: {
- if (input.isAtField(FieldNames.lineup)) {
- if (!input.trySkipNullValue()) {
- input.readMessage(lineup);
- bitField0_ |= 0x00000004;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 109254796: {
if (input.isAtField(FieldNames.scene)) {
if (!input.trySkipNullValue()) {
input.readMessage(scene);
+ bitField0_ |= 0x00000004;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -1102671473: {
+ if (input.isAtField(FieldNames.lineup)) {
+ if (!input.trySkipNullValue()) {
+ input.readMessage(lineup);
bitField0_ |= 0x00000008;
}
} else {
@@ -530,13 +530,13 @@ public final class EnterRogueMapRoomScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName curSiteId = FieldName.forField("curSiteId", "cur_site_id");
-
static final FieldName retcode = FieldName.forField("retcode");
- static final FieldName lineup = FieldName.forField("lineup");
+ static final FieldName curSiteId = FieldName.forField("curSiteId", "cur_site_id");
static final FieldName scene = FieldName.forField("scene");
+
+ static final FieldName lineup = FieldName.forField("lineup");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java
index 5f5e3ed..eb3679f 100644
--- a/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java
@@ -19,20 +19,20 @@ public final class EnterSceneByServerScNotifyOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .EnterSceneReason reason = 10;
+ * optional .EnterSceneReason reason = 8;
*/
private int reason;
- /**
- * optional .SceneInfo scene = 4;
- */
- private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance();
-
/**
* optional .LineupInfo lineup = 11;
*/
private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance();
+ /**
+ * optional .SceneInfo scene = 15;
+ */
+ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance();
+
private EnterSceneByServerScNotify() {
}
@@ -44,7 +44,7 @@ public final class EnterSceneByServerScNotifyOuterClass {
}
/**
- * optional .EnterSceneReason reason = 10;
+ * optional .EnterSceneReason reason = 8;
* @return whether the reason field is set
*/
public boolean hasReason() {
@@ -52,7 +52,7 @@ public final class EnterSceneByServerScNotifyOuterClass {
}
/**
- * optional .EnterSceneReason reason = 10;
+ * optional .EnterSceneReason reason = 8;
* @return this
*/
public EnterSceneByServerScNotify clearReason() {
@@ -62,7 +62,7 @@ public final class EnterSceneByServerScNotifyOuterClass {
}
/**
- * optional .EnterSceneReason reason = 10;
+ * optional .EnterSceneReason reason = 8;
* @return the reason
*/
public EnterSceneReasonOuterClass.EnterSceneReason getReason() {
@@ -95,7 +95,7 @@ public final class EnterSceneByServerScNotifyOuterClass {
}
/**
- * optional .EnterSceneReason reason = 10;
+ * optional .EnterSceneReason reason = 8;
* @param value the reason to set
* @return this
*/
@@ -106,69 +106,12 @@ public final class EnterSceneByServerScNotifyOuterClass {
return this;
}
- /**
- * optional .SceneInfo scene = 4;
- * @return whether the scene field is set
- */
- public boolean hasScene() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional .SceneInfo scene = 4;
- * @return this
- */
- public EnterSceneByServerScNotify clearScene() {
- bitField0_ &= ~0x00000002;
- scene.clear();
- return this;
- }
-
- /**
- * 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.
- *
- * Use {@link #getMutableScene()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public SceneInfoOuterClass.SceneInfo getScene() {
- return scene;
- }
-
- /**
- * 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
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public SceneInfoOuterClass.SceneInfo getMutableScene() {
- bitField0_ |= 0x00000002;
- return scene;
- }
-
- /**
- * optional .SceneInfo scene = 4;
- * @param value the scene to set
- * @return this
- */
- public EnterSceneByServerScNotify setScene(final SceneInfoOuterClass.SceneInfo value) {
- bitField0_ |= 0x00000002;
- scene.copyFrom(value);
- return this;
- }
-
/**
* optional .LineupInfo lineup = 11;
* @return whether the lineup field is set
*/
public boolean hasLineup() {
- return (bitField0_ & 0x00000004) != 0;
+ return (bitField0_ & 0x00000002) != 0;
}
/**
@@ -176,7 +119,7 @@ public final class EnterSceneByServerScNotifyOuterClass {
* @return this
*/
public EnterSceneByServerScNotify clearLineup() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
lineup.clear();
return this;
}
@@ -205,7 +148,7 @@ public final class EnterSceneByServerScNotifyOuterClass {
* @return internal storage object for modifications
*/
public LineupInfoOuterClass.LineupInfo getMutableLineup() {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
return lineup;
}
@@ -215,19 +158,76 @@ public final class EnterSceneByServerScNotifyOuterClass {
* @return this
*/
public EnterSceneByServerScNotify setLineup(final LineupInfoOuterClass.LineupInfo value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
lineup.copyFrom(value);
return this;
}
+ /**
+ * optional .SceneInfo scene = 15;
+ * @return whether the scene field is set
+ */
+ public boolean hasScene() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional .SceneInfo scene = 15;
+ * @return this
+ */
+ public EnterSceneByServerScNotify clearScene() {
+ bitField0_ &= ~0x00000004;
+ scene.clear();
+ return this;
+ }
+
+ /**
+ * 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.
+ *
+ * Use {@link #getMutableScene()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public SceneInfoOuterClass.SceneInfo getScene() {
+ return scene;
+ }
+
+ /**
+ * 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
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public SceneInfoOuterClass.SceneInfo getMutableScene() {
+ bitField0_ |= 0x00000004;
+ return scene;
+ }
+
+ /**
+ * optional .SceneInfo scene = 15;
+ * @param value the scene to set
+ * @return this
+ */
+ public EnterSceneByServerScNotify setScene(final SceneInfoOuterClass.SceneInfo value) {
+ bitField0_ |= 0x00000004;
+ scene.copyFrom(value);
+ return this;
+ }
+
@Override
public EnterSceneByServerScNotify copyFrom(final EnterSceneByServerScNotify other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
reason = other.reason;
- scene.copyFrom(other.scene);
lineup.copyFrom(other.lineup);
+ scene.copyFrom(other.scene);
}
return this;
}
@@ -241,12 +241,12 @@ public final class EnterSceneByServerScNotifyOuterClass {
if (other.hasReason()) {
setReasonValue(other.reason);
}
- if (other.hasScene()) {
- getMutableScene().mergeFrom(other.scene);
- }
if (other.hasLineup()) {
getMutableLineup().mergeFrom(other.lineup);
}
+ if (other.hasScene()) {
+ getMutableScene().mergeFrom(other.scene);
+ }
return this;
}
@@ -258,8 +258,8 @@ public final class EnterSceneByServerScNotifyOuterClass {
cachedSize = -1;
bitField0_ = 0;
reason = 0;
- scene.clear();
lineup.clear();
+ scene.clear();
return this;
}
@@ -270,8 +270,8 @@ public final class EnterSceneByServerScNotifyOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- scene.clearQuick();
lineup.clearQuick();
+ scene.clearQuick();
return this;
}
@@ -286,24 +286,24 @@ public final class EnterSceneByServerScNotifyOuterClass {
EnterSceneByServerScNotify other = (EnterSceneByServerScNotify) o;
return bitField0_ == other.bitField0_
&& (!hasReason() || reason == other.reason)
- && (!hasScene() || scene.equals(other.scene))
- && (!hasLineup() || lineup.equals(other.lineup));
+ && (!hasLineup() || lineup.equals(other.lineup))
+ && (!hasScene() || scene.equals(other.scene));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 64);
output.writeEnumNoTag(reason);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 34);
- output.writeMessageNoTag(scene);
- }
- if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 90);
output.writeMessageNoTag(lineup);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 122);
+ output.writeMessageNoTag(scene);
+ }
}
@Override
@@ -313,10 +313,10 @@ public final class EnterSceneByServerScNotifyOuterClass {
size += 1 + ProtoSink.computeEnumSizeNoTag(reason);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(scene);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(lineup);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(lineup);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(scene);
}
return size;
}
@@ -328,7 +328,7 @@ public final class EnterSceneByServerScNotifyOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 80: {
+ case 64: {
// reason
final int value = input.readInt32();
if (EnterSceneReasonOuterClass.EnterSceneReason.forNumber(value) != null) {
@@ -336,15 +336,6 @@ public final class EnterSceneByServerScNotifyOuterClass {
bitField0_ |= 0x00000001;
}
tag = input.readTag();
- if (tag != 34) {
- break;
- }
- }
- case 34: {
- // scene
- input.readMessage(scene);
- bitField0_ |= 0x00000002;
- tag = input.readTag();
if (tag != 90) {
break;
}
@@ -352,6 +343,15 @@ public final class EnterSceneByServerScNotifyOuterClass {
case 90: {
// lineup
input.readMessage(lineup);
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 122) {
+ break;
+ }
+ }
+ case 122: {
+ // scene
+ input.readMessage(scene);
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 0) {
@@ -379,10 +379,10 @@ public final class EnterSceneByServerScNotifyOuterClass {
output.writeEnum(FieldNames.reason, reason, EnterSceneReasonOuterClass.EnterSceneReason.converter());
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeMessage(FieldNames.scene, scene);
+ output.writeMessage(FieldNames.lineup, lineup);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeMessage(FieldNames.lineup, lineup);
+ output.writeMessage(FieldNames.scene, scene);
}
output.endObject();
}
@@ -410,10 +410,10 @@ public final class EnterSceneByServerScNotifyOuterClass {
}
break;
}
- case 109254796: {
- if (input.isAtField(FieldNames.scene)) {
+ case -1102671473: {
+ if (input.isAtField(FieldNames.lineup)) {
if (!input.trySkipNullValue()) {
- input.readMessage(scene);
+ input.readMessage(lineup);
bitField0_ |= 0x00000002;
}
} else {
@@ -421,10 +421,10 @@ public final class EnterSceneByServerScNotifyOuterClass {
}
break;
}
- case -1102671473: {
- if (input.isAtField(FieldNames.lineup)) {
+ case 109254796: {
+ if (input.isAtField(FieldNames.scene)) {
if (!input.trySkipNullValue()) {
- input.readMessage(lineup);
+ input.readMessage(scene);
bitField0_ |= 0x00000004;
}
} else {
@@ -487,9 +487,9 @@ public final class EnterSceneByServerScNotifyOuterClass {
static class FieldNames {
static final FieldName reason = FieldName.forField("reason");
- static final FieldName scene = FieldName.forField("scene");
-
static final FieldName lineup = FieldName.forField("lineup");
+
+ static final FieldName scene = FieldName.forField("scene");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java
index a57eca9..e6dbb7a 100644
--- a/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java
@@ -24,7 +24,7 @@ public final class EnterSceneCsReqOuterClass {
private int entryId;
/**
- * optional uint32 teleport_id = 8;
+ * optional uint32 teleport_id = 13;
*/
private int teleportId;
@@ -76,7 +76,7 @@ public final class EnterSceneCsReqOuterClass {
}
/**
- * optional uint32 teleport_id = 8;
+ * optional uint32 teleport_id = 13;
* @return whether the teleportId field is set
*/
public boolean hasTeleportId() {
@@ -84,7 +84,7 @@ public final class EnterSceneCsReqOuterClass {
}
/**
- * optional uint32 teleport_id = 8;
+ * optional uint32 teleport_id = 13;
* @return this
*/
public EnterSceneCsReq clearTeleportId() {
@@ -94,7 +94,7 @@ public final class EnterSceneCsReqOuterClass {
}
/**
- * optional uint32 teleport_id = 8;
+ * optional uint32 teleport_id = 13;
* @return the teleportId
*/
public int getTeleportId() {
@@ -102,7 +102,7 @@ public final class EnterSceneCsReqOuterClass {
}
/**
- * optional uint32 teleport_id = 8;
+ * optional uint32 teleport_id = 13;
* @param value the teleportId to set
* @return this
*/
@@ -181,7 +181,7 @@ public final class EnterSceneCsReqOuterClass {
output.writeUInt32NoTag(entryId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 104);
output.writeUInt32NoTag(teleportId);
}
}
@@ -210,11 +210,11 @@ public final class EnterSceneCsReqOuterClass {
entryId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 64) {
+ if (tag != 104) {
break;
}
}
- case 64: {
+ case 104: {
// teleportId
teleportId = input.readUInt32();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java
index c0dd88f..103b0a3 100644
--- a/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java
@@ -19,12 +19,12 @@ public final class EnteredSceneInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 plane_id = 9;
+ * optional uint32 plane_id = 7;
*/
private int planeId;
/**
- * optional uint32 floor_id = 12;
+ * optional uint32 floor_id = 13;
*/
private int floorId;
@@ -39,7 +39,7 @@ public final class EnteredSceneInfoOuterClass {
}
/**
- * optional uint32 plane_id = 9;
+ * optional uint32 plane_id = 7;
* @return whether the planeId field is set
*/
public boolean hasPlaneId() {
@@ -47,7 +47,7 @@ public final class EnteredSceneInfoOuterClass {
}
/**
- * optional uint32 plane_id = 9;
+ * optional uint32 plane_id = 7;
* @return this
*/
public EnteredSceneInfo clearPlaneId() {
@@ -57,7 +57,7 @@ public final class EnteredSceneInfoOuterClass {
}
/**
- * optional uint32 plane_id = 9;
+ * optional uint32 plane_id = 7;
* @return the planeId
*/
public int getPlaneId() {
@@ -65,7 +65,7 @@ public final class EnteredSceneInfoOuterClass {
}
/**
- * optional uint32 plane_id = 9;
+ * optional uint32 plane_id = 7;
* @param value the planeId to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class EnteredSceneInfoOuterClass {
}
/**
- * optional uint32 floor_id = 12;
+ * optional uint32 floor_id = 13;
* @return whether the floorId field is set
*/
public boolean hasFloorId() {
@@ -84,7 +84,7 @@ public final class EnteredSceneInfoOuterClass {
}
/**
- * optional uint32 floor_id = 12;
+ * optional uint32 floor_id = 13;
* @return this
*/
public EnteredSceneInfo clearFloorId() {
@@ -94,7 +94,7 @@ public final class EnteredSceneInfoOuterClass {
}
/**
- * optional uint32 floor_id = 12;
+ * optional uint32 floor_id = 13;
* @return the floorId
*/
public int getFloorId() {
@@ -102,7 +102,7 @@ public final class EnteredSceneInfoOuterClass {
}
/**
- * optional uint32 floor_id = 12;
+ * optional uint32 floor_id = 13;
* @param value the floorId to set
* @return this
*/
@@ -177,11 +177,11 @@ public final class EnteredSceneInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(planeId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 104);
output.writeUInt32NoTag(floorId);
}
}
@@ -205,16 +205,16 @@ public final class EnteredSceneInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 72: {
+ case 56: {
// planeId
planeId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 104) {
break;
}
}
- case 96: {
+ case 104: {
// floorId
floorId = input.readUInt32();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java
index c2dad54..fd15fe0 100644
--- a/src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java
@@ -19,17 +19,17 @@ public final class EntityBuffChangeInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 remove_buff_id = 8;
+ * optional uint32 remove_buff_id = 2;
*/
private int removeBuffId;
/**
- * optional uint32 entity_id = 15;
+ * optional uint32 entity_id = 10;
*/
private int entityId;
/**
- * optional .BuffInfo add_buff_info = 2;
+ * optional .BuffInfo add_buff_info = 7;
*/
private final BuffInfoOuterClass.BuffInfo addBuffInfo = BuffInfoOuterClass.BuffInfo.newInstance();
@@ -44,7 +44,7 @@ public final class EntityBuffChangeInfoOuterClass {
}
/**
- * optional uint32 remove_buff_id = 8;
+ * optional uint32 remove_buff_id = 2;
* @return whether the removeBuffId field is set
*/
public boolean hasRemoveBuffId() {
@@ -52,7 +52,7 @@ public final class EntityBuffChangeInfoOuterClass {
}
/**
- * optional uint32 remove_buff_id = 8;
+ * optional uint32 remove_buff_id = 2;
* @return this
*/
public EntityBuffChangeInfo clearRemoveBuffId() {
@@ -62,7 +62,7 @@ public final class EntityBuffChangeInfoOuterClass {
}
/**
- * optional uint32 remove_buff_id = 8;
+ * optional uint32 remove_buff_id = 2;
* @return the removeBuffId
*/
public int getRemoveBuffId() {
@@ -70,7 +70,7 @@ public final class EntityBuffChangeInfoOuterClass {
}
/**
- * optional uint32 remove_buff_id = 8;
+ * optional uint32 remove_buff_id = 2;
* @param value the removeBuffId to set
* @return this
*/
@@ -81,7 +81,7 @@ public final class EntityBuffChangeInfoOuterClass {
}
/**
- * optional uint32 entity_id = 15;
+ * optional uint32 entity_id = 10;
* @return whether the entityId field is set
*/
public boolean hasEntityId() {
@@ -89,7 +89,7 @@ public final class EntityBuffChangeInfoOuterClass {
}
/**
- * optional uint32 entity_id = 15;
+ * optional uint32 entity_id = 10;
* @return this
*/
public EntityBuffChangeInfo clearEntityId() {
@@ -99,7 +99,7 @@ public final class EntityBuffChangeInfoOuterClass {
}
/**
- * optional uint32 entity_id = 15;
+ * optional uint32 entity_id = 10;
* @return the entityId
*/
public int getEntityId() {
@@ -107,7 +107,7 @@ public final class EntityBuffChangeInfoOuterClass {
}
/**
- * optional uint32 entity_id = 15;
+ * optional uint32 entity_id = 10;
* @param value the entityId to set
* @return this
*/
@@ -118,7 +118,7 @@ public final class EntityBuffChangeInfoOuterClass {
}
/**
- * optional .BuffInfo add_buff_info = 2;
+ * optional .BuffInfo add_buff_info = 7;
* @return whether the addBuffInfo field is set
*/
public boolean hasAddBuffInfo() {
@@ -126,7 +126,7 @@ public final class EntityBuffChangeInfoOuterClass {
}
/**
- * optional .BuffInfo add_buff_info = 2;
+ * optional .BuffInfo add_buff_info = 7;
* @return this
*/
public EntityBuffChangeInfo clearAddBuffInfo() {
@@ -136,7 +136,7 @@ public final class EntityBuffChangeInfoOuterClass {
}
/**
- * optional .BuffInfo add_buff_info = 2;
+ * optional .BuffInfo add_buff_info = 7;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -150,7 +150,7 @@ public final class EntityBuffChangeInfoOuterClass {
}
/**
- * optional .BuffInfo add_buff_info = 2;
+ * optional .BuffInfo add_buff_info = 7;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -164,7 +164,7 @@ public final class EntityBuffChangeInfoOuterClass {
}
/**
- * optional .BuffInfo add_buff_info = 2;
+ * optional .BuffInfo add_buff_info = 7;
* @param value the addBuffInfo to set
* @return this
*/
@@ -246,15 +246,15 @@ public final class EntityBuffChangeInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(removeBuffId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(entityId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 18);
+ output.writeRawByte((byte) 58);
output.writeMessageNoTag(addBuffInfo);
}
}
@@ -281,25 +281,25 @@ public final class EntityBuffChangeInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 64: {
+ case 16: {
// removeBuffId
removeBuffId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 80) {
break;
}
}
- case 120: {
+ case 80: {
// entityId
entityId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 18) {
+ if (tag != 58) {
break;
}
}
- case 18: {
+ case 58: {
// addBuffInfo
input.readMessage(addBuffInfo);
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/EntityBuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/EntityBuffInfoOuterClass.java
index b153d23..21b9e1c 100644
--- a/src/generated/main/emu/lunarcore/proto/EntityBuffInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EntityBuffInfoOuterClass.java
@@ -20,12 +20,12 @@ public final class EntityBuffInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 entity_id = 6;
+ * optional uint32 entity_id = 5;
*/
private int entityId;
/**
- * repeated .BuffInfo buff_list = 11;
+ * repeated .BuffInfo buff_list = 15;
*/
private final RepeatedMessageoptional uint32 entity_id = 6;
+ * optional uint32 entity_id = 5;
* @return whether the entityId field is set
*/
public boolean hasEntityId() {
@@ -48,7 +48,7 @@ public final class EntityBuffInfoOuterClass {
}
/**
- * optional uint32 entity_id = 6;
+ * optional uint32 entity_id = 5;
* @return this
*/
public EntityBuffInfo clearEntityId() {
@@ -58,7 +58,7 @@ public final class EntityBuffInfoOuterClass {
}
/**
- * optional uint32 entity_id = 6;
+ * optional uint32 entity_id = 5;
* @return the entityId
*/
public int getEntityId() {
@@ -66,7 +66,7 @@ public final class EntityBuffInfoOuterClass {
}
/**
- * optional uint32 entity_id = 6;
+ * optional uint32 entity_id = 5;
* @param value the entityId to set
* @return this
*/
@@ -77,7 +77,7 @@ public final class EntityBuffInfoOuterClass {
}
/**
- * repeated .BuffInfo buff_list = 11;
+ * repeated .BuffInfo buff_list = 15;
* @return whether the buffList field is set
*/
public boolean hasBuffList() {
@@ -85,7 +85,7 @@ public final class EntityBuffInfoOuterClass {
}
/**
- * repeated .BuffInfo buff_list = 11;
+ * repeated .BuffInfo buff_list = 15;
* @return this
*/
public EntityBuffInfo clearBuffList() {
@@ -95,7 +95,7 @@ public final class EntityBuffInfoOuterClass {
}
/**
- * repeated .BuffInfo buff_list = 11;
+ * repeated .BuffInfo buff_list = 15;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class EntityBuffInfoOuterClass {
}
/**
- * repeated .BuffInfo buff_list = 11;
+ * repeated .BuffInfo buff_list = 15;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public final class EntityBuffInfoOuterClass {
}
/**
- * repeated .BuffInfo buff_list = 11;
+ * repeated .BuffInfo buff_list = 15;
* @param value the buffList to add
* @return this
*/
@@ -134,7 +134,7 @@ public final class EntityBuffInfoOuterClass {
}
/**
- * repeated .BuffInfo buff_list = 11;
+ * repeated .BuffInfo buff_list = 15;
* @param values the buffList to add
* @return this
*/
@@ -210,12 +210,12 @@ public final class EntityBuffInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(entityId);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < buffList.length(); i++) {
- output.writeRawByte((byte) 90);
+ output.writeRawByte((byte) 122);
output.writeMessageNoTag(buffList.get(i));
}
}
@@ -240,16 +240,16 @@ public final class EntityBuffInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 48: {
+ case 40: {
// entityId
entityId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 90) {
+ if (tag != 122) {
break;
}
}
- case 90: {
+ case 122: {
// buffList
tag = input.readRepeatedMessage(buffList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java b/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java
index 6416d46..5897bd7 100644
--- a/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java
@@ -19,17 +19,17 @@ public final class EntityMotionOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 map_layer = 1;
- */
- private int mapLayer;
-
- /**
- * optional uint32 entity_id = 2;
+ * optional uint32 entity_id = 4;
*/
private int entityId;
/**
- * optional .MotionInfo motion = 6;
+ * optional uint32 map_layer = 12;
+ */
+ private int mapLayer;
+
+ /**
+ * optional .MotionInfo motion = 1;
*/
private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance();
@@ -44,62 +44,25 @@ public final class EntityMotionOuterClass {
}
/**
- * optional uint32 map_layer = 1;
- * @return whether the mapLayer field is set
+ * optional uint32 entity_id = 4;
+ * @return whether the entityId field is set
*/
- public boolean hasMapLayer() {
+ public boolean hasEntityId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 map_layer = 1;
- * @return this
- */
- public EntityMotion clearMapLayer() {
- bitField0_ &= ~0x00000001;
- mapLayer = 0;
- return this;
- }
-
- /**
- * optional uint32 map_layer = 1;
- * @return the mapLayer
- */
- public int getMapLayer() {
- return mapLayer;
- }
-
- /**
- * optional uint32 map_layer = 1;
- * @param value the mapLayer to set
- * @return this
- */
- public EntityMotion setMapLayer(final int value) {
- bitField0_ |= 0x00000001;
- mapLayer = value;
- return this;
- }
-
- /**
- * optional uint32 entity_id = 2;
- * @return whether the entityId field is set
- */
- public boolean hasEntityId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 entity_id = 2;
+ * optional uint32 entity_id = 4;
* @return this
*/
public EntityMotion clearEntityId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
entityId = 0;
return this;
}
/**
- * optional uint32 entity_id = 2;
+ * optional uint32 entity_id = 4;
* @return the entityId
*/
public int getEntityId() {
@@ -107,18 +70,55 @@ public final class EntityMotionOuterClass {
}
/**
- * optional uint32 entity_id = 2;
+ * optional uint32 entity_id = 4;
* @param value the entityId to set
* @return this
*/
public EntityMotion setEntityId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
entityId = value;
return this;
}
/**
- * optional .MotionInfo motion = 6;
+ * optional uint32 map_layer = 12;
+ * @return whether the mapLayer field is set
+ */
+ public boolean hasMapLayer() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 map_layer = 12;
+ * @return this
+ */
+ public EntityMotion clearMapLayer() {
+ bitField0_ &= ~0x00000002;
+ mapLayer = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 map_layer = 12;
+ * @return the mapLayer
+ */
+ public int getMapLayer() {
+ return mapLayer;
+ }
+
+ /**
+ * optional uint32 map_layer = 12;
+ * @param value the mapLayer to set
+ * @return this
+ */
+ public EntityMotion setMapLayer(final int value) {
+ bitField0_ |= 0x00000002;
+ mapLayer = value;
+ return this;
+ }
+
+ /**
+ * optional .MotionInfo motion = 1;
* @return whether the motion field is set
*/
public boolean hasMotion() {
@@ -126,7 +126,7 @@ public final class EntityMotionOuterClass {
}
/**
- * optional .MotionInfo motion = 6;
+ * optional .MotionInfo motion = 1;
* @return this
*/
public EntityMotion clearMotion() {
@@ -136,7 +136,7 @@ public final class EntityMotionOuterClass {
}
/**
- * optional .MotionInfo motion = 6;
+ * optional .MotionInfo motion = 1;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -150,7 +150,7 @@ public final class EntityMotionOuterClass {
}
/**
- * optional .MotionInfo motion = 6;
+ * optional .MotionInfo motion = 1;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -164,7 +164,7 @@ public final class EntityMotionOuterClass {
}
/**
- * optional .MotionInfo motion = 6;
+ * optional .MotionInfo motion = 1;
* @param value the motion to set
* @return this
*/
@@ -179,8 +179,8 @@ public final class EntityMotionOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- mapLayer = other.mapLayer;
entityId = other.entityId;
+ mapLayer = other.mapLayer;
motion.copyFrom(other.motion);
}
return this;
@@ -192,12 +192,12 @@ public final class EntityMotionOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasMapLayer()) {
- setMapLayer(other.mapLayer);
- }
if (other.hasEntityId()) {
setEntityId(other.entityId);
}
+ if (other.hasMapLayer()) {
+ setMapLayer(other.mapLayer);
+ }
if (other.hasMotion()) {
getMutableMotion().mergeFrom(other.motion);
}
@@ -211,8 +211,8 @@ public final class EntityMotionOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- mapLayer = 0;
entityId = 0;
+ mapLayer = 0;
motion.clear();
return this;
}
@@ -238,23 +238,23 @@ public final class EntityMotionOuterClass {
}
EntityMotion other = (EntityMotion) o;
return bitField0_ == other.bitField0_
- && (!hasMapLayer() || mapLayer == other.mapLayer)
&& (!hasEntityId() || entityId == other.entityId)
+ && (!hasMapLayer() || mapLayer == other.mapLayer)
&& (!hasMotion() || motion.equals(other.motion));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(mapLayer);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(entityId);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 96);
+ output.writeUInt32NoTag(mapLayer);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 50);
+ output.writeRawByte((byte) 10);
output.writeMessageNoTag(motion);
}
}
@@ -263,10 +263,10 @@ public final class EntityMotionOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(mapLayer);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(mapLayer);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(motion);
@@ -281,25 +281,25 @@ public final class EntityMotionOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
- // mapLayer
- mapLayer = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 16) {
- break;
- }
- }
- case 16: {
+ case 32: {
// entityId
entityId = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 50) {
+ if (tag != 96) {
break;
}
}
- case 50: {
+ case 96: {
+ // mapLayer
+ mapLayer = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 10) {
+ break;
+ }
+ }
+ case 10: {
// motion
input.readMessage(motion);
bitField0_ |= 0x00000004;
@@ -326,10 +326,10 @@ public final class EntityMotionOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.mapLayer, mapLayer);
+ output.writeUInt32(FieldNames.entityId, entityId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.entityId, entityId);
+ output.writeUInt32(FieldNames.mapLayer, mapLayer);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeMessage(FieldNames.motion, motion);
@@ -344,11 +344,11 @@ public final class EntityMotionOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- 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_ |= 0x00000001;
}
} else {
@@ -356,11 +356,11 @@ public final class EntityMotionOuterClass {
}
break;
}
- 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_ |= 0x00000002;
}
} else {
@@ -431,10 +431,10 @@ public final class EntityMotionOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName mapLayer = FieldName.forField("mapLayer", "map_layer");
-
static final FieldName entityId = FieldName.forField("entityId", "entity_id");
+ static final FieldName mapLayer = FieldName.forField("mapLayer", "map_layer");
+
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 bd06fa2..d5df1f5 100644
--- a/src/generated/main/emu/lunarcore/proto/EquipRelicOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EquipRelicOuterClass.java
@@ -19,12 +19,12 @@ public final class EquipRelicOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 slot = 8;
+ * optional uint32 slot = 4;
*/
private int slot;
/**
- * optional uint32 relic_unique_id = 15;
+ * optional uint32 relic_unique_id = 11;
*/
private int relicUniqueId;
@@ -39,7 +39,7 @@ public final class EquipRelicOuterClass {
}
/**
- * optional uint32 slot = 8;
+ * optional uint32 slot = 4;
* @return whether the slot field is set
*/
public boolean hasSlot() {
@@ -47,7 +47,7 @@ public final class EquipRelicOuterClass {
}
/**
- * optional uint32 slot = 8;
+ * optional uint32 slot = 4;
* @return this
*/
public EquipRelic clearSlot() {
@@ -57,7 +57,7 @@ public final class EquipRelicOuterClass {
}
/**
- * optional uint32 slot = 8;
+ * optional uint32 slot = 4;
* @return the slot
*/
public int getSlot() {
@@ -65,7 +65,7 @@ public final class EquipRelicOuterClass {
}
/**
- * optional uint32 slot = 8;
+ * optional uint32 slot = 4;
* @param value the slot to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class EquipRelicOuterClass {
}
/**
- * optional uint32 relic_unique_id = 15;
+ * optional uint32 relic_unique_id = 11;
* @return whether the relicUniqueId field is set
*/
public boolean hasRelicUniqueId() {
@@ -84,7 +84,7 @@ public final class EquipRelicOuterClass {
}
/**
- * optional uint32 relic_unique_id = 15;
+ * optional uint32 relic_unique_id = 11;
* @return this
*/
public EquipRelic clearRelicUniqueId() {
@@ -94,7 +94,7 @@ public final class EquipRelicOuterClass {
}
/**
- * optional uint32 relic_unique_id = 15;
+ * optional uint32 relic_unique_id = 11;
* @return the relicUniqueId
*/
public int getRelicUniqueId() {
@@ -102,7 +102,7 @@ public final class EquipRelicOuterClass {
}
/**
- * optional uint32 relic_unique_id = 15;
+ * optional uint32 relic_unique_id = 11;
* @param value the relicUniqueId to set
* @return this
*/
@@ -177,11 +177,11 @@ public final class EquipRelicOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(slot);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(relicUniqueId);
}
}
@@ -205,16 +205,16 @@ public final class EquipRelicOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 64: {
+ case 32: {
// slot
slot = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 88) {
break;
}
}
- case 120: {
+ case 88: {
// relicUniqueId
relicUniqueId = input.readUInt32();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java b/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java
index b714b52..d927aa0 100644
--- a/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java
@@ -19,42 +19,47 @@ public final class EquipmentOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 rank = 2;
- */
- private int rank;
-
- /**
- * optional uint32 base_avatar_id = 4;
- */
- private int baseAvatarId;
-
- /**
- * optional uint32 unique_id = 5;
- */
- private int uniqueId;
-
- /**
- * optional uint32 tid = 8;
+ * optional uint32 tid = 2;
*/
private int tid;
/**
- * optional uint32 level = 12;
+ * optional uint32 level = 3;
*/
private int level;
/**
- * optional uint32 exp = 14;
- */
- private int exp;
-
- /**
- * optional uint32 promotion = 15;
+ * optional uint32 promotion = 5;
*/
private int promotion;
/**
- * optional bool is_protected = 1;
+ * optional uint32 equip_avatar_id = 6;
+ */
+ private int equipAvatarId;
+
+ /**
+ * optional uint32 exp = 7;
+ */
+ private int exp;
+
+ /**
+ * optional uint32 unique_id = 8;
+ */
+ private int uniqueId;
+
+ /**
+ * optional uint32 rank = 13;
+ */
+ private int rank;
+
+ /**
+ * optional uint32 base_avatar_id = 14;
+ */
+ private int baseAvatarId;
+
+ /**
+ * optional bool is_protected = 12;
*/
private boolean isProtected;
@@ -69,136 +74,25 @@ public final class EquipmentOuterClass {
}
/**
- * optional uint32 rank = 2;
- * @return whether the rank field is set
+ * optional uint32 tid = 2;
+ * @return whether the tid field is set
*/
- public boolean hasRank() {
+ public boolean hasTid() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 rank = 2;
- * @return this
- */
- public Equipment clearRank() {
- bitField0_ &= ~0x00000001;
- rank = 0;
- return this;
- }
-
- /**
- * optional uint32 rank = 2;
- * @return the rank
- */
- public int getRank() {
- return rank;
- }
-
- /**
- * optional uint32 rank = 2;
- * @param value the rank to set
- * @return this
- */
- public Equipment setRank(final int value) {
- bitField0_ |= 0x00000001;
- rank = value;
- return this;
- }
-
- /**
- * optional uint32 base_avatar_id = 4;
- * @return whether the baseAvatarId field is set
- */
- public boolean hasBaseAvatarId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 base_avatar_id = 4;
- * @return this
- */
- public Equipment clearBaseAvatarId() {
- bitField0_ &= ~0x00000002;
- baseAvatarId = 0;
- return this;
- }
-
- /**
- * optional uint32 base_avatar_id = 4;
- * @return the baseAvatarId
- */
- public int getBaseAvatarId() {
- return baseAvatarId;
- }
-
- /**
- * optional uint32 base_avatar_id = 4;
- * @param value the baseAvatarId to set
- * @return this
- */
- public Equipment setBaseAvatarId(final int value) {
- bitField0_ |= 0x00000002;
- baseAvatarId = value;
- return this;
- }
-
- /**
- * optional uint32 unique_id = 5;
- * @return whether the uniqueId field is set
- */
- public boolean hasUniqueId() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 unique_id = 5;
- * @return this
- */
- public Equipment clearUniqueId() {
- bitField0_ &= ~0x00000004;
- uniqueId = 0;
- return this;
- }
-
- /**
- * optional uint32 unique_id = 5;
- * @return the uniqueId
- */
- public int getUniqueId() {
- return uniqueId;
- }
-
- /**
- * optional uint32 unique_id = 5;
- * @param value the uniqueId to set
- * @return this
- */
- public Equipment setUniqueId(final int value) {
- bitField0_ |= 0x00000004;
- uniqueId = value;
- return this;
- }
-
- /**
- * optional uint32 tid = 8;
- * @return whether the tid field is set
- */
- public boolean hasTid() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional uint32 tid = 8;
+ * optional uint32 tid = 2;
* @return this
*/
public Equipment clearTid() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000001;
tid = 0;
return this;
}
/**
- * optional uint32 tid = 8;
+ * optional uint32 tid = 2;
* @return the tid
*/
public int getTid() {
@@ -206,36 +100,36 @@ public final class EquipmentOuterClass {
}
/**
- * optional uint32 tid = 8;
+ * optional uint32 tid = 2;
* @param value the tid to set
* @return this
*/
public Equipment setTid(final int value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000001;
tid = value;
return this;
}
/**
- * optional uint32 level = 12;
+ * optional uint32 level = 3;
* @return whether the level field is set
*/
public boolean hasLevel() {
- return (bitField0_ & 0x00000010) != 0;
+ return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 level = 12;
+ * optional uint32 level = 3;
* @return this
*/
public Equipment clearLevel() {
- bitField0_ &= ~0x00000010;
+ bitField0_ &= ~0x00000002;
level = 0;
return this;
}
/**
- * optional uint32 level = 12;
+ * optional uint32 level = 3;
* @return the level
*/
public int getLevel() {
@@ -243,73 +137,36 @@ public final class EquipmentOuterClass {
}
/**
- * optional uint32 level = 12;
+ * optional uint32 level = 3;
* @param value the level to set
* @return this
*/
public Equipment setLevel(final int value) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000002;
level = value;
return this;
}
/**
- * optional uint32 exp = 14;
- * @return whether the exp field is set
- */
- public boolean hasExp() {
- return (bitField0_ & 0x00000020) != 0;
- }
-
- /**
- * optional uint32 exp = 14;
- * @return this
- */
- public Equipment clearExp() {
- bitField0_ &= ~0x00000020;
- exp = 0;
- return this;
- }
-
- /**
- * optional uint32 exp = 14;
- * @return the exp
- */
- public int getExp() {
- return exp;
- }
-
- /**
- * optional uint32 exp = 14;
- * @param value the exp to set
- * @return this
- */
- public Equipment setExp(final int value) {
- bitField0_ |= 0x00000020;
- exp = value;
- return this;
- }
-
- /**
- * optional uint32 promotion = 15;
+ * optional uint32 promotion = 5;
* @return whether the promotion field is set
*/
public boolean hasPromotion() {
- return (bitField0_ & 0x00000040) != 0;
+ return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 promotion = 15;
+ * optional uint32 promotion = 5;
* @return this
*/
public Equipment clearPromotion() {
- bitField0_ &= ~0x00000040;
+ bitField0_ &= ~0x00000004;
promotion = 0;
return this;
}
/**
- * optional uint32 promotion = 15;
+ * optional uint32 promotion = 5;
* @return the promotion
*/
public int getPromotion() {
@@ -317,36 +174,221 @@ public final class EquipmentOuterClass {
}
/**
- * optional uint32 promotion = 15;
+ * optional uint32 promotion = 5;
* @param value the promotion to set
* @return this
*/
public Equipment setPromotion(final int value) {
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000004;
promotion = value;
return this;
}
/**
- * optional bool is_protected = 1;
- * @return whether the isProtected field is set
+ * optional uint32 equip_avatar_id = 6;
+ * @return whether the equipAvatarId field is set
*/
- public boolean hasIsProtected() {
+ public boolean hasEquipAvatarId() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional uint32 equip_avatar_id = 6;
+ * @return this
+ */
+ public Equipment clearEquipAvatarId() {
+ bitField0_ &= ~0x00000008;
+ equipAvatarId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 equip_avatar_id = 6;
+ * @return the equipAvatarId
+ */
+ public int getEquipAvatarId() {
+ return equipAvatarId;
+ }
+
+ /**
+ * optional uint32 equip_avatar_id = 6;
+ * @param value the equipAvatarId to set
+ * @return this
+ */
+ public Equipment setEquipAvatarId(final int value) {
+ bitField0_ |= 0x00000008;
+ equipAvatarId = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 exp = 7;
+ * @return whether the exp field is set
+ */
+ public boolean hasExp() {
+ return (bitField0_ & 0x00000010) != 0;
+ }
+
+ /**
+ * optional uint32 exp = 7;
+ * @return this
+ */
+ public Equipment clearExp() {
+ bitField0_ &= ~0x00000010;
+ exp = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 exp = 7;
+ * @return the exp
+ */
+ public int getExp() {
+ return exp;
+ }
+
+ /**
+ * optional uint32 exp = 7;
+ * @param value the exp to set
+ * @return this
+ */
+ public Equipment setExp(final int value) {
+ bitField0_ |= 0x00000010;
+ exp = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 unique_id = 8;
+ * @return whether the uniqueId field is set
+ */
+ public boolean hasUniqueId() {
+ return (bitField0_ & 0x00000020) != 0;
+ }
+
+ /**
+ * optional uint32 unique_id = 8;
+ * @return this
+ */
+ public Equipment clearUniqueId() {
+ bitField0_ &= ~0x00000020;
+ uniqueId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 unique_id = 8;
+ * @return the uniqueId
+ */
+ public int getUniqueId() {
+ return uniqueId;
+ }
+
+ /**
+ * optional uint32 unique_id = 8;
+ * @param value the uniqueId to set
+ * @return this
+ */
+ public Equipment setUniqueId(final int value) {
+ bitField0_ |= 0x00000020;
+ uniqueId = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 rank = 13;
+ * @return whether the rank field is set
+ */
+ public boolean hasRank() {
+ return (bitField0_ & 0x00000040) != 0;
+ }
+
+ /**
+ * optional uint32 rank = 13;
+ * @return this
+ */
+ public Equipment clearRank() {
+ bitField0_ &= ~0x00000040;
+ rank = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 rank = 13;
+ * @return the rank
+ */
+ public int getRank() {
+ return rank;
+ }
+
+ /**
+ * optional uint32 rank = 13;
+ * @param value the rank to set
+ * @return this
+ */
+ public Equipment setRank(final int value) {
+ bitField0_ |= 0x00000040;
+ rank = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 base_avatar_id = 14;
+ * @return whether the baseAvatarId field is set
+ */
+ public boolean hasBaseAvatarId() {
return (bitField0_ & 0x00000080) != 0;
}
/**
- * optional bool is_protected = 1;
+ * optional uint32 base_avatar_id = 14;
+ * @return this
+ */
+ public Equipment clearBaseAvatarId() {
+ bitField0_ &= ~0x00000080;
+ baseAvatarId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 base_avatar_id = 14;
+ * @return the baseAvatarId
+ */
+ public int getBaseAvatarId() {
+ return baseAvatarId;
+ }
+
+ /**
+ * optional uint32 base_avatar_id = 14;
+ * @param value the baseAvatarId to set
+ * @return this
+ */
+ public Equipment setBaseAvatarId(final int value) {
+ bitField0_ |= 0x00000080;
+ baseAvatarId = value;
+ return this;
+ }
+
+ /**
+ * optional bool is_protected = 12;
+ * @return whether the isProtected field is set
+ */
+ public boolean hasIsProtected() {
+ return (bitField0_ & 0x00000100) != 0;
+ }
+
+ /**
+ * optional bool is_protected = 12;
* @return this
*/
public Equipment clearIsProtected() {
- bitField0_ &= ~0x00000080;
+ bitField0_ &= ~0x00000100;
isProtected = false;
return this;
}
/**
- * optional bool is_protected = 1;
+ * optional bool is_protected = 12;
* @return the isProtected
*/
public boolean getIsProtected() {
@@ -354,12 +396,12 @@ public final class EquipmentOuterClass {
}
/**
- * optional bool is_protected = 1;
+ * optional bool is_protected = 12;
* @param value the isProtected to set
* @return this
*/
public Equipment setIsProtected(final boolean value) {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000100;
isProtected = value;
return this;
}
@@ -369,13 +411,14 @@ public final class EquipmentOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- rank = other.rank;
- baseAvatarId = other.baseAvatarId;
- uniqueId = other.uniqueId;
tid = other.tid;
level = other.level;
- exp = other.exp;
promotion = other.promotion;
+ equipAvatarId = other.equipAvatarId;
+ exp = other.exp;
+ uniqueId = other.uniqueId;
+ rank = other.rank;
+ baseAvatarId = other.baseAvatarId;
isProtected = other.isProtected;
}
return this;
@@ -387,26 +430,29 @@ public final class EquipmentOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasRank()) {
- setRank(other.rank);
- }
- if (other.hasBaseAvatarId()) {
- setBaseAvatarId(other.baseAvatarId);
- }
- if (other.hasUniqueId()) {
- setUniqueId(other.uniqueId);
- }
if (other.hasTid()) {
setTid(other.tid);
}
if (other.hasLevel()) {
setLevel(other.level);
}
+ if (other.hasPromotion()) {
+ setPromotion(other.promotion);
+ }
+ if (other.hasEquipAvatarId()) {
+ setEquipAvatarId(other.equipAvatarId);
+ }
if (other.hasExp()) {
setExp(other.exp);
}
- if (other.hasPromotion()) {
- setPromotion(other.promotion);
+ if (other.hasUniqueId()) {
+ setUniqueId(other.uniqueId);
+ }
+ if (other.hasRank()) {
+ setRank(other.rank);
+ }
+ if (other.hasBaseAvatarId()) {
+ setBaseAvatarId(other.baseAvatarId);
}
if (other.hasIsProtected()) {
setIsProtected(other.isProtected);
@@ -421,13 +467,14 @@ public final class EquipmentOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- rank = 0;
- baseAvatarId = 0;
- uniqueId = 0;
tid = 0;
level = 0;
- exp = 0;
promotion = 0;
+ equipAvatarId = 0;
+ exp = 0;
+ uniqueId = 0;
+ rank = 0;
+ baseAvatarId = 0;
isProtected = false;
return this;
}
@@ -452,13 +499,14 @@ public final class EquipmentOuterClass {
}
Equipment other = (Equipment) o;
return bitField0_ == other.bitField0_
- && (!hasRank() || rank == other.rank)
- && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
- && (!hasUniqueId() || uniqueId == other.uniqueId)
&& (!hasTid() || tid == other.tid)
&& (!hasLevel() || level == other.level)
- && (!hasExp() || exp == other.exp)
&& (!hasPromotion() || promotion == other.promotion)
+ && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId)
+ && (!hasExp() || exp == other.exp)
+ && (!hasUniqueId() || uniqueId == other.uniqueId)
+ && (!hasRank() || rank == other.rank)
+ && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
&& (!hasIsProtected() || isProtected == other.isProtected);
}
@@ -466,34 +514,38 @@ public final class EquipmentOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(rank);
+ output.writeUInt32NoTag(tid);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(baseAvatarId);
+ output.writeRawByte((byte) 24);
+ output.writeUInt32NoTag(level);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 40);
- output.writeUInt32NoTag(uniqueId);
- }
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 64);
- output.writeUInt32NoTag(tid);
- }
- if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 96);
- output.writeUInt32NoTag(level);
- }
- if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 112);
- output.writeUInt32NoTag(exp);
- }
- if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawByte((byte) 120);
output.writeUInt32NoTag(promotion);
}
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeRawByte((byte) 48);
+ output.writeUInt32NoTag(equipAvatarId);
+ }
+ if ((bitField0_ & 0x00000010) != 0) {
+ output.writeRawByte((byte) 56);
+ output.writeUInt32NoTag(exp);
+ }
+ if ((bitField0_ & 0x00000020) != 0) {
+ output.writeRawByte((byte) 64);
+ output.writeUInt32NoTag(uniqueId);
+ }
+ if ((bitField0_ & 0x00000040) != 0) {
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(rank);
+ }
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 112);
+ output.writeUInt32NoTag(baseAvatarId);
+ }
+ if ((bitField0_ & 0x00000100) != 0) {
+ output.writeRawByte((byte) 96);
output.writeBoolNoTag(isProtected);
}
}
@@ -502,27 +554,30 @@ public final class EquipmentOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(rank);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId);
- }
- if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(tid);
}
- if ((bitField0_ & 0x00000010) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
}
- if ((bitField0_ & 0x00000020) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(exp);
- }
- if ((bitField0_ & 0x00000040) != 0) {
+ if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion);
}
+ if ((bitField0_ & 0x00000008) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId);
+ }
+ if ((bitField0_ & 0x00000010) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(exp);
+ }
+ if ((bitField0_ & 0x00000020) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId);
+ }
+ if ((bitField0_ & 0x00000040) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(rank);
+ }
if ((bitField0_ & 0x00000080) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
+ }
+ if ((bitField0_ & 0x00000100) != 0) {
size += 2;
}
return size;
@@ -536,17 +591,17 @@ public final class EquipmentOuterClass {
while (true) {
switch (tag) {
case 16: {
- // rank
- rank = input.readUInt32();
+ // tid
+ tid = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 32) {
+ if (tag != 24) {
break;
}
}
- case 32: {
- // baseAvatarId
- baseAvatarId = input.readUInt32();
+ case 24: {
+ // level
+ level = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 40) {
@@ -554,54 +609,63 @@ public final class EquipmentOuterClass {
}
}
case 40: {
- // uniqueId
- uniqueId = input.readUInt32();
+ // promotion
+ promotion = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
+ if (tag != 48) {
+ break;
+ }
+ }
+ case 48: {
+ // equipAvatarId
+ equipAvatarId = input.readUInt32();
+ bitField0_ |= 0x00000008;
+ tag = input.readTag();
+ if (tag != 56) {
+ break;
+ }
+ }
+ case 56: {
+ // exp
+ exp = input.readUInt32();
+ bitField0_ |= 0x00000010;
+ tag = input.readTag();
if (tag != 64) {
break;
}
}
case 64: {
- // tid
- tid = input.readUInt32();
- bitField0_ |= 0x00000008;
+ // uniqueId
+ uniqueId = input.readUInt32();
+ bitField0_ |= 0x00000020;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 104) {
break;
}
}
- case 96: {
- // level
- level = input.readUInt32();
- bitField0_ |= 0x00000010;
+ case 104: {
+ // rank
+ rank = input.readUInt32();
+ bitField0_ |= 0x00000040;
tag = input.readTag();
if (tag != 112) {
break;
}
}
case 112: {
- // exp
- exp = input.readUInt32();
- bitField0_ |= 0x00000020;
+ // baseAvatarId
+ baseAvatarId = input.readUInt32();
+ bitField0_ |= 0x00000080;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 96) {
break;
}
}
- case 120: {
- // promotion
- promotion = input.readUInt32();
- bitField0_ |= 0x00000040;
- tag = input.readTag();
- if (tag != 8) {
- break;
- }
- }
- case 8: {
+ case 96: {
// isProtected
isProtected = input.readBool();
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000100;
tag = input.readTag();
if (tag != 0) {
break;
@@ -625,27 +689,30 @@ public final class EquipmentOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.rank, rank);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.uniqueId, uniqueId);
- }
- if ((bitField0_ & 0x00000008) != 0) {
output.writeUInt32(FieldNames.tid, tid);
}
- if ((bitField0_ & 0x00000010) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.level, level);
}
- if ((bitField0_ & 0x00000020) != 0) {
- output.writeUInt32(FieldNames.exp, exp);
- }
- if ((bitField0_ & 0x00000040) != 0) {
+ if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.promotion, promotion);
}
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId);
+ }
+ if ((bitField0_ & 0x00000010) != 0) {
+ output.writeUInt32(FieldNames.exp, exp);
+ }
+ if ((bitField0_ & 0x00000020) != 0) {
+ output.writeUInt32(FieldNames.uniqueId, uniqueId);
+ }
+ if ((bitField0_ & 0x00000040) != 0) {
+ output.writeUInt32(FieldNames.rank, rank);
+ }
if ((bitField0_ & 0x00000080) != 0) {
+ output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
+ }
+ if ((bitField0_ & 0x00000100) != 0) {
output.writeBool(FieldNames.isProtected, isProtected);
}
output.endObject();
@@ -658,10 +725,10 @@ public final class EquipmentOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 3492908: {
- if (input.isAtField(FieldNames.rank)) {
+ case 114831: {
+ if (input.isAtField(FieldNames.tid)) {
if (!input.trySkipNullValue()) {
- rank = input.readUInt32();
+ tid = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -669,11 +736,10 @@ public final class EquipmentOuterClass {
}
break;
}
- case 118022725:
- case -1756826157: {
- if (input.isAtField(FieldNames.baseAvatarId)) {
+ case 102865796: {
+ if (input.isAtField(FieldNames.level)) {
if (!input.trySkipNullValue()) {
- baseAvatarId = input.readUInt32();
+ level = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -681,44 +747,45 @@ public final class EquipmentOuterClass {
}
break;
}
+ case -799212381: {
+ if (input.isAtField(FieldNames.promotion)) {
+ if (!input.trySkipNullValue()) {
+ promotion = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 169047204:
+ case 33057906: {
+ if (input.isAtField(FieldNames.equipAvatarId)) {
+ if (!input.trySkipNullValue()) {
+ equipAvatarId = input.readUInt32();
+ bitField0_ |= 0x00000008;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 100893: {
+ if (input.isAtField(FieldNames.exp)) {
+ if (!input.trySkipNullValue()) {
+ exp = input.readUInt32();
+ bitField0_ |= 0x00000010;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case -294460212:
case -538310583: {
if (input.isAtField(FieldNames.uniqueId)) {
if (!input.trySkipNullValue()) {
uniqueId = input.readUInt32();
- bitField0_ |= 0x00000004;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 114831: {
- if (input.isAtField(FieldNames.tid)) {
- if (!input.trySkipNullValue()) {
- tid = input.readUInt32();
- bitField0_ |= 0x00000008;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 102865796: {
- if (input.isAtField(FieldNames.level)) {
- if (!input.trySkipNullValue()) {
- level = input.readUInt32();
- bitField0_ |= 0x00000010;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 100893: {
- if (input.isAtField(FieldNames.exp)) {
- if (!input.trySkipNullValue()) {
- exp = input.readUInt32();
bitField0_ |= 0x00000020;
}
} else {
@@ -726,10 +793,10 @@ public final class EquipmentOuterClass {
}
break;
}
- case -799212381: {
- if (input.isAtField(FieldNames.promotion)) {
+ case 3492908: {
+ if (input.isAtField(FieldNames.rank)) {
if (!input.trySkipNullValue()) {
- promotion = input.readUInt32();
+ rank = input.readUInt32();
bitField0_ |= 0x00000040;
}
} else {
@@ -737,12 +804,24 @@ public final class EquipmentOuterClass {
}
break;
}
+ case 118022725:
+ case -1756826157: {
+ if (input.isAtField(FieldNames.baseAvatarId)) {
+ if (!input.trySkipNullValue()) {
+ baseAvatarId = input.readUInt32();
+ bitField0_ |= 0x00000080;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case 569879972:
case -1919645991: {
if (input.isAtField(FieldNames.isProtected)) {
if (!input.trySkipNullValue()) {
isProtected = input.readBool();
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000100;
}
} else {
input.skipUnknownField();
@@ -801,19 +880,21 @@ public final class EquipmentOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName rank = FieldName.forField("rank");
-
- static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
-
- static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id");
-
static final FieldName tid = FieldName.forField("tid");
static final FieldName level = FieldName.forField("level");
+ static final FieldName promotion = FieldName.forField("promotion");
+
+ static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_avatar_id");
+
static final FieldName exp = FieldName.forField("exp");
- static final FieldName promotion = FieldName.forField("promotion");
+ static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id");
+
+ static final FieldName rank = FieldName.forField("rank");
+
+ static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
static final FieldName isProtected = FieldName.forField("isProtected", "is_protected");
}
diff --git a/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java
index fd9342a..9e5e19a 100644
--- a/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java
@@ -19,15 +19,15 @@ public final class ExchangeGachaCeilingCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 gacha_type = 9;
- */
- private int gachaType;
-
- /**
- * optional uint32 avatar_id = 12;
+ * optional uint32 avatar_id = 5;
*/
private int avatarId;
+ /**
+ * optional uint32 gacha_type = 13;
+ */
+ private int gachaType;
+
private ExchangeGachaCeilingCsReq() {
}
@@ -39,62 +39,25 @@ public final class ExchangeGachaCeilingCsReqOuterClass {
}
/**
- * optional uint32 gacha_type = 9;
- * @return whether the gachaType field is set
+ * optional uint32 avatar_id = 5;
+ * @return whether the avatarId field is set
*/
- public boolean hasGachaType() {
+ public boolean hasAvatarId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 gacha_type = 9;
- * @return this
- */
- public ExchangeGachaCeilingCsReq clearGachaType() {
- bitField0_ &= ~0x00000001;
- gachaType = 0;
- return this;
- }
-
- /**
- * optional uint32 gacha_type = 9;
- * @return the gachaType
- */
- public int getGachaType() {
- return gachaType;
- }
-
- /**
- * optional uint32 gacha_type = 9;
- * @param value the gachaType to set
- * @return this
- */
- public ExchangeGachaCeilingCsReq setGachaType(final int value) {
- bitField0_ |= 0x00000001;
- gachaType = value;
- return this;
- }
-
- /**
- * optional uint32 avatar_id = 12;
- * @return whether the avatarId field is set
- */
- public boolean hasAvatarId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 avatar_id = 12;
+ * optional uint32 avatar_id = 5;
* @return this
*/
public ExchangeGachaCeilingCsReq clearAvatarId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
avatarId = 0;
return this;
}
/**
- * optional uint32 avatar_id = 12;
+ * optional uint32 avatar_id = 5;
* @return the avatarId
*/
public int getAvatarId() {
@@ -102,23 +65,60 @@ public final class ExchangeGachaCeilingCsReqOuterClass {
}
/**
- * optional uint32 avatar_id = 12;
+ * optional uint32 avatar_id = 5;
* @param value the avatarId to set
* @return this
*/
public ExchangeGachaCeilingCsReq setAvatarId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
avatarId = value;
return this;
}
+ /**
+ * optional uint32 gacha_type = 13;
+ * @return whether the gachaType field is set
+ */
+ public boolean hasGachaType() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 gacha_type = 13;
+ * @return this
+ */
+ public ExchangeGachaCeilingCsReq clearGachaType() {
+ bitField0_ &= ~0x00000002;
+ gachaType = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 gacha_type = 13;
+ * @return the gachaType
+ */
+ public int getGachaType() {
+ return gachaType;
+ }
+
+ /**
+ * optional uint32 gacha_type = 13;
+ * @param value the gachaType to set
+ * @return this
+ */
+ public ExchangeGachaCeilingCsReq setGachaType(final int value) {
+ bitField0_ |= 0x00000002;
+ gachaType = value;
+ return this;
+ }
+
@Override
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 final class ExchangeGachaCeilingCsReqOuterClass {
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 final class ExchangeGachaCeilingCsReqOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- gachaType = 0;
avatarId = 0;
+ gachaType = 0;
return this;
}
@@ -170,19 +170,19 @@ public final class ExchangeGachaCeilingCsReqOuterClass {
}
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) 72);
- output.writeUInt32NoTag(gachaType);
+ output.writeRawByte((byte) 40);
+ output.writeUInt32NoTag(avatarId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 96);
- output.writeUInt32NoTag(avatarId);
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(gachaType);
}
}
@@ -190,10 +190,10 @@ public final class ExchangeGachaCeilingCsReqOuterClass {
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 final class ExchangeGachaCeilingCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 72: {
- // gachaType
- gachaType = input.readUInt32();
+ case 40: {
+ // avatarId
+ avatarId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 104) {
break;
}
}
- case 96: {
- // avatarId
- avatarId = input.readUInt32();
+ case 104: {
+ // gachaType
+ gachaType = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
@@ -241,10 +241,10 @@ public final class ExchangeGachaCeilingCsReqOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.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 final class ExchangeGachaCeilingCsReqOuterClass {
}
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 final class ExchangeGachaCeilingCsReqOuterClass {
}
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 final class ExchangeGachaCeilingCsReqOuterClass {
* 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 deddc3f..921475e 100644
--- a/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingScRspOuterClass.java
@@ -19,27 +19,27 @@ public final class ExchangeGachaCeilingScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 3;
- */
- private int retcode;
-
- /**
- * optional uint32 avatar_id = 4;
+ * optional uint32 avatar_id = 11;
*/
private int avatarId;
/**
- * optional uint32 gacha_type = 10;
+ * optional uint32 retcode = 13;
+ */
+ private int retcode;
+
+ /**
+ * optional uint32 gacha_type = 15;
*/
private int gachaType;
/**
- * optional .ItemList transfer_item_list = 2;
+ * optional .ItemList transfer_item_list = 8;
*/
private final ItemListOuterClass.ItemList transferItemList = ItemListOuterClass.ItemList.newInstance();
/**
- * optional .GachaCeiling gacha_ceiling = 5;
+ * optional .GachaCeiling gacha_ceiling = 12;
*/
private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance();
@@ -54,62 +54,25 @@ public final class ExchangeGachaCeilingScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
- * @return whether the retcode field is set
+ * optional uint32 avatar_id = 11;
+ * @return whether the avatarId field is set
*/
- public boolean hasRetcode() {
+ public boolean hasAvatarId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 retcode = 3;
- * @return this
- */
- public ExchangeGachaCeilingScRsp clearRetcode() {
- bitField0_ &= ~0x00000001;
- retcode = 0;
- return this;
- }
-
- /**
- * optional uint32 retcode = 3;
- * @return the retcode
- */
- public int getRetcode() {
- return retcode;
- }
-
- /**
- * optional uint32 retcode = 3;
- * @param value the retcode to set
- * @return this
- */
- public ExchangeGachaCeilingScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000001;
- retcode = value;
- return this;
- }
-
- /**
- * optional uint32 avatar_id = 4;
- * @return whether the avatarId field is set
- */
- public boolean hasAvatarId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 avatar_id = 4;
+ * optional uint32 avatar_id = 11;
* @return this
*/
public ExchangeGachaCeilingScRsp clearAvatarId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
avatarId = 0;
return this;
}
/**
- * optional uint32 avatar_id = 4;
+ * optional uint32 avatar_id = 11;
* @return the avatarId
*/
public int getAvatarId() {
@@ -117,18 +80,55 @@ public final class ExchangeGachaCeilingScRspOuterClass {
}
/**
- * optional uint32 avatar_id = 4;
+ * optional uint32 avatar_id = 11;
* @param value the avatarId to set
* @return this
*/
public ExchangeGachaCeilingScRsp setAvatarId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
avatarId = value;
return this;
}
/**
- * optional uint32 gacha_type = 10;
+ * optional uint32 retcode = 13;
+ * @return whether the retcode field is set
+ */
+ public boolean hasRetcode() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 retcode = 13;
+ * @return this
+ */
+ public ExchangeGachaCeilingScRsp clearRetcode() {
+ bitField0_ &= ~0x00000002;
+ retcode = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 retcode = 13;
+ * @return the retcode
+ */
+ public int getRetcode() {
+ return retcode;
+ }
+
+ /**
+ * optional uint32 retcode = 13;
+ * @param value the retcode to set
+ * @return this
+ */
+ public ExchangeGachaCeilingScRsp setRetcode(final int value) {
+ bitField0_ |= 0x00000002;
+ retcode = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 gacha_type = 15;
* @return whether the gachaType field is set
*/
public boolean hasGachaType() {
@@ -136,7 +136,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
}
/**
- * optional uint32 gacha_type = 10;
+ * optional uint32 gacha_type = 15;
* @return this
*/
public ExchangeGachaCeilingScRsp clearGachaType() {
@@ -146,7 +146,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
}
/**
- * optional uint32 gacha_type = 10;
+ * optional uint32 gacha_type = 15;
* @return the gachaType
*/
public int getGachaType() {
@@ -154,7 +154,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
}
/**
- * optional uint32 gacha_type = 10;
+ * optional uint32 gacha_type = 15;
* @param value the gachaType to set
* @return this
*/
@@ -165,7 +165,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
}
/**
- * optional .ItemList transfer_item_list = 2;
+ * optional .ItemList transfer_item_list = 8;
* @return whether the transferItemList field is set
*/
public boolean hasTransferItemList() {
@@ -173,7 +173,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
}
/**
- * optional .ItemList transfer_item_list = 2;
+ * optional .ItemList transfer_item_list = 8;
* @return this
*/
public ExchangeGachaCeilingScRsp clearTransferItemList() {
@@ -183,7 +183,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
}
/**
- * optional .ItemList transfer_item_list = 2;
+ * optional .ItemList transfer_item_list = 8;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -197,7 +197,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
}
/**
- * optional .ItemList transfer_item_list = 2;
+ * optional .ItemList transfer_item_list = 8;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -211,7 +211,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
}
/**
- * optional .ItemList transfer_item_list = 2;
+ * optional .ItemList transfer_item_list = 8;
* @param value the transferItemList to set
* @return this
*/
@@ -222,7 +222,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
}
/**
- * optional .GachaCeiling gacha_ceiling = 5;
+ * optional .GachaCeiling gacha_ceiling = 12;
* @return whether the gachaCeiling field is set
*/
public boolean hasGachaCeiling() {
@@ -230,7 +230,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
}
/**
- * optional .GachaCeiling gacha_ceiling = 5;
+ * optional .GachaCeiling gacha_ceiling = 12;
* @return this
*/
public ExchangeGachaCeilingScRsp clearGachaCeiling() {
@@ -240,7 +240,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
}
/**
- * optional .GachaCeiling gacha_ceiling = 5;
+ * optional .GachaCeiling gacha_ceiling = 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.
@@ -254,7 +254,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
}
/**
- * optional .GachaCeiling gacha_ceiling = 5;
+ * optional .GachaCeiling gacha_ceiling = 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
@@ -268,7 +268,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
}
/**
- * optional .GachaCeiling gacha_ceiling = 5;
+ * optional .GachaCeiling gacha_ceiling = 12;
* @param value the gachaCeiling to set
* @return this
*/
@@ -284,8 +284,8 @@ public final class ExchangeGachaCeilingScRspOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- retcode = other.retcode;
avatarId = other.avatarId;
+ retcode = other.retcode;
gachaType = other.gachaType;
transferItemList.copyFrom(other.transferItemList);
gachaCeiling.copyFrom(other.gachaCeiling);
@@ -299,12 +299,12 @@ public final class ExchangeGachaCeilingScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasRetcode()) {
- setRetcode(other.retcode);
- }
if (other.hasAvatarId()) {
setAvatarId(other.avatarId);
}
+ if (other.hasRetcode()) {
+ setRetcode(other.retcode);
+ }
if (other.hasGachaType()) {
setGachaType(other.gachaType);
}
@@ -324,8 +324,8 @@ public final class ExchangeGachaCeilingScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- retcode = 0;
avatarId = 0;
+ retcode = 0;
gachaType = 0;
transferItemList.clear();
gachaCeiling.clear();
@@ -354,8 +354,8 @@ public final class ExchangeGachaCeilingScRspOuterClass {
}
ExchangeGachaCeilingScRsp other = (ExchangeGachaCeilingScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasRetcode() || retcode == other.retcode)
&& (!hasAvatarId() || avatarId == other.avatarId)
+ && (!hasRetcode() || retcode == other.retcode)
&& (!hasGachaType() || gachaType == other.gachaType)
&& (!hasTransferItemList() || transferItemList.equals(other.transferItemList))
&& (!hasGachaCeiling() || gachaCeiling.equals(other.gachaCeiling));
@@ -364,23 +364,23 @@ public final class ExchangeGachaCeilingScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(retcode);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(avatarId);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(retcode);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(gachaType);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 18);
+ output.writeRawByte((byte) 66);
output.writeMessageNoTag(transferItemList);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 42);
+ output.writeRawByte((byte) 98);
output.writeMessageNoTag(gachaCeiling);
}
}
@@ -389,10 +389,10 @@ public final class ExchangeGachaCeilingScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaType);
@@ -413,43 +413,43 @@ public final class ExchangeGachaCeilingScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
- // retcode
- retcode = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 32) {
- break;
- }
- }
- case 32: {
+ case 88: {
// avatarId
avatarId = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 80) {
+ if (tag != 104) {
break;
}
}
- case 80: {
+ case 104: {
+ // retcode
+ retcode = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 120) {
+ break;
+ }
+ }
+ case 120: {
// gachaType
gachaType = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 18) {
+ if (tag != 66) {
break;
}
}
- case 18: {
+ case 66: {
// transferItemList
input.readMessage(transferItemList);
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 42) {
+ if (tag != 98) {
break;
}
}
- case 42: {
+ case 98: {
// gachaCeiling
input.readMessage(gachaCeiling);
bitField0_ |= 0x00000010;
@@ -476,10 +476,10 @@ public final class ExchangeGachaCeilingScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.avatarId, avatarId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.avatarId, avatarId);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.gachaType, gachaType);
@@ -500,10 +500,11 @@ public final class ExchangeGachaCeilingScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case 1787287636:
+ case -428636735: {
+ if (input.isAtField(FieldNames.avatarId)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ avatarId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -511,11 +512,10 @@ public final class ExchangeGachaCeilingScRspOuterClass {
}
break;
}
- case 1787287636:
- case -428636735: {
- if (input.isAtField(FieldNames.avatarId)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- avatarId = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -612,10 +612,10 @@ public final class ExchangeGachaCeilingScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName retcode = FieldName.forField("retcode");
-
static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id");
+ static final FieldName retcode = FieldName.forField("retcode");
+
static final FieldName gachaType = FieldName.forField("gachaType", "gacha_type");
static final FieldName transferItemList = FieldName.forField("transferItemList", "transfer_item_list");
diff --git a/src/generated/main/emu/lunarcore/proto/ExchangeHcoinCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinCsReqOuterClass.java
index 172d131..783af0e 100644
--- a/src/generated/main/emu/lunarcore/proto/ExchangeHcoinCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class ExchangeHcoinCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 num = 3;
+ * optional uint32 num = 11;
*/
private int num;
@@ -34,7 +34,7 @@ public final class ExchangeHcoinCsReqOuterClass {
}
/**
- * optional uint32 num = 3;
+ * optional uint32 num = 11;
* @return whether the num field is set
*/
public boolean hasNum() {
@@ -42,7 +42,7 @@ public final class ExchangeHcoinCsReqOuterClass {
}
/**
- * optional uint32 num = 3;
+ * optional uint32 num = 11;
* @return this
*/
public ExchangeHcoinCsReq clearNum() {
@@ -52,7 +52,7 @@ public final class ExchangeHcoinCsReqOuterClass {
}
/**
- * optional uint32 num = 3;
+ * optional uint32 num = 11;
* @return the num
*/
public int getNum() {
@@ -60,7 +60,7 @@ public final class ExchangeHcoinCsReqOuterClass {
}
/**
- * optional uint32 num = 3;
+ * optional uint32 num = 11;
* @param value the num to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class ExchangeHcoinCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(num);
}
}
@@ -150,7 +150,7 @@ public final class ExchangeHcoinCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
+ 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 8e522be..6066f56 100644
--- a/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java
@@ -19,12 +19,12 @@ public final class ExchangeHcoinScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 1;
+ * optional uint32 retcode = 10;
*/
private int retcode;
/**
- * optional uint32 num = 13;
+ * optional uint32 num = 12;
*/
private int num;
@@ -39,7 +39,7 @@ public final class ExchangeHcoinScRspOuterClass {
}
/**
- * optional uint32 retcode = 1;
+ * optional uint32 retcode = 10;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -47,7 +47,7 @@ public final class ExchangeHcoinScRspOuterClass {
}
/**
- * optional uint32 retcode = 1;
+ * optional uint32 retcode = 10;
* @return this
*/
public ExchangeHcoinScRsp clearRetcode() {
@@ -57,7 +57,7 @@ public final class ExchangeHcoinScRspOuterClass {
}
/**
- * optional uint32 retcode = 1;
+ * optional uint32 retcode = 10;
* @return the retcode
*/
public int getRetcode() {
@@ -65,7 +65,7 @@ public final class ExchangeHcoinScRspOuterClass {
}
/**
- * optional uint32 retcode = 1;
+ * optional uint32 retcode = 10;
* @param value the retcode to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class ExchangeHcoinScRspOuterClass {
}
/**
- * optional uint32 num = 13;
+ * optional uint32 num = 12;
* @return whether the num field is set
*/
public boolean hasNum() {
@@ -84,7 +84,7 @@ public final class ExchangeHcoinScRspOuterClass {
}
/**
- * optional uint32 num = 13;
+ * optional uint32 num = 12;
* @return this
*/
public ExchangeHcoinScRsp clearNum() {
@@ -94,7 +94,7 @@ public final class ExchangeHcoinScRspOuterClass {
}
/**
- * optional uint32 num = 13;
+ * optional uint32 num = 12;
* @return the num
*/
public int getNum() {
@@ -102,7 +102,7 @@ public final class ExchangeHcoinScRspOuterClass {
}
/**
- * optional uint32 num = 13;
+ * optional uint32 num = 12;
* @param value the num to set
* @return this
*/
@@ -177,11 +177,11 @@ public final class ExchangeHcoinScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(num);
}
}
@@ -205,16 +205,16 @@ public final class ExchangeHcoinScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 80: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 96) {
break;
}
}
- case 104: {
+ case 96: {
// 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 bdfbe84..a2ca4d9 100644
--- a/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentCsReqOuterClass.java
@@ -19,12 +19,12 @@ public final class ExpUpEquipmentCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 equipment_unique_id = 3;
+ * optional uint32 equipment_unique_id = 9;
*/
private int equipmentUniqueId;
/**
- * optional .ItemCostList item_cost_list = 5;
+ * optional .ItemCostList item_cost_list = 2;
*/
private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance();
@@ -39,7 +39,7 @@ public final class ExpUpEquipmentCsReqOuterClass {
}
/**
- * optional uint32 equipment_unique_id = 3;
+ * optional uint32 equipment_unique_id = 9;
* @return whether the equipmentUniqueId field is set
*/
public boolean hasEquipmentUniqueId() {
@@ -47,7 +47,7 @@ public final class ExpUpEquipmentCsReqOuterClass {
}
/**
- * optional uint32 equipment_unique_id = 3;
+ * optional uint32 equipment_unique_id = 9;
* @return this
*/
public ExpUpEquipmentCsReq clearEquipmentUniqueId() {
@@ -57,7 +57,7 @@ public final class ExpUpEquipmentCsReqOuterClass {
}
/**
- * optional uint32 equipment_unique_id = 3;
+ * optional uint32 equipment_unique_id = 9;
* @return the equipmentUniqueId
*/
public int getEquipmentUniqueId() {
@@ -65,7 +65,7 @@ public final class ExpUpEquipmentCsReqOuterClass {
}
/**
- * optional uint32 equipment_unique_id = 3;
+ * optional uint32 equipment_unique_id = 9;
* @param value the equipmentUniqueId to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class ExpUpEquipmentCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 5;
+ * optional .ItemCostList item_cost_list = 2;
* @return whether the itemCostList field is set
*/
public boolean hasItemCostList() {
@@ -84,7 +84,7 @@ public final class ExpUpEquipmentCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 5;
+ * optional .ItemCostList item_cost_list = 2;
* @return this
*/
public ExpUpEquipmentCsReq clearItemCostList() {
@@ -94,7 +94,7 @@ public final class ExpUpEquipmentCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 5;
+ * optional .ItemCostList item_cost_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.
@@ -108,7 +108,7 @@ public final class ExpUpEquipmentCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 5;
+ * optional .ItemCostList item_cost_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
@@ -122,7 +122,7 @@ public final class ExpUpEquipmentCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 5;
+ * optional .ItemCostList item_cost_list = 2;
* @param value the itemCostList to set
* @return this
*/
@@ -198,11 +198,11 @@ public final class ExpUpEquipmentCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 72);
output.writeUInt32NoTag(equipmentUniqueId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 42);
+ output.writeRawByte((byte) 18);
output.writeMessageNoTag(itemCostList);
}
}
@@ -226,16 +226,16 @@ public final class ExpUpEquipmentCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
+ case 72: {
// equipmentUniqueId
equipmentUniqueId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 42) {
+ if (tag != 18) {
break;
}
}
- case 42: {
+ case 18: {
// 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 a292eb6..005df2d 100644
--- a/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentScRspOuterClass.java
@@ -20,12 +20,12 @@ public final class ExpUpEquipmentScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 14;
*/
private int retcode;
/**
- * repeated .PileItem return_item_list = 4;
+ * repeated .PileItem return_item_list = 15;
*/
private final RepeatedMessageoptional uint32 retcode = 8;
+ * optional uint32 retcode = 14;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public final class ExpUpEquipmentScRspOuterClass {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 14;
* @return this
*/
public ExpUpEquipmentScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public final class ExpUpEquipmentScRspOuterClass {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 14;
* @return the retcode
*/
public int getRetcode() {
@@ -66,7 +66,7 @@ public final class ExpUpEquipmentScRspOuterClass {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 14;
* @param value the retcode to set
* @return this
*/
@@ -77,7 +77,7 @@ public final class ExpUpEquipmentScRspOuterClass {
}
/**
- * repeated .PileItem return_item_list = 4;
+ * repeated .PileItem return_item_list = 15;
* @return whether the returnItemList field is set
*/
public boolean hasReturnItemList() {
@@ -85,7 +85,7 @@ public final class ExpUpEquipmentScRspOuterClass {
}
/**
- * repeated .PileItem return_item_list = 4;
+ * repeated .PileItem return_item_list = 15;
* @return this
*/
public ExpUpEquipmentScRsp clearReturnItemList() {
@@ -95,7 +95,7 @@ public final class ExpUpEquipmentScRspOuterClass {
}
/**
- * repeated .PileItem return_item_list = 4;
+ * repeated .PileItem return_item_list = 15;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class ExpUpEquipmentScRspOuterClass {
}
/**
- * repeated .PileItem return_item_list = 4;
+ * repeated .PileItem return_item_list = 15;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public final class ExpUpEquipmentScRspOuterClass {
}
/**
- * repeated .PileItem return_item_list = 4;
+ * repeated .PileItem return_item_list = 15;
* @param value the returnItemList to add
* @return this
*/
@@ -134,7 +134,7 @@ public final class ExpUpEquipmentScRspOuterClass {
}
/**
- * repeated .PileItem return_item_list = 4;
+ * repeated .PileItem return_item_list = 15;
* @param values the returnItemList to add
* @return this
*/
@@ -210,12 +210,12 @@ public final class ExpUpEquipmentScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 112);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < returnItemList.length(); i++) {
- output.writeRawByte((byte) 34);
+ output.writeRawByte((byte) 122);
output.writeMessageNoTag(returnItemList.get(i));
}
}
@@ -240,16 +240,16 @@ public final class ExpUpEquipmentScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 64: {
+ case 112: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 34) {
+ if (tag != 122) {
break;
}
}
- case 34: {
+ case 122: {
// 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 63b6ffc..8f8bf9d 100644
--- a/src/generated/main/emu/lunarcore/proto/ExpUpRelicCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ExpUpRelicCsReqOuterClass.java
@@ -19,12 +19,12 @@ public final class ExpUpRelicCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 relic_unique_id = 11;
+ * optional uint32 relic_unique_id = 5;
*/
private int relicUniqueId;
/**
- * optional .ItemCostList item_cost_list = 3;
+ * optional .ItemCostList item_cost_list = 10;
*/
private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance();
@@ -39,7 +39,7 @@ public final class ExpUpRelicCsReqOuterClass {
}
/**
- * optional uint32 relic_unique_id = 11;
+ * optional uint32 relic_unique_id = 5;
* @return whether the relicUniqueId field is set
*/
public boolean hasRelicUniqueId() {
@@ -47,7 +47,7 @@ public final class ExpUpRelicCsReqOuterClass {
}
/**
- * optional uint32 relic_unique_id = 11;
+ * optional uint32 relic_unique_id = 5;
* @return this
*/
public ExpUpRelicCsReq clearRelicUniqueId() {
@@ -57,7 +57,7 @@ public final class ExpUpRelicCsReqOuterClass {
}
/**
- * optional uint32 relic_unique_id = 11;
+ * optional uint32 relic_unique_id = 5;
* @return the relicUniqueId
*/
public int getRelicUniqueId() {
@@ -65,7 +65,7 @@ public final class ExpUpRelicCsReqOuterClass {
}
/**
- * optional uint32 relic_unique_id = 11;
+ * optional uint32 relic_unique_id = 5;
* @param value the relicUniqueId to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class ExpUpRelicCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 3;
+ * optional .ItemCostList item_cost_list = 10;
* @return whether the itemCostList field is set
*/
public boolean hasItemCostList() {
@@ -84,7 +84,7 @@ public final class ExpUpRelicCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 3;
+ * optional .ItemCostList item_cost_list = 10;
* @return this
*/
public ExpUpRelicCsReq clearItemCostList() {
@@ -94,7 +94,7 @@ public final class ExpUpRelicCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 3;
+ * optional .ItemCostList item_cost_list = 10;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class ExpUpRelicCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 3;
+ * optional .ItemCostList item_cost_list = 10;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class ExpUpRelicCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 3;
+ * optional .ItemCostList item_cost_list = 10;
* @param value the itemCostList to set
* @return this
*/
@@ -198,11 +198,11 @@ public final class ExpUpRelicCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(relicUniqueId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 26);
+ output.writeRawByte((byte) 82);
output.writeMessageNoTag(itemCostList);
}
}
@@ -226,16 +226,16 @@ public final class ExpUpRelicCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 88: {
+ case 40: {
// relicUniqueId
relicUniqueId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 26) {
+ if (tag != 82) {
break;
}
}
- case 26: {
+ case 82: {
// 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 1e127bd..2fa3a77 100644
--- a/src/generated/main/emu/lunarcore/proto/ExpUpRelicScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ExpUpRelicScRspOuterClass.java
@@ -20,12 +20,12 @@ public final class ExpUpRelicScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 1;
+ * optional uint32 retcode = 5;
*/
private int retcode;
/**
- * repeated .PileItem return_item_list = 11;
+ * repeated .PileItem return_item_list = 12;
*/
private final RepeatedMessageoptional uint32 retcode = 1;
+ * optional uint32 retcode = 5;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public final class ExpUpRelicScRspOuterClass {
}
/**
- * optional uint32 retcode = 1;
+ * optional uint32 retcode = 5;
* @return this
*/
public ExpUpRelicScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public final class ExpUpRelicScRspOuterClass {
}
/**
- * optional uint32 retcode = 1;
+ * optional uint32 retcode = 5;
* @return the retcode
*/
public int getRetcode() {
@@ -66,7 +66,7 @@ public final class ExpUpRelicScRspOuterClass {
}
/**
- * optional uint32 retcode = 1;
+ * optional uint32 retcode = 5;
* @param value the retcode to set
* @return this
*/
@@ -77,7 +77,7 @@ public final class ExpUpRelicScRspOuterClass {
}
/**
- * repeated .PileItem return_item_list = 11;
+ * repeated .PileItem return_item_list = 12;
* @return whether the returnItemList field is set
*/
public boolean hasReturnItemList() {
@@ -85,7 +85,7 @@ public final class ExpUpRelicScRspOuterClass {
}
/**
- * repeated .PileItem return_item_list = 11;
+ * repeated .PileItem return_item_list = 12;
* @return this
*/
public ExpUpRelicScRsp clearReturnItemList() {
@@ -95,7 +95,7 @@ public final class ExpUpRelicScRspOuterClass {
}
/**
- * repeated .PileItem return_item_list = 11;
+ * repeated .PileItem return_item_list = 12;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class ExpUpRelicScRspOuterClass {
}
/**
- * repeated .PileItem return_item_list = 11;
+ * repeated .PileItem return_item_list = 12;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public final class ExpUpRelicScRspOuterClass {
}
/**
- * repeated .PileItem return_item_list = 11;
+ * repeated .PileItem return_item_list = 12;
* @param value the returnItemList to add
* @return this
*/
@@ -134,7 +134,7 @@ public final class ExpUpRelicScRspOuterClass {
}
/**
- * repeated .PileItem return_item_list = 11;
+ * repeated .PileItem return_item_list = 12;
* @param values the returnItemList to add
* @return this
*/
@@ -210,12 +210,12 @@ public final class ExpUpRelicScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < returnItemList.length(); i++) {
- output.writeRawByte((byte) 90);
+ output.writeRawByte((byte) 98);
output.writeMessageNoTag(returnItemList.get(i));
}
}
@@ -240,16 +240,16 @@ public final class ExpUpRelicScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 40: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 90) {
+ if (tag != 98) {
break;
}
}
- case 90: {
+ case 98: {
// returnItemList
tag = input.readRepeatedMessage(returnItemList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/FarmStageGachaInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FarmStageGachaInfoOuterClass.java
index 538693f..e255cce 100644
--- a/src/generated/main/emu/lunarcore/proto/FarmStageGachaInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/FarmStageGachaInfoOuterClass.java
@@ -19,17 +19,17 @@ public final class FarmStageGachaInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional int64 end_time = 3;
- */
- private long endTime;
-
- /**
- * optional int64 begin_time = 7;
+ * optional int64 begin_time = 3;
*/
private long beginTime;
/**
- * optional uint32 gacha_id = 15;
+ * optional int64 end_time = 11;
+ */
+ private long endTime;
+
+ /**
+ * optional uint32 gacha_id = 4;
*/
private int gachaId;
@@ -44,62 +44,25 @@ public final class FarmStageGachaInfoOuterClass {
}
/**
- * optional int64 end_time = 3;
- * @return whether the endTime field is set
+ * optional int64 begin_time = 3;
+ * @return whether the beginTime field is set
*/
- public boolean hasEndTime() {
+ public boolean hasBeginTime() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional int64 end_time = 3;
- * @return this
- */
- public FarmStageGachaInfo clearEndTime() {
- bitField0_ &= ~0x00000001;
- endTime = 0L;
- return this;
- }
-
- /**
- * optional int64 end_time = 3;
- * @return the endTime
- */
- public long getEndTime() {
- return endTime;
- }
-
- /**
- * optional int64 end_time = 3;
- * @param value the endTime to set
- * @return this
- */
- public FarmStageGachaInfo setEndTime(final long value) {
- bitField0_ |= 0x00000001;
- endTime = value;
- return this;
- }
-
- /**
- * optional int64 begin_time = 7;
- * @return whether the beginTime field is set
- */
- public boolean hasBeginTime() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional int64 begin_time = 7;
+ * optional int64 begin_time = 3;
* @return this
*/
public FarmStageGachaInfo clearBeginTime() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
beginTime = 0L;
return this;
}
/**
- * optional int64 begin_time = 7;
+ * optional int64 begin_time = 3;
* @return the beginTime
*/
public long getBeginTime() {
@@ -107,18 +70,55 @@ public final class FarmStageGachaInfoOuterClass {
}
/**
- * optional int64 begin_time = 7;
+ * optional int64 begin_time = 3;
* @param value the beginTime to set
* @return this
*/
public FarmStageGachaInfo setBeginTime(final long value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
beginTime = value;
return this;
}
/**
- * optional uint32 gacha_id = 15;
+ * optional int64 end_time = 11;
+ * @return whether the endTime field is set
+ */
+ public boolean hasEndTime() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional int64 end_time = 11;
+ * @return this
+ */
+ public FarmStageGachaInfo clearEndTime() {
+ bitField0_ &= ~0x00000002;
+ endTime = 0L;
+ return this;
+ }
+
+ /**
+ * optional int64 end_time = 11;
+ * @return the endTime
+ */
+ public long getEndTime() {
+ return endTime;
+ }
+
+ /**
+ * optional int64 end_time = 11;
+ * @param value the endTime to set
+ * @return this
+ */
+ public FarmStageGachaInfo setEndTime(final long value) {
+ bitField0_ |= 0x00000002;
+ endTime = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 gacha_id = 4;
* @return whether the gachaId field is set
*/
public boolean hasGachaId() {
@@ -126,7 +126,7 @@ public final class FarmStageGachaInfoOuterClass {
}
/**
- * optional uint32 gacha_id = 15;
+ * optional uint32 gacha_id = 4;
* @return this
*/
public FarmStageGachaInfo clearGachaId() {
@@ -136,7 +136,7 @@ public final class FarmStageGachaInfoOuterClass {
}
/**
- * optional uint32 gacha_id = 15;
+ * optional uint32 gacha_id = 4;
* @return the gachaId
*/
public int getGachaId() {
@@ -144,7 +144,7 @@ public final class FarmStageGachaInfoOuterClass {
}
/**
- * optional uint32 gacha_id = 15;
+ * optional uint32 gacha_id = 4;
* @param value the gachaId to set
* @return this
*/
@@ -159,8 +159,8 @@ public final class FarmStageGachaInfoOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- endTime = other.endTime;
beginTime = other.beginTime;
+ endTime = other.endTime;
gachaId = other.gachaId;
}
return this;
@@ -172,12 +172,12 @@ public final class FarmStageGachaInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasEndTime()) {
- setEndTime(other.endTime);
- }
if (other.hasBeginTime()) {
setBeginTime(other.beginTime);
}
+ if (other.hasEndTime()) {
+ setEndTime(other.endTime);
+ }
if (other.hasGachaId()) {
setGachaId(other.gachaId);
}
@@ -191,8 +191,8 @@ public final class FarmStageGachaInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- endTime = 0L;
beginTime = 0L;
+ endTime = 0L;
gachaId = 0;
return this;
}
@@ -217,8 +217,8 @@ public final class FarmStageGachaInfoOuterClass {
}
FarmStageGachaInfo other = (FarmStageGachaInfo) o;
return bitField0_ == other.bitField0_
- && (!hasEndTime() || endTime == other.endTime)
&& (!hasBeginTime() || beginTime == other.beginTime)
+ && (!hasEndTime() || endTime == other.endTime)
&& (!hasGachaId() || gachaId == other.gachaId);
}
@@ -226,14 +226,14 @@ public final class FarmStageGachaInfoOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 24);
- output.writeInt64NoTag(endTime);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 56);
output.writeInt64NoTag(beginTime);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 88);
+ output.writeInt64NoTag(endTime);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(gachaId);
}
}
@@ -242,10 +242,10 @@ public final class FarmStageGachaInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeInt64SizeNoTag(endTime);
+ size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime);
+ size += 1 + ProtoSink.computeInt64SizeNoTag(endTime);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId);
@@ -261,24 +261,24 @@ public final class FarmStageGachaInfoOuterClass {
while (true) {
switch (tag) {
case 24: {
- // endTime
- endTime = input.readInt64();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 56) {
- break;
- }
- }
- case 56: {
// beginTime
beginTime = input.readInt64();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 88) {
break;
}
}
- case 120: {
+ case 88: {
+ // endTime
+ endTime = input.readInt64();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 32) {
+ break;
+ }
+ }
+ case 32: {
// gachaId
gachaId = input.readUInt32();
bitField0_ |= 0x00000004;
@@ -305,10 +305,10 @@ public final class FarmStageGachaInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeInt64(FieldNames.endTime, endTime);
+ output.writeInt64(FieldNames.beginTime, beginTime);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeInt64(FieldNames.beginTime, beginTime);
+ output.writeInt64(FieldNames.endTime, endTime);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.gachaId, gachaId);
@@ -323,11 +323,11 @@ public final class FarmStageGachaInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1607243192:
- case 1725551537: {
- if (input.isAtField(FieldNames.endTime)) {
+ case -1072839914:
+ case 1112183971: {
+ if (input.isAtField(FieldNames.beginTime)) {
if (!input.trySkipNullValue()) {
- endTime = input.readInt64();
+ beginTime = input.readInt64();
bitField0_ |= 0x00000001;
}
} else {
@@ -335,11 +335,11 @@ public final class FarmStageGachaInfoOuterClass {
}
break;
}
- case -1072839914:
- case 1112183971: {
- if (input.isAtField(FieldNames.beginTime)) {
+ case -1607243192:
+ case 1725551537: {
+ if (input.isAtField(FieldNames.endTime)) {
if (!input.trySkipNullValue()) {
- beginTime = input.readInt64();
+ endTime = input.readInt64();
bitField0_ |= 0x00000002;
}
} else {
@@ -412,10 +412,10 @@ public final class FarmStageGachaInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName endTime = FieldName.forField("endTime", "end_time");
-
static final FieldName beginTime = FieldName.forField("beginTime", "begin_time");
+ static final FieldName endTime = FieldName.forField("endTime", "end_time");
+
static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/FinishRogueDialogueGroupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/FinishRogueDialogueGroupCsReqOuterClass.java
index 4c1a4ed..39aa7fa 100644
--- a/src/generated/main/emu/lunarcore/proto/FinishRogueDialogueGroupCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/FinishRogueDialogueGroupCsReqOuterClass.java
@@ -19,12 +19,12 @@ public final class FinishRogueDialogueGroupCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 dialogue_group_id = 1;
+ * optional uint32 dialogue_group_id = 10;
*/
private int dialogueGroupId;
/**
- * optional uint32 entity_id = 15;
+ * optional uint32 entity_id = 12;
*/
private int entityId;
@@ -39,7 +39,7 @@ public final class FinishRogueDialogueGroupCsReqOuterClass {
}
/**
- * optional uint32 dialogue_group_id = 1;
+ * optional uint32 dialogue_group_id = 10;
* @return whether the dialogueGroupId field is set
*/
public boolean hasDialogueGroupId() {
@@ -47,7 +47,7 @@ public final class FinishRogueDialogueGroupCsReqOuterClass {
}
/**
- * optional uint32 dialogue_group_id = 1;
+ * optional uint32 dialogue_group_id = 10;
* @return this
*/
public FinishRogueDialogueGroupCsReq clearDialogueGroupId() {
@@ -57,7 +57,7 @@ public final class FinishRogueDialogueGroupCsReqOuterClass {
}
/**
- * optional uint32 dialogue_group_id = 1;
+ * optional uint32 dialogue_group_id = 10;
* @return the dialogueGroupId
*/
public int getDialogueGroupId() {
@@ -65,7 +65,7 @@ public final class FinishRogueDialogueGroupCsReqOuterClass {
}
/**
- * optional uint32 dialogue_group_id = 1;
+ * optional uint32 dialogue_group_id = 10;
* @param value the dialogueGroupId to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class FinishRogueDialogueGroupCsReqOuterClass {
}
/**
- * optional uint32 entity_id = 15;
+ * optional uint32 entity_id = 12;
* @return whether the entityId field is set
*/
public boolean hasEntityId() {
@@ -84,7 +84,7 @@ public final class FinishRogueDialogueGroupCsReqOuterClass {
}
/**
- * optional uint32 entity_id = 15;
+ * optional uint32 entity_id = 12;
* @return this
*/
public FinishRogueDialogueGroupCsReq clearEntityId() {
@@ -94,7 +94,7 @@ public final class FinishRogueDialogueGroupCsReqOuterClass {
}
/**
- * optional uint32 entity_id = 15;
+ * optional uint32 entity_id = 12;
* @return the entityId
*/
public int getEntityId() {
@@ -102,7 +102,7 @@ public final class FinishRogueDialogueGroupCsReqOuterClass {
}
/**
- * optional uint32 entity_id = 15;
+ * optional uint32 entity_id = 12;
* @param value the entityId to set
* @return this
*/
@@ -177,11 +177,11 @@ public final class FinishRogueDialogueGroupCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(dialogueGroupId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(entityId);
}
}
@@ -205,16 +205,16 @@ public final class FinishRogueDialogueGroupCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 80: {
// dialogueGroupId
dialogueGroupId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 96) {
break;
}
}
- case 120: {
+ case 96: {
// entityId
entityId = input.readUInt32();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/FirstNpcTalkInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FirstNpcTalkInfoOuterClass.java
index da71ff7..493cba1 100644
--- a/src/generated/main/emu/lunarcore/proto/FirstNpcTalkInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/FirstNpcTalkInfoOuterClass.java
@@ -19,12 +19,12 @@ public final class FirstNpcTalkInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 npc_id = 15;
+ * optional uint32 npc_id = 6;
*/
private int npcId;
/**
- * optional bool unk_bool = 12;
+ * optional bool unk_bool = 14;
*/
private boolean unkBool;
@@ -39,7 +39,7 @@ public final class FirstNpcTalkInfoOuterClass {
}
/**
- * optional uint32 npc_id = 15;
+ * optional uint32 npc_id = 6;
* @return whether the npcId field is set
*/
public boolean hasNpcId() {
@@ -47,7 +47,7 @@ public final class FirstNpcTalkInfoOuterClass {
}
/**
- * optional uint32 npc_id = 15;
+ * optional uint32 npc_id = 6;
* @return this
*/
public FirstNpcTalkInfo clearNpcId() {
@@ -57,7 +57,7 @@ public final class FirstNpcTalkInfoOuterClass {
}
/**
- * optional uint32 npc_id = 15;
+ * optional uint32 npc_id = 6;
* @return the npcId
*/
public int getNpcId() {
@@ -65,7 +65,7 @@ public final class FirstNpcTalkInfoOuterClass {
}
/**
- * optional uint32 npc_id = 15;
+ * optional uint32 npc_id = 6;
* @param value the npcId to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class FirstNpcTalkInfoOuterClass {
}
/**
- * optional bool unk_bool = 12;
+ * optional bool unk_bool = 14;
* @return whether the unkBool field is set
*/
public boolean hasUnkBool() {
@@ -84,7 +84,7 @@ public final class FirstNpcTalkInfoOuterClass {
}
/**
- * optional bool unk_bool = 12;
+ * optional bool unk_bool = 14;
* @return this
*/
public FirstNpcTalkInfo clearUnkBool() {
@@ -94,7 +94,7 @@ public final class FirstNpcTalkInfoOuterClass {
}
/**
- * optional bool unk_bool = 12;
+ * optional bool unk_bool = 14;
* @return the unkBool
*/
public boolean getUnkBool() {
@@ -102,7 +102,7 @@ public final class FirstNpcTalkInfoOuterClass {
}
/**
- * optional bool unk_bool = 12;
+ * optional bool unk_bool = 14;
* @param value the unkBool to set
* @return this
*/
@@ -177,11 +177,11 @@ public final class FirstNpcTalkInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(npcId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 112);
output.writeBoolNoTag(unkBool);
}
}
@@ -205,16 +205,16 @@ public final class FirstNpcTalkInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 120: {
+ case 48: {
// npcId
npcId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 112) {
break;
}
}
- case 96: {
+ case 112: {
// unkBool
unkBool = input.readBool();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/FriendApplyInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FriendApplyInfoOuterClass.java
index 6030877..1dd52d4 100644
--- a/src/generated/main/emu/lunarcore/proto/FriendApplyInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/FriendApplyInfoOuterClass.java
@@ -19,7 +19,7 @@ public final class FriendApplyInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .SimpleInfo simple_info = 8;
+ * optional .SimpleInfo simple_info = 7;
*/
private final SimpleInfoOuterClass.SimpleInfo simpleInfo = SimpleInfoOuterClass.SimpleInfo.newInstance();
@@ -34,7 +34,7 @@ public final class FriendApplyInfoOuterClass {
}
/**
- * optional .SimpleInfo simple_info = 8;
+ * optional .SimpleInfo simple_info = 7;
* @return whether the simpleInfo field is set
*/
public boolean hasSimpleInfo() {
@@ -42,7 +42,7 @@ public final class FriendApplyInfoOuterClass {
}
/**
- * optional .SimpleInfo simple_info = 8;
+ * optional .SimpleInfo simple_info = 7;
* @return this
*/
public FriendApplyInfo clearSimpleInfo() {
@@ -52,7 +52,7 @@ public final class FriendApplyInfoOuterClass {
}
/**
- * optional .SimpleInfo simple_info = 8;
+ * optional .SimpleInfo simple_info = 7;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -66,7 +66,7 @@ public final class FriendApplyInfoOuterClass {
}
/**
- * optional .SimpleInfo simple_info = 8;
+ * optional .SimpleInfo simple_info = 7;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -80,7 +80,7 @@ public final class FriendApplyInfoOuterClass {
}
/**
- * optional .SimpleInfo simple_info = 8;
+ * optional .SimpleInfo simple_info = 7;
* @param value the simpleInfo to set
* @return this
*/
@@ -150,7 +150,7 @@ public final class FriendApplyInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 66);
+ output.writeRawByte((byte) 58);
output.writeMessageNoTag(simpleInfo);
}
}
@@ -171,7 +171,7 @@ public final class FriendApplyInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 66: {
+ case 58: {
// simpleInfo
input.readMessage(simpleInfo);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java
index 70ddbd8..e36ae8c 100644
--- a/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java
@@ -19,7 +19,12 @@ public final class FriendListInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .SimpleInfo simple_info = 2;
+ * optional .PlayingState playing_state = 5;
+ */
+ private int playingState;
+
+ /**
+ * optional .SimpleInfo simple_info = 7;
*/
private final SimpleInfoOuterClass.SimpleInfo simpleInfo = SimpleInfoOuterClass.SimpleInfo.newInstance();
@@ -34,25 +39,87 @@ public final class FriendListInfoOuterClass {
}
/**
- * optional .SimpleInfo simple_info = 2;
- * @return whether the simpleInfo field is set
+ * optional .PlayingState playing_state = 5;
+ * @return whether the playingState field is set
*/
- public boolean hasSimpleInfo() {
+ public boolean hasPlayingState() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional .SimpleInfo simple_info = 2;
+ * optional .PlayingState playing_state = 5;
+ * @return this
+ */
+ public FriendListInfo clearPlayingState() {
+ bitField0_ &= ~0x00000001;
+ playingState = 0;
+ return this;
+ }
+
+ /**
+ * optional .PlayingState playing_state = 5;
+ * @return the playingState
+ */
+ public PlayingStateOuterClass.PlayingState getPlayingState() {
+ return PlayingStateOuterClass.PlayingState.forNumber(playingState);
+ }
+
+ /**
+ * Gets the value of the internal enum store. The result is
+ * equivalent to {@link FriendListInfo#getPlayingState()}.getNumber().
+ *
+ * @return numeric wire representation
+ */
+ public int getPlayingStateValue() {
+ return playingState;
+ }
+
+ /**
+ * 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 PlayingStateOuterClass.PlayingState}. Setting an invalid value
+ * can cause {@link FriendListInfo#getPlayingState()} to return null
+ *
+ * @param value the numeric wire value to set
+ * @return this
+ */
+ public FriendListInfo setPlayingStateValue(final int value) {
+ bitField0_ |= 0x00000001;
+ playingState = value;
+ return this;
+ }
+
+ /**
+ * optional .PlayingState playing_state = 5;
+ * @param value the playingState to set
+ * @return this
+ */
+ public FriendListInfo setPlayingState(final PlayingStateOuterClass.PlayingState value) {
+ bitField0_ |= 0x00000001;
+ playingState = value.getNumber();
+ return this;
+ }
+
+ /**
+ * optional .SimpleInfo simple_info = 7;
+ * @return whether the simpleInfo field is set
+ */
+ public boolean hasSimpleInfo() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional .SimpleInfo simple_info = 7;
* @return this
*/
public FriendListInfo clearSimpleInfo() {
- bitField0_ &= ~0x00000001;
+ bitField0_ &= ~0x00000002;
simpleInfo.clear();
return this;
}
/**
- * optional .SimpleInfo simple_info = 2;
+ * 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 +133,7 @@ public final class FriendListInfoOuterClass {
}
/**
- * optional .SimpleInfo simple_info = 2;
+ * 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
@@ -75,17 +142,17 @@ public final class FriendListInfoOuterClass {
* @return internal storage object for modifications
*/
public SimpleInfoOuterClass.SimpleInfo getMutableSimpleInfo() {
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
return simpleInfo;
}
/**
- * optional .SimpleInfo simple_info = 2;
+ * optional .SimpleInfo simple_info = 7;
* @param value the simpleInfo to set
* @return this
*/
public FriendListInfo setSimpleInfo(final SimpleInfoOuterClass.SimpleInfo value) {
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
simpleInfo.copyFrom(value);
return this;
}
@@ -95,6 +162,7 @@ public final class FriendListInfoOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
+ playingState = other.playingState;
simpleInfo.copyFrom(other.simpleInfo);
}
return this;
@@ -106,6 +174,9 @@ public final class FriendListInfoOuterClass {
return this;
}
cachedSize = -1;
+ if (other.hasPlayingState()) {
+ setPlayingStateValue(other.playingState);
+ }
if (other.hasSimpleInfo()) {
getMutableSimpleInfo().mergeFrom(other.simpleInfo);
}
@@ -119,6 +190,7 @@ public final class FriendListInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
+ playingState = 0;
simpleInfo.clear();
return this;
}
@@ -144,13 +216,18 @@ public final class FriendListInfoOuterClass {
}
FriendListInfo other = (FriendListInfo) o;
return bitField0_ == other.bitField0_
+ && (!hasPlayingState() || playingState == other.playingState)
&& (!hasSimpleInfo() || simpleInfo.equals(other.simpleInfo));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 18);
+ output.writeRawByte((byte) 40);
+ output.writeEnumNoTag(playingState);
+ }
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 58);
output.writeMessageNoTag(simpleInfo);
}
}
@@ -159,6 +236,9 @@ public final class FriendListInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
+ size += 1 + ProtoSink.computeEnumSizeNoTag(playingState);
+ }
+ if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(simpleInfo);
}
return size;
@@ -171,10 +251,22 @@ public final class FriendListInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 18: {
+ case 40: {
+ // playingState
+ final int value = input.readInt32();
+ if (PlayingStateOuterClass.PlayingState.forNumber(value) != null) {
+ playingState = value;
+ bitField0_ |= 0x00000001;
+ }
+ tag = input.readTag();
+ if (tag != 58) {
+ break;
+ }
+ }
+ case 58: {
// simpleInfo
input.readMessage(simpleInfo);
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
break;
@@ -198,6 +290,9 @@ public final class FriendListInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
+ output.writeEnum(FieldNames.playingState, playingState, PlayingStateOuterClass.PlayingState.converter());
+ }
+ if ((bitField0_ & 0x00000002) != 0) {
output.writeMessage(FieldNames.simpleInfo, simpleInfo);
}
output.endObject();
@@ -210,12 +305,29 @@ public final class FriendListInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
+ case -583798525:
+ case -574710464: {
+ if (input.isAtField(FieldNames.playingState)) {
+ if (!input.trySkipNullValue()) {
+ final PlayingStateOuterClass.PlayingState value = input.readEnum(PlayingStateOuterClass.PlayingState.converter());
+ if (value != null) {
+ playingState = value.getNumber();
+ bitField0_ |= 0x00000001;
+ } else {
+ input.skipUnknownEnumValue();
+ }
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case -1431903872:
case -1419171045: {
if (input.isAtField(FieldNames.simpleInfo)) {
if (!input.trySkipNullValue()) {
input.readMessage(simpleInfo);
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
}
} else {
input.skipUnknownField();
@@ -275,6 +387,8 @@ public final class FriendListInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
+ static final FieldName playingState = FieldName.forField("playingState", "playing_state");
+
static final FieldName simpleInfo = FieldName.forField("simpleInfo", "simple_info");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/FriendRecommendInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FriendRecommendInfoOuterClass.java
index ff69f6d..97b22f6 100644
--- a/src/generated/main/emu/lunarcore/proto/FriendRecommendInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/FriendRecommendInfoOuterClass.java
@@ -19,7 +19,7 @@ public final class FriendRecommendInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .SimpleInfo simple_info = 8;
+ * optional .SimpleInfo simple_info = 1;
*/
private final SimpleInfoOuterClass.SimpleInfo simpleInfo = SimpleInfoOuterClass.SimpleInfo.newInstance();
@@ -34,7 +34,7 @@ public final class FriendRecommendInfoOuterClass {
}
/**
- * optional .SimpleInfo simple_info = 8;
+ * optional .SimpleInfo simple_info = 1;
* @return whether the simpleInfo field is set
*/
public boolean hasSimpleInfo() {
@@ -42,7 +42,7 @@ public final class FriendRecommendInfoOuterClass {
}
/**
- * optional .SimpleInfo simple_info = 8;
+ * optional .SimpleInfo simple_info = 1;
* @return this
*/
public FriendRecommendInfo clearSimpleInfo() {
@@ -52,7 +52,7 @@ public final class FriendRecommendInfoOuterClass {
}
/**
- * optional .SimpleInfo simple_info = 8;
+ * 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 final class FriendRecommendInfoOuterClass {
}
/**
- * optional .SimpleInfo simple_info = 8;
+ * 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 final class FriendRecommendInfoOuterClass {
}
/**
- * optional .SimpleInfo simple_info = 8;
+ * optional .SimpleInfo simple_info = 1;
* @param value the simpleInfo to set
* @return this
*/
@@ -150,7 +150,7 @@ public final class FriendRecommendInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 66);
+ output.writeRawByte((byte) 10);
output.writeMessageNoTag(simpleInfo);
}
}
@@ -171,7 +171,7 @@ public final class FriendRecommendInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 66: {
+ 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 01fef0f..292af81 100644
--- a/src/generated/main/emu/lunarcore/proto/GachaCeilingAvatarOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GachaCeilingAvatarOuterClass.java
@@ -19,12 +19,12 @@ public final class GachaCeilingAvatarOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 repeated_cnt = 14;
+ * optional uint32 repeated_cnt = 3;
*/
private int repeatedCnt;
/**
- * optional uint32 avatar_id = 15;
+ * optional uint32 avatar_id = 9;
*/
private int avatarId;
@@ -39,7 +39,7 @@ public final class GachaCeilingAvatarOuterClass {
}
/**
- * optional uint32 repeated_cnt = 14;
+ * optional uint32 repeated_cnt = 3;
* @return whether the repeatedCnt field is set
*/
public boolean hasRepeatedCnt() {
@@ -47,7 +47,7 @@ public final class GachaCeilingAvatarOuterClass {
}
/**
- * optional uint32 repeated_cnt = 14;
+ * optional uint32 repeated_cnt = 3;
* @return this
*/
public GachaCeilingAvatar clearRepeatedCnt() {
@@ -57,7 +57,7 @@ public final class GachaCeilingAvatarOuterClass {
}
/**
- * optional uint32 repeated_cnt = 14;
+ * optional uint32 repeated_cnt = 3;
* @return the repeatedCnt
*/
public int getRepeatedCnt() {
@@ -65,7 +65,7 @@ public final class GachaCeilingAvatarOuterClass {
}
/**
- * optional uint32 repeated_cnt = 14;
+ * optional uint32 repeated_cnt = 3;
* @param value the repeatedCnt to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class GachaCeilingAvatarOuterClass {
}
/**
- * optional uint32 avatar_id = 15;
+ * optional uint32 avatar_id = 9;
* @return whether the avatarId field is set
*/
public boolean hasAvatarId() {
@@ -84,7 +84,7 @@ public final class GachaCeilingAvatarOuterClass {
}
/**
- * optional uint32 avatar_id = 15;
+ * optional uint32 avatar_id = 9;
* @return this
*/
public GachaCeilingAvatar clearAvatarId() {
@@ -94,7 +94,7 @@ public final class GachaCeilingAvatarOuterClass {
}
/**
- * optional uint32 avatar_id = 15;
+ * optional uint32 avatar_id = 9;
* @return the avatarId
*/
public int getAvatarId() {
@@ -102,7 +102,7 @@ public final class GachaCeilingAvatarOuterClass {
}
/**
- * optional uint32 avatar_id = 15;
+ * optional uint32 avatar_id = 9;
* @param value the avatarId to set
* @return this
*/
@@ -177,11 +177,11 @@ public final class GachaCeilingAvatarOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(repeatedCnt);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 72);
output.writeUInt32NoTag(avatarId);
}
}
@@ -205,16 +205,16 @@ public final class GachaCeilingAvatarOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 112: {
+ case 24: {
// repeatedCnt
repeatedCnt = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 72) {
break;
}
}
- case 120: {
+ case 72: {
// avatarId
avatarId = 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 b58006d..421c258 100644
--- a/src/generated/main/emu/lunarcore/proto/GachaCeilingOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GachaCeilingOuterClass.java
@@ -20,17 +20,17 @@ public final class GachaCeilingOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 ceiling_num = 8;
+ * optional uint32 ceiling_num = 4;
*/
private int ceilingNum;
/**
- * optional bool is_claimed = 11;
+ * optional bool is_claimed = 5;
*/
private boolean isClaimed;
/**
- * repeated .GachaCeilingAvatar avatar_list = 6;
+ * repeated .GachaCeilingAvatar avatar_list = 9;
*/
private final RepeatedMessageoptional uint32 ceiling_num = 8;
+ * optional uint32 ceiling_num = 4;
* @return whether the ceilingNum field is set
*/
public boolean hasCeilingNum() {
@@ -53,7 +53,7 @@ public final class GachaCeilingOuterClass {
}
/**
- * optional uint32 ceiling_num = 8;
+ * optional uint32 ceiling_num = 4;
* @return this
*/
public GachaCeiling clearCeilingNum() {
@@ -63,7 +63,7 @@ public final class GachaCeilingOuterClass {
}
/**
- * optional uint32 ceiling_num = 8;
+ * optional uint32 ceiling_num = 4;
* @return the ceilingNum
*/
public int getCeilingNum() {
@@ -71,7 +71,7 @@ public final class GachaCeilingOuterClass {
}
/**
- * optional uint32 ceiling_num = 8;
+ * optional uint32 ceiling_num = 4;
* @param value the ceilingNum to set
* @return this
*/
@@ -82,7 +82,7 @@ public final class GachaCeilingOuterClass {
}
/**
- * optional bool is_claimed = 11;
+ * optional bool is_claimed = 5;
* @return whether the isClaimed field is set
*/
public boolean hasIsClaimed() {
@@ -90,7 +90,7 @@ public final class GachaCeilingOuterClass {
}
/**
- * optional bool is_claimed = 11;
+ * optional bool is_claimed = 5;
* @return this
*/
public GachaCeiling clearIsClaimed() {
@@ -100,7 +100,7 @@ public final class GachaCeilingOuterClass {
}
/**
- * optional bool is_claimed = 11;
+ * optional bool is_claimed = 5;
* @return the isClaimed
*/
public boolean getIsClaimed() {
@@ -108,7 +108,7 @@ public final class GachaCeilingOuterClass {
}
/**
- * optional bool is_claimed = 11;
+ * optional bool is_claimed = 5;
* @param value the isClaimed to set
* @return this
*/
@@ -119,7 +119,7 @@ public final class GachaCeilingOuterClass {
}
/**
- * repeated .GachaCeilingAvatar avatar_list = 6;
+ * repeated .GachaCeilingAvatar avatar_list = 9;
* @return whether the avatarList field is set
*/
public boolean hasAvatarList() {
@@ -127,7 +127,7 @@ public final class GachaCeilingOuterClass {
}
/**
- * repeated .GachaCeilingAvatar avatar_list = 6;
+ * repeated .GachaCeilingAvatar avatar_list = 9;
* @return this
*/
public GachaCeiling clearAvatarList() {
@@ -137,7 +137,7 @@ public final class GachaCeilingOuterClass {
}
/**
- * repeated .GachaCeilingAvatar avatar_list = 6;
+ * repeated .GachaCeilingAvatar avatar_list = 9;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -151,7 +151,7 @@ public final class GachaCeilingOuterClass {
}
/**
- * repeated .GachaCeilingAvatar avatar_list = 6;
+ * repeated .GachaCeilingAvatar avatar_list = 9;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -165,7 +165,7 @@ public final class GachaCeilingOuterClass {
}
/**
- * repeated .GachaCeilingAvatar avatar_list = 6;
+ * repeated .GachaCeilingAvatar avatar_list = 9;
* @param value the avatarList to add
* @return this
*/
@@ -176,7 +176,7 @@ public final class GachaCeilingOuterClass {
}
/**
- * repeated .GachaCeilingAvatar avatar_list = 6;
+ * repeated .GachaCeilingAvatar avatar_list = 9;
* @param values the avatarList to add
* @return this
*/
@@ -259,16 +259,16 @@ public final class GachaCeilingOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(ceilingNum);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 40);
output.writeBoolNoTag(isClaimed);
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < avatarList.length(); i++) {
- output.writeRawByte((byte) 50);
+ output.writeRawByte((byte) 74);
output.writeMessageNoTag(avatarList.get(i));
}
}
@@ -296,25 +296,25 @@ public final class GachaCeilingOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 64: {
+ case 32: {
// ceilingNum
ceilingNum = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 88) {
+ if (tag != 40) {
break;
}
}
- case 88: {
+ case 40: {
// isClaimed
isClaimed = input.readBool();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 50) {
+ if (tag != 74) {
break;
}
}
- case 50: {
+ case 74: {
// 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 f5544d2..3447100 100644
--- a/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java
@@ -21,45 +21,45 @@ public final class GachaInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional int64 begin_time = 4;
+ * optional int64 begin_time = 1;
*/
private long beginTime;
/**
- * optional int64 end_time = 8;
+ * optional int64 end_time = 7;
*/
private long endTime;
/**
- * optional uint32 gacha_id = 11;
+ * optional uint32 gacha_id = 10;
*/
private int gachaId;
/**
- * optional .GachaCeiling gacha_ceiling = 6;
+ * optional .GachaCeiling gacha_ceiling = 5;
*/
private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance();
/**
- * optional string detail_url = 2;
- */
- private final Utf8String detailUrl = Utf8String.newEmptyInstance();
-
- /**
- * optional string history_url = 13;
+ * optional string history_url = 4;
*/
private final Utf8String historyUrl = Utf8String.newEmptyInstance();
/**
- * repeated uint32 featured = 3;
+ * optional string detail_url = 6;
*/
- private final RepeatedInt featured = RepeatedInt.newEmptyInstance();
+ private final Utf8String detailUrl = Utf8String.newEmptyInstance();
/**
- * repeated uint32 up_info = 9;
+ * repeated uint32 up_info = 11;
*/
private final RepeatedInt upInfo = RepeatedInt.newEmptyInstance();
+ /**
+ * repeated uint32 featured = 13;
+ */
+ private final RepeatedInt featured = RepeatedInt.newEmptyInstance();
+
private GachaInfo() {
}
@@ -71,7 +71,7 @@ public final class GachaInfoOuterClass {
}
/**
- * optional int64 begin_time = 4;
+ * optional int64 begin_time = 1;
* @return whether the beginTime field is set
*/
public boolean hasBeginTime() {
@@ -79,7 +79,7 @@ public final class GachaInfoOuterClass {
}
/**
- * optional int64 begin_time = 4;
+ * optional int64 begin_time = 1;
* @return this
*/
public GachaInfo clearBeginTime() {
@@ -89,7 +89,7 @@ public final class GachaInfoOuterClass {
}
/**
- * optional int64 begin_time = 4;
+ * optional int64 begin_time = 1;
* @return the beginTime
*/
public long getBeginTime() {
@@ -97,7 +97,7 @@ public final class GachaInfoOuterClass {
}
/**
- * optional int64 begin_time = 4;
+ * optional int64 begin_time = 1;
* @param value the beginTime to set
* @return this
*/
@@ -108,7 +108,7 @@ public final class GachaInfoOuterClass {
}
/**
- * optional int64 end_time = 8;
+ * optional int64 end_time = 7;
* @return whether the endTime field is set
*/
public boolean hasEndTime() {
@@ -116,7 +116,7 @@ public final class GachaInfoOuterClass {
}
/**
- * optional int64 end_time = 8;
+ * optional int64 end_time = 7;
* @return this
*/
public GachaInfo clearEndTime() {
@@ -126,7 +126,7 @@ public final class GachaInfoOuterClass {
}
/**
- * optional int64 end_time = 8;
+ * optional int64 end_time = 7;
* @return the endTime
*/
public long getEndTime() {
@@ -134,7 +134,7 @@ public final class GachaInfoOuterClass {
}
/**
- * optional int64 end_time = 8;
+ * optional int64 end_time = 7;
* @param value the endTime to set
* @return this
*/
@@ -145,7 +145,7 @@ public final class GachaInfoOuterClass {
}
/**
- * optional uint32 gacha_id = 11;
+ * optional uint32 gacha_id = 10;
* @return whether the gachaId field is set
*/
public boolean hasGachaId() {
@@ -153,7 +153,7 @@ public final class GachaInfoOuterClass {
}
/**
- * optional uint32 gacha_id = 11;
+ * optional uint32 gacha_id = 10;
* @return this
*/
public GachaInfo clearGachaId() {
@@ -163,7 +163,7 @@ public final class GachaInfoOuterClass {
}
/**
- * optional uint32 gacha_id = 11;
+ * optional uint32 gacha_id = 10;
* @return the gachaId
*/
public int getGachaId() {
@@ -171,7 +171,7 @@ public final class GachaInfoOuterClass {
}
/**
- * optional uint32 gacha_id = 11;
+ * optional uint32 gacha_id = 10;
* @param value the gachaId to set
* @return this
*/
@@ -182,7 +182,7 @@ public final class GachaInfoOuterClass {
}
/**
- * optional .GachaCeiling gacha_ceiling = 6;
+ * optional .GachaCeiling gacha_ceiling = 5;
* @return whether the gachaCeiling field is set
*/
public boolean hasGachaCeiling() {
@@ -190,7 +190,7 @@ public final class GachaInfoOuterClass {
}
/**
- * optional .GachaCeiling gacha_ceiling = 6;
+ * optional .GachaCeiling gacha_ceiling = 5;
* @return this
*/
public GachaInfo clearGachaCeiling() {
@@ -200,7 +200,7 @@ public final class GachaInfoOuterClass {
}
/**
- * optional .GachaCeiling gacha_ceiling = 6;
+ * 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.
@@ -214,7 +214,7 @@ public final class GachaInfoOuterClass {
}
/**
- * optional .GachaCeiling gacha_ceiling = 6;
+ * 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
@@ -228,7 +228,7 @@ public final class GachaInfoOuterClass {
}
/**
- * optional .GachaCeiling gacha_ceiling = 6;
+ * optional .GachaCeiling gacha_ceiling = 5;
* @param value the gachaCeiling to set
* @return this
*/
@@ -239,90 +239,25 @@ public final class GachaInfoOuterClass {
}
/**
- * optional string detail_url = 2;
- * @return whether the detailUrl field is set
+ * optional string history_url = 4;
+ * @return whether the historyUrl field is set
*/
- public boolean hasDetailUrl() {
+ public boolean hasHistoryUrl() {
return (bitField0_ & 0x00000010) != 0;
}
/**
- * optional string detail_url = 2;
- * @return this
- */
- public GachaInfo clearDetailUrl() {
- bitField0_ &= ~0x00000010;
- detailUrl.clear();
- return this;
- }
-
- /**
- * optional string detail_url = 2;
- * @return the detailUrl
- */
- public String getDetailUrl() {
- return detailUrl.getString();
- }
-
- /**
- * optional string detail_url = 2;
- * @return internal {@code Utf8String} representation of detailUrl for reading
- */
- public Utf8String getDetailUrlBytes() {
- return this.detailUrl;
- }
-
- /**
- * optional string detail_url = 2;
- * @return internal {@code Utf8String} representation of detailUrl for modifications
- */
- public Utf8String getMutableDetailUrlBytes() {
- bitField0_ |= 0x00000010;
- return this.detailUrl;
- }
-
- /**
- * optional string detail_url = 2;
- * @param value the detailUrl to set
- * @return this
- */
- public GachaInfo setDetailUrl(final CharSequence value) {
- bitField0_ |= 0x00000010;
- detailUrl.copyFrom(value);
- return this;
- }
-
- /**
- * optional string detail_url = 2;
- * @param value the detailUrl to set
- * @return this
- */
- public GachaInfo setDetailUrl(final Utf8String value) {
- bitField0_ |= 0x00000010;
- detailUrl.copyFrom(value);
- return this;
- }
-
- /**
- * optional string history_url = 13;
- * @return whether the historyUrl field is set
- */
- public boolean hasHistoryUrl() {
- return (bitField0_ & 0x00000020) != 0;
- }
-
- /**
- * optional string history_url = 13;
+ * optional string history_url = 4;
* @return this
*/
public GachaInfo clearHistoryUrl() {
- bitField0_ &= ~0x00000020;
+ bitField0_ &= ~0x00000010;
historyUrl.clear();
return this;
}
/**
- * optional string history_url = 13;
+ * optional string history_url = 4;
* @return the historyUrl
*/
public String getHistoryUrl() {
@@ -330,7 +265,7 @@ public final class GachaInfoOuterClass {
}
/**
- * optional string history_url = 13;
+ * optional string history_url = 4;
* @return internal {@code Utf8String} representation of historyUrl for reading
*/
public Utf8String getHistoryUrlBytes() {
@@ -338,124 +273,121 @@ public final class GachaInfoOuterClass {
}
/**
- * optional string history_url = 13;
+ * optional string history_url = 4;
* @return internal {@code Utf8String} representation of historyUrl for modifications
*/
public Utf8String getMutableHistoryUrlBytes() {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
return this.historyUrl;
}
/**
- * optional string history_url = 13;
+ * optional string history_url = 4;
* @param value the historyUrl to set
* @return this
*/
public GachaInfo setHistoryUrl(final CharSequence value) {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
historyUrl.copyFrom(value);
return this;
}
/**
- * optional string history_url = 13;
+ * optional string history_url = 4;
* @param value the historyUrl to set
* @return this
*/
public GachaInfo setHistoryUrl(final Utf8String value) {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
historyUrl.copyFrom(value);
return this;
}
/**
- * repeated uint32 featured = 3;
- * @return whether the featured field is set
+ * optional string detail_url = 6;
+ * @return whether the detailUrl field is set
*/
- public boolean hasFeatured() {
+ public boolean hasDetailUrl() {
+ return (bitField0_ & 0x00000020) != 0;
+ }
+
+ /**
+ * optional string detail_url = 6;
+ * @return this
+ */
+ public GachaInfo clearDetailUrl() {
+ bitField0_ &= ~0x00000020;
+ detailUrl.clear();
+ return this;
+ }
+
+ /**
+ * optional string detail_url = 6;
+ * @return the detailUrl
+ */
+ public String getDetailUrl() {
+ return detailUrl.getString();
+ }
+
+ /**
+ * optional string detail_url = 6;
+ * @return internal {@code Utf8String} representation of detailUrl for reading
+ */
+ public Utf8String getDetailUrlBytes() {
+ return this.detailUrl;
+ }
+
+ /**
+ * optional string detail_url = 6;
+ * @return internal {@code Utf8String} representation of detailUrl for modifications
+ */
+ public Utf8String getMutableDetailUrlBytes() {
+ bitField0_ |= 0x00000020;
+ return this.detailUrl;
+ }
+
+ /**
+ * optional string detail_url = 6;
+ * @param value the detailUrl to set
+ * @return this
+ */
+ public GachaInfo setDetailUrl(final CharSequence value) {
+ bitField0_ |= 0x00000020;
+ detailUrl.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional string detail_url = 6;
+ * @param value the detailUrl to set
+ * @return this
+ */
+ public GachaInfo setDetailUrl(final Utf8String value) {
+ bitField0_ |= 0x00000020;
+ detailUrl.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * repeated uint32 up_info = 11;
+ * @return whether the upInfo field is set
+ */
+ public boolean hasUpInfo() {
return (bitField0_ & 0x00000040) != 0;
}
/**
- * repeated uint32 featured = 3;
- * @return this
- */
- public GachaInfo clearFeatured() {
- bitField0_ &= ~0x00000040;
- featured.clear();
- return this;
- }
-
- /**
- * repeated uint32 featured = 3;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableFeatured()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedInt getFeatured() {
- return featured;
- }
-
- /**
- * repeated uint32 featured = 3;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedInt getMutableFeatured() {
- bitField0_ |= 0x00000040;
- return featured;
- }
-
- /**
- * repeated uint32 featured = 3;
- * @param value the featured to add
- * @return this
- */
- public GachaInfo addFeatured(final int value) {
- bitField0_ |= 0x00000040;
- featured.add(value);
- return this;
- }
-
- /**
- * repeated uint32 featured = 3;
- * @param values the featured to add
- * @return this
- */
- public GachaInfo addAllFeatured(final int... values) {
- bitField0_ |= 0x00000040;
- featured.addAll(values);
- return this;
- }
-
- /**
- * repeated uint32 up_info = 9;
- * @return whether the upInfo field is set
- */
- public boolean hasUpInfo() {
- return (bitField0_ & 0x00000080) != 0;
- }
-
- /**
- * repeated uint32 up_info = 9;
+ * repeated uint32 up_info = 11;
* @return this
*/
public GachaInfo clearUpInfo() {
- bitField0_ &= ~0x00000080;
+ bitField0_ &= ~0x00000040;
upInfo.clear();
return this;
}
/**
- * repeated uint32 up_info = 9;
+ * repeated uint32 up_info = 11;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -469,7 +401,7 @@ public final class GachaInfoOuterClass {
}
/**
- * repeated uint32 up_info = 9;
+ * repeated uint32 up_info = 11;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -478,32 +410,100 @@ public final class GachaInfoOuterClass {
* @return internal storage object for modifications
*/
public RepeatedInt getMutableUpInfo() {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000040;
return upInfo;
}
/**
- * repeated uint32 up_info = 9;
+ * repeated uint32 up_info = 11;
* @param value the upInfo to add
* @return this
*/
public GachaInfo addUpInfo(final int value) {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000040;
upInfo.add(value);
return this;
}
/**
- * repeated uint32 up_info = 9;
+ * repeated uint32 up_info = 11;
* @param values the upInfo to add
* @return this
*/
public GachaInfo addAllUpInfo(final int... values) {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000040;
upInfo.addAll(values);
return this;
}
+ /**
+ * repeated uint32 featured = 13;
+ * @return whether the featured field is set
+ */
+ public boolean hasFeatured() {
+ return (bitField0_ & 0x00000080) != 0;
+ }
+
+ /**
+ * repeated uint32 featured = 13;
+ * @return this
+ */
+ public GachaInfo clearFeatured() {
+ bitField0_ &= ~0x00000080;
+ featured.clear();
+ return this;
+ }
+
+ /**
+ * repeated uint32 featured = 13;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableFeatured()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedInt getFeatured() {
+ return featured;
+ }
+
+ /**
+ * repeated uint32 featured = 13;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedInt getMutableFeatured() {
+ bitField0_ |= 0x00000080;
+ return featured;
+ }
+
+ /**
+ * repeated uint32 featured = 13;
+ * @param value the featured to add
+ * @return this
+ */
+ public GachaInfo addFeatured(final int value) {
+ bitField0_ |= 0x00000080;
+ featured.add(value);
+ return this;
+ }
+
+ /**
+ * repeated uint32 featured = 13;
+ * @param values the featured to add
+ * @return this
+ */
+ public GachaInfo addAllFeatured(final int... values) {
+ bitField0_ |= 0x00000080;
+ featured.addAll(values);
+ return this;
+ }
+
@Override
public GachaInfo copyFrom(final GachaInfo other) {
cachedSize = other.cachedSize;
@@ -513,10 +513,10 @@ public final class GachaInfoOuterClass {
endTime = other.endTime;
gachaId = other.gachaId;
gachaCeiling.copyFrom(other.gachaCeiling);
- detailUrl.copyFrom(other.detailUrl);
historyUrl.copyFrom(other.historyUrl);
- featured.copyFrom(other.featured);
+ detailUrl.copyFrom(other.detailUrl);
upInfo.copyFrom(other.upInfo);
+ featured.copyFrom(other.featured);
}
return this;
}
@@ -539,18 +539,18 @@ public final class GachaInfoOuterClass {
if (other.hasGachaCeiling()) {
getMutableGachaCeiling().mergeFrom(other.gachaCeiling);
}
- if (other.hasDetailUrl()) {
- getMutableDetailUrlBytes().copyFrom(other.detailUrl);
- }
if (other.hasHistoryUrl()) {
getMutableHistoryUrlBytes().copyFrom(other.historyUrl);
}
- if (other.hasFeatured()) {
- getMutableFeatured().addAll(other.featured);
+ if (other.hasDetailUrl()) {
+ getMutableDetailUrlBytes().copyFrom(other.detailUrl);
}
if (other.hasUpInfo()) {
getMutableUpInfo().addAll(other.upInfo);
}
+ if (other.hasFeatured()) {
+ getMutableFeatured().addAll(other.featured);
+ }
return this;
}
@@ -565,10 +565,10 @@ public final class GachaInfoOuterClass {
endTime = 0L;
gachaId = 0;
gachaCeiling.clear();
- detailUrl.clear();
historyUrl.clear();
- featured.clear();
+ detailUrl.clear();
upInfo.clear();
+ featured.clear();
return this;
}
@@ -580,10 +580,10 @@ public final class GachaInfoOuterClass {
cachedSize = -1;
bitField0_ = 0;
gachaCeiling.clearQuick();
- detailUrl.clear();
historyUrl.clear();
- featured.clear();
+ detailUrl.clear();
upInfo.clear();
+ featured.clear();
return this;
}
@@ -601,48 +601,48 @@ public final class GachaInfoOuterClass {
&& (!hasEndTime() || endTime == other.endTime)
&& (!hasGachaId() || gachaId == other.gachaId)
&& (!hasGachaCeiling() || gachaCeiling.equals(other.gachaCeiling))
- && (!hasDetailUrl() || detailUrl.equals(other.detailUrl))
&& (!hasHistoryUrl() || historyUrl.equals(other.historyUrl))
- && (!hasFeatured() || featured.equals(other.featured))
- && (!hasUpInfo() || upInfo.equals(other.upInfo));
+ && (!hasDetailUrl() || detailUrl.equals(other.detailUrl))
+ && (!hasUpInfo() || upInfo.equals(other.upInfo))
+ && (!hasFeatured() || featured.equals(other.featured));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 8);
output.writeInt64NoTag(beginTime);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 56);
output.writeInt64NoTag(endTime);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(gachaId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 50);
+ output.writeRawByte((byte) 42);
output.writeMessageNoTag(gachaCeiling);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 18);
- output.writeStringNoTag(detailUrl);
- }
- if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 106);
+ output.writeRawByte((byte) 34);
output.writeStringNoTag(historyUrl);
}
+ if ((bitField0_ & 0x00000020) != 0) {
+ output.writeRawByte((byte) 50);
+ output.writeStringNoTag(detailUrl);
+ }
if ((bitField0_ & 0x00000040) != 0) {
- for (int i = 0; i < featured.length(); i++) {
- output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(featured.array()[i]);
+ for (int i = 0; i < upInfo.length(); i++) {
+ output.writeRawByte((byte) 88);
+ output.writeUInt32NoTag(upInfo.array()[i]);
}
}
if ((bitField0_ & 0x00000080) != 0) {
- for (int i = 0; i < upInfo.length(); i++) {
- output.writeRawByte((byte) 72);
- output.writeUInt32NoTag(upInfo.array()[i]);
+ for (int i = 0; i < featured.length(); i++) {
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(featured.array()[i]);
}
}
}
@@ -663,16 +663,16 @@ public final class GachaInfoOuterClass {
size += 1 + ProtoSink.computeMessageSizeNoTag(gachaCeiling);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += 1 + ProtoSink.computeStringSizeNoTag(detailUrl);
- }
- if ((bitField0_ & 0x00000020) != 0) {
size += 1 + ProtoSink.computeStringSizeNoTag(historyUrl);
}
+ if ((bitField0_ & 0x00000020) != 0) {
+ size += 1 + ProtoSink.computeStringSizeNoTag(detailUrl);
+ }
if ((bitField0_ & 0x00000040) != 0) {
- size += (1 * featured.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(featured);
+ size += (1 * upInfo.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(upInfo);
}
if ((bitField0_ & 0x00000080) != 0) {
- size += (1 * upInfo.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(upInfo);
+ size += (1 * featured.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(featured);
}
return size;
}
@@ -684,72 +684,72 @@ public final class GachaInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
+ case 8: {
// beginTime
beginTime = input.readInt64();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 64) {
+ if (tag != 56) {
break;
}
}
- case 64: {
+ case 56: {
// endTime
endTime = input.readInt64();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 88) {
+ if (tag != 80) {
break;
}
}
- case 88: {
+ case 80: {
// gachaId
gachaId = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
+ if (tag != 42) {
+ break;
+ }
+ }
+ case 42: {
+ // gachaCeiling
+ input.readMessage(gachaCeiling);
+ bitField0_ |= 0x00000008;
+ tag = input.readTag();
+ if (tag != 34) {
+ break;
+ }
+ }
+ case 34: {
+ // historyUrl
+ input.readString(historyUrl);
+ bitField0_ |= 0x00000010;
+ tag = input.readTag();
if (tag != 50) {
break;
}
}
case 50: {
- // gachaCeiling
- input.readMessage(gachaCeiling);
- bitField0_ |= 0x00000008;
+ // detailUrl
+ input.readString(detailUrl);
+ bitField0_ |= 0x00000020;
tag = input.readTag();
- if (tag != 18) {
+ if (tag != 90) {
break;
}
}
- case 18: {
- // detailUrl
- input.readString(detailUrl);
- bitField0_ |= 0x00000010;
+ case 90: {
+ // upInfo [packed=true]
+ input.readPackedUInt32(upInfo, tag);
+ bitField0_ |= 0x00000040;
tag = input.readTag();
if (tag != 106) {
break;
}
}
case 106: {
- // historyUrl
- input.readString(historyUrl);
- bitField0_ |= 0x00000020;
- tag = input.readTag();
- if (tag != 26) {
- break;
- }
- }
- case 26: {
// featured [packed=true]
input.readPackedUInt32(featured, tag);
- bitField0_ |= 0x00000040;
- tag = input.readTag();
- if (tag != 74) {
- break;
- }
- }
- case 74: {
- // upInfo [packed=true]
- input.readPackedUInt32(upInfo, tag);
bitField0_ |= 0x00000080;
tag = input.readTag();
if (tag != 0) {
@@ -766,15 +766,15 @@ public final class GachaInfoOuterClass {
tag = input.readTag();
break;
}
- case 24: {
- // featured [packed=false]
- tag = input.readRepeatedUInt32(featured, tag);
+ case 88: {
+ // upInfo [packed=false]
+ tag = input.readRepeatedUInt32(upInfo, tag);
bitField0_ |= 0x00000040;
break;
}
- case 72: {
- // upInfo [packed=false]
- tag = input.readRepeatedUInt32(upInfo, tag);
+ case 104: {
+ // featured [packed=false]
+ tag = input.readRepeatedUInt32(featured, tag);
bitField0_ |= 0x00000080;
break;
}
@@ -798,16 +798,16 @@ public final class GachaInfoOuterClass {
output.writeMessage(FieldNames.gachaCeiling, gachaCeiling);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeString(FieldNames.detailUrl, detailUrl);
- }
- if ((bitField0_ & 0x00000020) != 0) {
output.writeString(FieldNames.historyUrl, historyUrl);
}
+ if ((bitField0_ & 0x00000020) != 0) {
+ output.writeString(FieldNames.detailUrl, detailUrl);
+ }
if ((bitField0_ & 0x00000040) != 0) {
- output.writeRepeatedUInt32(FieldNames.featured, featured);
+ output.writeRepeatedUInt32(FieldNames.upInfo, upInfo);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRepeatedUInt32(FieldNames.upInfo, upInfo);
+ output.writeRepeatedUInt32(FieldNames.featured, featured);
}
output.endObject();
}
@@ -867,11 +867,11 @@ public final class GachaInfoOuterClass {
}
break;
}
- case -1973090466:
- case -1035961215: {
- if (input.isAtField(FieldNames.detailUrl)) {
+ case 1951019067:
+ case 352350020: {
+ if (input.isAtField(FieldNames.historyUrl)) {
if (!input.trySkipNullValue()) {
- input.readString(detailUrl);
+ input.readString(historyUrl);
bitField0_ |= 0x00000010;
}
} else {
@@ -879,11 +879,11 @@ public final class GachaInfoOuterClass {
}
break;
}
- case 1951019067:
- case 352350020: {
- if (input.isAtField(FieldNames.historyUrl)) {
+ case -1973090466:
+ case -1035961215: {
+ if (input.isAtField(FieldNames.detailUrl)) {
if (!input.trySkipNullValue()) {
- input.readString(historyUrl);
+ input.readString(detailUrl);
bitField0_ |= 0x00000020;
}
} else {
@@ -891,22 +891,22 @@ public final class GachaInfoOuterClass {
}
break;
}
- case -290659282: {
- if (input.isAtField(FieldNames.featured)) {
- if (!input.trySkipNullValue()) {
- input.readRepeatedUInt32(featured);
- bitField0_ |= 0x00000040;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case -839638551:
case -238815278: {
if (input.isAtField(FieldNames.upInfo)) {
if (!input.trySkipNullValue()) {
input.readRepeatedUInt32(upInfo);
+ bitField0_ |= 0x00000040;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -290659282: {
+ if (input.isAtField(FieldNames.featured)) {
+ if (!input.trySkipNullValue()) {
+ input.readRepeatedUInt32(featured);
bitField0_ |= 0x00000080;
}
} else {
@@ -974,13 +974,13 @@ public final class GachaInfoOuterClass {
static final FieldName gachaCeiling = FieldName.forField("gachaCeiling", "gacha_ceiling");
- static final FieldName detailUrl = FieldName.forField("detailUrl", "detail_url");
-
static final FieldName historyUrl = FieldName.forField("historyUrl", "history_url");
- static final FieldName featured = FieldName.forField("featured");
+ static final FieldName detailUrl = FieldName.forField("detailUrl", "detail_url");
static final FieldName upInfo = FieldName.forField("upInfo", "up_info");
+
+ static final FieldName featured = FieldName.forField("featured");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java b/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java
index 777dfe9..cd9c943 100644
--- a/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java
@@ -24,15 +24,15 @@ public final class GachaItemOuterClass {
private boolean isNew;
/**
- * optional .Item gacha_item = 3;
- */
- private final ItemOuterClass.Item gachaItem = ItemOuterClass.Item.newInstance();
-
- /**
- * optional .ItemList token_item = 4;
+ * optional .ItemList token_item = 1;
*/
private final ItemListOuterClass.ItemList tokenItem = ItemListOuterClass.ItemList.newInstance();
+ /**
+ * optional .Item gacha_item = 6;
+ */
+ private final ItemOuterClass.Item gachaItem = ItemOuterClass.Item.newInstance();
+
/**
* optional .ItemList transfer_item_list = 9;
*/
@@ -86,82 +86,25 @@ public final class GachaItemOuterClass {
}
/**
- * optional .Item gacha_item = 3;
- * @return whether the gachaItem field is set
+ * optional .ItemList token_item = 1;
+ * @return whether the tokenItem field is set
*/
- public boolean hasGachaItem() {
+ public boolean hasTokenItem() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional .Item gacha_item = 3;
- * @return this
- */
- public GachaItem clearGachaItem() {
- bitField0_ &= ~0x00000002;
- gachaItem.clear();
- return this;
- }
-
- /**
- * optional .Item gacha_item = 3;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableGachaItem()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public ItemOuterClass.Item getGachaItem() {
- return gachaItem;
- }
-
- /**
- * optional .Item gacha_item = 3;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public ItemOuterClass.Item getMutableGachaItem() {
- bitField0_ |= 0x00000002;
- return gachaItem;
- }
-
- /**
- * optional .Item gacha_item = 3;
- * @param value the gachaItem to set
- * @return this
- */
- public GachaItem setGachaItem(final ItemOuterClass.Item value) {
- bitField0_ |= 0x00000002;
- gachaItem.copyFrom(value);
- return this;
- }
-
- /**
- * optional .ItemList token_item = 4;
- * @return whether the tokenItem field is set
- */
- public boolean hasTokenItem() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional .ItemList token_item = 4;
+ * optional .ItemList token_item = 1;
* @return this
*/
public GachaItem clearTokenItem() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
tokenItem.clear();
return this;
}
/**
- * optional .ItemList token_item = 4;
+ * optional .ItemList token_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.
@@ -175,7 +118,7 @@ public final class GachaItemOuterClass {
}
/**
- * optional .ItemList token_item = 4;
+ * optional .ItemList token_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
@@ -184,21 +127,78 @@ public final class GachaItemOuterClass {
* @return internal storage object for modifications
*/
public ItemListOuterClass.ItemList getMutableTokenItem() {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
return tokenItem;
}
/**
- * optional .ItemList token_item = 4;
+ * optional .ItemList token_item = 1;
* @param value the tokenItem to set
* @return this
*/
public GachaItem setTokenItem(final ItemListOuterClass.ItemList value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
tokenItem.copyFrom(value);
return this;
}
+ /**
+ * optional .Item gacha_item = 6;
+ * @return whether the gachaItem field is set
+ */
+ public boolean hasGachaItem() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional .Item gacha_item = 6;
+ * @return this
+ */
+ public GachaItem clearGachaItem() {
+ bitField0_ &= ~0x00000004;
+ gachaItem.clear();
+ return this;
+ }
+
+ /**
+ * optional .Item gacha_item = 6;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableGachaItem()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public ItemOuterClass.Item getGachaItem() {
+ return gachaItem;
+ }
+
+ /**
+ * optional .Item gacha_item = 6;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public ItemOuterClass.Item getMutableGachaItem() {
+ bitField0_ |= 0x00000004;
+ return gachaItem;
+ }
+
+ /**
+ * optional .Item gacha_item = 6;
+ * @param value the gachaItem to set
+ * @return this
+ */
+ public GachaItem setGachaItem(final ItemOuterClass.Item value) {
+ bitField0_ |= 0x00000004;
+ gachaItem.copyFrom(value);
+ return this;
+ }
+
/**
* optional .ItemList transfer_item_list = 9;
* @return whether the transferItemList field is set
@@ -262,8 +262,8 @@ public final class GachaItemOuterClass {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
isNew = other.isNew;
- gachaItem.copyFrom(other.gachaItem);
tokenItem.copyFrom(other.tokenItem);
+ gachaItem.copyFrom(other.gachaItem);
transferItemList.copyFrom(other.transferItemList);
}
return this;
@@ -278,12 +278,12 @@ public final class GachaItemOuterClass {
if (other.hasIsNew()) {
setIsNew(other.isNew);
}
- if (other.hasGachaItem()) {
- getMutableGachaItem().mergeFrom(other.gachaItem);
- }
if (other.hasTokenItem()) {
getMutableTokenItem().mergeFrom(other.tokenItem);
}
+ if (other.hasGachaItem()) {
+ getMutableGachaItem().mergeFrom(other.gachaItem);
+ }
if (other.hasTransferItemList()) {
getMutableTransferItemList().mergeFrom(other.transferItemList);
}
@@ -298,8 +298,8 @@ public final class GachaItemOuterClass {
cachedSize = -1;
bitField0_ = 0;
isNew = false;
- gachaItem.clear();
tokenItem.clear();
+ gachaItem.clear();
transferItemList.clear();
return this;
}
@@ -311,8 +311,8 @@ public final class GachaItemOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- gachaItem.clearQuick();
tokenItem.clearQuick();
+ gachaItem.clearQuick();
transferItemList.clearQuick();
return this;
}
@@ -328,8 +328,8 @@ public final class GachaItemOuterClass {
GachaItem other = (GachaItem) o;
return bitField0_ == other.bitField0_
&& (!hasIsNew() || isNew == other.isNew)
- && (!hasGachaItem() || gachaItem.equals(other.gachaItem))
&& (!hasTokenItem() || tokenItem.equals(other.tokenItem))
+ && (!hasGachaItem() || gachaItem.equals(other.gachaItem))
&& (!hasTransferItemList() || transferItemList.equals(other.transferItemList));
}
@@ -340,12 +340,12 @@ public final class GachaItemOuterClass {
output.writeBoolNoTag(isNew);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 26);
- output.writeMessageNoTag(gachaItem);
+ output.writeRawByte((byte) 10);
+ output.writeMessageNoTag(tokenItem);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 34);
- output.writeMessageNoTag(tokenItem);
+ output.writeRawByte((byte) 50);
+ output.writeMessageNoTag(gachaItem);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeRawByte((byte) 74);
@@ -360,10 +360,10 @@ public final class GachaItemOuterClass {
size += 2;
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(gachaItem);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(tokenItem);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(tokenItem);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(gachaItem);
}
if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(transferItemList);
@@ -383,22 +383,22 @@ public final class GachaItemOuterClass {
isNew = input.readBool();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 26) {
+ if (tag != 10) {
break;
}
}
- case 26: {
- // gachaItem
- input.readMessage(gachaItem);
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 34) {
- break;
- }
- }
- case 34: {
+ case 10: {
// tokenItem
input.readMessage(tokenItem);
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 50) {
+ break;
+ }
+ }
+ case 50: {
+ // gachaItem
+ input.readMessage(gachaItem);
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 74) {
@@ -435,10 +435,10 @@ public final class GachaItemOuterClass {
output.writeBool(FieldNames.isNew, isNew);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeMessage(FieldNames.gachaItem, gachaItem);
+ output.writeMessage(FieldNames.tokenItem, tokenItem);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeMessage(FieldNames.tokenItem, tokenItem);
+ output.writeMessage(FieldNames.gachaItem, gachaItem);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeMessage(FieldNames.transferItemList, transferItemList);
@@ -465,11 +465,11 @@ public final class GachaItemOuterClass {
}
break;
}
- case 802515893:
- case -871807056: {
- if (input.isAtField(FieldNames.gachaItem)) {
+ case 141165740:
+ case 101174681: {
+ if (input.isAtField(FieldNames.tokenItem)) {
if (!input.trySkipNullValue()) {
- input.readMessage(gachaItem);
+ input.readMessage(tokenItem);
bitField0_ |= 0x00000002;
}
} else {
@@ -477,11 +477,11 @@ public final class GachaItemOuterClass {
}
break;
}
- case 141165740:
- case 101174681: {
- if (input.isAtField(FieldNames.tokenItem)) {
+ case 802515893:
+ case -871807056: {
+ if (input.isAtField(FieldNames.gachaItem)) {
if (!input.trySkipNullValue()) {
- input.readMessage(tokenItem);
+ input.readMessage(gachaItem);
bitField0_ |= 0x00000004;
}
} else {
@@ -555,10 +555,10 @@ public final class GachaItemOuterClass {
static class FieldNames {
static final FieldName isNew = FieldName.forField("isNew", "is_new");
- static final FieldName gachaItem = FieldName.forField("gachaItem", "gacha_item");
-
static final FieldName tokenItem = FieldName.forField("tokenItem", "token_item");
+ static final FieldName gachaItem = FieldName.forField("gachaItem", "gacha_item");
+
static final FieldName transferItemList = FieldName.forField("transferItemList", "transfer_item_list");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java b/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java
index 9d4f635..7f1558d 100644
--- a/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java
@@ -20,7 +20,7 @@ public final class GateserverOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 port = 1;
+ * optional uint32 port = 3;
*/
private int port;
@@ -35,72 +35,77 @@ public final class GateserverOuterClass {
private boolean unk2;
/**
- * optional bool unk3 = 960;
+ * optional bool unk3 = 33;
*/
private boolean unk3;
/**
- * optional bool unk4 = 1120;
+ * optional bool unk4 = 859;
*/
private boolean unk4;
/**
- * optional bool unk5 = 1362;
+ * optional bool unk5 = 1213;
*/
private boolean unk5;
/**
- * optional bool unk6 = 1906;
+ * optional bool unk6 = 1236;
*/
private boolean unk6;
/**
- * optional string lua_url = 3;
+ * optional bool unk7 = 1698;
*/
- private final Utf8String luaUrl = Utf8String.newEmptyInstance();
+ private boolean unk7;
/**
- * optional string region_name = 5;
+ * optional string region_name = 9;
*/
private final Utf8String regionName = Utf8String.newEmptyInstance();
/**
- * optional string ex_resource_url = 6;
+ * optional string ex_resource_url = 12;
*/
private final Utf8String exResourceUrl = Utf8String.newEmptyInstance();
/**
- * optional string ip = 10;
+ * optional string lua_url = 13;
*/
- private final Utf8String ip = Utf8String.newEmptyInstance();
+ private final Utf8String luaUrl = Utf8String.newEmptyInstance();
/**
- * optional string asset_bundle_url = 12;
+ * optional string asset_bundle_url = 14;
*/
private final Utf8String assetBundleUrl = Utf8String.newEmptyInstance();
/**
- * optional string ifix_url = 150;
+ * optional string ip = 15;
*/
- private final Utf8String ifixUrl = Utf8String.newEmptyInstance();
+ private final Utf8String ip = Utf8String.newEmptyInstance();
/**
- * optional string client_secret_key = 605;
- */
- private final Utf8String clientSecretKey = Utf8String.newEmptyInstance();
-
- /**
- * optional string ifix_version = 687;
+ * optional string ifix_version = 260;
*/
private final Utf8String ifixVersion = Utf8String.newEmptyInstance();
/**
- * optional string msg = 1836;
+ * optional string client_secret_key = 274;
+ */
+ private final Utf8String clientSecretKey = Utf8String.newEmptyInstance();
+
+ /**
+ * optional string ifix_url = 696;
+ */
+ private final Utf8String ifixUrl = Utf8String.newEmptyInstance();
+
+ /**
+ * optional string msg = 900;
*/
private final Utf8String msg = Utf8String.newEmptyInstance();
/**
- * optional string mdk_res_version = 2010;
+ * optional string mdk_res_version = 1895;
*/
private final Utf8String mdkResVersion = Utf8String.newEmptyInstance();
@@ -115,7 +120,7 @@ public final class GateserverOuterClass {
}
/**
- * optional uint32 port = 1;
+ * optional uint32 port = 3;
* @return whether the port field is set
*/
public boolean hasPort() {
@@ -123,7 +128,7 @@ public final class GateserverOuterClass {
}
/**
- * optional uint32 port = 1;
+ * optional uint32 port = 3;
* @return this
*/
public Gateserver clearPort() {
@@ -133,7 +138,7 @@ public final class GateserverOuterClass {
}
/**
- * optional uint32 port = 1;
+ * optional uint32 port = 3;
* @return the port
*/
public int getPort() {
@@ -141,7 +146,7 @@ public final class GateserverOuterClass {
}
/**
- * optional uint32 port = 1;
+ * optional uint32 port = 3;
* @param value the port to set
* @return this
*/
@@ -226,7 +231,7 @@ public final class GateserverOuterClass {
}
/**
- * optional bool unk3 = 960;
+ * optional bool unk3 = 33;
* @return whether the unk3 field is set
*/
public boolean hasUnk3() {
@@ -234,7 +239,7 @@ public final class GateserverOuterClass {
}
/**
- * optional bool unk3 = 960;
+ * optional bool unk3 = 33;
* @return this
*/
public Gateserver clearUnk3() {
@@ -244,7 +249,7 @@ public final class GateserverOuterClass {
}
/**
- * optional bool unk3 = 960;
+ * optional bool unk3 = 33;
* @return the unk3
*/
public boolean getUnk3() {
@@ -252,7 +257,7 @@ public final class GateserverOuterClass {
}
/**
- * optional bool unk3 = 960;
+ * optional bool unk3 = 33;
* @param value the unk3 to set
* @return this
*/
@@ -263,7 +268,7 @@ public final class GateserverOuterClass {
}
/**
- * optional bool unk4 = 1120;
+ * optional bool unk4 = 859;
* @return whether the unk4 field is set
*/
public boolean hasUnk4() {
@@ -271,7 +276,7 @@ public final class GateserverOuterClass {
}
/**
- * optional bool unk4 = 1120;
+ * optional bool unk4 = 859;
* @return this
*/
public Gateserver clearUnk4() {
@@ -281,7 +286,7 @@ public final class GateserverOuterClass {
}
/**
- * optional bool unk4 = 1120;
+ * optional bool unk4 = 859;
* @return the unk4
*/
public boolean getUnk4() {
@@ -289,7 +294,7 @@ public final class GateserverOuterClass {
}
/**
- * optional bool unk4 = 1120;
+ * optional bool unk4 = 859;
* @param value the unk4 to set
* @return this
*/
@@ -300,7 +305,7 @@ public final class GateserverOuterClass {
}
/**
- * optional bool unk5 = 1362;
+ * optional bool unk5 = 1213;
* @return whether the unk5 field is set
*/
public boolean hasUnk5() {
@@ -308,7 +313,7 @@ public final class GateserverOuterClass {
}
/**
- * optional bool unk5 = 1362;
+ * optional bool unk5 = 1213;
* @return this
*/
public Gateserver clearUnk5() {
@@ -318,7 +323,7 @@ public final class GateserverOuterClass {
}
/**
- * optional bool unk5 = 1362;
+ * optional bool unk5 = 1213;
* @return the unk5
*/
public boolean getUnk5() {
@@ -326,7 +331,7 @@ public final class GateserverOuterClass {
}
/**
- * optional bool unk5 = 1362;
+ * optional bool unk5 = 1213;
* @param value the unk5 to set
* @return this
*/
@@ -337,7 +342,7 @@ public final class GateserverOuterClass {
}
/**
- * optional bool unk6 = 1906;
+ * optional bool unk6 = 1236;
* @return whether the unk6 field is set
*/
public boolean hasUnk6() {
@@ -345,7 +350,7 @@ public final class GateserverOuterClass {
}
/**
- * optional bool unk6 = 1906;
+ * optional bool unk6 = 1236;
* @return this
*/
public Gateserver clearUnk6() {
@@ -355,7 +360,7 @@ public final class GateserverOuterClass {
}
/**
- * optional bool unk6 = 1906;
+ * optional bool unk6 = 1236;
* @return the unk6
*/
public boolean getUnk6() {
@@ -363,7 +368,7 @@ public final class GateserverOuterClass {
}
/**
- * optional bool unk6 = 1906;
+ * optional bool unk6 = 1236;
* @param value the unk6 to set
* @return this
*/
@@ -374,72 +379,44 @@ public final class GateserverOuterClass {
}
/**
- * optional string lua_url = 3;
- * @return whether the luaUrl field is set
+ * optional bool unk7 = 1698;
+ * @return whether the unk7 field is set
*/
- public boolean hasLuaUrl() {
+ public boolean hasUnk7() {
return (bitField0_ & 0x00000080) != 0;
}
/**
- * optional string lua_url = 3;
+ * optional bool unk7 = 1698;
* @return this
*/
- public Gateserver clearLuaUrl() {
+ public Gateserver clearUnk7() {
bitField0_ &= ~0x00000080;
- luaUrl.clear();
+ unk7 = false;
return this;
}
/**
- * optional string lua_url = 3;
- * @return the luaUrl
+ * optional bool unk7 = 1698;
+ * @return the unk7
*/
- public String getLuaUrl() {
- return luaUrl.getString();
+ public boolean getUnk7() {
+ return unk7;
}
/**
- * optional string lua_url = 3;
- * @return internal {@code Utf8String} representation of luaUrl for reading
- */
- public Utf8String getLuaUrlBytes() {
- return this.luaUrl;
- }
-
- /**
- * optional string lua_url = 3;
- * @return internal {@code Utf8String} representation of luaUrl for modifications
- */
- public Utf8String getMutableLuaUrlBytes() {
- bitField0_ |= 0x00000080;
- return this.luaUrl;
- }
-
- /**
- * optional string lua_url = 3;
- * @param value the luaUrl to set
+ * optional bool unk7 = 1698;
+ * @param value the unk7 to set
* @return this
*/
- public Gateserver setLuaUrl(final CharSequence value) {
+ public Gateserver setUnk7(final boolean value) {
bitField0_ |= 0x00000080;
- luaUrl.copyFrom(value);
+ unk7 = value;
return this;
}
/**
- * optional string lua_url = 3;
- * @param value the luaUrl to set
- * @return this
- */
- public Gateserver setLuaUrl(final Utf8String value) {
- bitField0_ |= 0x00000080;
- luaUrl.copyFrom(value);
- return this;
- }
-
- /**
- * optional string region_name = 5;
+ * optional string region_name = 9;
* @return whether the regionName field is set
*/
public boolean hasRegionName() {
@@ -447,7 +424,7 @@ public final class GateserverOuterClass {
}
/**
- * optional string region_name = 5;
+ * optional string region_name = 9;
* @return this
*/
public Gateserver clearRegionName() {
@@ -457,7 +434,7 @@ public final class GateserverOuterClass {
}
/**
- * optional string region_name = 5;
+ * optional string region_name = 9;
* @return the regionName
*/
public String getRegionName() {
@@ -465,7 +442,7 @@ public final class GateserverOuterClass {
}
/**
- * optional string region_name = 5;
+ * optional string region_name = 9;
* @return internal {@code Utf8String} representation of regionName for reading
*/
public Utf8String getRegionNameBytes() {
@@ -473,7 +450,7 @@ public final class GateserverOuterClass {
}
/**
- * optional string region_name = 5;
+ * optional string region_name = 9;
* @return internal {@code Utf8String} representation of regionName for modifications
*/
public Utf8String getMutableRegionNameBytes() {
@@ -482,7 +459,7 @@ public final class GateserverOuterClass {
}
/**
- * optional string region_name = 5;
+ * optional string region_name = 9;
* @param value the regionName to set
* @return this
*/
@@ -493,7 +470,7 @@ public final class GateserverOuterClass {
}
/**
- * optional string region_name = 5;
+ * optional string region_name = 9;
* @param value the regionName to set
* @return this
*/
@@ -504,7 +481,7 @@ public final class GateserverOuterClass {
}
/**
- * optional string ex_resource_url = 6;
+ * optional string ex_resource_url = 12;
* @return whether the exResourceUrl field is set
*/
public boolean hasExResourceUrl() {
@@ -512,7 +489,7 @@ public final class GateserverOuterClass {
}
/**
- * optional string ex_resource_url = 6;
+ * optional string ex_resource_url = 12;
* @return this
*/
public Gateserver clearExResourceUrl() {
@@ -522,7 +499,7 @@ public final class GateserverOuterClass {
}
/**
- * optional string ex_resource_url = 6;
+ * optional string ex_resource_url = 12;
* @return the exResourceUrl
*/
public String getExResourceUrl() {
@@ -530,7 +507,7 @@ public final class GateserverOuterClass {
}
/**
- * optional string ex_resource_url = 6;
+ * optional string ex_resource_url = 12;
* @return internal {@code Utf8String} representation of exResourceUrl for reading
*/
public Utf8String getExResourceUrlBytes() {
@@ -538,7 +515,7 @@ public final class GateserverOuterClass {
}
/**
- * optional string ex_resource_url = 6;
+ * optional string ex_resource_url = 12;
* @return internal {@code Utf8String} representation of exResourceUrl for modifications
*/
public Utf8String getMutableExResourceUrlBytes() {
@@ -547,7 +524,7 @@ public final class GateserverOuterClass {
}
/**
- * optional string ex_resource_url = 6;
+ * optional string ex_resource_url = 12;
* @param value the exResourceUrl to set
* @return this
*/
@@ -558,7 +535,7 @@ public final class GateserverOuterClass {
}
/**
- * optional string ex_resource_url = 6;
+ * optional string ex_resource_url = 12;
* @param value the exResourceUrl to set
* @return this
*/
@@ -569,72 +546,72 @@ public final class GateserverOuterClass {
}
/**
- * optional string ip = 10;
- * @return whether the ip field is set
+ * optional string lua_url = 13;
+ * @return whether the luaUrl field is set
*/
- public boolean hasIp() {
+ public boolean hasLuaUrl() {
return (bitField0_ & 0x00000400) != 0;
}
/**
- * optional string ip = 10;
+ * optional string lua_url = 13;
* @return this
*/
- public Gateserver clearIp() {
+ public Gateserver clearLuaUrl() {
bitField0_ &= ~0x00000400;
- ip.clear();
+ luaUrl.clear();
return this;
}
/**
- * optional string ip = 10;
- * @return the ip
+ * optional string lua_url = 13;
+ * @return the luaUrl
*/
- public String getIp() {
- return ip.getString();
+ public String getLuaUrl() {
+ return luaUrl.getString();
}
/**
- * optional string ip = 10;
- * @return internal {@code Utf8String} representation of ip for reading
+ * optional string lua_url = 13;
+ * @return internal {@code Utf8String} representation of luaUrl for reading
*/
- public Utf8String getIpBytes() {
- return this.ip;
+ public Utf8String getLuaUrlBytes() {
+ return this.luaUrl;
}
/**
- * optional string ip = 10;
- * @return internal {@code Utf8String} representation of ip for modifications
+ * optional string lua_url = 13;
+ * @return internal {@code Utf8String} representation of luaUrl for modifications
*/
- public Utf8String getMutableIpBytes() {
+ public Utf8String getMutableLuaUrlBytes() {
bitField0_ |= 0x00000400;
- return this.ip;
+ return this.luaUrl;
}
/**
- * optional string ip = 10;
- * @param value the ip to set
+ * optional string lua_url = 13;
+ * @param value the luaUrl to set
* @return this
*/
- public Gateserver setIp(final CharSequence value) {
+ public Gateserver setLuaUrl(final CharSequence value) {
bitField0_ |= 0x00000400;
- ip.copyFrom(value);
+ luaUrl.copyFrom(value);
return this;
}
/**
- * optional string ip = 10;
- * @param value the ip to set
+ * optional string lua_url = 13;
+ * @param value the luaUrl to set
* @return this
*/
- public Gateserver setIp(final Utf8String value) {
+ public Gateserver setLuaUrl(final Utf8String value) {
bitField0_ |= 0x00000400;
- ip.copyFrom(value);
+ luaUrl.copyFrom(value);
return this;
}
/**
- * optional string asset_bundle_url = 12;
+ * optional string asset_bundle_url = 14;
* @return whether the assetBundleUrl field is set
*/
public boolean hasAssetBundleUrl() {
@@ -642,7 +619,7 @@ public final class GateserverOuterClass {
}
/**
- * optional string asset_bundle_url = 12;
+ * optional string asset_bundle_url = 14;
* @return this
*/
public Gateserver clearAssetBundleUrl() {
@@ -652,7 +629,7 @@ public final class GateserverOuterClass {
}
/**
- * optional string asset_bundle_url = 12;
+ * optional string asset_bundle_url = 14;
* @return the assetBundleUrl
*/
public String getAssetBundleUrl() {
@@ -660,7 +637,7 @@ public final class GateserverOuterClass {
}
/**
- * optional string asset_bundle_url = 12;
+ * optional string asset_bundle_url = 14;
* @return internal {@code Utf8String} representation of assetBundleUrl for reading
*/
public Utf8String getAssetBundleUrlBytes() {
@@ -668,7 +645,7 @@ public final class GateserverOuterClass {
}
/**
- * optional string asset_bundle_url = 12;
+ * optional string asset_bundle_url = 14;
* @return internal {@code Utf8String} representation of assetBundleUrl for modifications
*/
public Utf8String getMutableAssetBundleUrlBytes() {
@@ -677,7 +654,7 @@ public final class GateserverOuterClass {
}
/**
- * optional string asset_bundle_url = 12;
+ * optional string asset_bundle_url = 14;
* @param value the assetBundleUrl to set
* @return this
*/
@@ -688,7 +665,7 @@ public final class GateserverOuterClass {
}
/**
- * optional string asset_bundle_url = 12;
+ * optional string asset_bundle_url = 14;
* @param value the assetBundleUrl to set
* @return this
*/
@@ -699,155 +676,90 @@ public final class GateserverOuterClass {
}
/**
- * optional string ifix_url = 150;
- * @return whether the ifixUrl field is set
+ * optional string ip = 15;
+ * @return whether the ip field is set
*/
- public boolean hasIfixUrl() {
+ public boolean hasIp() {
return (bitField0_ & 0x00001000) != 0;
}
/**
- * optional string ifix_url = 150;
+ * optional string ip = 15;
* @return this
*/
- public Gateserver clearIfixUrl() {
+ public Gateserver clearIp() {
bitField0_ &= ~0x00001000;
- ifixUrl.clear();
+ ip.clear();
return this;
}
/**
- * optional string ifix_url = 150;
- * @return the ifixUrl
+ * optional string ip = 15;
+ * @return the ip
*/
- public String getIfixUrl() {
- return ifixUrl.getString();
+ public String getIp() {
+ return ip.getString();
}
/**
- * optional string ifix_url = 150;
- * @return internal {@code Utf8String} representation of ifixUrl for reading
+ * optional string ip = 15;
+ * @return internal {@code Utf8String} representation of ip for reading
*/
- public Utf8String getIfixUrlBytes() {
- return this.ifixUrl;
+ public Utf8String getIpBytes() {
+ return this.ip;
}
/**
- * optional string ifix_url = 150;
- * @return internal {@code Utf8String} representation of ifixUrl for modifications
+ * optional string ip = 15;
+ * @return internal {@code Utf8String} representation of ip for modifications
*/
- public Utf8String getMutableIfixUrlBytes() {
+ public Utf8String getMutableIpBytes() {
bitField0_ |= 0x00001000;
- return this.ifixUrl;
+ return this.ip;
}
/**
- * optional string ifix_url = 150;
- * @param value the ifixUrl to set
+ * optional string ip = 15;
+ * @param value the ip to set
* @return this
*/
- public Gateserver setIfixUrl(final CharSequence value) {
+ public Gateserver setIp(final CharSequence value) {
bitField0_ |= 0x00001000;
- ifixUrl.copyFrom(value);
+ ip.copyFrom(value);
return this;
}
/**
- * optional string ifix_url = 150;
- * @param value the ifixUrl to set
+ * optional string ip = 15;
+ * @param value the ip to set
* @return this
*/
- public Gateserver setIfixUrl(final Utf8String value) {
+ public Gateserver setIp(final Utf8String value) {
bitField0_ |= 0x00001000;
- ifixUrl.copyFrom(value);
+ ip.copyFrom(value);
return this;
}
/**
- * optional string client_secret_key = 605;
- * @return whether the clientSecretKey field is set
+ * optional string ifix_version = 260;
+ * @return whether the ifixVersion field is set
*/
- public boolean hasClientSecretKey() {
+ public boolean hasIfixVersion() {
return (bitField0_ & 0x00002000) != 0;
}
/**
- * optional string client_secret_key = 605;
- * @return this
- */
- public Gateserver clearClientSecretKey() {
- bitField0_ &= ~0x00002000;
- clientSecretKey.clear();
- return this;
- }
-
- /**
- * optional string client_secret_key = 605;
- * @return the clientSecretKey
- */
- public String getClientSecretKey() {
- return clientSecretKey.getString();
- }
-
- /**
- * optional string client_secret_key = 605;
- * @return internal {@code Utf8String} representation of clientSecretKey for reading
- */
- public Utf8String getClientSecretKeyBytes() {
- return this.clientSecretKey;
- }
-
- /**
- * optional string client_secret_key = 605;
- * @return internal {@code Utf8String} representation of clientSecretKey for modifications
- */
- public Utf8String getMutableClientSecretKeyBytes() {
- bitField0_ |= 0x00002000;
- return this.clientSecretKey;
- }
-
- /**
- * optional string client_secret_key = 605;
- * @param value the clientSecretKey to set
- * @return this
- */
- public Gateserver setClientSecretKey(final CharSequence value) {
- bitField0_ |= 0x00002000;
- clientSecretKey.copyFrom(value);
- return this;
- }
-
- /**
- * optional string client_secret_key = 605;
- * @param value the clientSecretKey to set
- * @return this
- */
- public Gateserver setClientSecretKey(final Utf8String value) {
- bitField0_ |= 0x00002000;
- clientSecretKey.copyFrom(value);
- return this;
- }
-
- /**
- * optional string ifix_version = 687;
- * @return whether the ifixVersion field is set
- */
- public boolean hasIfixVersion() {
- return (bitField0_ & 0x00004000) != 0;
- }
-
- /**
- * optional string ifix_version = 687;
+ * optional string ifix_version = 260;
* @return this
*/
public Gateserver clearIfixVersion() {
- bitField0_ &= ~0x00004000;
+ bitField0_ &= ~0x00002000;
ifixVersion.clear();
return this;
}
/**
- * optional string ifix_version = 687;
+ * optional string ifix_version = 260;
* @return the ifixVersion
*/
public String getIfixVersion() {
@@ -855,7 +767,7 @@ public final class GateserverOuterClass {
}
/**
- * optional string ifix_version = 687;
+ * optional string ifix_version = 260;
* @return internal {@code Utf8String} representation of ifixVersion for reading
*/
public Utf8String getIfixVersionBytes() {
@@ -863,56 +775,186 @@ public final class GateserverOuterClass {
}
/**
- * optional string ifix_version = 687;
+ * optional string ifix_version = 260;
* @return internal {@code Utf8String} representation of ifixVersion for modifications
*/
public Utf8String getMutableIfixVersionBytes() {
- bitField0_ |= 0x00004000;
+ bitField0_ |= 0x00002000;
return this.ifixVersion;
}
/**
- * optional string ifix_version = 687;
+ * optional string ifix_version = 260;
* @param value the ifixVersion to set
* @return this
*/
public Gateserver setIfixVersion(final CharSequence value) {
- bitField0_ |= 0x00004000;
+ bitField0_ |= 0x00002000;
ifixVersion.copyFrom(value);
return this;
}
/**
- * optional string ifix_version = 687;
+ * optional string ifix_version = 260;
* @param value the ifixVersion to set
* @return this
*/
public Gateserver setIfixVersion(final Utf8String value) {
- bitField0_ |= 0x00004000;
+ bitField0_ |= 0x00002000;
ifixVersion.copyFrom(value);
return this;
}
/**
- * optional string msg = 1836;
- * @return whether the msg field is set
+ * optional string client_secret_key = 274;
+ * @return whether the clientSecretKey field is set
*/
- public boolean hasMsg() {
+ public boolean hasClientSecretKey() {
+ return (bitField0_ & 0x00004000) != 0;
+ }
+
+ /**
+ * optional string client_secret_key = 274;
+ * @return this
+ */
+ public Gateserver clearClientSecretKey() {
+ bitField0_ &= ~0x00004000;
+ clientSecretKey.clear();
+ return this;
+ }
+
+ /**
+ * optional string client_secret_key = 274;
+ * @return the clientSecretKey
+ */
+ public String getClientSecretKey() {
+ return clientSecretKey.getString();
+ }
+
+ /**
+ * optional string client_secret_key = 274;
+ * @return internal {@code Utf8String} representation of clientSecretKey for reading
+ */
+ public Utf8String getClientSecretKeyBytes() {
+ return this.clientSecretKey;
+ }
+
+ /**
+ * optional string client_secret_key = 274;
+ * @return internal {@code Utf8String} representation of clientSecretKey for modifications
+ */
+ public Utf8String getMutableClientSecretKeyBytes() {
+ bitField0_ |= 0x00004000;
+ return this.clientSecretKey;
+ }
+
+ /**
+ * optional string client_secret_key = 274;
+ * @param value the clientSecretKey to set
+ * @return this
+ */
+ public Gateserver setClientSecretKey(final CharSequence value) {
+ bitField0_ |= 0x00004000;
+ clientSecretKey.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional string client_secret_key = 274;
+ * @param value the clientSecretKey to set
+ * @return this
+ */
+ public Gateserver setClientSecretKey(final Utf8String value) {
+ bitField0_ |= 0x00004000;
+ clientSecretKey.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional string ifix_url = 696;
+ * @return whether the ifixUrl field is set
+ */
+ public boolean hasIfixUrl() {
return (bitField0_ & 0x00008000) != 0;
}
/**
- * optional string msg = 1836;
+ * optional string ifix_url = 696;
+ * @return this
+ */
+ public Gateserver clearIfixUrl() {
+ bitField0_ &= ~0x00008000;
+ ifixUrl.clear();
+ return this;
+ }
+
+ /**
+ * optional string ifix_url = 696;
+ * @return the ifixUrl
+ */
+ public String getIfixUrl() {
+ return ifixUrl.getString();
+ }
+
+ /**
+ * optional string ifix_url = 696;
+ * @return internal {@code Utf8String} representation of ifixUrl for reading
+ */
+ public Utf8String getIfixUrlBytes() {
+ return this.ifixUrl;
+ }
+
+ /**
+ * optional string ifix_url = 696;
+ * @return internal {@code Utf8String} representation of ifixUrl for modifications
+ */
+ public Utf8String getMutableIfixUrlBytes() {
+ bitField0_ |= 0x00008000;
+ return this.ifixUrl;
+ }
+
+ /**
+ * optional string ifix_url = 696;
+ * @param value the ifixUrl to set
+ * @return this
+ */
+ public Gateserver setIfixUrl(final CharSequence value) {
+ bitField0_ |= 0x00008000;
+ ifixUrl.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional string ifix_url = 696;
+ * @param value the ifixUrl to set
+ * @return this
+ */
+ public Gateserver setIfixUrl(final Utf8String value) {
+ bitField0_ |= 0x00008000;
+ ifixUrl.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional string msg = 900;
+ * @return whether the msg field is set
+ */
+ public boolean hasMsg() {
+ return (bitField0_ & 0x00010000) != 0;
+ }
+
+ /**
+ * optional string msg = 900;
* @return this
*/
public Gateserver clearMsg() {
- bitField0_ &= ~0x00008000;
+ bitField0_ &= ~0x00010000;
msg.clear();
return this;
}
/**
- * optional string msg = 1836;
+ * optional string msg = 900;
* @return the msg
*/
public String getMsg() {
@@ -920,7 +962,7 @@ public final class GateserverOuterClass {
}
/**
- * optional string msg = 1836;
+ * optional string msg = 900;
* @return internal {@code Utf8String} representation of msg for reading
*/
public Utf8String getMsgBytes() {
@@ -928,56 +970,56 @@ public final class GateserverOuterClass {
}
/**
- * optional string msg = 1836;
+ * optional string msg = 900;
* @return internal {@code Utf8String} representation of msg for modifications
*/
public Utf8String getMutableMsgBytes() {
- bitField0_ |= 0x00008000;
+ bitField0_ |= 0x00010000;
return this.msg;
}
/**
- * optional string msg = 1836;
+ * optional string msg = 900;
* @param value the msg to set
* @return this
*/
public Gateserver setMsg(final CharSequence value) {
- bitField0_ |= 0x00008000;
+ bitField0_ |= 0x00010000;
msg.copyFrom(value);
return this;
}
/**
- * optional string msg = 1836;
+ * optional string msg = 900;
* @param value the msg to set
* @return this
*/
public Gateserver setMsg(final Utf8String value) {
- bitField0_ |= 0x00008000;
+ bitField0_ |= 0x00010000;
msg.copyFrom(value);
return this;
}
/**
- * optional string mdk_res_version = 2010;
+ * optional string mdk_res_version = 1895;
* @return whether the mdkResVersion field is set
*/
public boolean hasMdkResVersion() {
- return (bitField0_ & 0x00010000) != 0;
+ return (bitField0_ & 0x00020000) != 0;
}
/**
- * optional string mdk_res_version = 2010;
+ * optional string mdk_res_version = 1895;
* @return this
*/
public Gateserver clearMdkResVersion() {
- bitField0_ &= ~0x00010000;
+ bitField0_ &= ~0x00020000;
mdkResVersion.clear();
return this;
}
/**
- * optional string mdk_res_version = 2010;
+ * optional string mdk_res_version = 1895;
* @return the mdkResVersion
*/
public String getMdkResVersion() {
@@ -985,7 +1027,7 @@ public final class GateserverOuterClass {
}
/**
- * optional string mdk_res_version = 2010;
+ * optional string mdk_res_version = 1895;
* @return internal {@code Utf8String} representation of mdkResVersion for reading
*/
public Utf8String getMdkResVersionBytes() {
@@ -993,32 +1035,32 @@ public final class GateserverOuterClass {
}
/**
- * optional string mdk_res_version = 2010;
+ * optional string mdk_res_version = 1895;
* @return internal {@code Utf8String} representation of mdkResVersion for modifications
*/
public Utf8String getMutableMdkResVersionBytes() {
- bitField0_ |= 0x00010000;
+ bitField0_ |= 0x00020000;
return this.mdkResVersion;
}
/**
- * optional string mdk_res_version = 2010;
+ * optional string mdk_res_version = 1895;
* @param value the mdkResVersion to set
* @return this
*/
public Gateserver setMdkResVersion(final CharSequence value) {
- bitField0_ |= 0x00010000;
+ bitField0_ |= 0x00020000;
mdkResVersion.copyFrom(value);
return this;
}
/**
- * optional string mdk_res_version = 2010;
+ * optional string mdk_res_version = 1895;
* @param value the mdkResVersion to set
* @return this
*/
public Gateserver setMdkResVersion(final Utf8String value) {
- bitField0_ |= 0x00010000;
+ bitField0_ |= 0x00020000;
mdkResVersion.copyFrom(value);
return this;
}
@@ -1035,14 +1077,15 @@ public final class GateserverOuterClass {
unk4 = other.unk4;
unk5 = other.unk5;
unk6 = other.unk6;
- luaUrl.copyFrom(other.luaUrl);
+ unk7 = other.unk7;
regionName.copyFrom(other.regionName);
exResourceUrl.copyFrom(other.exResourceUrl);
- ip.copyFrom(other.ip);
+ luaUrl.copyFrom(other.luaUrl);
assetBundleUrl.copyFrom(other.assetBundleUrl);
- ifixUrl.copyFrom(other.ifixUrl);
- clientSecretKey.copyFrom(other.clientSecretKey);
+ ip.copyFrom(other.ip);
ifixVersion.copyFrom(other.ifixVersion);
+ clientSecretKey.copyFrom(other.clientSecretKey);
+ ifixUrl.copyFrom(other.ifixUrl);
msg.copyFrom(other.msg);
mdkResVersion.copyFrom(other.mdkResVersion);
}
@@ -1076,8 +1119,8 @@ public final class GateserverOuterClass {
if (other.hasUnk6()) {
setUnk6(other.unk6);
}
- if (other.hasLuaUrl()) {
- getMutableLuaUrlBytes().copyFrom(other.luaUrl);
+ if (other.hasUnk7()) {
+ setUnk7(other.unk7);
}
if (other.hasRegionName()) {
getMutableRegionNameBytes().copyFrom(other.regionName);
@@ -1085,20 +1128,23 @@ public final class GateserverOuterClass {
if (other.hasExResourceUrl()) {
getMutableExResourceUrlBytes().copyFrom(other.exResourceUrl);
}
- if (other.hasIp()) {
- getMutableIpBytes().copyFrom(other.ip);
+ if (other.hasLuaUrl()) {
+ getMutableLuaUrlBytes().copyFrom(other.luaUrl);
}
if (other.hasAssetBundleUrl()) {
getMutableAssetBundleUrlBytes().copyFrom(other.assetBundleUrl);
}
- if (other.hasIfixUrl()) {
- getMutableIfixUrlBytes().copyFrom(other.ifixUrl);
+ if (other.hasIp()) {
+ getMutableIpBytes().copyFrom(other.ip);
+ }
+ if (other.hasIfixVersion()) {
+ getMutableIfixVersionBytes().copyFrom(other.ifixVersion);
}
if (other.hasClientSecretKey()) {
getMutableClientSecretKeyBytes().copyFrom(other.clientSecretKey);
}
- if (other.hasIfixVersion()) {
- getMutableIfixVersionBytes().copyFrom(other.ifixVersion);
+ if (other.hasIfixUrl()) {
+ getMutableIfixUrlBytes().copyFrom(other.ifixUrl);
}
if (other.hasMsg()) {
getMutableMsgBytes().copyFrom(other.msg);
@@ -1123,14 +1169,15 @@ public final class GateserverOuterClass {
unk4 = false;
unk5 = false;
unk6 = false;
- luaUrl.clear();
+ unk7 = false;
regionName.clear();
exResourceUrl.clear();
- ip.clear();
+ luaUrl.clear();
assetBundleUrl.clear();
- ifixUrl.clear();
- clientSecretKey.clear();
+ ip.clear();
ifixVersion.clear();
+ clientSecretKey.clear();
+ ifixUrl.clear();
msg.clear();
mdkResVersion.clear();
return this;
@@ -1143,14 +1190,14 @@ public final class GateserverOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- luaUrl.clear();
regionName.clear();
exResourceUrl.clear();
- ip.clear();
+ luaUrl.clear();
assetBundleUrl.clear();
- ifixUrl.clear();
- clientSecretKey.clear();
+ ip.clear();
ifixVersion.clear();
+ clientSecretKey.clear();
+ ifixUrl.clear();
msg.clear();
mdkResVersion.clear();
return this;
@@ -1173,14 +1220,15 @@ public final class GateserverOuterClass {
&& (!hasUnk4() || unk4 == other.unk4)
&& (!hasUnk5() || unk5 == other.unk5)
&& (!hasUnk6() || unk6 == other.unk6)
- && (!hasLuaUrl() || luaUrl.equals(other.luaUrl))
+ && (!hasUnk7() || unk7 == other.unk7)
&& (!hasRegionName() || regionName.equals(other.regionName))
&& (!hasExResourceUrl() || exResourceUrl.equals(other.exResourceUrl))
- && (!hasIp() || ip.equals(other.ip))
+ && (!hasLuaUrl() || luaUrl.equals(other.luaUrl))
&& (!hasAssetBundleUrl() || assetBundleUrl.equals(other.assetBundleUrl))
- && (!hasIfixUrl() || ifixUrl.equals(other.ifixUrl))
- && (!hasClientSecretKey() || clientSecretKey.equals(other.clientSecretKey))
+ && (!hasIp() || ip.equals(other.ip))
&& (!hasIfixVersion() || ifixVersion.equals(other.ifixVersion))
+ && (!hasClientSecretKey() || clientSecretKey.equals(other.clientSecretKey))
+ && (!hasIfixUrl() || ifixUrl.equals(other.ifixUrl))
&& (!hasMsg() || msg.equals(other.msg))
&& (!hasMdkResVersion() || mdkResVersion.equals(other.mdkResVersion));
}
@@ -1188,7 +1236,7 @@ public final class GateserverOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(port);
}
if ((bitField0_ & 0x00000002) != 0) {
@@ -1200,59 +1248,63 @@ public final class GateserverOuterClass {
output.writeBoolNoTag(unk2);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawLittleEndian16((short) 15488);
+ output.writeRawLittleEndian16((short) 648);
output.writeBoolNoTag(unk3);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawLittleEndian16((short) 18048);
+ output.writeRawLittleEndian16((short) 13784);
output.writeBoolNoTag(unk4);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawLittleEndian16((short) 21904);
+ output.writeRawLittleEndian16((short) 19432);
output.writeBoolNoTag(unk5);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawLittleEndian16((short) 30608);
+ output.writeRawLittleEndian16((short) 19872);
output.writeBoolNoTag(unk6);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRawByte((byte) 26);
- output.writeStringNoTag(luaUrl);
+ output.writeRawLittleEndian16((short) 27280);
+ output.writeBoolNoTag(unk7);
}
if ((bitField0_ & 0x00000100) != 0) {
- output.writeRawByte((byte) 42);
+ output.writeRawByte((byte) 74);
output.writeStringNoTag(regionName);
}
if ((bitField0_ & 0x00000200) != 0) {
- output.writeRawByte((byte) 50);
+ output.writeRawByte((byte) 98);
output.writeStringNoTag(exResourceUrl);
}
if ((bitField0_ & 0x00000400) != 0) {
- output.writeRawByte((byte) 82);
- output.writeStringNoTag(ip);
+ output.writeRawByte((byte) 106);
+ output.writeStringNoTag(luaUrl);
}
if ((bitField0_ & 0x00000800) != 0) {
- output.writeRawByte((byte) 98);
+ output.writeRawByte((byte) 114);
output.writeStringNoTag(assetBundleUrl);
}
if ((bitField0_ & 0x00001000) != 0) {
- output.writeRawLittleEndian16((short) 2482);
- output.writeStringNoTag(ifixUrl);
+ output.writeRawByte((byte) 122);
+ output.writeStringNoTag(ip);
}
if ((bitField0_ & 0x00002000) != 0) {
- output.writeRawLittleEndian16((short) 9706);
- output.writeStringNoTag(clientSecretKey);
- }
- if ((bitField0_ & 0x00004000) != 0) {
- output.writeRawLittleEndian16((short) 11002);
+ output.writeRawLittleEndian16((short) 4258);
output.writeStringNoTag(ifixVersion);
}
+ if ((bitField0_ & 0x00004000) != 0) {
+ output.writeRawLittleEndian16((short) 4498);
+ output.writeStringNoTag(clientSecretKey);
+ }
if ((bitField0_ & 0x00008000) != 0) {
- output.writeRawLittleEndian16((short) 29410);
- output.writeStringNoTag(msg);
+ output.writeRawLittleEndian16((short) 11202);
+ output.writeStringNoTag(ifixUrl);
}
if ((bitField0_ & 0x00010000) != 0) {
- output.writeRawLittleEndian16((short) 32210);
+ output.writeRawLittleEndian16((short) 14498);
+ output.writeStringNoTag(msg);
+ }
+ if ((bitField0_ & 0x00020000) != 0) {
+ output.writeRawLittleEndian16((short) 30394);
output.writeStringNoTag(mdkResVersion);
}
}
@@ -1282,7 +1334,7 @@ public final class GateserverOuterClass {
size += 3;
}
if ((bitField0_ & 0x00000080) != 0) {
- size += 1 + ProtoSink.computeStringSizeNoTag(luaUrl);
+ size += 3;
}
if ((bitField0_ & 0x00000100) != 0) {
size += 1 + ProtoSink.computeStringSizeNoTag(regionName);
@@ -1291,24 +1343,27 @@ public final class GateserverOuterClass {
size += 1 + ProtoSink.computeStringSizeNoTag(exResourceUrl);
}
if ((bitField0_ & 0x00000400) != 0) {
- size += 1 + ProtoSink.computeStringSizeNoTag(ip);
+ size += 1 + ProtoSink.computeStringSizeNoTag(luaUrl);
}
if ((bitField0_ & 0x00000800) != 0) {
size += 1 + ProtoSink.computeStringSizeNoTag(assetBundleUrl);
}
if ((bitField0_ & 0x00001000) != 0) {
- size += 2 + ProtoSink.computeStringSizeNoTag(ifixUrl);
+ size += 1 + ProtoSink.computeStringSizeNoTag(ip);
}
if ((bitField0_ & 0x00002000) != 0) {
- size += 2 + ProtoSink.computeStringSizeNoTag(clientSecretKey);
- }
- if ((bitField0_ & 0x00004000) != 0) {
size += 2 + ProtoSink.computeStringSizeNoTag(ifixVersion);
}
+ if ((bitField0_ & 0x00004000) != 0) {
+ size += 2 + ProtoSink.computeStringSizeNoTag(clientSecretKey);
+ }
if ((bitField0_ & 0x00008000) != 0) {
- size += 2 + ProtoSink.computeStringSizeNoTag(msg);
+ size += 2 + ProtoSink.computeStringSizeNoTag(ifixUrl);
}
if ((bitField0_ & 0x00010000) != 0) {
+ size += 2 + ProtoSink.computeStringSizeNoTag(msg);
+ }
+ if ((bitField0_ & 0x00020000) != 0) {
size += 2 + ProtoSink.computeStringSizeNoTag(mdkResVersion);
}
return size;
@@ -1321,7 +1376,7 @@ public final class GateserverOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 24: {
// port
port = input.readUInt32();
bitField0_ |= 0x00000001;
@@ -1344,131 +1399,140 @@ public final class GateserverOuterClass {
unk2 = input.readBool();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 7680) {
+ if (tag != 264) {
break;
}
}
- case 7680: {
+ case 264: {
// unk3
unk3 = input.readBool();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 8960) {
+ if (tag != 6872) {
break;
}
}
- case 8960: {
+ case 6872: {
// unk4
unk4 = input.readBool();
bitField0_ |= 0x00000010;
tag = input.readTag();
- if (tag != 10896) {
+ if (tag != 9704) {
break;
}
}
- case 10896: {
+ case 9704: {
// unk5
unk5 = input.readBool();
bitField0_ |= 0x00000020;
tag = input.readTag();
- if (tag != 15248) {
+ if (tag != 9888) {
break;
}
}
- case 15248: {
+ case 9888: {
// unk6
unk6 = input.readBool();
bitField0_ |= 0x00000040;
tag = input.readTag();
- if (tag != 26) {
+ if (tag != 13584) {
break;
}
}
- case 26: {
- // luaUrl
- input.readString(luaUrl);
+ case 13584: {
+ // unk7
+ unk7 = input.readBool();
bitField0_ |= 0x00000080;
tag = input.readTag();
- if (tag != 42) {
+ if (tag != 74) {
break;
}
}
- case 42: {
+ case 74: {
// regionName
input.readString(regionName);
bitField0_ |= 0x00000100;
tag = input.readTag();
- if (tag != 50) {
- break;
- }
- }
- case 50: {
- // exResourceUrl
- input.readString(exResourceUrl);
- bitField0_ |= 0x00000200;
- tag = input.readTag();
- if (tag != 82) {
- break;
- }
- }
- case 82: {
- // ip
- input.readString(ip);
- bitField0_ |= 0x00000400;
- tag = input.readTag();
if (tag != 98) {
break;
}
}
case 98: {
+ // exResourceUrl
+ input.readString(exResourceUrl);
+ bitField0_ |= 0x00000200;
+ tag = input.readTag();
+ if (tag != 106) {
+ break;
+ }
+ }
+ case 106: {
+ // luaUrl
+ input.readString(luaUrl);
+ bitField0_ |= 0x00000400;
+ tag = input.readTag();
+ if (tag != 114) {
+ break;
+ }
+ }
+ case 114: {
// assetBundleUrl
input.readString(assetBundleUrl);
bitField0_ |= 0x00000800;
tag = input.readTag();
- if (tag != 1202) {
+ if (tag != 122) {
break;
}
}
- case 1202: {
- // ifixUrl
- input.readString(ifixUrl);
+ case 122: {
+ // ip
+ input.readString(ip);
bitField0_ |= 0x00001000;
tag = input.readTag();
- if (tag != 4842) {
+ if (tag != 2082) {
break;
}
}
- case 4842: {
- // clientSecretKey
- input.readString(clientSecretKey);
- bitField0_ |= 0x00002000;
- tag = input.readTag();
- if (tag != 5498) {
- break;
- }
- }
- case 5498: {
+ case 2082: {
// ifixVersion
input.readString(ifixVersion);
+ bitField0_ |= 0x00002000;
+ tag = input.readTag();
+ if (tag != 2194) {
+ break;
+ }
+ }
+ case 2194: {
+ // clientSecretKey
+ input.readString(clientSecretKey);
bitField0_ |= 0x00004000;
tag = input.readTag();
- if (tag != 14690) {
+ if (tag != 5570) {
break;
}
}
- case 14690: {
- // msg
- input.readString(msg);
+ case 5570: {
+ // ifixUrl
+ input.readString(ifixUrl);
bitField0_ |= 0x00008000;
tag = input.readTag();
- if (tag != 16082) {
+ if (tag != 7202) {
break;
}
}
- case 16082: {
+ case 7202: {
+ // msg
+ input.readString(msg);
+ bitField0_ |= 0x00010000;
+ tag = input.readTag();
+ if (tag != 15162) {
+ break;
+ }
+ }
+ case 15162: {
// mdkResVersion
input.readString(mdkResVersion);
- bitField0_ |= 0x00010000;
+ bitField0_ |= 0x00020000;
tag = input.readTag();
if (tag != 0) {
break;
@@ -1513,7 +1577,7 @@ public final class GateserverOuterClass {
output.writeBool(FieldNames.unk6, unk6);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeString(FieldNames.luaUrl, luaUrl);
+ output.writeBool(FieldNames.unk7, unk7);
}
if ((bitField0_ & 0x00000100) != 0) {
output.writeString(FieldNames.regionName, regionName);
@@ -1522,24 +1586,27 @@ public final class GateserverOuterClass {
output.writeString(FieldNames.exResourceUrl, exResourceUrl);
}
if ((bitField0_ & 0x00000400) != 0) {
- output.writeString(FieldNames.ip, ip);
+ output.writeString(FieldNames.luaUrl, luaUrl);
}
if ((bitField0_ & 0x00000800) != 0) {
output.writeString(FieldNames.assetBundleUrl, assetBundleUrl);
}
if ((bitField0_ & 0x00001000) != 0) {
- output.writeString(FieldNames.ifixUrl, ifixUrl);
+ output.writeString(FieldNames.ip, ip);
}
if ((bitField0_ & 0x00002000) != 0) {
- output.writeString(FieldNames.clientSecretKey, clientSecretKey);
- }
- if ((bitField0_ & 0x00004000) != 0) {
output.writeString(FieldNames.ifixVersion, ifixVersion);
}
+ if ((bitField0_ & 0x00004000) != 0) {
+ output.writeString(FieldNames.clientSecretKey, clientSecretKey);
+ }
if ((bitField0_ & 0x00008000) != 0) {
- output.writeString(FieldNames.msg, msg);
+ output.writeString(FieldNames.ifixUrl, ifixUrl);
}
if ((bitField0_ & 0x00010000) != 0) {
+ output.writeString(FieldNames.msg, msg);
+ }
+ if ((bitField0_ & 0x00020000) != 0) {
output.writeString(FieldNames.mdkResVersion, mdkResVersion);
}
output.endObject();
@@ -1629,11 +1696,10 @@ public final class GateserverOuterClass {
}
break;
}
- case -1091991977:
- case 508288168: {
- if (input.isAtField(FieldNames.luaUrl)) {
+ case 3594629: {
+ if (input.isAtField(FieldNames.unk7)) {
if (!input.trySkipNullValue()) {
- input.readString(luaUrl);
+ unk7 = input.readBool();
bitField0_ |= 0x00000080;
}
} else {
@@ -1665,10 +1731,11 @@ public final class GateserverOuterClass {
}
break;
}
- case 3367: {
- if (input.isAtField(FieldNames.ip)) {
+ case -1091991977:
+ case 508288168: {
+ if (input.isAtField(FieldNames.luaUrl)) {
if (!input.trySkipNullValue()) {
- input.readString(ip);
+ input.readString(luaUrl);
bitField0_ |= 0x00000400;
}
} else {
@@ -1688,11 +1755,10 @@ public final class GateserverOuterClass {
}
break;
}
- case 1719409347:
- case 1762383292: {
- if (input.isAtField(FieldNames.ifixUrl)) {
+ case 3367: {
+ if (input.isAtField(FieldNames.ip)) {
if (!input.trySkipNullValue()) {
- input.readString(ifixUrl);
+ input.readString(ip);
bitField0_ |= 0x00001000;
}
} else {
@@ -1700,23 +1766,23 @@ public final class GateserverOuterClass {
}
break;
}
- case -584558076:
- case 904194372: {
- if (input.isAtField(FieldNames.clientSecretKey)) {
- if (!input.trySkipNullValue()) {
- input.readString(clientSecretKey);
- bitField0_ |= 0x00002000;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 1625073708:
case -827048283: {
if (input.isAtField(FieldNames.ifixVersion)) {
if (!input.trySkipNullValue()) {
input.readString(ifixVersion);
+ bitField0_ |= 0x00002000;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -584558076:
+ case 904194372: {
+ if (input.isAtField(FieldNames.clientSecretKey)) {
+ if (!input.trySkipNullValue()) {
+ input.readString(clientSecretKey);
bitField0_ |= 0x00004000;
}
} else {
@@ -1724,11 +1790,23 @@ public final class GateserverOuterClass {
}
break;
}
+ case 1719409347:
+ case 1762383292: {
+ if (input.isAtField(FieldNames.ifixUrl)) {
+ if (!input.trySkipNullValue()) {
+ input.readString(ifixUrl);
+ bitField0_ |= 0x00008000;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case 108417: {
if (input.isAtField(FieldNames.msg)) {
if (!input.trySkipNullValue()) {
input.readString(msg);
- bitField0_ |= 0x00008000;
+ bitField0_ |= 0x00010000;
}
} else {
input.skipUnknownField();
@@ -1740,7 +1818,7 @@ public final class GateserverOuterClass {
if (input.isAtField(FieldNames.mdkResVersion)) {
if (!input.trySkipNullValue()) {
input.readString(mdkResVersion);
- bitField0_ |= 0x00010000;
+ bitField0_ |= 0x00020000;
}
} else {
input.skipUnknownField();
@@ -1813,21 +1891,23 @@ public final class GateserverOuterClass {
static final FieldName unk6 = FieldName.forField("unk6");
- static final FieldName luaUrl = FieldName.forField("luaUrl", "lua_url");
+ static final FieldName unk7 = FieldName.forField("unk7");
static final FieldName regionName = FieldName.forField("regionName", "region_name");
static final FieldName exResourceUrl = FieldName.forField("exResourceUrl", "ex_resource_url");
- static final FieldName ip = FieldName.forField("ip");
+ static final FieldName luaUrl = FieldName.forField("luaUrl", "lua_url");
static final FieldName assetBundleUrl = FieldName.forField("assetBundleUrl", "asset_bundle_url");
- static final FieldName ifixUrl = FieldName.forField("ifixUrl", "ifix_url");
+ static final FieldName ip = FieldName.forField("ip");
+
+ static final FieldName ifixVersion = FieldName.forField("ifixVersion", "ifix_version");
static final FieldName clientSecretKey = FieldName.forField("clientSecretKey", "client_secret_key");
- static final FieldName ifixVersion = FieldName.forField("ifixVersion", "ifix_version");
+ static final FieldName ifixUrl = FieldName.forField("ifixUrl", "ifix_url");
static final FieldName msg = FieldName.forField("msg");
diff --git a/src/generated/main/emu/lunarcore/proto/GetActivityScheduleConfigScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetActivityScheduleConfigScRspOuterClass.java
index 844ec6e..4f32799 100644
--- a/src/generated/main/emu/lunarcore/proto/GetActivityScheduleConfigScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetActivityScheduleConfigScRspOuterClass.java
@@ -25,7 +25,7 @@ public final class GetActivityScheduleConfigScRspOuterClass {
private int retcode;
/**
- * repeated .ActivityScheduleInfo activity_schedule_list = 7;
+ * repeated .ActivityScheduleInfo activity_schedule_list = 8;
*/
private final RepeatedMessagerepeated .ActivityScheduleInfo activity_schedule_list = 7;
+ * repeated .ActivityScheduleInfo activity_schedule_list = 8;
* @return whether the activityScheduleList field is set
*/
public boolean hasActivityScheduleList() {
@@ -85,7 +85,7 @@ public final class GetActivityScheduleConfigScRspOuterClass {
}
/**
- * repeated .ActivityScheduleInfo activity_schedule_list = 7;
+ * repeated .ActivityScheduleInfo activity_schedule_list = 8;
* @return this
*/
public GetActivityScheduleConfigScRsp clearActivityScheduleList() {
@@ -95,7 +95,7 @@ public final class GetActivityScheduleConfigScRspOuterClass {
}
/**
- * repeated .ActivityScheduleInfo activity_schedule_list = 7;
+ * repeated .ActivityScheduleInfo activity_schedule_list = 8;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -110,7 +110,7 @@ public final class GetActivityScheduleConfigScRspOuterClass {
}
/**
- * repeated .ActivityScheduleInfo activity_schedule_list = 7;
+ * repeated .ActivityScheduleInfo activity_schedule_list = 8;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -125,7 +125,7 @@ public final class GetActivityScheduleConfigScRspOuterClass {
}
/**
- * repeated .ActivityScheduleInfo activity_schedule_list = 7;
+ * repeated .ActivityScheduleInfo activity_schedule_list = 8;
* @param value the activityScheduleList to add
* @return this
*/
@@ -137,7 +137,7 @@ public final class GetActivityScheduleConfigScRspOuterClass {
}
/**
- * repeated .ActivityScheduleInfo activity_schedule_list = 7;
+ * repeated .ActivityScheduleInfo activity_schedule_list = 8;
* @param values the activityScheduleList to add
* @return this
*/
@@ -219,7 +219,7 @@ public final class GetActivityScheduleConfigScRspOuterClass {
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < activityScheduleList.length(); i++) {
- output.writeRawByte((byte) 58);
+ output.writeRawByte((byte) 66);
output.writeMessageNoTag(activityScheduleList.get(i));
}
}
@@ -249,11 +249,11 @@ public final class GetActivityScheduleConfigScRspOuterClass {
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 58) {
+ if (tag != 66) {
break;
}
}
- case 58: {
+ case 66: {
// activityScheduleList
tag = input.readRepeatedMessage(activityScheduleList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetAllLineupDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetAllLineupDataScRspOuterClass.java
index 9228aa7..96c6683 100644
--- a/src/generated/main/emu/lunarcore/proto/GetAllLineupDataScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetAllLineupDataScRspOuterClass.java
@@ -20,17 +20,17 @@ public final class GetAllLineupDataScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 cur_index = 1;
- */
- private int curIndex;
-
- /**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 8;
*/
private int retcode;
/**
- * repeated .LineupInfo lineup_list = 3;
+ * optional uint32 cur_index = 11;
+ */
+ private int curIndex;
+
+ /**
+ * repeated .LineupInfo lineup_list = 4;
*/
private final RepeatedMessageoptional uint32 cur_index = 1;
- * @return whether the curIndex field is set
+ * optional uint32 retcode = 8;
+ * @return whether the retcode field is set
*/
- public boolean hasCurIndex() {
+ public boolean hasRetcode() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 cur_index = 1;
- * @return this
- */
- public GetAllLineupDataScRsp clearCurIndex() {
- bitField0_ &= ~0x00000001;
- curIndex = 0;
- return this;
- }
-
- /**
- * optional uint32 cur_index = 1;
- * @return the curIndex
- */
- public int getCurIndex() {
- return curIndex;
- }
-
- /**
- * optional uint32 cur_index = 1;
- * @param value the curIndex to set
- * @return this
- */
- public GetAllLineupDataScRsp setCurIndex(final int value) {
- bitField0_ |= 0x00000001;
- curIndex = value;
- return this;
- }
-
- /**
- * optional uint32 retcode = 4;
- * @return whether the retcode field is set
- */
- public boolean hasRetcode() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 8;
* @return this
*/
public GetAllLineupDataScRsp clearRetcode() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
retcode = 0;
return this;
}
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 8;
* @return the retcode
*/
public int getRetcode() {
@@ -108,18 +71,55 @@ public final class GetAllLineupDataScRspOuterClass {
}
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 8;
* @param value the retcode to set
* @return this
*/
public GetAllLineupDataScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
retcode = value;
return this;
}
/**
- * repeated .LineupInfo lineup_list = 3;
+ * optional uint32 cur_index = 11;
+ * @return whether the curIndex field is set
+ */
+ public boolean hasCurIndex() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 cur_index = 11;
+ * @return this
+ */
+ public GetAllLineupDataScRsp clearCurIndex() {
+ bitField0_ &= ~0x00000002;
+ curIndex = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 cur_index = 11;
+ * @return the curIndex
+ */
+ public int getCurIndex() {
+ return curIndex;
+ }
+
+ /**
+ * optional uint32 cur_index = 11;
+ * @param value the curIndex to set
+ * @return this
+ */
+ public GetAllLineupDataScRsp setCurIndex(final int value) {
+ bitField0_ |= 0x00000002;
+ curIndex = value;
+ return this;
+ }
+
+ /**
+ * repeated .LineupInfo lineup_list = 4;
* @return whether the lineupList field is set
*/
public boolean hasLineupList() {
@@ -127,7 +127,7 @@ public final class GetAllLineupDataScRspOuterClass {
}
/**
- * repeated .LineupInfo lineup_list = 3;
+ * repeated .LineupInfo lineup_list = 4;
* @return this
*/
public GetAllLineupDataScRsp clearLineupList() {
@@ -137,7 +137,7 @@ public final class GetAllLineupDataScRspOuterClass {
}
/**
- * repeated .LineupInfo lineup_list = 3;
+ * repeated .LineupInfo lineup_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.
@@ -151,7 +151,7 @@ public final class GetAllLineupDataScRspOuterClass {
}
/**
- * repeated .LineupInfo lineup_list = 3;
+ * repeated .LineupInfo lineup_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
@@ -165,7 +165,7 @@ public final class GetAllLineupDataScRspOuterClass {
}
/**
- * repeated .LineupInfo lineup_list = 3;
+ * repeated .LineupInfo lineup_list = 4;
* @param value the lineupList to add
* @return this
*/
@@ -176,7 +176,7 @@ public final class GetAllLineupDataScRspOuterClass {
}
/**
- * repeated .LineupInfo lineup_list = 3;
+ * repeated .LineupInfo lineup_list = 4;
* @param values the lineupList to add
* @return this
*/
@@ -191,8 +191,8 @@ public final class GetAllLineupDataScRspOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- curIndex = other.curIndex;
retcode = other.retcode;
+ curIndex = other.curIndex;
lineupList.copyFrom(other.lineupList);
}
return this;
@@ -204,12 +204,12 @@ public final class GetAllLineupDataScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasCurIndex()) {
- setCurIndex(other.curIndex);
- }
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
+ if (other.hasCurIndex()) {
+ setCurIndex(other.curIndex);
+ }
if (other.hasLineupList()) {
getMutableLineupList().addAll(other.lineupList);
}
@@ -223,8 +223,8 @@ public final class GetAllLineupDataScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- curIndex = 0;
retcode = 0;
+ curIndex = 0;
lineupList.clear();
return this;
}
@@ -250,24 +250,24 @@ public final class GetAllLineupDataScRspOuterClass {
}
GetAllLineupDataScRsp other = (GetAllLineupDataScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasCurIndex() || curIndex == other.curIndex)
&& (!hasRetcode() || retcode == other.retcode)
+ && (!hasCurIndex() || curIndex == other.curIndex)
&& (!hasLineupList() || lineupList.equals(other.lineupList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(curIndex);
+ output.writeRawByte((byte) 64);
+ output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(retcode);
+ output.writeRawByte((byte) 88);
+ output.writeUInt32NoTag(curIndex);
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < lineupList.length(); i++) {
- output.writeRawByte((byte) 26);
+ output.writeRawByte((byte) 34);
output.writeMessageNoTag(lineupList.get(i));
}
}
@@ -277,10 +277,10 @@ public final class GetAllLineupDataScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(curIndex);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(curIndex);
}
if ((bitField0_ & 0x00000004) != 0) {
size += (1 * lineupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(lineupList);
@@ -295,25 +295,25 @@ public final class GetAllLineupDataScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
- // curIndex
- curIndex = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 32) {
- break;
- }
- }
- case 32: {
+ case 64: {
// retcode
retcode = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 26) {
+ if (tag != 88) {
break;
}
}
- case 26: {
+ case 88: {
+ // curIndex
+ curIndex = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 34) {
+ break;
+ }
+ }
+ case 34: {
// lineupList
tag = input.readRepeatedMessage(lineupList, tag);
bitField0_ |= 0x00000004;
@@ -339,10 +339,10 @@ public final class GetAllLineupDataScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.curIndex, curIndex);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.curIndex, curIndex);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRepeatedMessage(FieldNames.lineupList, lineupList);
@@ -357,11 +357,10 @@ public final class GetAllLineupDataScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 537796210:
- case 117333523: {
- if (input.isAtField(FieldNames.curIndex)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- curIndex = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -369,10 +368,11 @@ public final class GetAllLineupDataScRspOuterClass {
}
break;
}
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case 537796210:
+ case 117333523: {
+ if (input.isAtField(FieldNames.curIndex)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ curIndex = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -445,10 +445,10 @@ public final class GetAllLineupDataScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName curIndex = FieldName.forField("curIndex", "cur_index");
-
static final FieldName retcode = FieldName.forField("retcode");
+ static final FieldName curIndex = FieldName.forField("curIndex", "cur_index");
+
static final FieldName lineupList = FieldName.forField("lineupList", "lineup_list");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java
index 8a4f7ad..833dce1 100644
--- a/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java
@@ -19,12 +19,12 @@ public final class GetArchiveDataScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 8;
*/
private int retcode;
/**
- * optional .ArchiveData archive_data = 4;
+ * optional .ArchiveData archive_data = 14;
*/
private final ArchiveDataOuterClass.ArchiveData archiveData = ArchiveDataOuterClass.ArchiveData.newInstance();
@@ -39,7 +39,7 @@ public final class GetArchiveDataScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 8;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -47,7 +47,7 @@ public final class GetArchiveDataScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 8;
* @return this
*/
public GetArchiveDataScRsp clearRetcode() {
@@ -57,7 +57,7 @@ public final class GetArchiveDataScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 8;
* @return the retcode
*/
public int getRetcode() {
@@ -65,7 +65,7 @@ public final class GetArchiveDataScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 8;
* @param value the retcode to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class GetArchiveDataScRspOuterClass {
}
/**
- * optional .ArchiveData archive_data = 4;
+ * optional .ArchiveData archive_data = 14;
* @return whether the archiveData field is set
*/
public boolean hasArchiveData() {
@@ -84,7 +84,7 @@ public final class GetArchiveDataScRspOuterClass {
}
/**
- * optional .ArchiveData archive_data = 4;
+ * optional .ArchiveData archive_data = 14;
* @return this
*/
public GetArchiveDataScRsp clearArchiveData() {
@@ -94,7 +94,7 @@ public final class GetArchiveDataScRspOuterClass {
}
/**
- * optional .ArchiveData archive_data = 4;
+ * optional .ArchiveData archive_data = 14;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class GetArchiveDataScRspOuterClass {
}
/**
- * optional .ArchiveData archive_data = 4;
+ * optional .ArchiveData archive_data = 14;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class GetArchiveDataScRspOuterClass {
}
/**
- * optional .ArchiveData archive_data = 4;
+ * optional .ArchiveData archive_data = 14;
* @param value the archiveData to set
* @return this
*/
@@ -198,11 +198,11 @@ public final class GetArchiveDataScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 34);
+ output.writeRawByte((byte) 114);
output.writeMessageNoTag(archiveData);
}
}
@@ -226,16 +226,16 @@ public final class GetArchiveDataScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
+ case 64: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 34) {
+ if (tag != 114) {
break;
}
}
- case 34: {
+ case 114: {
// 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 0bee304..ff4601b 100644
--- a/src/generated/main/emu/lunarcore/proto/GetAvatarDataCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetAvatarDataCsReqOuterClass.java
@@ -20,12 +20,12 @@ public final class GetAvatarDataCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional bool is_get_all = 1;
+ * optional bool is_get_all = 8;
*/
private boolean isGetAll;
/**
- * repeated uint32 base_avatar_id_list = 7;
+ * repeated uint32 base_avatar_id_list = 3;
*/
private final RepeatedInt baseAvatarIdList = RepeatedInt.newEmptyInstance();
@@ -40,7 +40,7 @@ public final class GetAvatarDataCsReqOuterClass {
}
/**
- * optional bool is_get_all = 1;
+ * optional bool is_get_all = 8;
* @return whether the isGetAll field is set
*/
public boolean hasIsGetAll() {
@@ -48,7 +48,7 @@ public final class GetAvatarDataCsReqOuterClass {
}
/**
- * optional bool is_get_all = 1;
+ * optional bool is_get_all = 8;
* @return this
*/
public GetAvatarDataCsReq clearIsGetAll() {
@@ -58,7 +58,7 @@ public final class GetAvatarDataCsReqOuterClass {
}
/**
- * optional bool is_get_all = 1;
+ * optional bool is_get_all = 8;
* @return the isGetAll
*/
public boolean getIsGetAll() {
@@ -66,7 +66,7 @@ public final class GetAvatarDataCsReqOuterClass {
}
/**
- * optional bool is_get_all = 1;
+ * optional bool is_get_all = 8;
* @param value the isGetAll to set
* @return this
*/
@@ -77,7 +77,7 @@ public final class GetAvatarDataCsReqOuterClass {
}
/**
- * repeated uint32 base_avatar_id_list = 7;
+ * repeated uint32 base_avatar_id_list = 3;
* @return whether the baseAvatarIdList field is set
*/
public boolean hasBaseAvatarIdList() {
@@ -85,7 +85,7 @@ public final class GetAvatarDataCsReqOuterClass {
}
/**
- * repeated uint32 base_avatar_id_list = 7;
+ * repeated uint32 base_avatar_id_list = 3;
* @return this
*/
public GetAvatarDataCsReq clearBaseAvatarIdList() {
@@ -95,7 +95,7 @@ public final class GetAvatarDataCsReqOuterClass {
}
/**
- * repeated uint32 base_avatar_id_list = 7;
+ * repeated uint32 base_avatar_id_list = 3;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class GetAvatarDataCsReqOuterClass {
}
/**
- * repeated uint32 base_avatar_id_list = 7;
+ * repeated uint32 base_avatar_id_list = 3;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public final class GetAvatarDataCsReqOuterClass {
}
/**
- * repeated uint32 base_avatar_id_list = 7;
+ * repeated uint32 base_avatar_id_list = 3;
* @param value the baseAvatarIdList to add
* @return this
*/
@@ -134,7 +134,7 @@ public final class GetAvatarDataCsReqOuterClass {
}
/**
- * repeated uint32 base_avatar_id_list = 7;
+ * repeated uint32 base_avatar_id_list = 3;
* @param values the baseAvatarIdList to add
* @return this
*/
@@ -210,12 +210,12 @@ public final class GetAvatarDataCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 64);
output.writeBoolNoTag(isGetAll);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < baseAvatarIdList.length(); i++) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(baseAvatarIdList.array()[i]);
}
}
@@ -240,16 +240,16 @@ public final class GetAvatarDataCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 64: {
// isGetAll
isGetAll = input.readBool();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 58) {
+ if (tag != 26) {
break;
}
}
- case 58: {
+ case 26: {
// baseAvatarIdList [packed=true]
input.readPackedUInt32(baseAvatarIdList, tag);
bitField0_ |= 0x00000002;
@@ -268,7 +268,7 @@ public final class GetAvatarDataCsReqOuterClass {
tag = input.readTag();
break;
}
- case 56: {
+ case 24: {
// 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 e46ff63..a6aa69a 100644
--- a/src/generated/main/emu/lunarcore/proto/GetAvatarDataScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetAvatarDataScRspOuterClass.java
@@ -20,17 +20,17 @@ public final class GetAvatarDataScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 2;
+ * optional uint32 retcode = 14;
*/
private int retcode;
/**
- * optional bool is_get_all = 6;
+ * optional bool is_get_all = 2;
*/
private boolean isGetAll;
/**
- * repeated .Avatar avatar_list = 15;
+ * repeated .Avatar avatar_list = 8;
*/
private final RepeatedMessageoptional uint32 retcode = 2;
+ * optional uint32 retcode = 14;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -53,7 +53,7 @@ public final class GetAvatarDataScRspOuterClass {
}
/**
- * optional uint32 retcode = 2;
+ * optional uint32 retcode = 14;
* @return this
*/
public GetAvatarDataScRsp clearRetcode() {
@@ -63,7 +63,7 @@ public final class GetAvatarDataScRspOuterClass {
}
/**
- * optional uint32 retcode = 2;
+ * optional uint32 retcode = 14;
* @return the retcode
*/
public int getRetcode() {
@@ -71,7 +71,7 @@ public final class GetAvatarDataScRspOuterClass {
}
/**
- * optional uint32 retcode = 2;
+ * optional uint32 retcode = 14;
* @param value the retcode to set
* @return this
*/
@@ -82,7 +82,7 @@ public final class GetAvatarDataScRspOuterClass {
}
/**
- * optional bool is_get_all = 6;
+ * optional bool is_get_all = 2;
* @return whether the isGetAll field is set
*/
public boolean hasIsGetAll() {
@@ -90,7 +90,7 @@ public final class GetAvatarDataScRspOuterClass {
}
/**
- * optional bool is_get_all = 6;
+ * optional bool is_get_all = 2;
* @return this
*/
public GetAvatarDataScRsp clearIsGetAll() {
@@ -100,7 +100,7 @@ public final class GetAvatarDataScRspOuterClass {
}
/**
- * optional bool is_get_all = 6;
+ * optional bool is_get_all = 2;
* @return the isGetAll
*/
public boolean getIsGetAll() {
@@ -108,7 +108,7 @@ public final class GetAvatarDataScRspOuterClass {
}
/**
- * optional bool is_get_all = 6;
+ * optional bool is_get_all = 2;
* @param value the isGetAll to set
* @return this
*/
@@ -119,7 +119,7 @@ public final class GetAvatarDataScRspOuterClass {
}
/**
- * repeated .Avatar avatar_list = 15;
+ * repeated .Avatar avatar_list = 8;
* @return whether the avatarList field is set
*/
public boolean hasAvatarList() {
@@ -127,7 +127,7 @@ public final class GetAvatarDataScRspOuterClass {
}
/**
- * repeated .Avatar avatar_list = 15;
+ * repeated .Avatar avatar_list = 8;
* @return this
*/
public GetAvatarDataScRsp clearAvatarList() {
@@ -137,7 +137,7 @@ public final class GetAvatarDataScRspOuterClass {
}
/**
- * repeated .Avatar avatar_list = 15;
+ * repeated .Avatar avatar_list = 8;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -151,7 +151,7 @@ public final class GetAvatarDataScRspOuterClass {
}
/**
- * repeated .Avatar avatar_list = 15;
+ * repeated .Avatar avatar_list = 8;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -165,7 +165,7 @@ public final class GetAvatarDataScRspOuterClass {
}
/**
- * repeated .Avatar avatar_list = 15;
+ * repeated .Avatar avatar_list = 8;
* @param value the avatarList to add
* @return this
*/
@@ -176,7 +176,7 @@ public final class GetAvatarDataScRspOuterClass {
}
/**
- * repeated .Avatar avatar_list = 15;
+ * repeated .Avatar avatar_list = 8;
* @param values the avatarList to add
* @return this
*/
@@ -258,16 +258,16 @@ public final class GetAvatarDataScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 112);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 16);
output.writeBoolNoTag(isGetAll);
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < avatarList.length(); i++) {
- output.writeRawByte((byte) 122);
+ output.writeRawByte((byte) 66);
output.writeMessageNoTag(avatarList.get(i));
}
}
@@ -295,25 +295,25 @@ public final class GetAvatarDataScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
+ case 112: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 48) {
+ if (tag != 16) {
break;
}
}
- case 48: {
+ case 16: {
// isGetAll
isGetAll = input.readBool();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 122) {
+ if (tag != 66) {
break;
}
}
- case 122: {
+ case 66: {
// 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 b0aa4de..a898b9a 100644
--- a/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java
@@ -20,25 +20,25 @@ public final class GetBagScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 4;
*/
private int retcode;
/**
- * repeated .Equipment equipment_list = 2;
- */
- private final RepeatedMessagerepeated .Material material_list = 6;
+ * repeated .Material material_list = 7;
*/
private final RepeatedMessagerepeated .Relic relic_list = 11;
+ * repeated .Relic relic_list = 8;
*/
private final RepeatedMessagerepeated .Equipment equipment_list = 15;
+ */
+ private final RepeatedMessageoptional uint32 retcode = 3;
+ * optional uint32 retcode = 4;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -58,7 +58,7 @@ public final class GetBagScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 4;
* @return this
*/
public GetBagScRsp clearRetcode() {
@@ -68,7 +68,7 @@ public final class GetBagScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 4;
* @return the retcode
*/
public int getRetcode() {
@@ -76,7 +76,7 @@ public final class GetBagScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 4;
* @param value the retcode to set
* @return this
*/
@@ -87,93 +87,25 @@ public final class GetBagScRspOuterClass {
}
/**
- * repeated .Equipment equipment_list = 2;
- * @return whether the equipmentList field is set
+ * repeated .Material material_list = 7;
+ * @return whether the materialList field is set
*/
- public boolean hasEquipmentList() {
+ public boolean hasMaterialList() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * repeated .Equipment equipment_list = 2;
- * @return this
- */
- public GetBagScRsp clearEquipmentList() {
- bitField0_ &= ~0x00000002;
- equipmentList.clear();
- return this;
- }
-
- /**
- * repeated .Equipment equipment_list = 2;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableEquipmentList()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedMessagerepeated .Equipment equipment_list = 2;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedMessagerepeated .Equipment equipment_list = 2;
- * @param value the equipmentList to add
- * @return this
- */
- public GetBagScRsp addEquipmentList(final EquipmentOuterClass.Equipment value) {
- bitField0_ |= 0x00000002;
- equipmentList.add(value);
- return this;
- }
-
- /**
- * repeated .Equipment equipment_list = 2;
- * @param values the equipmentList to add
- * @return this
- */
- public GetBagScRsp addAllEquipmentList(final EquipmentOuterClass.Equipment... values) {
- bitField0_ |= 0x00000002;
- equipmentList.addAll(values);
- return this;
- }
-
- /**
- * repeated .Material material_list = 6;
- * @return whether the materialList field is set
- */
- public boolean hasMaterialList() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * repeated .Material material_list = 6;
+ * repeated .Material material_list = 7;
* @return this
*/
public GetBagScRsp clearMaterialList() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
materialList.clear();
return this;
}
/**
- * repeated .Material material_list = 6;
+ * repeated .Material material_list = 7;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -187,7 +119,7 @@ public final class GetBagScRspOuterClass {
}
/**
- * repeated .Material material_list = 6;
+ * repeated .Material material_list = 7;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -196,52 +128,52 @@ public final class GetBagScRspOuterClass {
* @return internal storage object for modifications
*/
public RepeatedMessagerepeated .Material material_list = 6;
+ * repeated .Material material_list = 7;
* @param value the materialList to add
* @return this
*/
public GetBagScRsp addMaterialList(final MaterialOuterClass.Material value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
materialList.add(value);
return this;
}
/**
- * repeated .Material material_list = 6;
+ * repeated .Material material_list = 7;
* @param values the materialList to add
* @return this
*/
public GetBagScRsp addAllMaterialList(final MaterialOuterClass.Material... values) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
materialList.addAll(values);
return this;
}
/**
- * repeated .Relic relic_list = 11;
+ * repeated .Relic relic_list = 8;
* @return whether the relicList field is set
*/
public boolean hasRelicList() {
- return (bitField0_ & 0x00000008) != 0;
+ return (bitField0_ & 0x00000004) != 0;
}
/**
- * repeated .Relic relic_list = 11;
+ * repeated .Relic relic_list = 8;
* @return this
*/
public GetBagScRsp clearRelicList() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000004;
relicList.clear();
return this;
}
/**
- * repeated .Relic relic_list = 11;
+ * repeated .Relic relic_list = 8;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -255,7 +187,7 @@ public final class GetBagScRspOuterClass {
}
/**
- * repeated .Relic relic_list = 11;
+ * repeated .Relic relic_list = 8;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -264,41 +196,109 @@ public final class GetBagScRspOuterClass {
* @return internal storage object for modifications
*/
public RepeatedMessagerepeated .Relic relic_list = 11;
+ * repeated .Relic relic_list = 8;
* @param value the relicList to add
* @return this
*/
public GetBagScRsp addRelicList(final RelicOuterClass.Relic value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
relicList.add(value);
return this;
}
/**
- * repeated .Relic relic_list = 11;
+ * repeated .Relic relic_list = 8;
* @param values the relicList to add
* @return this
*/
public GetBagScRsp addAllRelicList(final RelicOuterClass.Relic... values) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
relicList.addAll(values);
return this;
}
+ /**
+ * repeated .Equipment equipment_list = 15;
+ * @return whether the equipmentList field is set
+ */
+ public boolean hasEquipmentList() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * repeated .Equipment equipment_list = 15;
+ * @return this
+ */
+ public GetBagScRsp clearEquipmentList() {
+ bitField0_ &= ~0x00000008;
+ equipmentList.clear();
+ return this;
+ }
+
+ /**
+ * repeated .Equipment equipment_list = 15;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableEquipmentList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedMessagerepeated .Equipment equipment_list = 15;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedMessagerepeated .Equipment equipment_list = 15;
+ * @param value the equipmentList to add
+ * @return this
+ */
+ public GetBagScRsp addEquipmentList(final EquipmentOuterClass.Equipment value) {
+ bitField0_ |= 0x00000008;
+ equipmentList.add(value);
+ return this;
+ }
+
+ /**
+ * repeated .Equipment equipment_list = 15;
+ * @param values the equipmentList to add
+ * @return this
+ */
+ public GetBagScRsp addAllEquipmentList(final EquipmentOuterClass.Equipment... values) {
+ bitField0_ |= 0x00000008;
+ equipmentList.addAll(values);
+ return this;
+ }
+
@Override
public GetBagScRsp copyFrom(final GetBagScRsp other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
retcode = other.retcode;
- equipmentList.copyFrom(other.equipmentList);
materialList.copyFrom(other.materialList);
relicList.copyFrom(other.relicList);
+ equipmentList.copyFrom(other.equipmentList);
}
return this;
}
@@ -312,15 +312,15 @@ public final class GetBagScRspOuterClass {
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
- if (other.hasEquipmentList()) {
- getMutableEquipmentList().addAll(other.equipmentList);
- }
if (other.hasMaterialList()) {
getMutableMaterialList().addAll(other.materialList);
}
if (other.hasRelicList()) {
getMutableRelicList().addAll(other.relicList);
}
+ if (other.hasEquipmentList()) {
+ getMutableEquipmentList().addAll(other.equipmentList);
+ }
return this;
}
@@ -332,9 +332,9 @@ public final class GetBagScRspOuterClass {
cachedSize = -1;
bitField0_ = 0;
retcode = 0;
- equipmentList.clear();
materialList.clear();
relicList.clear();
+ equipmentList.clear();
return this;
}
@@ -345,9 +345,9 @@ public final class GetBagScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- equipmentList.clearQuick();
materialList.clearQuick();
relicList.clearQuick();
+ equipmentList.clearQuick();
return this;
}
@@ -362,35 +362,35 @@ public final class GetBagScRspOuterClass {
GetBagScRsp other = (GetBagScRsp) o;
return bitField0_ == other.bitField0_
&& (!hasRetcode() || retcode == other.retcode)
- && (!hasEquipmentList() || equipmentList.equals(other.equipmentList))
&& (!hasMaterialList() || materialList.equals(other.materialList))
- && (!hasRelicList() || relicList.equals(other.relicList));
+ && (!hasRelicList() || relicList.equals(other.relicList))
+ && (!hasEquipmentList() || equipmentList.equals(other.equipmentList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- for (int i = 0; i < equipmentList.length(); i++) {
- output.writeRawByte((byte) 18);
- output.writeMessageNoTag(equipmentList.get(i));
- }
- }
- if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < materialList.length(); i++) {
- output.writeRawByte((byte) 50);
+ output.writeRawByte((byte) 58);
output.writeMessageNoTag(materialList.get(i));
}
}
- if ((bitField0_ & 0x00000008) != 0) {
+ if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < relicList.length(); i++) {
- output.writeRawByte((byte) 90);
+ output.writeRawByte((byte) 66);
output.writeMessageNoTag(relicList.get(i));
}
}
+ if ((bitField0_ & 0x00000008) != 0) {
+ for (int i = 0; i < equipmentList.length(); i++) {
+ output.writeRawByte((byte) 122);
+ output.writeMessageNoTag(equipmentList.get(i));
+ }
+ }
}
@Override
@@ -400,14 +400,14 @@ public final class GetBagScRspOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList);
- }
- if ((bitField0_ & 0x00000004) != 0) {
size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList);
}
- if ((bitField0_ & 0x00000008) != 0) {
+ if ((bitField0_ & 0x00000004) != 0) {
size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList);
}
+ if ((bitField0_ & 0x00000008) != 0) {
+ size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList);
+ }
return size;
}
@@ -418,34 +418,34 @@ public final class GetBagScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
+ case 32: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 18) {
+ if (tag != 58) {
break;
}
}
- case 18: {
- // equipmentList
- tag = input.readRepeatedMessage(equipmentList, tag);
- bitField0_ |= 0x00000002;
- if (tag != 50) {
- break;
- }
- }
- case 50: {
+ case 58: {
// materialList
tag = input.readRepeatedMessage(materialList, tag);
- bitField0_ |= 0x00000004;
- if (tag != 90) {
+ bitField0_ |= 0x00000002;
+ if (tag != 66) {
break;
}
}
- case 90: {
+ case 66: {
// relicList
tag = input.readRepeatedMessage(relicList, tag);
+ bitField0_ |= 0x00000004;
+ if (tag != 122) {
+ break;
+ }
+ }
+ case 122: {
+ // equipmentList
+ tag = input.readRepeatedMessage(equipmentList, tag);
bitField0_ |= 0x00000008;
if (tag != 0) {
break;
@@ -472,14 +472,14 @@ public final class GetBagScRspOuterClass {
output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList);
- }
- if ((bitField0_ & 0x00000004) != 0) {
output.writeRepeatedMessage(FieldNames.materialList, materialList);
}
- if ((bitField0_ & 0x00000008) != 0) {
+ if ((bitField0_ & 0x00000004) != 0) {
output.writeRepeatedMessage(FieldNames.relicList, relicList);
}
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList);
+ }
output.endObject();
}
@@ -501,24 +501,12 @@ public final class GetBagScRspOuterClass {
}
break;
}
- case 2007143244:
- case 2109525167: {
- if (input.isAtField(FieldNames.equipmentList)) {
- if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(equipmentList);
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case -2115854747:
case -1149360970: {
if (input.isAtField(FieldNames.materialList)) {
if (!input.trySkipNullValue()) {
input.readRepeatedMessage(materialList);
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
}
} else {
input.skipUnknownField();
@@ -530,6 +518,18 @@ public final class GetBagScRspOuterClass {
if (input.isAtField(FieldNames.relicList)) {
if (!input.trySkipNullValue()) {
input.readRepeatedMessage(relicList);
+ bitField0_ |= 0x00000004;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 2007143244:
+ case 2109525167: {
+ if (input.isAtField(FieldNames.equipmentList)) {
+ if (!input.trySkipNullValue()) {
+ input.readRepeatedMessage(equipmentList);
bitField0_ |= 0x00000008;
}
} else {
@@ -591,11 +591,11 @@ public final class GetBagScRspOuterClass {
static class FieldNames {
static final FieldName retcode = FieldName.forField("retcode");
- static final FieldName equipmentList = FieldName.forField("equipmentList", "equipment_list");
-
static final FieldName materialList = FieldName.forField("materialList", "material_list");
static final FieldName relicList = FieldName.forField("relicList", "relic_list");
+
+ static final FieldName equipmentList = FieldName.forField("equipmentList", "equipment_list");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java
index 273ab58..3f88ad1 100644
--- a/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java
@@ -19,42 +19,42 @@ public final class GetBasicInfoScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional int64 next_recover_time = 6;
- */
- private long nextRecoverTime;
-
- /**
- * optional int64 last_set_nickname_time = 7;
+ * optional int64 last_set_nickname_time = 10;
*/
private long lastSetNicknameTime;
/**
- * optional uint32 week_cocoon_finished_count = 3;
+ * optional int64 next_recover_time = 15;
*/
- private int weekCocoonFinishedCount;
+ private long nextRecoverTime;
/**
- * optional uint32 cur_day = 4;
- */
- private int curDay;
-
- /**
- * optional uint32 gameplay_birthday = 5;
+ * optional uint32 gameplay_birthday = 2;
*/
private int gameplayBirthday;
/**
- * optional uint32 retcode = 11;
+ * optional uint32 cur_day = 3;
+ */
+ private int curDay;
+
+ /**
+ * optional uint32 retcode = 7;
*/
private int retcode;
/**
- * optional uint32 exchange_times = 14;
+ * optional uint32 exchange_times = 8;
*/
private int exchangeTimes;
/**
- * optional .PlayerSettingInfo player_setting_info = 15;
+ * optional uint32 week_cocoon_finished_count = 11;
+ */
+ private int weekCocoonFinishedCount;
+
+ /**
+ * optional .PlayerSettingInfo player_setting_info = 12;
*/
private final PlayerSettingInfoOuterClass.PlayerSettingInfo playerSettingInfo = PlayerSettingInfoOuterClass.PlayerSettingInfo.newInstance();
@@ -69,62 +69,25 @@ public final class GetBasicInfoScRspOuterClass {
}
/**
- * optional int64 next_recover_time = 6;
- * @return whether the nextRecoverTime field is set
+ * optional int64 last_set_nickname_time = 10;
+ * @return whether the lastSetNicknameTime field is set
*/
- public boolean hasNextRecoverTime() {
+ public boolean hasLastSetNicknameTime() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional int64 next_recover_time = 6;
- * @return this
- */
- public GetBasicInfoScRsp clearNextRecoverTime() {
- bitField0_ &= ~0x00000001;
- nextRecoverTime = 0L;
- return this;
- }
-
- /**
- * optional int64 next_recover_time = 6;
- * @return the nextRecoverTime
- */
- public long getNextRecoverTime() {
- return nextRecoverTime;
- }
-
- /**
- * optional int64 next_recover_time = 6;
- * @param value the nextRecoverTime to set
- * @return this
- */
- public GetBasicInfoScRsp setNextRecoverTime(final long value) {
- bitField0_ |= 0x00000001;
- nextRecoverTime = value;
- return this;
- }
-
- /**
- * optional int64 last_set_nickname_time = 7;
- * @return whether the lastSetNicknameTime field is set
- */
- public boolean hasLastSetNicknameTime() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional int64 last_set_nickname_time = 7;
+ * optional int64 last_set_nickname_time = 10;
* @return this
*/
public GetBasicInfoScRsp clearLastSetNicknameTime() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
lastSetNicknameTime = 0L;
return this;
}
/**
- * optional int64 last_set_nickname_time = 7;
+ * optional int64 last_set_nickname_time = 10;
* @return the lastSetNicknameTime
*/
public long getLastSetNicknameTime() {
@@ -132,55 +95,92 @@ public final class GetBasicInfoScRspOuterClass {
}
/**
- * optional int64 last_set_nickname_time = 7;
+ * optional int64 last_set_nickname_time = 10;
* @param value the lastSetNicknameTime to set
* @return this
*/
public GetBasicInfoScRsp setLastSetNicknameTime(final long value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
lastSetNicknameTime = value;
return this;
}
/**
- * optional uint32 week_cocoon_finished_count = 3;
- * @return whether the weekCocoonFinishedCount field is set
+ * optional int64 next_recover_time = 15;
+ * @return whether the nextRecoverTime field is set
*/
- public boolean hasWeekCocoonFinishedCount() {
+ public boolean hasNextRecoverTime() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional int64 next_recover_time = 15;
+ * @return this
+ */
+ public GetBasicInfoScRsp clearNextRecoverTime() {
+ bitField0_ &= ~0x00000002;
+ nextRecoverTime = 0L;
+ return this;
+ }
+
+ /**
+ * optional int64 next_recover_time = 15;
+ * @return the nextRecoverTime
+ */
+ public long getNextRecoverTime() {
+ return nextRecoverTime;
+ }
+
+ /**
+ * optional int64 next_recover_time = 15;
+ * @param value the nextRecoverTime to set
+ * @return this
+ */
+ public GetBasicInfoScRsp setNextRecoverTime(final long value) {
+ bitField0_ |= 0x00000002;
+ nextRecoverTime = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 gameplay_birthday = 2;
+ * @return whether the gameplayBirthday field is set
+ */
+ public boolean hasGameplayBirthday() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 week_cocoon_finished_count = 3;
+ * optional uint32 gameplay_birthday = 2;
* @return this
*/
- public GetBasicInfoScRsp clearWeekCocoonFinishedCount() {
+ public GetBasicInfoScRsp clearGameplayBirthday() {
bitField0_ &= ~0x00000004;
- weekCocoonFinishedCount = 0;
+ gameplayBirthday = 0;
return this;
}
/**
- * optional uint32 week_cocoon_finished_count = 3;
- * @return the weekCocoonFinishedCount
+ * optional uint32 gameplay_birthday = 2;
+ * @return the gameplayBirthday
*/
- public int getWeekCocoonFinishedCount() {
- return weekCocoonFinishedCount;
+ public int getGameplayBirthday() {
+ return gameplayBirthday;
}
/**
- * optional uint32 week_cocoon_finished_count = 3;
- * @param value the weekCocoonFinishedCount to set
+ * optional uint32 gameplay_birthday = 2;
+ * @param value the gameplayBirthday to set
* @return this
*/
- public GetBasicInfoScRsp setWeekCocoonFinishedCount(final int value) {
+ public GetBasicInfoScRsp setGameplayBirthday(final int value) {
bitField0_ |= 0x00000004;
- weekCocoonFinishedCount = value;
+ gameplayBirthday = value;
return this;
}
/**
- * optional uint32 cur_day = 4;
+ * optional uint32 cur_day = 3;
* @return whether the curDay field is set
*/
public boolean hasCurDay() {
@@ -188,7 +188,7 @@ public final class GetBasicInfoScRspOuterClass {
}
/**
- * optional uint32 cur_day = 4;
+ * optional uint32 cur_day = 3;
* @return this
*/
public GetBasicInfoScRsp clearCurDay() {
@@ -198,7 +198,7 @@ public final class GetBasicInfoScRspOuterClass {
}
/**
- * optional uint32 cur_day = 4;
+ * optional uint32 cur_day = 3;
* @return the curDay
*/
public int getCurDay() {
@@ -206,7 +206,7 @@ public final class GetBasicInfoScRspOuterClass {
}
/**
- * optional uint32 cur_day = 4;
+ * optional uint32 cur_day = 3;
* @param value the curDay to set
* @return this
*/
@@ -217,62 +217,25 @@ public final class GetBasicInfoScRspOuterClass {
}
/**
- * optional uint32 gameplay_birthday = 5;
- * @return whether the gameplayBirthday field is set
+ * optional uint32 retcode = 7;
+ * @return whether the retcode field is set
*/
- public boolean hasGameplayBirthday() {
+ public boolean hasRetcode() {
return (bitField0_ & 0x00000010) != 0;
}
/**
- * optional uint32 gameplay_birthday = 5;
- * @return this
- */
- public GetBasicInfoScRsp clearGameplayBirthday() {
- bitField0_ &= ~0x00000010;
- gameplayBirthday = 0;
- return this;
- }
-
- /**
- * optional uint32 gameplay_birthday = 5;
- * @return the gameplayBirthday
- */
- public int getGameplayBirthday() {
- return gameplayBirthday;
- }
-
- /**
- * optional uint32 gameplay_birthday = 5;
- * @param value the gameplayBirthday to set
- * @return this
- */
- public GetBasicInfoScRsp setGameplayBirthday(final int value) {
- bitField0_ |= 0x00000010;
- gameplayBirthday = value;
- return this;
- }
-
- /**
- * optional uint32 retcode = 11;
- * @return whether the retcode field is set
- */
- public boolean hasRetcode() {
- return (bitField0_ & 0x00000020) != 0;
- }
-
- /**
- * optional uint32 retcode = 11;
+ * optional uint32 retcode = 7;
* @return this
*/
public GetBasicInfoScRsp clearRetcode() {
- bitField0_ &= ~0x00000020;
+ bitField0_ &= ~0x00000010;
retcode = 0;
return this;
}
/**
- * optional uint32 retcode = 11;
+ * optional uint32 retcode = 7;
* @return the retcode
*/
public int getRetcode() {
@@ -280,36 +243,36 @@ public final class GetBasicInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 11;
+ * optional uint32 retcode = 7;
* @param value the retcode to set
* @return this
*/
public GetBasicInfoScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
retcode = value;
return this;
}
/**
- * optional uint32 exchange_times = 14;
+ * optional uint32 exchange_times = 8;
* @return whether the exchangeTimes field is set
*/
public boolean hasExchangeTimes() {
- return (bitField0_ & 0x00000040) != 0;
+ return (bitField0_ & 0x00000020) != 0;
}
/**
- * optional uint32 exchange_times = 14;
+ * optional uint32 exchange_times = 8;
* @return this
*/
public GetBasicInfoScRsp clearExchangeTimes() {
- bitField0_ &= ~0x00000040;
+ bitField0_ &= ~0x00000020;
exchangeTimes = 0;
return this;
}
/**
- * optional uint32 exchange_times = 14;
+ * optional uint32 exchange_times = 8;
* @return the exchangeTimes
*/
public int getExchangeTimes() {
@@ -317,18 +280,55 @@ public final class GetBasicInfoScRspOuterClass {
}
/**
- * optional uint32 exchange_times = 14;
+ * optional uint32 exchange_times = 8;
* @param value the exchangeTimes to set
* @return this
*/
public GetBasicInfoScRsp setExchangeTimes(final int value) {
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000020;
exchangeTimes = value;
return this;
}
/**
- * optional .PlayerSettingInfo player_setting_info = 15;
+ * optional uint32 week_cocoon_finished_count = 11;
+ * @return whether the weekCocoonFinishedCount field is set
+ */
+ public boolean hasWeekCocoonFinishedCount() {
+ return (bitField0_ & 0x00000040) != 0;
+ }
+
+ /**
+ * optional uint32 week_cocoon_finished_count = 11;
+ * @return this
+ */
+ public GetBasicInfoScRsp clearWeekCocoonFinishedCount() {
+ bitField0_ &= ~0x00000040;
+ weekCocoonFinishedCount = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 week_cocoon_finished_count = 11;
+ * @return the weekCocoonFinishedCount
+ */
+ public int getWeekCocoonFinishedCount() {
+ return weekCocoonFinishedCount;
+ }
+
+ /**
+ * optional uint32 week_cocoon_finished_count = 11;
+ * @param value the weekCocoonFinishedCount to set
+ * @return this
+ */
+ public GetBasicInfoScRsp setWeekCocoonFinishedCount(final int value) {
+ bitField0_ |= 0x00000040;
+ weekCocoonFinishedCount = value;
+ return this;
+ }
+
+ /**
+ * optional .PlayerSettingInfo player_setting_info = 12;
* @return whether the playerSettingInfo field is set
*/
public boolean hasPlayerSettingInfo() {
@@ -336,7 +336,7 @@ public final class GetBasicInfoScRspOuterClass {
}
/**
- * optional .PlayerSettingInfo player_setting_info = 15;
+ * optional .PlayerSettingInfo player_setting_info = 12;
* @return this
*/
public GetBasicInfoScRsp clearPlayerSettingInfo() {
@@ -346,7 +346,7 @@ public final class GetBasicInfoScRspOuterClass {
}
/**
- * optional .PlayerSettingInfo player_setting_info = 15;
+ * optional .PlayerSettingInfo player_setting_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.
@@ -360,7 +360,7 @@ public final class GetBasicInfoScRspOuterClass {
}
/**
- * optional .PlayerSettingInfo player_setting_info = 15;
+ * optional .PlayerSettingInfo player_setting_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
@@ -374,7 +374,7 @@ public final class GetBasicInfoScRspOuterClass {
}
/**
- * optional .PlayerSettingInfo player_setting_info = 15;
+ * optional .PlayerSettingInfo player_setting_info = 12;
* @param value the playerSettingInfo to set
* @return this
*/
@@ -390,13 +390,13 @@ public final class GetBasicInfoScRspOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- nextRecoverTime = other.nextRecoverTime;
lastSetNicknameTime = other.lastSetNicknameTime;
- weekCocoonFinishedCount = other.weekCocoonFinishedCount;
- curDay = other.curDay;
+ nextRecoverTime = other.nextRecoverTime;
gameplayBirthday = other.gameplayBirthday;
+ curDay = other.curDay;
retcode = other.retcode;
exchangeTimes = other.exchangeTimes;
+ weekCocoonFinishedCount = other.weekCocoonFinishedCount;
playerSettingInfo.copyFrom(other.playerSettingInfo);
}
return this;
@@ -408,27 +408,27 @@ public final class GetBasicInfoScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasNextRecoverTime()) {
- setNextRecoverTime(other.nextRecoverTime);
- }
if (other.hasLastSetNicknameTime()) {
setLastSetNicknameTime(other.lastSetNicknameTime);
}
- if (other.hasWeekCocoonFinishedCount()) {
- setWeekCocoonFinishedCount(other.weekCocoonFinishedCount);
- }
- if (other.hasCurDay()) {
- setCurDay(other.curDay);
+ if (other.hasNextRecoverTime()) {
+ setNextRecoverTime(other.nextRecoverTime);
}
if (other.hasGameplayBirthday()) {
setGameplayBirthday(other.gameplayBirthday);
}
+ if (other.hasCurDay()) {
+ setCurDay(other.curDay);
+ }
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
if (other.hasExchangeTimes()) {
setExchangeTimes(other.exchangeTimes);
}
+ if (other.hasWeekCocoonFinishedCount()) {
+ setWeekCocoonFinishedCount(other.weekCocoonFinishedCount);
+ }
if (other.hasPlayerSettingInfo()) {
getMutablePlayerSettingInfo().mergeFrom(other.playerSettingInfo);
}
@@ -442,13 +442,13 @@ public final class GetBasicInfoScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- nextRecoverTime = 0L;
lastSetNicknameTime = 0L;
- weekCocoonFinishedCount = 0;
- curDay = 0;
+ nextRecoverTime = 0L;
gameplayBirthday = 0;
+ curDay = 0;
retcode = 0;
exchangeTimes = 0;
+ weekCocoonFinishedCount = 0;
playerSettingInfo.clear();
return this;
}
@@ -474,48 +474,48 @@ public final class GetBasicInfoScRspOuterClass {
}
GetBasicInfoScRsp other = (GetBasicInfoScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasNextRecoverTime() || nextRecoverTime == other.nextRecoverTime)
&& (!hasLastSetNicknameTime() || lastSetNicknameTime == other.lastSetNicknameTime)
- && (!hasWeekCocoonFinishedCount() || weekCocoonFinishedCount == other.weekCocoonFinishedCount)
- && (!hasCurDay() || curDay == other.curDay)
+ && (!hasNextRecoverTime() || nextRecoverTime == other.nextRecoverTime)
&& (!hasGameplayBirthday() || gameplayBirthday == other.gameplayBirthday)
+ && (!hasCurDay() || curDay == other.curDay)
&& (!hasRetcode() || retcode == other.retcode)
&& (!hasExchangeTimes() || exchangeTimes == other.exchangeTimes)
+ && (!hasWeekCocoonFinishedCount() || weekCocoonFinishedCount == other.weekCocoonFinishedCount)
&& (!hasPlayerSettingInfo() || playerSettingInfo.equals(other.playerSettingInfo));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 48);
- output.writeInt64NoTag(nextRecoverTime);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 80);
output.writeInt64NoTag(lastSetNicknameTime);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 120);
+ output.writeInt64NoTag(nextRecoverTime);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(weekCocoonFinishedCount);
+ output.writeRawByte((byte) 16);
+ output.writeUInt32NoTag(gameplayBirthday);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(curDay);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 40);
- output.writeUInt32NoTag(gameplayBirthday);
- }
- if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(retcode);
}
- if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawByte((byte) 112);
+ if ((bitField0_ & 0x00000020) != 0) {
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(exchangeTimes);
}
+ if ((bitField0_ & 0x00000040) != 0) {
+ output.writeRawByte((byte) 88);
+ output.writeUInt32NoTag(weekCocoonFinishedCount);
+ }
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRawByte((byte) 122);
+ output.writeRawByte((byte) 98);
output.writeMessageNoTag(playerSettingInfo);
}
}
@@ -524,26 +524,26 @@ public final class GetBasicInfoScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeInt64SizeNoTag(nextRecoverTime);
- }
- if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeInt64SizeNoTag(lastSetNicknameTime);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ size += 1 + ProtoSink.computeInt64SizeNoTag(nextRecoverTime);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(weekCocoonFinishedCount);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(gameplayBirthday);
}
if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(curDay);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(gameplayBirthday);
- }
- if ((bitField0_ & 0x00000020) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
- if ((bitField0_ & 0x00000040) != 0) {
+ if ((bitField0_ & 0x00000020) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(exchangeTimes);
}
+ if ((bitField0_ & 0x00000040) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(weekCocoonFinishedCount);
+ }
if ((bitField0_ & 0x00000080) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(playerSettingInfo);
}
@@ -557,70 +557,70 @@ public final class GetBasicInfoScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 48: {
- // nextRecoverTime
- nextRecoverTime = input.readInt64();
+ case 80: {
+ // lastSetNicknameTime
+ lastSetNicknameTime = input.readInt64();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 56) {
+ if (tag != 120) {
break;
}
}
- case 56: {
- // lastSetNicknameTime
- lastSetNicknameTime = input.readInt64();
+ case 120: {
+ // nextRecoverTime
+ nextRecoverTime = input.readInt64();
bitField0_ |= 0x00000002;
tag = input.readTag();
+ if (tag != 16) {
+ break;
+ }
+ }
+ case 16: {
+ // gameplayBirthday
+ gameplayBirthday = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
if (tag != 24) {
break;
}
}
case 24: {
- // weekCocoonFinishedCount
- weekCocoonFinishedCount = input.readUInt32();
- bitField0_ |= 0x00000004;
- tag = input.readTag();
- if (tag != 32) {
- break;
- }
- }
- case 32: {
// curDay
curDay = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 40) {
+ if (tag != 56) {
break;
}
}
- case 40: {
- // gameplayBirthday
- gameplayBirthday = input.readUInt32();
+ case 56: {
+ // retcode
+ retcode = input.readUInt32();
bitField0_ |= 0x00000010;
tag = input.readTag();
+ if (tag != 64) {
+ break;
+ }
+ }
+ case 64: {
+ // exchangeTimes
+ exchangeTimes = input.readUInt32();
+ bitField0_ |= 0x00000020;
+ tag = input.readTag();
if (tag != 88) {
break;
}
}
case 88: {
- // retcode
- retcode = input.readUInt32();
- bitField0_ |= 0x00000020;
- tag = input.readTag();
- if (tag != 112) {
- break;
- }
- }
- case 112: {
- // exchangeTimes
- exchangeTimes = input.readUInt32();
+ // weekCocoonFinishedCount
+ weekCocoonFinishedCount = input.readUInt32();
bitField0_ |= 0x00000040;
tag = input.readTag();
- if (tag != 122) {
+ if (tag != 98) {
break;
}
}
- case 122: {
+ case 98: {
// playerSettingInfo
input.readMessage(playerSettingInfo);
bitField0_ |= 0x00000080;
@@ -647,26 +647,26 @@ public final class GetBasicInfoScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeInt64(FieldNames.nextRecoverTime, nextRecoverTime);
- }
- if ((bitField0_ & 0x00000002) != 0) {
output.writeInt64(FieldNames.lastSetNicknameTime, lastSetNicknameTime);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeInt64(FieldNames.nextRecoverTime, nextRecoverTime);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.weekCocoonFinishedCount, weekCocoonFinishedCount);
+ output.writeUInt32(FieldNames.gameplayBirthday, gameplayBirthday);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeUInt32(FieldNames.curDay, curDay);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeUInt32(FieldNames.gameplayBirthday, gameplayBirthday);
- }
- if ((bitField0_ & 0x00000020) != 0) {
output.writeUInt32(FieldNames.retcode, retcode);
}
- if ((bitField0_ & 0x00000040) != 0) {
+ if ((bitField0_ & 0x00000020) != 0) {
output.writeUInt32(FieldNames.exchangeTimes, exchangeTimes);
}
+ if ((bitField0_ & 0x00000040) != 0) {
+ output.writeUInt32(FieldNames.weekCocoonFinishedCount, weekCocoonFinishedCount);
+ }
if ((bitField0_ & 0x00000080) != 0) {
output.writeMessage(FieldNames.playerSettingInfo, playerSettingInfo);
}
@@ -680,11 +680,11 @@ public final class GetBasicInfoScRspOuterClass {
}
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 final class GetBasicInfoScRspOuterClass {
}
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 {
@@ -704,11 +704,11 @@ public final class GetBasicInfoScRspOuterClass {
}
break;
}
- case 1387396786:
- case 668486783: {
- if (input.isAtField(FieldNames.weekCocoonFinishedCount)) {
+ case 686542531:
+ case 172986486: {
+ if (input.isAtField(FieldNames.gameplayBirthday)) {
if (!input.trySkipNullValue()) {
- weekCocoonFinishedCount = input.readUInt32();
+ gameplayBirthday = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -728,23 +728,11 @@ public final class GetBasicInfoScRspOuterClass {
}
break;
}
- case 686542531:
- case 172986486: {
- if (input.isAtField(FieldNames.gameplayBirthday)) {
- if (!input.trySkipNullValue()) {
- gameplayBirthday = input.readUInt32();
- bitField0_ |= 0x00000010;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 1097936398: {
if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
retcode = input.readUInt32();
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
}
} else {
input.skipUnknownField();
@@ -756,6 +744,18 @@ public final class GetBasicInfoScRspOuterClass {
if (input.isAtField(FieldNames.exchangeTimes)) {
if (!input.trySkipNullValue()) {
exchangeTimes = input.readUInt32();
+ bitField0_ |= 0x00000020;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 1387396786:
+ case 668486783: {
+ if (input.isAtField(FieldNames.weekCocoonFinishedCount)) {
+ if (!input.trySkipNullValue()) {
+ weekCocoonFinishedCount = input.readUInt32();
bitField0_ |= 0x00000040;
}
} else {
@@ -828,20 +828,20 @@ public final class GetBasicInfoScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName nextRecoverTime = FieldName.forField("nextRecoverTime", "next_recover_time");
-
static final FieldName lastSetNicknameTime = FieldName.forField("lastSetNicknameTime", "last_set_nickname_time");
- static final FieldName weekCocoonFinishedCount = FieldName.forField("weekCocoonFinishedCount", "week_cocoon_finished_count");
-
- static final FieldName curDay = FieldName.forField("curDay", "cur_day");
+ static final FieldName nextRecoverTime = FieldName.forField("nextRecoverTime", "next_recover_time");
static final FieldName gameplayBirthday = FieldName.forField("gameplayBirthday", "gameplay_birthday");
+ static final FieldName curDay = FieldName.forField("curDay", "cur_day");
+
static final FieldName retcode = FieldName.forField("retcode");
static final FieldName exchangeTimes = FieldName.forField("exchangeTimes", "exchange_times");
+ static final FieldName weekCocoonFinishedCount = FieldName.forField("weekCocoonFinishedCount", "week_cocoon_finished_count");
+
static final FieldName playerSettingInfo = FieldName.forField("playerSettingInfo", "player_setting_info");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java
index 1e3f6b2..62d84b4 100644
--- a/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java
@@ -20,17 +20,17 @@ public final class GetChallengeScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 14;
+ * optional uint32 retcode = 1;
*/
private int retcode;
/**
- * repeated .ChallengeReward challenge_reward_list = 2;
+ * repeated .ChallengeReward challenge_reward_list = 7;
*/
private final RepeatedMessagerepeated .Challenge challenge_list = 10;
+ * repeated .Challenge challenge_list = 11;
*/
private final RepeatedMessageoptional uint32 retcode = 14;
+ * optional uint32 retcode = 1;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -53,7 +53,7 @@ public final class GetChallengeScRspOuterClass {
}
/**
- * optional uint32 retcode = 14;
+ * optional uint32 retcode = 1;
* @return this
*/
public GetChallengeScRsp clearRetcode() {
@@ -63,7 +63,7 @@ public final class GetChallengeScRspOuterClass {
}
/**
- * optional uint32 retcode = 14;
+ * optional uint32 retcode = 1;
* @return the retcode
*/
public int getRetcode() {
@@ -71,7 +71,7 @@ public final class GetChallengeScRspOuterClass {
}
/**
- * optional uint32 retcode = 14;
+ * optional uint32 retcode = 1;
* @param value the retcode to set
* @return this
*/
@@ -82,7 +82,7 @@ public final class GetChallengeScRspOuterClass {
}
/**
- * repeated .ChallengeReward challenge_reward_list = 2;
+ * repeated .ChallengeReward challenge_reward_list = 7;
* @return whether the challengeRewardList field is set
*/
public boolean hasChallengeRewardList() {
@@ -90,7 +90,7 @@ public final class GetChallengeScRspOuterClass {
}
/**
- * repeated .ChallengeReward challenge_reward_list = 2;
+ * repeated .ChallengeReward challenge_reward_list = 7;
* @return this
*/
public GetChallengeScRsp clearChallengeRewardList() {
@@ -100,7 +100,7 @@ public final class GetChallengeScRspOuterClass {
}
/**
- * repeated .ChallengeReward challenge_reward_list = 2;
+ * repeated .ChallengeReward challenge_reward_list = 7;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -114,7 +114,7 @@ public final class GetChallengeScRspOuterClass {
}
/**
- * repeated .ChallengeReward challenge_reward_list = 2;
+ * repeated .ChallengeReward challenge_reward_list = 7;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -129,7 +129,7 @@ public final class GetChallengeScRspOuterClass {
}
/**
- * repeated .ChallengeReward challenge_reward_list = 2;
+ * repeated .ChallengeReward challenge_reward_list = 7;
* @param value the challengeRewardList to add
* @return this
*/
@@ -141,7 +141,7 @@ public final class GetChallengeScRspOuterClass {
}
/**
- * repeated .ChallengeReward challenge_reward_list = 2;
+ * repeated .ChallengeReward challenge_reward_list = 7;
* @param values the challengeRewardList to add
* @return this
*/
@@ -153,7 +153,7 @@ public final class GetChallengeScRspOuterClass {
}
/**
- * repeated .Challenge challenge_list = 10;
+ * repeated .Challenge challenge_list = 11;
* @return whether the challengeList field is set
*/
public boolean hasChallengeList() {
@@ -161,7 +161,7 @@ public final class GetChallengeScRspOuterClass {
}
/**
- * repeated .Challenge challenge_list = 10;
+ * repeated .Challenge challenge_list = 11;
* @return this
*/
public GetChallengeScRsp clearChallengeList() {
@@ -171,7 +171,7 @@ public final class GetChallengeScRspOuterClass {
}
/**
- * repeated .Challenge challenge_list = 10;
+ * repeated .Challenge challenge_list = 11;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -185,7 +185,7 @@ public final class GetChallengeScRspOuterClass {
}
/**
- * repeated .Challenge challenge_list = 10;
+ * repeated .Challenge challenge_list = 11;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -199,7 +199,7 @@ public final class GetChallengeScRspOuterClass {
}
/**
- * repeated .Challenge challenge_list = 10;
+ * repeated .Challenge challenge_list = 11;
* @param value the challengeList to add
* @return this
*/
@@ -210,7 +210,7 @@ public final class GetChallengeScRspOuterClass {
}
/**
- * repeated .Challenge challenge_list = 10;
+ * repeated .Challenge challenge_list = 11;
* @param values the challengeList to add
* @return this
*/
@@ -293,18 +293,18 @@ public final class GetChallengeScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < challengeRewardList.length(); i++) {
- output.writeRawByte((byte) 18);
+ output.writeRawByte((byte) 58);
output.writeMessageNoTag(challengeRewardList.get(i));
}
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < challengeList.length(); i++) {
- output.writeRawByte((byte) 82);
+ output.writeRawByte((byte) 90);
output.writeMessageNoTag(challengeList.get(i));
}
}
@@ -332,24 +332,24 @@ public final class GetChallengeScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 112: {
+ case 8: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 18) {
+ if (tag != 58) {
break;
}
}
- case 18: {
+ case 58: {
// challengeRewardList
tag = input.readRepeatedMessage(challengeRewardList, tag);
bitField0_ |= 0x00000002;
- if (tag != 82) {
+ if (tag != 90) {
break;
}
}
- case 82: {
+ case 90: {
// challengeList
tag = input.readRepeatedMessage(challengeList, tag);
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/GetCurChallengeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetCurChallengeScRspOuterClass.java
index 13072b3..b804086 100644
--- a/src/generated/main/emu/lunarcore/proto/GetCurChallengeScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetCurChallengeScRspOuterClass.java
@@ -19,12 +19,12 @@ public final class GetCurChallengeScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 13;
*/
private int retcode;
/**
- * optional .ChallengeInfo challenge_info = 7;
+ * optional .ChallengeInfo challenge_info = 11;
*/
private final ChallengeInfoOuterClass.ChallengeInfo challengeInfo = ChallengeInfoOuterClass.ChallengeInfo.newInstance();
@@ -39,7 +39,7 @@ public final class GetCurChallengeScRspOuterClass {
}
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 13;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -47,7 +47,7 @@ public final class GetCurChallengeScRspOuterClass {
}
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 13;
* @return this
*/
public GetCurChallengeScRsp clearRetcode() {
@@ -57,7 +57,7 @@ public final class GetCurChallengeScRspOuterClass {
}
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 13;
* @return the retcode
*/
public int getRetcode() {
@@ -65,7 +65,7 @@ public final class GetCurChallengeScRspOuterClass {
}
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 13;
* @param value the retcode to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class GetCurChallengeScRspOuterClass {
}
/**
- * optional .ChallengeInfo challenge_info = 7;
+ * optional .ChallengeInfo challenge_info = 11;
* @return whether the challengeInfo field is set
*/
public boolean hasChallengeInfo() {
@@ -84,7 +84,7 @@ public final class GetCurChallengeScRspOuterClass {
}
/**
- * optional .ChallengeInfo challenge_info = 7;
+ * optional .ChallengeInfo challenge_info = 11;
* @return this
*/
public GetCurChallengeScRsp clearChallengeInfo() {
@@ -94,7 +94,7 @@ public final class GetCurChallengeScRspOuterClass {
}
/**
- * optional .ChallengeInfo challenge_info = 7;
+ * optional .ChallengeInfo challenge_info = 11;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class GetCurChallengeScRspOuterClass {
}
/**
- * optional .ChallengeInfo challenge_info = 7;
+ * optional .ChallengeInfo challenge_info = 11;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class GetCurChallengeScRspOuterClass {
}
/**
- * optional .ChallengeInfo challenge_info = 7;
+ * optional .ChallengeInfo challenge_info = 11;
* @param value the challengeInfo to set
* @return this
*/
@@ -199,11 +199,11 @@ public final class GetCurChallengeScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 104);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 58);
+ output.writeRawByte((byte) 90);
output.writeMessageNoTag(challengeInfo);
}
}
@@ -227,16 +227,16 @@ public final class GetCurChallengeScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 48: {
+ case 104: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 58) {
+ if (tag != 90) {
break;
}
}
- case 58: {
+ case 90: {
// 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 5775bb8..9f0ec56 100644
--- a/src/generated/main/emu/lunarcore/proto/GetCurLineupDataScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetCurLineupDataScRspOuterClass.java
@@ -24,7 +24,7 @@ public final class GetCurLineupDataScRspOuterClass {
private int retcode;
/**
- * optional .LineupInfo lineup = 1;
+ * optional .LineupInfo lineup = 7;
*/
private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance();
@@ -76,7 +76,7 @@ public final class GetCurLineupDataScRspOuterClass {
}
/**
- * optional .LineupInfo lineup = 1;
+ * optional .LineupInfo lineup = 7;
* @return whether the lineup field is set
*/
public boolean hasLineup() {
@@ -84,7 +84,7 @@ public final class GetCurLineupDataScRspOuterClass {
}
/**
- * optional .LineupInfo lineup = 1;
+ * optional .LineupInfo lineup = 7;
* @return this
*/
public GetCurLineupDataScRsp clearLineup() {
@@ -94,7 +94,7 @@ public final class GetCurLineupDataScRspOuterClass {
}
/**
- * optional .LineupInfo lineup = 1;
+ * optional .LineupInfo lineup = 7;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class GetCurLineupDataScRspOuterClass {
}
/**
- * optional .LineupInfo lineup = 1;
+ * optional .LineupInfo lineup = 7;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class GetCurLineupDataScRspOuterClass {
}
/**
- * optional .LineupInfo lineup = 1;
+ * optional .LineupInfo lineup = 7;
* @param value the lineup to set
* @return this
*/
@@ -202,7 +202,7 @@ public final class GetCurLineupDataScRspOuterClass {
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 10);
+ output.writeRawByte((byte) 58);
output.writeMessageNoTag(lineup);
}
}
@@ -231,11 +231,11 @@ public final class GetCurLineupDataScRspOuterClass {
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 10) {
+ if (tag != 58) {
break;
}
}
- case 10: {
+ case 58: {
// 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 4073c77..beb9288 100644
--- a/src/generated/main/emu/lunarcore/proto/GetCurSceneInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetCurSceneInfoScRspOuterClass.java
@@ -19,12 +19,12 @@ public final class GetCurSceneInfoScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 12;
*/
private int retcode;
/**
- * optional .SceneInfo scene = 9;
+ * optional .SceneInfo scene = 3;
*/
private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance();
@@ -39,7 +39,7 @@ public final class GetCurSceneInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 12;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -47,7 +47,7 @@ public final class GetCurSceneInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 12;
* @return this
*/
public GetCurSceneInfoScRsp clearRetcode() {
@@ -57,7 +57,7 @@ public final class GetCurSceneInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 12;
* @return the retcode
*/
public int getRetcode() {
@@ -65,7 +65,7 @@ public final class GetCurSceneInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 12;
* @param value the retcode to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class GetCurSceneInfoScRspOuterClass {
}
/**
- * optional .SceneInfo scene = 9;
+ * optional .SceneInfo scene = 3;
* @return whether the scene field is set
*/
public boolean hasScene() {
@@ -84,7 +84,7 @@ public final class GetCurSceneInfoScRspOuterClass {
}
/**
- * optional .SceneInfo scene = 9;
+ * optional .SceneInfo scene = 3;
* @return this
*/
public GetCurSceneInfoScRsp clearScene() {
@@ -94,7 +94,7 @@ public final class GetCurSceneInfoScRspOuterClass {
}
/**
- * optional .SceneInfo scene = 9;
+ * optional .SceneInfo scene = 3;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class GetCurSceneInfoScRspOuterClass {
}
/**
- * optional .SceneInfo scene = 9;
+ * optional .SceneInfo scene = 3;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class GetCurSceneInfoScRspOuterClass {
}
/**
- * optional .SceneInfo scene = 9;
+ * optional .SceneInfo scene = 3;
* @param value the scene to set
* @return this
*/
@@ -198,11 +198,11 @@ public final class GetCurSceneInfoScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 74);
+ output.writeRawByte((byte) 26);
output.writeMessageNoTag(scene);
}
}
@@ -226,16 +226,16 @@ public final class GetCurSceneInfoScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 64: {
+ case 96: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 74) {
+ if (tag != 26) {
break;
}
}
- case 74: {
+ case 26: {
// scene
input.readMessage(scene);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java
index de3dae0..a569473 100644
--- a/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java
@@ -21,22 +21,22 @@ public final class GetDailyActiveInfoScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 daily_active_point = 4;
+ * optional uint32 daily_active_point = 6;
*/
private int dailyActivePoint;
/**
- * optional uint32 retcode = 10;
+ * optional uint32 retcode = 15;
*/
private int retcode;
/**
- * repeated uint32 daily_active_quest_id_list = 13;
+ * repeated uint32 daily_active_quest_id_list = 2;
*/
private final RepeatedInt dailyActiveQuestIdList = RepeatedInt.newEmptyInstance();
/**
- * repeated .DailyActivityInfo daily_active_level_list = 11;
+ * repeated .DailyActivityInfo daily_active_level_list = 12;
*/
private final RepeatedMessageoptional uint32 daily_active_point = 4;
+ * optional uint32 daily_active_point = 6;
* @return whether the dailyActivePoint field is set
*/
public boolean hasDailyActivePoint() {
@@ -59,7 +59,7 @@ public final class GetDailyActiveInfoScRspOuterClass {
}
/**
- * optional uint32 daily_active_point = 4;
+ * optional uint32 daily_active_point = 6;
* @return this
*/
public GetDailyActiveInfoScRsp clearDailyActivePoint() {
@@ -69,7 +69,7 @@ public final class GetDailyActiveInfoScRspOuterClass {
}
/**
- * optional uint32 daily_active_point = 4;
+ * optional uint32 daily_active_point = 6;
* @return the dailyActivePoint
*/
public int getDailyActivePoint() {
@@ -77,7 +77,7 @@ public final class GetDailyActiveInfoScRspOuterClass {
}
/**
- * optional uint32 daily_active_point = 4;
+ * optional uint32 daily_active_point = 6;
* @param value the dailyActivePoint to set
* @return this
*/
@@ -88,7 +88,7 @@ public final class GetDailyActiveInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 10;
+ * optional uint32 retcode = 15;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -96,7 +96,7 @@ public final class GetDailyActiveInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 10;
+ * optional uint32 retcode = 15;
* @return this
*/
public GetDailyActiveInfoScRsp clearRetcode() {
@@ -106,7 +106,7 @@ public final class GetDailyActiveInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 10;
+ * optional uint32 retcode = 15;
* @return the retcode
*/
public int getRetcode() {
@@ -114,7 +114,7 @@ public final class GetDailyActiveInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 10;
+ * optional uint32 retcode = 15;
* @param value the retcode to set
* @return this
*/
@@ -125,7 +125,7 @@ public final class GetDailyActiveInfoScRspOuterClass {
}
/**
- * repeated uint32 daily_active_quest_id_list = 13;
+ * repeated uint32 daily_active_quest_id_list = 2;
* @return whether the dailyActiveQuestIdList field is set
*/
public boolean hasDailyActiveQuestIdList() {
@@ -133,7 +133,7 @@ public final class GetDailyActiveInfoScRspOuterClass {
}
/**
- * repeated uint32 daily_active_quest_id_list = 13;
+ * repeated uint32 daily_active_quest_id_list = 2;
* @return this
*/
public GetDailyActiveInfoScRsp clearDailyActiveQuestIdList() {
@@ -143,7 +143,7 @@ public final class GetDailyActiveInfoScRspOuterClass {
}
/**
- * repeated uint32 daily_active_quest_id_list = 13;
+ * repeated uint32 daily_active_quest_id_list = 2;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -157,7 +157,7 @@ public final class GetDailyActiveInfoScRspOuterClass {
}
/**
- * repeated uint32 daily_active_quest_id_list = 13;
+ * repeated uint32 daily_active_quest_id_list = 2;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -171,7 +171,7 @@ public final class GetDailyActiveInfoScRspOuterClass {
}
/**
- * repeated uint32 daily_active_quest_id_list = 13;
+ * repeated uint32 daily_active_quest_id_list = 2;
* @param value the dailyActiveQuestIdList to add
* @return this
*/
@@ -182,7 +182,7 @@ public final class GetDailyActiveInfoScRspOuterClass {
}
/**
- * repeated uint32 daily_active_quest_id_list = 13;
+ * repeated uint32 daily_active_quest_id_list = 2;
* @param values the dailyActiveQuestIdList to add
* @return this
*/
@@ -193,7 +193,7 @@ public final class GetDailyActiveInfoScRspOuterClass {
}
/**
- * repeated .DailyActivityInfo daily_active_level_list = 11;
+ * repeated .DailyActivityInfo daily_active_level_list = 12;
* @return whether the dailyActiveLevelList field is set
*/
public boolean hasDailyActiveLevelList() {
@@ -201,7 +201,7 @@ public final class GetDailyActiveInfoScRspOuterClass {
}
/**
- * repeated .DailyActivityInfo daily_active_level_list = 11;
+ * repeated .DailyActivityInfo daily_active_level_list = 12;
* @return this
*/
public GetDailyActiveInfoScRsp clearDailyActiveLevelList() {
@@ -211,7 +211,7 @@ public final class GetDailyActiveInfoScRspOuterClass {
}
/**
- * repeated .DailyActivityInfo daily_active_level_list = 11;
+ * repeated .DailyActivityInfo daily_active_level_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.
@@ -226,7 +226,7 @@ public final class GetDailyActiveInfoScRspOuterClass {
}
/**
- * repeated .DailyActivityInfo daily_active_level_list = 11;
+ * repeated .DailyActivityInfo daily_active_level_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
@@ -241,7 +241,7 @@ public final class GetDailyActiveInfoScRspOuterClass {
}
/**
- * repeated .DailyActivityInfo daily_active_level_list = 11;
+ * repeated .DailyActivityInfo daily_active_level_list = 12;
* @param value the dailyActiveLevelList to add
* @return this
*/
@@ -253,7 +253,7 @@ public final class GetDailyActiveInfoScRspOuterClass {
}
/**
- * repeated .DailyActivityInfo daily_active_level_list = 11;
+ * repeated .DailyActivityInfo daily_active_level_list = 12;
* @param values the dailyActiveLevelList to add
* @return this
*/
@@ -343,22 +343,22 @@ public final class GetDailyActiveInfoScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(dailyActivePoint);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < dailyActiveQuestIdList.length(); i++) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(dailyActiveQuestIdList.array()[i]);
}
}
if ((bitField0_ & 0x00000008) != 0) {
for (int i = 0; i < dailyActiveLevelList.length(); i++) {
- output.writeRawByte((byte) 90);
+ output.writeRawByte((byte) 98);
output.writeMessageNoTag(dailyActiveLevelList.get(i));
}
}
@@ -389,34 +389,34 @@ public final class GetDailyActiveInfoScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
+ case 48: {
// dailyActivePoint
dailyActivePoint = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 80) {
+ if (tag != 120) {
break;
}
}
- case 80: {
+ case 120: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 106) {
+ if (tag != 18) {
break;
}
}
- case 106: {
+ case 18: {
// dailyActiveQuestIdList [packed=true]
input.readPackedUInt32(dailyActiveQuestIdList, tag);
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 90) {
+ if (tag != 98) {
break;
}
}
- case 90: {
+ case 98: {
// dailyActiveLevelList
tag = input.readRepeatedMessage(dailyActiveLevelList, tag);
bitField0_ |= 0x00000008;
@@ -434,7 +434,7 @@ public final class GetDailyActiveInfoScRspOuterClass {
tag = input.readTag();
break;
}
- case 104: {
+ case 16: {
// dailyActiveQuestIdList [packed=false]
tag = input.readRepeatedUInt32(dailyActiveQuestIdList, tag);
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java
index aab8eda..02ed0de 100644
--- a/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java
@@ -20,12 +20,12 @@ public final class GetEnteredSceneScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 2;
+ * optional uint32 retcode = 6;
*/
private int retcode;
/**
- * repeated .EnteredSceneInfo entered_scene_info = 4;
+ * repeated .EnteredSceneInfo entered_scene_info = 13;
*/
private final RepeatedMessageoptional uint32 retcode = 2;
+ * optional uint32 retcode = 6;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public final class GetEnteredSceneScRspOuterClass {
}
/**
- * optional uint32 retcode = 2;
+ * optional uint32 retcode = 6;
* @return this
*/
public GetEnteredSceneScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public final class GetEnteredSceneScRspOuterClass {
}
/**
- * optional uint32 retcode = 2;
+ * optional uint32 retcode = 6;
* @return the retcode
*/
public int getRetcode() {
@@ -66,7 +66,7 @@ public final class GetEnteredSceneScRspOuterClass {
}
/**
- * optional uint32 retcode = 2;
+ * optional uint32 retcode = 6;
* @param value the retcode to set
* @return this
*/
@@ -77,7 +77,7 @@ public final class GetEnteredSceneScRspOuterClass {
}
/**
- * repeated .EnteredSceneInfo entered_scene_info = 4;
+ * repeated .EnteredSceneInfo entered_scene_info = 13;
* @return whether the enteredSceneInfo field is set
*/
public boolean hasEnteredSceneInfo() {
@@ -85,7 +85,7 @@ public final class GetEnteredSceneScRspOuterClass {
}
/**
- * repeated .EnteredSceneInfo entered_scene_info = 4;
+ * repeated .EnteredSceneInfo entered_scene_info = 13;
* @return this
*/
public GetEnteredSceneScRsp clearEnteredSceneInfo() {
@@ -95,7 +95,7 @@ public final class GetEnteredSceneScRspOuterClass {
}
/**
- * repeated .EnteredSceneInfo entered_scene_info = 4;
+ * repeated .EnteredSceneInfo entered_scene_info = 13;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class GetEnteredSceneScRspOuterClass {
}
/**
- * repeated .EnteredSceneInfo entered_scene_info = 4;
+ * repeated .EnteredSceneInfo entered_scene_info = 13;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -124,7 +124,7 @@ public final class GetEnteredSceneScRspOuterClass {
}
/**
- * repeated .EnteredSceneInfo entered_scene_info = 4;
+ * repeated .EnteredSceneInfo entered_scene_info = 13;
* @param value the enteredSceneInfo to add
* @return this
*/
@@ -136,7 +136,7 @@ public final class GetEnteredSceneScRspOuterClass {
}
/**
- * repeated .EnteredSceneInfo entered_scene_info = 4;
+ * repeated .EnteredSceneInfo entered_scene_info = 13;
* @param values the enteredSceneInfo to add
* @return this
*/
@@ -213,12 +213,12 @@ public final class GetEnteredSceneScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < enteredSceneInfo.length(); i++) {
- output.writeRawByte((byte) 34);
+ output.writeRawByte((byte) 106);
output.writeMessageNoTag(enteredSceneInfo.get(i));
}
}
@@ -243,16 +243,16 @@ public final class GetEnteredSceneScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
+ case 48: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 34) {
+ if (tag != 106) {
break;
}
}
- case 34: {
+ case 106: {
// enteredSceneInfo
tag = input.readRepeatedMessage(enteredSceneInfo, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoCsReqOuterClass.java
index 84eea45..7cd297e 100644
--- a/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoCsReqOuterClass.java
@@ -20,7 +20,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated uint32 farm_stage_gacha_id_list = 5;
+ * repeated uint32 farm_stage_gacha_id_list = 6;
*/
private final RepeatedInt farmStageGachaIdList = RepeatedInt.newEmptyInstance();
@@ -35,7 +35,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass {
}
/**
- * repeated uint32 farm_stage_gacha_id_list = 5;
+ * repeated uint32 farm_stage_gacha_id_list = 6;
* @return whether the farmStageGachaIdList field is set
*/
public boolean hasFarmStageGachaIdList() {
@@ -43,7 +43,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass {
}
/**
- * repeated uint32 farm_stage_gacha_id_list = 5;
+ * repeated uint32 farm_stage_gacha_id_list = 6;
* @return this
*/
public GetFarmStageGachaInfoCsReq clearFarmStageGachaIdList() {
@@ -53,7 +53,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass {
}
/**
- * repeated uint32 farm_stage_gacha_id_list = 5;
+ * repeated uint32 farm_stage_gacha_id_list = 6;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass {
}
/**
- * repeated uint32 farm_stage_gacha_id_list = 5;
+ * repeated uint32 farm_stage_gacha_id_list = 6;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass {
}
/**
- * repeated uint32 farm_stage_gacha_id_list = 5;
+ * repeated uint32 farm_stage_gacha_id_list = 6;
* @param value the farmStageGachaIdList to add
* @return this
*/
@@ -92,7 +92,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass {
}
/**
- * repeated uint32 farm_stage_gacha_id_list = 5;
+ * repeated uint32 farm_stage_gacha_id_list = 6;
* @param values the farmStageGachaIdList to add
* @return this
*/
@@ -163,7 +163,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < farmStageGachaIdList.length(); i++) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(farmStageGachaIdList.array()[i]);
}
}
@@ -185,7 +185,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 42: {
+ case 50: {
// farmStageGachaIdList [packed=true]
input.readPackedUInt32(farmStageGachaIdList, tag);
bitField0_ |= 0x00000001;
@@ -204,7 +204,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass {
tag = input.readTag();
break;
}
- case 40: {
+ case 48: {
// farmStageGachaIdList [packed=false]
tag = input.readRepeatedUInt32(farmStageGachaIdList, tag);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoScRspOuterClass.java
index 08835eb..1694b9b 100644
--- a/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoScRspOuterClass.java
@@ -20,12 +20,12 @@ public final class GetFarmStageGachaInfoScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 8;
*/
private int retcode;
/**
- * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 12;
+ * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 3;
*/
private final RepeatedMessageoptional uint32 retcode = 5;
+ * optional uint32 retcode = 8;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 8;
* @return this
*/
public GetFarmStageGachaInfoScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 8;
* @return the retcode
*/
public int getRetcode() {
@@ -66,7 +66,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 8;
* @param value the retcode to set
* @return this
*/
@@ -77,7 +77,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass {
}
/**
- * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 12;
+ * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 3;
* @return whether the farmStageGachaInfoList field is set
*/
public boolean hasFarmStageGachaInfoList() {
@@ -85,7 +85,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass {
}
/**
- * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 12;
+ * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 3;
* @return this
*/
public GetFarmStageGachaInfoScRsp clearFarmStageGachaInfoList() {
@@ -95,7 +95,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass {
}
/**
- * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 12;
+ * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 3;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -110,7 +110,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass {
}
/**
- * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 12;
+ * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 3;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -125,7 +125,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass {
}
/**
- * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 12;
+ * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 3;
* @param value the farmStageGachaInfoList to add
* @return this
*/
@@ -137,7 +137,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass {
}
/**
- * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 12;
+ * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 3;
* @param values the farmStageGachaInfoList to add
* @return this
*/
@@ -214,12 +214,12 @@ public final class GetFarmStageGachaInfoScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < farmStageGachaInfoList.length(); i++) {
- output.writeRawByte((byte) 98);
+ output.writeRawByte((byte) 26);
output.writeMessageNoTag(farmStageGachaInfoList.get(i));
}
}
@@ -244,16 +244,16 @@ public final class GetFarmStageGachaInfoScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
+ case 64: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 98) {
+ if (tag != 26) {
break;
}
}
- case 98: {
+ case 26: {
// farmStageGachaInfoList
tag = input.readRepeatedMessage(farmStageGachaInfoList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcCsReqOuterClass.java
index e44ca89..9adaf96 100644
--- a/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcCsReqOuterClass.java
@@ -20,7 +20,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated uint32 npc_talk_list = 3;
+ * repeated uint32 npc_talk_list = 13;
*/
private final RepeatedInt npcTalkList = RepeatedInt.newEmptyInstance();
@@ -35,7 +35,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass {
}
/**
- * repeated uint32 npc_talk_list = 3;
+ * repeated uint32 npc_talk_list = 13;
* @return whether the npcTalkList field is set
*/
public boolean hasNpcTalkList() {
@@ -43,7 +43,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass {
}
/**
- * repeated uint32 npc_talk_list = 3;
+ * repeated uint32 npc_talk_list = 13;
* @return this
*/
public GetFirstTalkByPerformanceNpcCsReq clearNpcTalkList() {
@@ -53,7 +53,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass {
}
/**
- * repeated uint32 npc_talk_list = 3;
+ * repeated uint32 npc_talk_list = 13;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass {
}
/**
- * repeated uint32 npc_talk_list = 3;
+ * repeated uint32 npc_talk_list = 13;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass {
}
/**
- * repeated uint32 npc_talk_list = 3;
+ * repeated uint32 npc_talk_list = 13;
* @param value the npcTalkList to add
* @return this
*/
@@ -92,7 +92,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass {
}
/**
- * repeated uint32 npc_talk_list = 3;
+ * repeated uint32 npc_talk_list = 13;
* @param values the npcTalkList to add
* @return this
*/
@@ -165,7 +165,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < npcTalkList.length(); i++) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 104);
output.writeUInt32NoTag(npcTalkList.array()[i]);
}
}
@@ -187,7 +187,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 26: {
+ case 106: {
// npcTalkList [packed=true]
input.readPackedUInt32(npcTalkList, tag);
bitField0_ |= 0x00000001;
@@ -206,7 +206,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass {
tag = input.readTag();
break;
}
- case 24: {
+ case 104: {
// 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 8c987b5..4836b96 100644
--- a/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcScRspOuterClass.java
@@ -20,12 +20,12 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 6;
*/
private int retcode;
/**
- * repeated .NpcTalkInfo npc_talk_info_list = 12;
+ * repeated .NpcTalkInfo npc_talk_info_list = 15;
*/
private final RepeatedMessageoptional uint32 retcode = 3;
+ * optional uint32 retcode = 6;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 6;
* @return this
*/
public GetFirstTalkByPerformanceNpcScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 6;
* @return the retcode
*/
public int getRetcode() {
@@ -66,7 +66,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 6;
* @param value the retcode to set
* @return this
*/
@@ -77,7 +77,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass {
}
/**
- * repeated .NpcTalkInfo npc_talk_info_list = 12;
+ * repeated .NpcTalkInfo npc_talk_info_list = 15;
* @return whether the npcTalkInfoList field is set
*/
public boolean hasNpcTalkInfoList() {
@@ -85,7 +85,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass {
}
/**
- * repeated .NpcTalkInfo npc_talk_info_list = 12;
+ * repeated .NpcTalkInfo npc_talk_info_list = 15;
* @return this
*/
public GetFirstTalkByPerformanceNpcScRsp clearNpcTalkInfoList() {
@@ -95,7 +95,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass {
}
/**
- * repeated .NpcTalkInfo npc_talk_info_list = 12;
+ * repeated .NpcTalkInfo npc_talk_info_list = 15;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass {
}
/**
- * repeated .NpcTalkInfo npc_talk_info_list = 12;
+ * repeated .NpcTalkInfo npc_talk_info_list = 15;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass {
}
/**
- * repeated .NpcTalkInfo npc_talk_info_list = 12;
+ * repeated .NpcTalkInfo npc_talk_info_list = 15;
* @param value the npcTalkInfoList to add
* @return this
*/
@@ -135,7 +135,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass {
}
/**
- * repeated .NpcTalkInfo npc_talk_info_list = 12;
+ * repeated .NpcTalkInfo npc_talk_info_list = 15;
* @param values the npcTalkInfoList to add
* @return this
*/
@@ -214,12 +214,12 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < npcTalkInfoList.length(); i++) {
- output.writeRawByte((byte) 98);
+ output.writeRawByte((byte) 122);
output.writeMessageNoTag(npcTalkInfoList.get(i));
}
}
@@ -244,16 +244,16 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
+ case 48: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 98) {
+ if (tag != 122) {
break;
}
}
- case 98: {
+ case 122: {
// npcTalkInfoList
tag = input.readRepeatedMessage(npcTalkInfoList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetFirstTalkNpcCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFirstTalkNpcCsReqOuterClass.java
index c432774..f60315a 100644
--- a/src/generated/main/emu/lunarcore/proto/GetFirstTalkNpcCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetFirstTalkNpcCsReqOuterClass.java
@@ -20,9 +20,9 @@ public final class GetFirstTalkNpcCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated uint32 npc_id = 15;
+ * repeated uint32 npc_id_list = 15;
*/
- private final RepeatedInt npcId = RepeatedInt.newEmptyInstance();
+ private final RepeatedInt npcIdList = RepeatedInt.newEmptyInstance();
private GetFirstTalkNpcCsReq() {
}
@@ -35,39 +35,39 @@ public final class GetFirstTalkNpcCsReqOuterClass {
}
/**
- * repeated uint32 npc_id = 15;
- * @return whether the npcId field is set
+ * repeated uint32 npc_id_list = 15;
+ * @return whether the npcIdList field is set
*/
- public boolean hasNpcId() {
+ public boolean hasNpcIdList() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * repeated uint32 npc_id = 15;
+ * repeated uint32 npc_id_list = 15;
* @return this
*/
- public GetFirstTalkNpcCsReq clearNpcId() {
+ public GetFirstTalkNpcCsReq clearNpcIdList() {
bitField0_ &= ~0x00000001;
- npcId.clear();
+ npcIdList.clear();
return this;
}
/**
- * repeated uint32 npc_id = 15;
+ * repeated uint32 npc_id_list = 15;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
*
- * Use {@link #getMutableNpcId()} if you want to modify it.
+ * Use {@link #getMutableNpcIdList()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public RepeatedInt getNpcId() {
- return npcId;
+ public RepeatedInt getNpcIdList() {
+ return npcIdList;
}
/**
- * repeated uint32 npc_id = 15;
+ * repeated uint32 npc_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
@@ -75,30 +75,30 @@ public final class GetFirstTalkNpcCsReqOuterClass {
*
* @return internal storage object for modifications
*/
- public RepeatedInt getMutableNpcId() {
+ public RepeatedInt getMutableNpcIdList() {
bitField0_ |= 0x00000001;
- return npcId;
+ return npcIdList;
}
/**
- * repeated uint32 npc_id = 15;
- * @param value the npcId to add
+ * repeated uint32 npc_id_list = 15;
+ * @param value the npcIdList to add
* @return this
*/
- public GetFirstTalkNpcCsReq addNpcId(final int value) {
+ public GetFirstTalkNpcCsReq addNpcIdList(final int value) {
bitField0_ |= 0x00000001;
- npcId.add(value);
+ npcIdList.add(value);
return this;
}
/**
- * repeated uint32 npc_id = 15;
- * @param values the npcId to add
+ * repeated uint32 npc_id_list = 15;
+ * @param values the npcIdList to add
* @return this
*/
- public GetFirstTalkNpcCsReq addAllNpcId(final int... values) {
+ public GetFirstTalkNpcCsReq addAllNpcIdList(final int... values) {
bitField0_ |= 0x00000001;
- npcId.addAll(values);
+ npcIdList.addAll(values);
return this;
}
@@ -107,7 +107,7 @@ public final class GetFirstTalkNpcCsReqOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- npcId.copyFrom(other.npcId);
+ npcIdList.copyFrom(other.npcIdList);
}
return this;
}
@@ -118,8 +118,8 @@ public final class GetFirstTalkNpcCsReqOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasNpcId()) {
- getMutableNpcId().addAll(other.npcId);
+ if (other.hasNpcIdList()) {
+ getMutableNpcIdList().addAll(other.npcIdList);
}
return this;
}
@@ -131,7 +131,7 @@ public final class GetFirstTalkNpcCsReqOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- npcId.clear();
+ npcIdList.clear();
return this;
}
@@ -142,7 +142,7 @@ public final class GetFirstTalkNpcCsReqOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- npcId.clear();
+ npcIdList.clear();
return this;
}
@@ -156,15 +156,15 @@ public final class GetFirstTalkNpcCsReqOuterClass {
}
GetFirstTalkNpcCsReq other = (GetFirstTalkNpcCsReq) o;
return bitField0_ == other.bitField0_
- && (!hasNpcId() || npcId.equals(other.npcId));
+ && (!hasNpcIdList() || npcIdList.equals(other.npcIdList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- for (int i = 0; i < npcId.length(); i++) {
+ for (int i = 0; i < npcIdList.length(); i++) {
output.writeRawByte((byte) 120);
- output.writeUInt32NoTag(npcId.array()[i]);
+ output.writeUInt32NoTag(npcIdList.array()[i]);
}
}
}
@@ -173,7 +173,7 @@ public final class GetFirstTalkNpcCsReqOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += (1 * npcId.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(npcId);
+ size += (1 * npcIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(npcIdList);
}
return size;
}
@@ -186,8 +186,8 @@ public final class GetFirstTalkNpcCsReqOuterClass {
while (true) {
switch (tag) {
case 122: {
- // npcId [packed=true]
- input.readPackedUInt32(npcId, tag);
+ // npcIdList [packed=true]
+ input.readPackedUInt32(npcIdList, tag);
bitField0_ |= 0x00000001;
tag = input.readTag();
if (tag != 0) {
@@ -205,8 +205,8 @@ public final class GetFirstTalkNpcCsReqOuterClass {
break;
}
case 120: {
- // npcId [packed=false]
- tag = input.readRepeatedUInt32(npcId, tag);
+ // npcIdList [packed=false]
+ tag = input.readRepeatedUInt32(npcIdList, tag);
bitField0_ |= 0x00000001;
break;
}
@@ -218,7 +218,7 @@ public final class GetFirstTalkNpcCsReqOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRepeatedUInt32(FieldNames.npcId, npcId);
+ output.writeRepeatedUInt32(FieldNames.npcIdList, npcIdList);
}
output.endObject();
}
@@ -230,11 +230,11 @@ public final class GetFirstTalkNpcCsReqOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 105021404:
- case -1039282375: {
- if (input.isAtField(FieldNames.npcId)) {
+ case 522933914:
+ case 535639524: {
+ if (input.isAtField(FieldNames.npcIdList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedUInt32(npcId);
+ input.readRepeatedUInt32(npcIdList);
bitField0_ |= 0x00000001;
}
} else {
@@ -295,7 +295,7 @@ public final class GetFirstTalkNpcCsReqOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName npcId = FieldName.forField("npcId", "npc_id");
+ static final FieldName npcIdList = FieldName.forField("npcIdList", "npc_id_list");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/GetFirstTalkNpcScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFirstTalkNpcScRspOuterClass.java
index 8289e30..0679520 100644
--- a/src/generated/main/emu/lunarcore/proto/GetFirstTalkNpcScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetFirstTalkNpcScRspOuterClass.java
@@ -20,12 +20,12 @@ public final class GetFirstTalkNpcScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 10;
*/
private int retcode;
/**
- * repeated .FirstNpcTalkInfo npc_talk_info_list = 14;
+ * repeated .FirstNpcTalkInfo npc_talk_info_list = 12;
*/
private final RepeatedMessageoptional uint32 retcode = 4;
+ * optional uint32 retcode = 10;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public final class GetFirstTalkNpcScRspOuterClass {
}
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 10;
* @return this
*/
public GetFirstTalkNpcScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public final class GetFirstTalkNpcScRspOuterClass {
}
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 10;
* @return the retcode
*/
public int getRetcode() {
@@ -66,7 +66,7 @@ public final class GetFirstTalkNpcScRspOuterClass {
}
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 10;
* @param value the retcode to set
* @return this
*/
@@ -77,7 +77,7 @@ public final class GetFirstTalkNpcScRspOuterClass {
}
/**
- * repeated .FirstNpcTalkInfo npc_talk_info_list = 14;
+ * repeated .FirstNpcTalkInfo npc_talk_info_list = 12;
* @return whether the npcTalkInfoList field is set
*/
public boolean hasNpcTalkInfoList() {
@@ -85,7 +85,7 @@ public final class GetFirstTalkNpcScRspOuterClass {
}
/**
- * repeated .FirstNpcTalkInfo npc_talk_info_list = 14;
+ * repeated .FirstNpcTalkInfo npc_talk_info_list = 12;
* @return this
*/
public GetFirstTalkNpcScRsp clearNpcTalkInfoList() {
@@ -95,7 +95,7 @@ public final class GetFirstTalkNpcScRspOuterClass {
}
/**
- * repeated .FirstNpcTalkInfo npc_talk_info_list = 14;
+ * repeated .FirstNpcTalkInfo npc_talk_info_list = 12;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class GetFirstTalkNpcScRspOuterClass {
}
/**
- * repeated .FirstNpcTalkInfo npc_talk_info_list = 14;
+ * repeated .FirstNpcTalkInfo npc_talk_info_list = 12;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -124,7 +124,7 @@ public final class GetFirstTalkNpcScRspOuterClass {
}
/**
- * repeated .FirstNpcTalkInfo npc_talk_info_list = 14;
+ * repeated .FirstNpcTalkInfo npc_talk_info_list = 12;
* @param value the npcTalkInfoList to add
* @return this
*/
@@ -136,7 +136,7 @@ public final class GetFirstTalkNpcScRspOuterClass {
}
/**
- * repeated .FirstNpcTalkInfo npc_talk_info_list = 14;
+ * repeated .FirstNpcTalkInfo npc_talk_info_list = 12;
* @param values the npcTalkInfoList to add
* @return this
*/
@@ -213,12 +213,12 @@ public final class GetFirstTalkNpcScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < npcTalkInfoList.length(); i++) {
- output.writeRawByte((byte) 114);
+ output.writeRawByte((byte) 98);
output.writeMessageNoTag(npcTalkInfoList.get(i));
}
}
@@ -243,16 +243,16 @@ public final class GetFirstTalkNpcScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
+ case 80: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 114) {
+ if (tag != 98) {
break;
}
}
- case 114: {
+ case 98: {
// 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 f4dd815..83f6afa 100644
--- a/src/generated/main/emu/lunarcore/proto/GetFriendApplyListInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetFriendApplyListInfoScRspOuterClass.java
@@ -20,12 +20,12 @@ public final class GetFriendApplyListInfoScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 13;
*/
private int retcode;
/**
- * repeated .FriendApplyInfo friend_apply_list = 3;
+ * repeated .FriendApplyInfo friend_apply_list = 4;
*/
private final RepeatedMessageoptional uint32 retcode = 12;
+ * optional uint32 retcode = 13;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public final class GetFriendApplyListInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 13;
* @return this
*/
public GetFriendApplyListInfoScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public final class GetFriendApplyListInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 13;
* @return the retcode
*/
public int getRetcode() {
@@ -66,7 +66,7 @@ public final class GetFriendApplyListInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 13;
* @param value the retcode to set
* @return this
*/
@@ -77,7 +77,7 @@ public final class GetFriendApplyListInfoScRspOuterClass {
}
/**
- * repeated .FriendApplyInfo friend_apply_list = 3;
+ * repeated .FriendApplyInfo friend_apply_list = 4;
* @return whether the friendApplyList field is set
*/
public boolean hasFriendApplyList() {
@@ -85,7 +85,7 @@ public final class GetFriendApplyListInfoScRspOuterClass {
}
/**
- * repeated .FriendApplyInfo friend_apply_list = 3;
+ * repeated .FriendApplyInfo friend_apply_list = 4;
* @return this
*/
public GetFriendApplyListInfoScRsp clearFriendApplyList() {
@@ -95,7 +95,7 @@ public final class GetFriendApplyListInfoScRspOuterClass {
}
/**
- * repeated .FriendApplyInfo friend_apply_list = 3;
+ * repeated .FriendApplyInfo friend_apply_list = 4;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class GetFriendApplyListInfoScRspOuterClass {
}
/**
- * repeated .FriendApplyInfo friend_apply_list = 3;
+ * repeated .FriendApplyInfo friend_apply_list = 4;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public final class GetFriendApplyListInfoScRspOuterClass {
}
/**
- * repeated .FriendApplyInfo friend_apply_list = 3;
+ * repeated .FriendApplyInfo friend_apply_list = 4;
* @param value the friendApplyList to add
* @return this
*/
@@ -135,7 +135,7 @@ public final class GetFriendApplyListInfoScRspOuterClass {
}
/**
- * repeated .FriendApplyInfo friend_apply_list = 3;
+ * repeated .FriendApplyInfo friend_apply_list = 4;
* @param values the friendApplyList to add
* @return this
*/
@@ -212,12 +212,12 @@ public final class GetFriendApplyListInfoScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 104);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < friendApplyList.length(); i++) {
- output.writeRawByte((byte) 26);
+ output.writeRawByte((byte) 34);
output.writeMessageNoTag(friendApplyList.get(i));
}
}
@@ -242,16 +242,16 @@ public final class GetFriendApplyListInfoScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 96: {
+ case 104: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 26) {
+ if (tag != 34) {
break;
}
}
- case 26: {
+ case 34: {
// 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 da87cb4..b8ebfa2 100644
--- a/src/generated/main/emu/lunarcore/proto/GetFriendListInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetFriendListInfoScRspOuterClass.java
@@ -20,12 +20,12 @@ public final class GetFriendListInfoScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 10;
+ * optional uint32 retcode = 15;
*/
private int retcode;
/**
- * repeated .FriendListInfo friend_list = 13;
+ * repeated .FriendListInfo friend_list = 7;
*/
private final RepeatedMessageoptional uint32 retcode = 10;
+ * optional uint32 retcode = 15;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public final class GetFriendListInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 10;
+ * optional uint32 retcode = 15;
* @return this
*/
public GetFriendListInfoScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public final class GetFriendListInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 10;
+ * optional uint32 retcode = 15;
* @return the retcode
*/
public int getRetcode() {
@@ -66,7 +66,7 @@ public final class GetFriendListInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 10;
+ * optional uint32 retcode = 15;
* @param value the retcode to set
* @return this
*/
@@ -77,7 +77,7 @@ public final class GetFriendListInfoScRspOuterClass {
}
/**
- * repeated .FriendListInfo friend_list = 13;
+ * repeated .FriendListInfo friend_list = 7;
* @return whether the friendList field is set
*/
public boolean hasFriendList() {
@@ -85,7 +85,7 @@ public final class GetFriendListInfoScRspOuterClass {
}
/**
- * repeated .FriendListInfo friend_list = 13;
+ * repeated .FriendListInfo friend_list = 7;
* @return this
*/
public GetFriendListInfoScRsp clearFriendList() {
@@ -95,7 +95,7 @@ public final class GetFriendListInfoScRspOuterClass {
}
/**
- * repeated .FriendListInfo friend_list = 13;
+ * repeated .FriendListInfo friend_list = 7;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class GetFriendListInfoScRspOuterClass {
}
/**
- * repeated .FriendListInfo friend_list = 13;
+ * repeated .FriendListInfo friend_list = 7;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public final class GetFriendListInfoScRspOuterClass {
}
/**
- * repeated .FriendListInfo friend_list = 13;
+ * repeated .FriendListInfo friend_list = 7;
* @param value the friendList to add
* @return this
*/
@@ -135,7 +135,7 @@ public final class GetFriendListInfoScRspOuterClass {
}
/**
- * repeated .FriendListInfo friend_list = 13;
+ * repeated .FriendListInfo friend_list = 7;
* @param values the friendList to add
* @return this
*/
@@ -212,12 +212,12 @@ public final class GetFriendListInfoScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < friendList.length(); i++) {
- output.writeRawByte((byte) 106);
+ output.writeRawByte((byte) 58);
output.writeMessageNoTag(friendList.get(i));
}
}
@@ -242,16 +242,16 @@ public final class GetFriendListInfoScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 80: {
+ case 120: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 106) {
+ if (tag != 58) {
break;
}
}
- case 106: {
+ case 58: {
// friendList
tag = input.readRepeatedMessage(friendList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetFriendLoginInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFriendLoginInfoScRspOuterClass.java
index 8669e44..fb08253 100644
--- a/src/generated/main/emu/lunarcore/proto/GetFriendLoginInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetFriendLoginInfoScRspOuterClass.java
@@ -25,7 +25,11 @@ public final class GetFriendLoginInfoScRspOuterClass {
private int retcode;
/**
- * repeated uint32 friend_uid_list = 2;
+ * + * ? + *+ * + *
repeated uint32 friend_uid_list = 11;
*/
private final RepeatedInt friendUidList = RepeatedInt.newEmptyInstance();
@@ -77,7 +81,11 @@ public final class GetFriendLoginInfoScRspOuterClass {
}
/**
- * repeated uint32 friend_uid_list = 2;
+ * + * ? + *+ * + *
repeated uint32 friend_uid_list = 11;
* @return whether the friendUidList field is set
*/
public boolean hasFriendUidList() {
@@ -85,7 +93,11 @@ public final class GetFriendLoginInfoScRspOuterClass {
}
/**
- * repeated uint32 friend_uid_list = 2;
+ * + * ? + *+ * + *
repeated uint32 friend_uid_list = 11;
* @return this
*/
public GetFriendLoginInfoScRsp clearFriendUidList() {
@@ -95,7 +107,11 @@ public final class GetFriendLoginInfoScRspOuterClass {
}
/**
- * repeated uint32 friend_uid_list = 2;
+ * + * ? + *+ * + *
repeated uint32 friend_uid_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 +125,11 @@ public final class GetFriendLoginInfoScRspOuterClass {
}
/**
- * repeated uint32 friend_uid_list = 2;
+ * + * ? + *+ * + *
repeated uint32 friend_uid_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 +143,11 @@ public final class GetFriendLoginInfoScRspOuterClass {
}
/**
- * repeated uint32 friend_uid_list = 2;
+ * + * ? + *+ * + *
repeated uint32 friend_uid_list = 11;
* @param value the friendUidList to add
* @return this
*/
@@ -134,7 +158,11 @@ public final class GetFriendLoginInfoScRspOuterClass {
}
/**
- * repeated uint32 friend_uid_list = 2;
+ * + * ? + *+ * + *
repeated uint32 friend_uid_list = 11;
* @param values the friendUidList to add
* @return this
*/
@@ -215,7 +243,7 @@ public final class GetFriendLoginInfoScRspOuterClass {
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < friendUidList.length(); i++) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(friendUidList.array()[i]);
}
}
@@ -245,11 +273,11 @@ public final class GetFriendLoginInfoScRspOuterClass {
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 18) {
+ if (tag != 90) {
break;
}
}
- case 18: {
+ case 90: {
// friendUidList [packed=true]
input.readPackedUInt32(friendUidList, tag);
bitField0_ |= 0x00000002;
@@ -268,7 +296,7 @@ public final class GetFriendLoginInfoScRspOuterClass {
tag = input.readTag();
break;
}
- case 16: {
+ case 88: {
// friendUidList [packed=false]
tag = input.readRepeatedUInt32(friendUidList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetFriendRecommendListInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFriendRecommendListInfoScRspOuterClass.java
index 9ec17b2..94c67be 100644
--- a/src/generated/main/emu/lunarcore/proto/GetFriendRecommendListInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetFriendRecommendListInfoScRspOuterClass.java
@@ -25,7 +25,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass {
private int retcode;
/**
- * repeated .FriendRecommendInfo friend_recommend_list = 12;
+ * repeated .FriendRecommendInfo friend_recommend_list = 9;
*/
private final RepeatedMessagerepeated .FriendRecommendInfo friend_recommend_list = 12;
+ * repeated .FriendRecommendInfo friend_recommend_list = 9;
* @return whether the friendRecommendList field is set
*/
public boolean hasFriendRecommendList() {
@@ -85,7 +85,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass {
}
/**
- * repeated .FriendRecommendInfo friend_recommend_list = 12;
+ * repeated .FriendRecommendInfo friend_recommend_list = 9;
* @return this
*/
public GetFriendRecommendListInfoScRsp clearFriendRecommendList() {
@@ -95,7 +95,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass {
}
/**
- * repeated .FriendRecommendInfo friend_recommend_list = 12;
+ * repeated .FriendRecommendInfo friend_recommend_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.
@@ -110,7 +110,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass {
}
/**
- * repeated .FriendRecommendInfo friend_recommend_list = 12;
+ * repeated .FriendRecommendInfo friend_recommend_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
@@ -125,7 +125,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass {
}
/**
- * repeated .FriendRecommendInfo friend_recommend_list = 12;
+ * repeated .FriendRecommendInfo friend_recommend_list = 9;
* @param value the friendRecommendList to add
* @return this
*/
@@ -137,7 +137,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass {
}
/**
- * repeated .FriendRecommendInfo friend_recommend_list = 12;
+ * repeated .FriendRecommendInfo friend_recommend_list = 9;
* @param values the friendRecommendList to add
* @return this
*/
@@ -219,7 +219,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass {
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < friendRecommendList.length(); i++) {
- output.writeRawByte((byte) 98);
+ output.writeRawByte((byte) 74);
output.writeMessageNoTag(friendRecommendList.get(i));
}
}
@@ -249,11 +249,11 @@ public final class GetFriendRecommendListInfoScRspOuterClass {
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 98) {
+ if (tag != 74) {
break;
}
}
- case 98: {
+ case 74: {
// 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 1df2c2e..b1d7c04 100644
--- a/src/generated/main/emu/lunarcore/proto/GetGachaCeilingCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetGachaCeilingCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class GetGachaCeilingCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 gacha_type = 11;
+ * optional uint32 gacha_type = 2;
*/
private int gachaType;
@@ -34,7 +34,7 @@ public final class GetGachaCeilingCsReqOuterClass {
}
/**
- * optional uint32 gacha_type = 11;
+ * optional uint32 gacha_type = 2;
* @return whether the gachaType field is set
*/
public boolean hasGachaType() {
@@ -42,7 +42,7 @@ public final class GetGachaCeilingCsReqOuterClass {
}
/**
- * optional uint32 gacha_type = 11;
+ * optional uint32 gacha_type = 2;
* @return this
*/
public GetGachaCeilingCsReq clearGachaType() {
@@ -52,7 +52,7 @@ public final class GetGachaCeilingCsReqOuterClass {
}
/**
- * optional uint32 gacha_type = 11;
+ * optional uint32 gacha_type = 2;
* @return the gachaType
*/
public int getGachaType() {
@@ -60,7 +60,7 @@ public final class GetGachaCeilingCsReqOuterClass {
}
/**
- * optional uint32 gacha_type = 11;
+ * optional uint32 gacha_type = 2;
* @param value the gachaType to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class GetGachaCeilingCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(gachaType);
}
}
@@ -150,7 +150,7 @@ public final class GetGachaCeilingCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 88: {
+ case 16: {
// 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 528d386..d6c8f6a 100644
--- a/src/generated/main/emu/lunarcore/proto/GetGachaCeilingScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetGachaCeilingScRspOuterClass.java
@@ -19,17 +19,17 @@ public final class GetGachaCeilingScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 5;
*/
private int retcode;
/**
- * optional uint32 gacha_type = 8;
+ * optional uint32 gacha_type = 13;
*/
private int gachaType;
/**
- * optional .GachaCeiling gacha_ceiling = 11;
+ * optional .GachaCeiling gacha_ceiling = 3;
*/
private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance();
@@ -44,7 +44,7 @@ public final class GetGachaCeilingScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 5;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -52,7 +52,7 @@ public final class GetGachaCeilingScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 5;
* @return this
*/
public GetGachaCeilingScRsp clearRetcode() {
@@ -62,7 +62,7 @@ public final class GetGachaCeilingScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 5;
* @return the retcode
*/
public int getRetcode() {
@@ -70,7 +70,7 @@ public final class GetGachaCeilingScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 5;
* @param value the retcode to set
* @return this
*/
@@ -81,7 +81,7 @@ public final class GetGachaCeilingScRspOuterClass {
}
/**
- * optional uint32 gacha_type = 8;
+ * optional uint32 gacha_type = 13;
* @return whether the gachaType field is set
*/
public boolean hasGachaType() {
@@ -89,7 +89,7 @@ public final class GetGachaCeilingScRspOuterClass {
}
/**
- * optional uint32 gacha_type = 8;
+ * optional uint32 gacha_type = 13;
* @return this
*/
public GetGachaCeilingScRsp clearGachaType() {
@@ -99,7 +99,7 @@ public final class GetGachaCeilingScRspOuterClass {
}
/**
- * optional uint32 gacha_type = 8;
+ * optional uint32 gacha_type = 13;
* @return the gachaType
*/
public int getGachaType() {
@@ -107,7 +107,7 @@ public final class GetGachaCeilingScRspOuterClass {
}
/**
- * optional uint32 gacha_type = 8;
+ * optional uint32 gacha_type = 13;
* @param value the gachaType to set
* @return this
*/
@@ -118,7 +118,7 @@ public final class GetGachaCeilingScRspOuterClass {
}
/**
- * optional .GachaCeiling gacha_ceiling = 11;
+ * optional .GachaCeiling gacha_ceiling = 3;
* @return whether the gachaCeiling field is set
*/
public boolean hasGachaCeiling() {
@@ -126,7 +126,7 @@ public final class GetGachaCeilingScRspOuterClass {
}
/**
- * optional .GachaCeiling gacha_ceiling = 11;
+ * optional .GachaCeiling gacha_ceiling = 3;
* @return this
*/
public GetGachaCeilingScRsp clearGachaCeiling() {
@@ -136,7 +136,7 @@ public final class GetGachaCeilingScRspOuterClass {
}
/**
- * optional .GachaCeiling gacha_ceiling = 11;
+ * optional .GachaCeiling gacha_ceiling = 3;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -150,7 +150,7 @@ public final class GetGachaCeilingScRspOuterClass {
}
/**
- * optional .GachaCeiling gacha_ceiling = 11;
+ * optional .GachaCeiling gacha_ceiling = 3;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -164,7 +164,7 @@ public final class GetGachaCeilingScRspOuterClass {
}
/**
- * optional .GachaCeiling gacha_ceiling = 11;
+ * optional .GachaCeiling gacha_ceiling = 3;
* @param value the gachaCeiling to set
* @return this
*/
@@ -246,15 +246,15 @@ public final class GetGachaCeilingScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 104);
output.writeUInt32NoTag(gachaType);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 90);
+ output.writeRawByte((byte) 26);
output.writeMessageNoTag(gachaCeiling);
}
}
@@ -281,25 +281,25 @@ public final class GetGachaCeilingScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
+ case 40: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 64) {
+ if (tag != 104) {
break;
}
}
- case 64: {
+ case 104: {
// gachaType
gachaType = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 90) {
+ if (tag != 26) {
break;
}
}
- case 90: {
+ case 26: {
// 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 3a566cf..836e4cf 100644
--- a/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java
@@ -20,12 +20,17 @@ public final class GetGachaInfoScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 4;
*/
private int retcode;
/**
- * repeated .GachaInfo gacha_info_list = 7;
+ * optional uint32 gacha_random = 8;
+ */
+ private int gachaRandom;
+
+ /**
+ * repeated .GachaInfo gacha_info_list = 9;
*/
private final RepeatedMessageoptional uint32 retcode = 8;
+ * optional uint32 retcode = 4;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -48,7 +53,7 @@ public final class GetGachaInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 4;
* @return this
*/
public GetGachaInfoScRsp clearRetcode() {
@@ -58,7 +63,7 @@ public final class GetGachaInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 4;
* @return the retcode
*/
public int getRetcode() {
@@ -66,7 +71,7 @@ public final class GetGachaInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 4;
* @param value the retcode to set
* @return this
*/
@@ -77,25 +82,62 @@ public final class GetGachaInfoScRspOuterClass {
}
/**
- * repeated .GachaInfo gacha_info_list = 7;
- * @return whether the gachaInfoList field is set
+ * optional uint32 gacha_random = 8;
+ * @return whether the gachaRandom field is set
*/
- public boolean hasGachaInfoList() {
+ public boolean hasGachaRandom() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * repeated .GachaInfo gacha_info_list = 7;
+ * optional uint32 gacha_random = 8;
+ * @return this
+ */
+ public GetGachaInfoScRsp clearGachaRandom() {
+ bitField0_ &= ~0x00000002;
+ gachaRandom = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 gacha_random = 8;
+ * @return the gachaRandom
+ */
+ public int getGachaRandom() {
+ return gachaRandom;
+ }
+
+ /**
+ * optional uint32 gacha_random = 8;
+ * @param value the gachaRandom to set
+ * @return this
+ */
+ public GetGachaInfoScRsp setGachaRandom(final int value) {
+ bitField0_ |= 0x00000002;
+ gachaRandom = value;
+ return this;
+ }
+
+ /**
+ * repeated .GachaInfo gacha_info_list = 9;
+ * @return whether the gachaInfoList field is set
+ */
+ public boolean hasGachaInfoList() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * repeated .GachaInfo gacha_info_list = 9;
* @return this
*/
public GetGachaInfoScRsp clearGachaInfoList() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000004;
gachaInfoList.clear();
return this;
}
/**
- * repeated .GachaInfo gacha_info_list = 7;
+ * repeated .GachaInfo gacha_info_list = 9;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +151,7 @@ public final class GetGachaInfoScRspOuterClass {
}
/**
- * repeated .GachaInfo gacha_info_list = 7;
+ * repeated .GachaInfo gacha_info_list = 9;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -118,28 +160,28 @@ public final class GetGachaInfoScRspOuterClass {
* @return internal storage object for modifications
*/
public RepeatedMessagerepeated .GachaInfo gacha_info_list = 7;
+ * repeated .GachaInfo gacha_info_list = 9;
* @param value the gachaInfoList to add
* @return this
*/
public GetGachaInfoScRsp addGachaInfoList(final GachaInfoOuterClass.GachaInfo value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
gachaInfoList.add(value);
return this;
}
/**
- * repeated .GachaInfo gacha_info_list = 7;
+ * repeated .GachaInfo gacha_info_list = 9;
* @param values the gachaInfoList to add
* @return this
*/
public GetGachaInfoScRsp addAllGachaInfoList(final GachaInfoOuterClass.GachaInfo... values) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
gachaInfoList.addAll(values);
return this;
}
@@ -150,6 +192,7 @@ public final class GetGachaInfoScRspOuterClass {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
retcode = other.retcode;
+ gachaRandom = other.gachaRandom;
gachaInfoList.copyFrom(other.gachaInfoList);
}
return this;
@@ -164,6 +207,9 @@ public final class GetGachaInfoScRspOuterClass {
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
+ if (other.hasGachaRandom()) {
+ setGachaRandom(other.gachaRandom);
+ }
if (other.hasGachaInfoList()) {
getMutableGachaInfoList().addAll(other.gachaInfoList);
}
@@ -178,6 +224,7 @@ public final class GetGachaInfoScRspOuterClass {
cachedSize = -1;
bitField0_ = 0;
retcode = 0;
+ gachaRandom = 0;
gachaInfoList.clear();
return this;
}
@@ -204,18 +251,23 @@ public final class GetGachaInfoScRspOuterClass {
GetGachaInfoScRsp other = (GetGachaInfoScRsp) o;
return bitField0_ == other.bitField0_
&& (!hasRetcode() || retcode == other.retcode)
+ && (!hasGachaRandom() || gachaRandom == other.gachaRandom)
&& (!hasGachaInfoList() || gachaInfoList.equals(other.gachaInfoList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 64);
+ output.writeUInt32NoTag(gachaRandom);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < gachaInfoList.length(); i++) {
- output.writeRawByte((byte) 58);
+ output.writeRawByte((byte) 74);
output.writeMessageNoTag(gachaInfoList.get(i));
}
}
@@ -228,6 +280,9 @@ public final class GetGachaInfoScRspOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
size += (1 * gachaInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(gachaInfoList);
}
return size;
@@ -240,19 +295,28 @@ public final class GetGachaInfoScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 64: {
+ case 32: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 58) {
+ if (tag != 64) {
break;
}
}
- case 58: {
+ case 64: {
+ // gachaRandom
+ gachaRandom = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 74) {
+ break;
+ }
+ }
+ case 74: {
// gachaInfoList
tag = input.readRepeatedMessage(gachaInfoList, tag);
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
if (tag != 0) {
break;
}
@@ -278,6 +342,9 @@ public final class GetGachaInfoScRspOuterClass {
output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
+ output.writeUInt32(FieldNames.gachaRandom, gachaRandom);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
output.writeRepeatedMessage(FieldNames.gachaInfoList, gachaInfoList);
}
output.endObject();
@@ -301,12 +368,24 @@ public final class GetGachaInfoScRspOuterClass {
}
break;
}
+ case -1635961627:
+ case -47579616: {
+ if (input.isAtField(FieldNames.gachaRandom)) {
+ if (!input.trySkipNullValue()) {
+ gachaRandom = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case -273788402:
case 1953910546: {
if (input.isAtField(FieldNames.gachaInfoList)) {
if (!input.trySkipNullValue()) {
input.readRepeatedMessage(gachaInfoList);
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
}
} else {
input.skipUnknownField();
@@ -368,6 +447,8 @@ public final class GetGachaInfoScRspOuterClass {
static class FieldNames {
static final FieldName retcode = FieldName.forField("retcode");
+ static final FieldName gachaRandom = FieldName.forField("gachaRandom", "gacha_random");
+
static final FieldName gachaInfoList = FieldName.forField("gachaInfoList", "gacha_info_list");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java
index 3f7a24d..5c9fdaf 100644
--- a/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java
@@ -20,22 +20,22 @@ public final class GetHeroBasicTypeInfoScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 1;
*/
private int retcode;
/**
- * optional .HeroBasicType cur_basic_type = 5;
- */
- private int curBasicType;
-
- /**
- * optional .Gender gender = 13;
+ * optional .Gender gender = 7;
*/
private int gender;
/**
- * repeated .HeroBasicTypeInfo basic_type_info_list = 2;
+ * optional .HeroBasicType cur_basic_type = 8;
+ */
+ private int curBasicType;
+
+ /**
+ * repeated .HeroBasicTypeInfo basic_type_info_list = 9;
*/
private final RepeatedMessageoptional uint32 retcode = 6;
+ * optional uint32 retcode = 1;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -58,7 +58,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 1;
* @return this
*/
public GetHeroBasicTypeInfoScRsp clearRetcode() {
@@ -68,7 +68,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 1;
* @return the retcode
*/
public int getRetcode() {
@@ -76,7 +76,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 1;
* @param value the retcode to set
* @return this
*/
@@ -87,88 +87,25 @@ public final class GetHeroBasicTypeInfoScRspOuterClass {
}
/**
- * optional .HeroBasicType cur_basic_type = 5;
- * @return whether the curBasicType field is set
+ * optional .Gender gender = 7;
+ * @return whether the gender field is set
*/
- public boolean hasCurBasicType() {
+ public boolean hasGender() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional .HeroBasicType cur_basic_type = 5;
- * @return this
- */
- public GetHeroBasicTypeInfoScRsp clearCurBasicType() {
- bitField0_ &= ~0x00000002;
- curBasicType = 0;
- return this;
- }
-
- /**
- * optional .HeroBasicType cur_basic_type = 5;
- * @return the curBasicType
- */
- public HeroBasicTypeOuterClass.HeroBasicType getCurBasicType() {
- return HeroBasicTypeOuterClass.HeroBasicType.forNumber(curBasicType);
- }
-
- /**
- * Gets the value of the internal enum store. The result is
- * equivalent to {@link GetHeroBasicTypeInfoScRsp#getCurBasicType()}.getNumber().
- *
- * @return numeric wire representation
- */
- public int getCurBasicTypeValue() {
- return curBasicType;
- }
-
- /**
- * Sets the value of the internal enum store. This does not
- * do any validity checks, so be sure to use appropriate value
- * constants from {@link HeroBasicTypeOuterClass.HeroBasicType}. Setting an invalid value
- * can cause {@link GetHeroBasicTypeInfoScRsp#getCurBasicType()} to return null
- *
- * @param value the numeric wire value to set
- * @return this
- */
- public GetHeroBasicTypeInfoScRsp setCurBasicTypeValue(final int value) {
- bitField0_ |= 0x00000002;
- curBasicType = value;
- return this;
- }
-
- /**
- * optional .HeroBasicType cur_basic_type = 5;
- * @param value the curBasicType to set
- * @return this
- */
- public GetHeroBasicTypeInfoScRsp setCurBasicType(
- final HeroBasicTypeOuterClass.HeroBasicType value) {
- bitField0_ |= 0x00000002;
- curBasicType = value.getNumber();
- return this;
- }
-
- /**
- * optional .Gender gender = 13;
- * @return whether the gender field is set
- */
- public boolean hasGender() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional .Gender gender = 13;
+ * optional .Gender gender = 7;
* @return this
*/
public GetHeroBasicTypeInfoScRsp clearGender() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
gender = 0;
return this;
}
/**
- * optional .Gender gender = 13;
+ * optional .Gender gender = 7;
* @return the gender
*/
public GenderOuterClass.Gender getGender() {
@@ -195,24 +132,87 @@ public final class GetHeroBasicTypeInfoScRspOuterClass {
* @return this
*/
public GetHeroBasicTypeInfoScRsp setGenderValue(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
gender = value;
return this;
}
/**
- * optional .Gender gender = 13;
+ * optional .Gender gender = 7;
* @param value the gender to set
* @return this
*/
public GetHeroBasicTypeInfoScRsp setGender(final GenderOuterClass.Gender value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
gender = value.getNumber();
return this;
}
/**
- * repeated .HeroBasicTypeInfo basic_type_info_list = 2;
+ * optional .HeroBasicType cur_basic_type = 8;
+ * @return whether the curBasicType field is set
+ */
+ public boolean hasCurBasicType() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional .HeroBasicType cur_basic_type = 8;
+ * @return this
+ */
+ public GetHeroBasicTypeInfoScRsp clearCurBasicType() {
+ bitField0_ &= ~0x00000004;
+ curBasicType = 0;
+ return this;
+ }
+
+ /**
+ * optional .HeroBasicType cur_basic_type = 8;
+ * @return the curBasicType
+ */
+ public HeroBasicTypeOuterClass.HeroBasicType getCurBasicType() {
+ return HeroBasicTypeOuterClass.HeroBasicType.forNumber(curBasicType);
+ }
+
+ /**
+ * Gets the value of the internal enum store. The result is
+ * equivalent to {@link GetHeroBasicTypeInfoScRsp#getCurBasicType()}.getNumber().
+ *
+ * @return numeric wire representation
+ */
+ public int getCurBasicTypeValue() {
+ return curBasicType;
+ }
+
+ /**
+ * Sets the value of the internal enum store. This does not
+ * do any validity checks, so be sure to use appropriate value
+ * constants from {@link HeroBasicTypeOuterClass.HeroBasicType}. Setting an invalid value
+ * can cause {@link GetHeroBasicTypeInfoScRsp#getCurBasicType()} to return null
+ *
+ * @param value the numeric wire value to set
+ * @return this
+ */
+ public GetHeroBasicTypeInfoScRsp setCurBasicTypeValue(final int value) {
+ bitField0_ |= 0x00000004;
+ curBasicType = value;
+ return this;
+ }
+
+ /**
+ * optional .HeroBasicType cur_basic_type = 8;
+ * @param value the curBasicType to set
+ * @return this
+ */
+ public GetHeroBasicTypeInfoScRsp setCurBasicType(
+ final HeroBasicTypeOuterClass.HeroBasicType value) {
+ bitField0_ |= 0x00000004;
+ curBasicType = value.getNumber();
+ return this;
+ }
+
+ /**
+ * repeated .HeroBasicTypeInfo basic_type_info_list = 9;
* @return whether the basicTypeInfoList field is set
*/
public boolean hasBasicTypeInfoList() {
@@ -220,7 +220,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass {
}
/**
- * repeated .HeroBasicTypeInfo basic_type_info_list = 2;
+ * repeated .HeroBasicTypeInfo basic_type_info_list = 9;
* @return this
*/
public GetHeroBasicTypeInfoScRsp clearBasicTypeInfoList() {
@@ -230,7 +230,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass {
}
/**
- * repeated .HeroBasicTypeInfo basic_type_info_list = 2;
+ * repeated .HeroBasicTypeInfo basic_type_info_list = 9;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -244,7 +244,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass {
}
/**
- * repeated .HeroBasicTypeInfo basic_type_info_list = 2;
+ * repeated .HeroBasicTypeInfo basic_type_info_list = 9;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -259,7 +259,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass {
}
/**
- * repeated .HeroBasicTypeInfo basic_type_info_list = 2;
+ * repeated .HeroBasicTypeInfo basic_type_info_list = 9;
* @param value the basicTypeInfoList to add
* @return this
*/
@@ -271,7 +271,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass {
}
/**
- * repeated .HeroBasicTypeInfo basic_type_info_list = 2;
+ * repeated .HeroBasicTypeInfo basic_type_info_list = 9;
* @param values the basicTypeInfoList to add
* @return this
*/
@@ -288,8 +288,8 @@ public final class GetHeroBasicTypeInfoScRspOuterClass {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
retcode = other.retcode;
- curBasicType = other.curBasicType;
gender = other.gender;
+ curBasicType = other.curBasicType;
basicTypeInfoList.copyFrom(other.basicTypeInfoList);
}
return this;
@@ -304,12 +304,12 @@ public final class GetHeroBasicTypeInfoScRspOuterClass {
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
- if (other.hasCurBasicType()) {
- setCurBasicTypeValue(other.curBasicType);
- }
if (other.hasGender()) {
setGenderValue(other.gender);
}
+ if (other.hasCurBasicType()) {
+ setCurBasicTypeValue(other.curBasicType);
+ }
if (other.hasBasicTypeInfoList()) {
getMutableBasicTypeInfoList().addAll(other.basicTypeInfoList);
}
@@ -324,8 +324,8 @@ public final class GetHeroBasicTypeInfoScRspOuterClass {
cachedSize = -1;
bitField0_ = 0;
retcode = 0;
- curBasicType = 0;
gender = 0;
+ curBasicType = 0;
basicTypeInfoList.clear();
return this;
}
@@ -352,28 +352,28 @@ public final class GetHeroBasicTypeInfoScRspOuterClass {
GetHeroBasicTypeInfoScRsp other = (GetHeroBasicTypeInfoScRsp) o;
return bitField0_ == other.bitField0_
&& (!hasRetcode() || retcode == other.retcode)
- && (!hasCurBasicType() || curBasicType == other.curBasicType)
&& (!hasGender() || gender == other.gender)
+ && (!hasCurBasicType() || curBasicType == other.curBasicType)
&& (!hasBasicTypeInfoList() || basicTypeInfoList.equals(other.basicTypeInfoList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 40);
- output.writeEnumNoTag(curBasicType);
+ output.writeRawByte((byte) 56);
+ output.writeEnumNoTag(gender);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 104);
- output.writeEnumNoTag(gender);
+ output.writeRawByte((byte) 64);
+ output.writeEnumNoTag(curBasicType);
}
if ((bitField0_ & 0x00000008) != 0) {
for (int i = 0; i < basicTypeInfoList.length(); i++) {
- output.writeRawByte((byte) 18);
+ output.writeRawByte((byte) 74);
output.writeMessageNoTag(basicTypeInfoList.get(i));
}
}
@@ -386,10 +386,10 @@ public final class GetHeroBasicTypeInfoScRspOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeEnumSizeNoTag(curBasicType);
+ size += 1 + ProtoSink.computeEnumSizeNoTag(gender);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeEnumSizeNoTag(gender);
+ size += 1 + ProtoSink.computeEnumSizeNoTag(curBasicType);
}
if ((bitField0_ & 0x00000008) != 0) {
size += (1 * basicTypeInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(basicTypeInfoList);
@@ -404,40 +404,40 @@ public final class GetHeroBasicTypeInfoScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 48: {
+ case 8: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 40) {
+ if (tag != 56) {
break;
}
}
- case 40: {
- // curBasicType
- final int value = input.readInt32();
- if (HeroBasicTypeOuterClass.HeroBasicType.forNumber(value) != null) {
- curBasicType = value;
- bitField0_ |= 0x00000002;
- }
- tag = input.readTag();
- if (tag != 104) {
- break;
- }
- }
- case 104: {
+ case 56: {
// gender
final int value = input.readInt32();
if (GenderOuterClass.Gender.forNumber(value) != null) {
gender = value;
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
}
tag = input.readTag();
- if (tag != 18) {
+ if (tag != 64) {
break;
}
}
- case 18: {
+ case 64: {
+ // curBasicType
+ final int value = input.readInt32();
+ if (HeroBasicTypeOuterClass.HeroBasicType.forNumber(value) != null) {
+ curBasicType = value;
+ bitField0_ |= 0x00000004;
+ }
+ tag = input.readTag();
+ if (tag != 74) {
+ break;
+ }
+ }
+ case 74: {
// basicTypeInfoList
tag = input.readRepeatedMessage(basicTypeInfoList, tag);
bitField0_ |= 0x00000008;
@@ -466,10 +466,10 @@ public final class GetHeroBasicTypeInfoScRspOuterClass {
output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeEnum(FieldNames.curBasicType, curBasicType, HeroBasicTypeOuterClass.HeroBasicType.converter());
+ output.writeEnum(FieldNames.gender, gender, GenderOuterClass.Gender.converter());
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeEnum(FieldNames.gender, gender, GenderOuterClass.Gender.converter());
+ output.writeEnum(FieldNames.curBasicType, curBasicType, HeroBasicTypeOuterClass.HeroBasicType.converter());
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeRepeatedMessage(FieldNames.basicTypeInfoList, basicTypeInfoList);
@@ -495,13 +495,12 @@ public final class GetHeroBasicTypeInfoScRspOuterClass {
}
break;
}
- case -518506968:
- case -979186678: {
- if (input.isAtField(FieldNames.curBasicType)) {
+ case -1249512767: {
+ if (input.isAtField(FieldNames.gender)) {
if (!input.trySkipNullValue()) {
- final HeroBasicTypeOuterClass.HeroBasicType value = input.readEnum(HeroBasicTypeOuterClass.HeroBasicType.converter());
+ final GenderOuterClass.Gender value = input.readEnum(GenderOuterClass.Gender.converter());
if (value != null) {
- curBasicType = value.getNumber();
+ gender = value.getNumber();
bitField0_ |= 0x00000002;
} else {
input.skipUnknownEnumValue();
@@ -512,12 +511,13 @@ public final class GetHeroBasicTypeInfoScRspOuterClass {
}
break;
}
- case -1249512767: {
- if (input.isAtField(FieldNames.gender)) {
+ case -518506968:
+ case -979186678: {
+ if (input.isAtField(FieldNames.curBasicType)) {
if (!input.trySkipNullValue()) {
- final GenderOuterClass.Gender value = input.readEnum(GenderOuterClass.Gender.converter());
+ final HeroBasicTypeOuterClass.HeroBasicType value = input.readEnum(HeroBasicTypeOuterClass.HeroBasicType.converter());
if (value != null) {
- gender = value.getNumber();
+ curBasicType = value.getNumber();
bitField0_ |= 0x00000004;
} else {
input.skipUnknownEnumValue();
@@ -595,10 +595,10 @@ public final class GetHeroBasicTypeInfoScRspOuterClass {
static class FieldNames {
static final FieldName retcode = FieldName.forField("retcode");
- static final FieldName curBasicType = FieldName.forField("curBasicType", "cur_basic_type");
-
static final FieldName gender = FieldName.forField("gender");
+ static final FieldName curBasicType = FieldName.forField("curBasicType", "cur_basic_type");
+
static final FieldName 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 7098554..5992e3b 100644
--- a/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java
@@ -20,17 +20,17 @@ public final class GetJukeboxDataScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 3;
*/
private int retcode;
/**
- * optional uint32 playing_id = 9;
+ * optional uint32 playing_id = 7;
*/
private int playingId;
/**
- * repeated .UnlockedMusic music_list = 10;
+ * repeated .UnlockedMusic music_list = 11;
*/
private final RepeatedMessageoptional uint32 retcode = 4;
+ * optional uint32 retcode = 3;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -53,7 +53,7 @@ public final class GetJukeboxDataScRspOuterClass {
}
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 3;
* @return this
*/
public GetJukeboxDataScRsp clearRetcode() {
@@ -63,7 +63,7 @@ public final class GetJukeboxDataScRspOuterClass {
}
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 3;
* @return the retcode
*/
public int getRetcode() {
@@ -71,7 +71,7 @@ public final class GetJukeboxDataScRspOuterClass {
}
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 3;
* @param value the retcode to set
* @return this
*/
@@ -82,7 +82,7 @@ public final class GetJukeboxDataScRspOuterClass {
}
/**
- * optional uint32 playing_id = 9;
+ * optional uint32 playing_id = 7;
* @return whether the playingId field is set
*/
public boolean hasPlayingId() {
@@ -90,7 +90,7 @@ public final class GetJukeboxDataScRspOuterClass {
}
/**
- * optional uint32 playing_id = 9;
+ * optional uint32 playing_id = 7;
* @return this
*/
public GetJukeboxDataScRsp clearPlayingId() {
@@ -100,7 +100,7 @@ public final class GetJukeboxDataScRspOuterClass {
}
/**
- * optional uint32 playing_id = 9;
+ * optional uint32 playing_id = 7;
* @return the playingId
*/
public int getPlayingId() {
@@ -108,7 +108,7 @@ public final class GetJukeboxDataScRspOuterClass {
}
/**
- * optional uint32 playing_id = 9;
+ * optional uint32 playing_id = 7;
* @param value the playingId to set
* @return this
*/
@@ -119,7 +119,7 @@ public final class GetJukeboxDataScRspOuterClass {
}
/**
- * repeated .UnlockedMusic music_list = 10;
+ * repeated .UnlockedMusic music_list = 11;
* @return whether the musicList field is set
*/
public boolean hasMusicList() {
@@ -127,7 +127,7 @@ public final class GetJukeboxDataScRspOuterClass {
}
/**
- * repeated .UnlockedMusic music_list = 10;
+ * repeated .UnlockedMusic music_list = 11;
* @return this
*/
public GetJukeboxDataScRsp clearMusicList() {
@@ -137,7 +137,7 @@ public final class GetJukeboxDataScRspOuterClass {
}
/**
- * repeated .UnlockedMusic music_list = 10;
+ * repeated .UnlockedMusic music_list = 11;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -151,7 +151,7 @@ public final class GetJukeboxDataScRspOuterClass {
}
/**
- * repeated .UnlockedMusic music_list = 10;
+ * repeated .UnlockedMusic music_list = 11;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -165,7 +165,7 @@ public final class GetJukeboxDataScRspOuterClass {
}
/**
- * repeated .UnlockedMusic music_list = 10;
+ * repeated .UnlockedMusic music_list = 11;
* @param value the musicList to add
* @return this
*/
@@ -176,7 +176,7 @@ public final class GetJukeboxDataScRspOuterClass {
}
/**
- * repeated .UnlockedMusic music_list = 10;
+ * repeated .UnlockedMusic music_list = 11;
* @param values the musicList to add
* @return this
*/
@@ -259,16 +259,16 @@ public final class GetJukeboxDataScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(playingId);
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < musicList.length(); i++) {
- output.writeRawByte((byte) 82);
+ output.writeRawByte((byte) 90);
output.writeMessageNoTag(musicList.get(i));
}
}
@@ -296,25 +296,25 @@ public final class GetJukeboxDataScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
+ case 24: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 72) {
+ if (tag != 56) {
break;
}
}
- case 72: {
+ case 56: {
// playingId
playingId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 82) {
+ if (tag != 90) {
break;
}
}
- case 82: {
+ case 90: {
// musicList
tag = input.readRepeatedMessage(musicList, tag);
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/GetMailScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetMailScRspOuterClass.java
index bf5e595..4258f41 100644
--- a/src/generated/main/emu/lunarcore/proto/GetMailScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetMailScRspOuterClass.java
@@ -20,35 +20,35 @@ public final class GetMailScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 start = 2;
- */
- private int start;
-
- /**
- * optional uint32 total_num = 5;
- */
- private int totalNum;
-
- /**
- * optional uint32 retcode = 9;
+ * optional uint32 retcode = 1;
*/
private int retcode;
/**
- * optional bool is_end = 4;
+ * optional uint32 start = 3;
+ */
+ private int start;
+
+ /**
+ * optional uint32 total_num = 6;
+ */
+ private int totalNum;
+
+ /**
+ * optional bool is_end = 10;
*/
private boolean isEnd;
/**
- * repeated .ClientMail mail_list = 1;
- */
- private final RepeatedMessagerepeated .ClientMail notice_mail_list = 7;
+ * repeated .ClientMail notice_mail_list = 2;
*/
private final RepeatedMessagerepeated .ClientMail mail_list = 13;
+ */
+ private final RepeatedMessageoptional uint32 start = 2;
- * @return whether the start field is set
+ * optional uint32 retcode = 1;
+ * @return whether the retcode field is set
*/
- public boolean hasStart() {
+ public boolean hasRetcode() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 start = 2;
- * @return this
- */
- public GetMailScRsp clearStart() {
- bitField0_ &= ~0x00000001;
- start = 0;
- return this;
- }
-
- /**
- * optional uint32 start = 2;
- * @return the start
- */
- public int getStart() {
- return start;
- }
-
- /**
- * optional uint32 start = 2;
- * @param value the start to set
- * @return this
- */
- public GetMailScRsp setStart(final int value) {
- bitField0_ |= 0x00000001;
- start = value;
- return this;
- }
-
- /**
- * optional uint32 total_num = 5;
- * @return whether the totalNum field is set
- */
- public boolean hasTotalNum() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 total_num = 5;
- * @return this
- */
- public GetMailScRsp clearTotalNum() {
- bitField0_ &= ~0x00000002;
- totalNum = 0;
- return this;
- }
-
- /**
- * optional uint32 total_num = 5;
- * @return the totalNum
- */
- public int getTotalNum() {
- return totalNum;
- }
-
- /**
- * optional uint32 total_num = 5;
- * @param value the totalNum to set
- * @return this
- */
- public GetMailScRsp setTotalNum(final int value) {
- bitField0_ |= 0x00000002;
- totalNum = value;
- return this;
- }
-
- /**
- * optional uint32 retcode = 9;
- * @return whether the retcode field is set
- */
- public boolean hasRetcode() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 retcode = 9;
+ * optional uint32 retcode = 1;
* @return this
*/
public GetMailScRsp clearRetcode() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000001;
retcode = 0;
return this;
}
/**
- * optional uint32 retcode = 9;
+ * optional uint32 retcode = 1;
* @return the retcode
*/
public int getRetcode() {
@@ -160,18 +86,92 @@ public final class GetMailScRspOuterClass {
}
/**
- * optional uint32 retcode = 9;
+ * optional uint32 retcode = 1;
* @param value the retcode to set
* @return this
*/
public GetMailScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
retcode = value;
return this;
}
/**
- * optional bool is_end = 4;
+ * optional uint32 start = 3;
+ * @return whether the start field is set
+ */
+ public boolean hasStart() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 start = 3;
+ * @return this
+ */
+ public GetMailScRsp clearStart() {
+ bitField0_ &= ~0x00000002;
+ start = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 start = 3;
+ * @return the start
+ */
+ public int getStart() {
+ return start;
+ }
+
+ /**
+ * optional uint32 start = 3;
+ * @param value the start to set
+ * @return this
+ */
+ public GetMailScRsp setStart(final int value) {
+ bitField0_ |= 0x00000002;
+ start = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 total_num = 6;
+ * @return whether the totalNum field is set
+ */
+ public boolean hasTotalNum() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 total_num = 6;
+ * @return this
+ */
+ public GetMailScRsp clearTotalNum() {
+ bitField0_ &= ~0x00000004;
+ totalNum = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 total_num = 6;
+ * @return the totalNum
+ */
+ public int getTotalNum() {
+ return totalNum;
+ }
+
+ /**
+ * optional uint32 total_num = 6;
+ * @param value the totalNum to set
+ * @return this
+ */
+ public GetMailScRsp setTotalNum(final int value) {
+ bitField0_ |= 0x00000004;
+ totalNum = value;
+ return this;
+ }
+
+ /**
+ * optional bool is_end = 10;
* @return whether the isEnd field is set
*/
public boolean hasIsEnd() {
@@ -179,7 +179,7 @@ public final class GetMailScRspOuterClass {
}
/**
- * optional bool is_end = 4;
+ * optional bool is_end = 10;
* @return this
*/
public GetMailScRsp clearIsEnd() {
@@ -189,7 +189,7 @@ public final class GetMailScRspOuterClass {
}
/**
- * optional bool is_end = 4;
+ * optional bool is_end = 10;
* @return the isEnd
*/
public boolean getIsEnd() {
@@ -197,7 +197,7 @@ public final class GetMailScRspOuterClass {
}
/**
- * optional bool is_end = 4;
+ * optional bool is_end = 10;
* @param value the isEnd to set
* @return this
*/
@@ -208,93 +208,25 @@ public final class GetMailScRspOuterClass {
}
/**
- * repeated .ClientMail mail_list = 1;
- * @return whether the mailList field is set
+ * repeated .ClientMail notice_mail_list = 2;
+ * @return whether the noticeMailList field is set
*/
- public boolean hasMailList() {
+ public boolean hasNoticeMailList() {
return (bitField0_ & 0x00000010) != 0;
}
/**
- * repeated .ClientMail mail_list = 1;
- * @return this
- */
- public GetMailScRsp clearMailList() {
- bitField0_ &= ~0x00000010;
- mailList.clear();
- return this;
- }
-
- /**
- * repeated .ClientMail mail_list = 1;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableMailList()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedMessagerepeated .ClientMail mail_list = 1;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedMessagerepeated .ClientMail mail_list = 1;
- * @param value the mailList to add
- * @return this
- */
- public GetMailScRsp addMailList(final ClientMailOuterClass.ClientMail value) {
- bitField0_ |= 0x00000010;
- mailList.add(value);
- return this;
- }
-
- /**
- * repeated .ClientMail mail_list = 1;
- * @param values the mailList to add
- * @return this
- */
- public GetMailScRsp addAllMailList(final ClientMailOuterClass.ClientMail... values) {
- bitField0_ |= 0x00000010;
- mailList.addAll(values);
- return this;
- }
-
- /**
- * repeated .ClientMail notice_mail_list = 7;
- * @return whether the noticeMailList field is set
- */
- public boolean hasNoticeMailList() {
- return (bitField0_ & 0x00000020) != 0;
- }
-
- /**
- * repeated .ClientMail notice_mail_list = 7;
+ * repeated .ClientMail notice_mail_list = 2;
* @return this
*/
public GetMailScRsp clearNoticeMailList() {
- bitField0_ &= ~0x00000020;
+ bitField0_ &= ~0x00000010;
noticeMailList.clear();
return this;
}
/**
- * repeated .ClientMail notice_mail_list = 7;
+ * repeated .ClientMail notice_mail_list = 2;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -308,7 +240,7 @@ public final class GetMailScRspOuterClass {
}
/**
- * repeated .ClientMail notice_mail_list = 7;
+ * repeated .ClientMail notice_mail_list = 2;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -317,43 +249,111 @@ public final class GetMailScRspOuterClass {
* @return internal storage object for modifications
*/
public RepeatedMessagerepeated .ClientMail notice_mail_list = 7;
+ * repeated .ClientMail notice_mail_list = 2;
* @param value the noticeMailList to add
* @return this
*/
public GetMailScRsp addNoticeMailList(final ClientMailOuterClass.ClientMail value) {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
noticeMailList.add(value);
return this;
}
/**
- * repeated .ClientMail notice_mail_list = 7;
+ * repeated .ClientMail notice_mail_list = 2;
* @param values the noticeMailList to add
* @return this
*/
public GetMailScRsp addAllNoticeMailList(final ClientMailOuterClass.ClientMail... values) {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
noticeMailList.addAll(values);
return this;
}
+ /**
+ * repeated .ClientMail mail_list = 13;
+ * @return whether the mailList field is set
+ */
+ public boolean hasMailList() {
+ return (bitField0_ & 0x00000020) != 0;
+ }
+
+ /**
+ * repeated .ClientMail mail_list = 13;
+ * @return this
+ */
+ public GetMailScRsp clearMailList() {
+ bitField0_ &= ~0x00000020;
+ mailList.clear();
+ return this;
+ }
+
+ /**
+ * repeated .ClientMail mail_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 #getMutableMailList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedMessagerepeated .ClientMail mail_list = 13;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedMessagerepeated .ClientMail mail_list = 13;
+ * @param value the mailList to add
+ * @return this
+ */
+ public GetMailScRsp addMailList(final ClientMailOuterClass.ClientMail value) {
+ bitField0_ |= 0x00000020;
+ mailList.add(value);
+ return this;
+ }
+
+ /**
+ * repeated .ClientMail mail_list = 13;
+ * @param values the mailList to add
+ * @return this
+ */
+ public GetMailScRsp addAllMailList(final ClientMailOuterClass.ClientMail... values) {
+ bitField0_ |= 0x00000020;
+ mailList.addAll(values);
+ return this;
+ }
+
@Override
public GetMailScRsp copyFrom(final GetMailScRsp other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
+ retcode = other.retcode;
start = other.start;
totalNum = other.totalNum;
- retcode = other.retcode;
isEnd = other.isEnd;
- mailList.copyFrom(other.mailList);
noticeMailList.copyFrom(other.noticeMailList);
+ mailList.copyFrom(other.mailList);
}
return this;
}
@@ -364,24 +364,24 @@ public final class GetMailScRspOuterClass {
return this;
}
cachedSize = -1;
+ if (other.hasRetcode()) {
+ setRetcode(other.retcode);
+ }
if (other.hasStart()) {
setStart(other.start);
}
if (other.hasTotalNum()) {
setTotalNum(other.totalNum);
}
- if (other.hasRetcode()) {
- setRetcode(other.retcode);
- }
if (other.hasIsEnd()) {
setIsEnd(other.isEnd);
}
- if (other.hasMailList()) {
- getMutableMailList().addAll(other.mailList);
- }
if (other.hasNoticeMailList()) {
getMutableNoticeMailList().addAll(other.noticeMailList);
}
+ if (other.hasMailList()) {
+ getMutableMailList().addAll(other.mailList);
+ }
return this;
}
@@ -392,12 +392,12 @@ public final class GetMailScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
+ retcode = 0;
start = 0;
totalNum = 0;
- retcode = 0;
isEnd = false;
- mailList.clear();
noticeMailList.clear();
+ mailList.clear();
return this;
}
@@ -408,8 +408,8 @@ public final class GetMailScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- mailList.clearQuick();
noticeMailList.clearQuick();
+ mailList.clearQuick();
return this;
}
@@ -423,42 +423,42 @@ public final class GetMailScRspOuterClass {
}
GetMailScRsp other = (GetMailScRsp) o;
return bitField0_ == other.bitField0_
+ && (!hasRetcode() || retcode == other.retcode)
&& (!hasStart() || start == other.start)
&& (!hasTotalNum() || totalNum == other.totalNum)
- && (!hasRetcode() || retcode == other.retcode)
&& (!hasIsEnd() || isEnd == other.isEnd)
- && (!hasMailList() || mailList.equals(other.mailList))
- && (!hasNoticeMailList() || noticeMailList.equals(other.noticeMailList));
+ && (!hasNoticeMailList() || noticeMailList.equals(other.noticeMailList))
+ && (!hasMailList() || mailList.equals(other.mailList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(start);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 40);
- output.writeUInt32NoTag(totalNum);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(retcode);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 24);
+ output.writeUInt32NoTag(start);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 48);
+ output.writeUInt32NoTag(totalNum);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 80);
output.writeBoolNoTag(isEnd);
}
if ((bitField0_ & 0x00000010) != 0) {
- for (int i = 0; i < mailList.length(); i++) {
- output.writeRawByte((byte) 10);
- output.writeMessageNoTag(mailList.get(i));
+ for (int i = 0; i < noticeMailList.length(); i++) {
+ output.writeRawByte((byte) 18);
+ output.writeMessageNoTag(noticeMailList.get(i));
}
}
if ((bitField0_ & 0x00000020) != 0) {
- for (int i = 0; i < noticeMailList.length(); i++) {
- output.writeRawByte((byte) 58);
- output.writeMessageNoTag(noticeMailList.get(i));
+ for (int i = 0; i < mailList.length(); i++) {
+ output.writeRawByte((byte) 106);
+ output.writeMessageNoTag(mailList.get(i));
}
}
}
@@ -467,22 +467,22 @@ public final class GetMailScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(start);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(totalNum);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(start);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(totalNum);
}
if ((bitField0_ & 0x00000008) != 0) {
size += 2;
}
if ((bitField0_ & 0x00000010) != 0) {
- size += (1 * mailList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mailList);
+ size += (1 * noticeMailList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(noticeMailList);
}
if ((bitField0_ & 0x00000020) != 0) {
- size += (1 * noticeMailList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(noticeMailList);
+ size += (1 * mailList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mailList);
}
return size;
}
@@ -494,53 +494,53 @@ public final class GetMailScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
- // start
- start = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 40) {
- break;
- }
- }
- case 40: {
- // totalNum
- totalNum = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 72) {
- break;
- }
- }
- case 72: {
+ case 8: {
// retcode
retcode = input.readUInt32();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 32) {
+ if (tag != 24) {
break;
}
}
- case 32: {
+ case 24: {
+ // start
+ start = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 48) {
+ break;
+ }
+ }
+ case 48: {
+ // totalNum
+ totalNum = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 80) {
+ break;
+ }
+ }
+ case 80: {
// isEnd
isEnd = input.readBool();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 10) {
+ if (tag != 18) {
break;
}
}
- case 10: {
- // mailList
- tag = input.readRepeatedMessage(mailList, tag);
- bitField0_ |= 0x00000010;
- if (tag != 58) {
- break;
- }
- }
- case 58: {
+ case 18: {
// noticeMailList
tag = input.readRepeatedMessage(noticeMailList, tag);
+ bitField0_ |= 0x00000010;
+ if (tag != 106) {
+ break;
+ }
+ }
+ case 106: {
+ // mailList
+ tag = input.readRepeatedMessage(mailList, tag);
bitField0_ |= 0x00000020;
if (tag != 0) {
break;
@@ -564,22 +564,22 @@ public final class GetMailScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.start, start);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.totalNum, totalNum);
+ output.writeUInt32(FieldNames.start, start);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.totalNum, totalNum);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeBool(FieldNames.isEnd, isEnd);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRepeatedMessage(FieldNames.mailList, mailList);
+ output.writeRepeatedMessage(FieldNames.noticeMailList, noticeMailList);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRepeatedMessage(FieldNames.noticeMailList, noticeMailList);
+ output.writeRepeatedMessage(FieldNames.mailList, mailList);
}
output.endObject();
}
@@ -591,11 +591,22 @@ public final class GetMailScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
+ if (!input.trySkipNullValue()) {
+ retcode = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case 109757538: {
if (input.isAtField(FieldNames.start)) {
if (!input.trySkipNullValue()) {
start = input.readUInt32();
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
}
} else {
input.skipUnknownField();
@@ -607,17 +618,6 @@ public final class GetMailScRspOuterClass {
if (input.isAtField(FieldNames.totalNum)) {
if (!input.trySkipNullValue()) {
totalNum = input.readUInt32();
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
- if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -637,11 +637,11 @@ public final class GetMailScRspOuterClass {
}
break;
}
- case -10520843:
- case -308519386: {
- if (input.isAtField(FieldNames.mailList)) {
+ case 17373677:
+ case 1540899199: {
+ if (input.isAtField(FieldNames.noticeMailList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(mailList);
+ input.readRepeatedMessage(noticeMailList);
bitField0_ |= 0x00000010;
}
} else {
@@ -649,11 +649,11 @@ public final class GetMailScRspOuterClass {
}
break;
}
- case 17373677:
- case 1540899199: {
- if (input.isAtField(FieldNames.noticeMailList)) {
+ case -10520843:
+ case -308519386: {
+ if (input.isAtField(FieldNames.mailList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(noticeMailList);
+ input.readRepeatedMessage(mailList);
bitField0_ |= 0x00000020;
}
} else {
@@ -713,17 +713,17 @@ public final class GetMailScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
+ static final FieldName retcode = FieldName.forField("retcode");
+
static final FieldName start = FieldName.forField("start");
static final FieldName totalNum = FieldName.forField("totalNum", "total_num");
- static final FieldName retcode = FieldName.forField("retcode");
-
static final FieldName isEnd = FieldName.forField("isEnd", "is_end");
- static final FieldName mailList = FieldName.forField("mailList", "mail_list");
-
static final FieldName noticeMailList = FieldName.forField("noticeMailList", "notice_mail_list");
+
+ static final FieldName mailList = FieldName.forField("mailList", "mail_list");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java
index a8da158..0a6495f 100644
--- a/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java
@@ -20,17 +20,17 @@ public final class GetMissionStatusCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated uint32 sub_mission_id_list = 2;
+ * repeated uint32 sub_mission_id_list = 6;
*/
private final RepeatedInt subMissionIdList = RepeatedInt.newEmptyInstance();
/**
- * repeated uint32 mission_event_id_list = 8;
+ * repeated uint32 mission_event_id_list = 9;
*/
private final RepeatedInt missionEventIdList = RepeatedInt.newEmptyInstance();
/**
- * repeated uint32 main_mission_id_list = 13;
+ * repeated uint32 main_mission_id_list = 12;
*/
private final RepeatedInt mainMissionIdList = RepeatedInt.newEmptyInstance();
@@ -45,7 +45,7 @@ public final class GetMissionStatusCsReqOuterClass {
}
/**
- * repeated uint32 sub_mission_id_list = 2;
+ * repeated uint32 sub_mission_id_list = 6;
* @return whether the subMissionIdList field is set
*/
public boolean hasSubMissionIdList() {
@@ -53,7 +53,7 @@ public final class GetMissionStatusCsReqOuterClass {
}
/**
- * repeated uint32 sub_mission_id_list = 2;
+ * repeated uint32 sub_mission_id_list = 6;
* @return this
*/
public GetMissionStatusCsReq clearSubMissionIdList() {
@@ -63,7 +63,7 @@ public final class GetMissionStatusCsReqOuterClass {
}
/**
- * repeated uint32 sub_mission_id_list = 2;
+ * repeated uint32 sub_mission_id_list = 6;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -77,7 +77,7 @@ public final class GetMissionStatusCsReqOuterClass {
}
/**
- * repeated uint32 sub_mission_id_list = 2;
+ * repeated uint32 sub_mission_id_list = 6;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -91,7 +91,7 @@ public final class GetMissionStatusCsReqOuterClass {
}
/**
- * repeated uint32 sub_mission_id_list = 2;
+ * repeated uint32 sub_mission_id_list = 6;
* @param value the subMissionIdList to add
* @return this
*/
@@ -102,7 +102,7 @@ public final class GetMissionStatusCsReqOuterClass {
}
/**
- * repeated uint32 sub_mission_id_list = 2;
+ * repeated uint32 sub_mission_id_list = 6;
* @param values the subMissionIdList to add
* @return this
*/
@@ -113,7 +113,7 @@ public final class GetMissionStatusCsReqOuterClass {
}
/**
- * repeated uint32 mission_event_id_list = 8;
+ * repeated uint32 mission_event_id_list = 9;
* @return whether the missionEventIdList field is set
*/
public boolean hasMissionEventIdList() {
@@ -121,7 +121,7 @@ public final class GetMissionStatusCsReqOuterClass {
}
/**
- * repeated uint32 mission_event_id_list = 8;
+ * repeated uint32 mission_event_id_list = 9;
* @return this
*/
public GetMissionStatusCsReq clearMissionEventIdList() {
@@ -131,7 +131,7 @@ public final class GetMissionStatusCsReqOuterClass {
}
/**
- * repeated uint32 mission_event_id_list = 8;
+ * repeated uint32 mission_event_id_list = 9;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -145,7 +145,7 @@ public final class GetMissionStatusCsReqOuterClass {
}
/**
- * repeated uint32 mission_event_id_list = 8;
+ * repeated uint32 mission_event_id_list = 9;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -159,7 +159,7 @@ public final class GetMissionStatusCsReqOuterClass {
}
/**
- * repeated uint32 mission_event_id_list = 8;
+ * repeated uint32 mission_event_id_list = 9;
* @param value the missionEventIdList to add
* @return this
*/
@@ -170,7 +170,7 @@ public final class GetMissionStatusCsReqOuterClass {
}
/**
- * repeated uint32 mission_event_id_list = 8;
+ * repeated uint32 mission_event_id_list = 9;
* @param values the missionEventIdList to add
* @return this
*/
@@ -181,7 +181,7 @@ public final class GetMissionStatusCsReqOuterClass {
}
/**
- * repeated uint32 main_mission_id_list = 13;
+ * repeated uint32 main_mission_id_list = 12;
* @return whether the mainMissionIdList field is set
*/
public boolean hasMainMissionIdList() {
@@ -189,7 +189,7 @@ public final class GetMissionStatusCsReqOuterClass {
}
/**
- * repeated uint32 main_mission_id_list = 13;
+ * repeated uint32 main_mission_id_list = 12;
* @return this
*/
public GetMissionStatusCsReq clearMainMissionIdList() {
@@ -199,7 +199,7 @@ public final class GetMissionStatusCsReqOuterClass {
}
/**
- * repeated uint32 main_mission_id_list = 13;
+ * repeated uint32 main_mission_id_list = 12;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -213,7 +213,7 @@ public final class GetMissionStatusCsReqOuterClass {
}
/**
- * repeated uint32 main_mission_id_list = 13;
+ * repeated uint32 main_mission_id_list = 12;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -227,7 +227,7 @@ public final class GetMissionStatusCsReqOuterClass {
}
/**
- * repeated uint32 main_mission_id_list = 13;
+ * repeated uint32 main_mission_id_list = 12;
* @param value the mainMissionIdList to add
* @return this
*/
@@ -238,7 +238,7 @@ public final class GetMissionStatusCsReqOuterClass {
}
/**
- * repeated uint32 main_mission_id_list = 13;
+ * repeated uint32 main_mission_id_list = 12;
* @param values the mainMissionIdList to add
* @return this
*/
@@ -323,19 +323,19 @@ public final class GetMissionStatusCsReqOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < subMissionIdList.length(); i++) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(subMissionIdList.array()[i]);
}
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < missionEventIdList.length(); i++) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 72);
output.writeUInt32NoTag(missionEventIdList.array()[i]);
}
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < mainMissionIdList.length(); i++) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(mainMissionIdList.array()[i]);
}
}
@@ -363,25 +363,25 @@ public final class GetMissionStatusCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 18: {
+ case 50: {
// subMissionIdList [packed=true]
input.readPackedUInt32(subMissionIdList, tag);
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 66) {
+ if (tag != 74) {
break;
}
}
- case 66: {
+ case 74: {
// missionEventIdList [packed=true]
input.readPackedUInt32(missionEventIdList, tag);
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 106) {
+ if (tag != 98) {
break;
}
}
- case 106: {
+ case 98: {
// mainMissionIdList [packed=true]
input.readPackedUInt32(mainMissionIdList, tag);
bitField0_ |= 0x00000004;
@@ -400,19 +400,19 @@ public final class GetMissionStatusCsReqOuterClass {
tag = input.readTag();
break;
}
- case 16: {
+ case 48: {
// subMissionIdList [packed=false]
tag = input.readRepeatedUInt32(subMissionIdList, tag);
bitField0_ |= 0x00000001;
break;
}
- case 64: {
+ case 72: {
// missionEventIdList [packed=false]
tag = input.readRepeatedUInt32(missionEventIdList, tag);
bitField0_ |= 0x00000002;
break;
}
- case 104: {
+ case 96: {
// mainMissionIdList [packed=false]
tag = input.readRepeatedUInt32(mainMissionIdList, tag);
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/GetMissionStatusScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetMissionStatusScRspOuterClass.java
index 807887a..2cdaff5 100644
--- a/src/generated/main/emu/lunarcore/proto/GetMissionStatusScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetMissionStatusScRspOuterClass.java
@@ -21,35 +21,35 @@ public final class GetMissionStatusScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 2;
+ * optional uint32 retcode = 8;
*/
private int retcode;
/**
- * repeated uint32 unfinished_main_mission_id_list = 9;
- */
- private final RepeatedInt unfinishedMainMissionIdList = RepeatedInt.newEmptyInstance();
-
- /**
- * repeated uint32 disabled_main_mission_id_list = 13;
- */
- private final RepeatedInt disabledMainMissionIdList = RepeatedInt.newEmptyInstance();
-
- /**
- * repeated uint32 finished_main_mission_id_list = 14;
+ * repeated uint32 finished_main_mission_id_list = 6;
*/
private final RepeatedInt finishedMainMissionIdList = RepeatedInt.newEmptyInstance();
/**
- * repeated .Mission sub_mission_status_list = 5;
+ * repeated uint32 disabled_main_mission_id_list = 10;
*/
- private final RepeatedMessagerepeated .Mission mission_event_status_list = 6;
+ * repeated uint32 unfinished_main_mission_id_list = 12;
+ */
+ private final RepeatedInt unfinishedMainMissionIdList = RepeatedInt.newEmptyInstance();
+
+ /**
+ * repeated .Mission mission_event_status_list = 1;
*/
private final RepeatedMessagerepeated .Mission sub_mission_status_list = 14;
+ */
+ private final RepeatedMessageoptional uint32 retcode = 2;
+ * optional uint32 retcode = 8;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -69,7 +69,7 @@ public final class GetMissionStatusScRspOuterClass {
}
/**
- * optional uint32 retcode = 2;
+ * optional uint32 retcode = 8;
* @return this
*/
public GetMissionStatusScRsp clearRetcode() {
@@ -79,7 +79,7 @@ public final class GetMissionStatusScRspOuterClass {
}
/**
- * optional uint32 retcode = 2;
+ * optional uint32 retcode = 8;
* @return the retcode
*/
public int getRetcode() {
@@ -87,7 +87,7 @@ public final class GetMissionStatusScRspOuterClass {
}
/**
- * optional uint32 retcode = 2;
+ * optional uint32 retcode = 8;
* @param value the retcode to set
* @return this
*/
@@ -98,161 +98,25 @@ public final class GetMissionStatusScRspOuterClass {
}
/**
- * repeated uint32 unfinished_main_mission_id_list = 9;
- * @return whether the unfinishedMainMissionIdList field is set
+ * repeated uint32 finished_main_mission_id_list = 6;
+ * @return whether the finishedMainMissionIdList field is set
*/
- public boolean hasUnfinishedMainMissionIdList() {
+ public boolean hasFinishedMainMissionIdList() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * repeated uint32 unfinished_main_mission_id_list = 9;
- * @return this
- */
- public GetMissionStatusScRsp clearUnfinishedMainMissionIdList() {
- bitField0_ &= ~0x00000002;
- unfinishedMainMissionIdList.clear();
- return this;
- }
-
- /**
- * repeated uint32 unfinished_main_mission_id_list = 9;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableUnfinishedMainMissionIdList()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedInt getUnfinishedMainMissionIdList() {
- return unfinishedMainMissionIdList;
- }
-
- /**
- * repeated uint32 unfinished_main_mission_id_list = 9;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedInt getMutableUnfinishedMainMissionIdList() {
- bitField0_ |= 0x00000002;
- return unfinishedMainMissionIdList;
- }
-
- /**
- * repeated uint32 unfinished_main_mission_id_list = 9;
- * @param value the unfinishedMainMissionIdList to add
- * @return this
- */
- public GetMissionStatusScRsp addUnfinishedMainMissionIdList(final int value) {
- bitField0_ |= 0x00000002;
- unfinishedMainMissionIdList.add(value);
- return this;
- }
-
- /**
- * repeated uint32 unfinished_main_mission_id_list = 9;
- * @param values the unfinishedMainMissionIdList to add
- * @return this
- */
- public GetMissionStatusScRsp addAllUnfinishedMainMissionIdList(final int... values) {
- bitField0_ |= 0x00000002;
- unfinishedMainMissionIdList.addAll(values);
- return this;
- }
-
- /**
- * repeated uint32 disabled_main_mission_id_list = 13;
- * @return whether the disabledMainMissionIdList field is set
- */
- public boolean hasDisabledMainMissionIdList() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * repeated uint32 disabled_main_mission_id_list = 13;
- * @return this
- */
- public GetMissionStatusScRsp clearDisabledMainMissionIdList() {
- bitField0_ &= ~0x00000004;
- disabledMainMissionIdList.clear();
- return this;
- }
-
- /**
- * repeated uint32 disabled_main_mission_id_list = 13;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableDisabledMainMissionIdList()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedInt getDisabledMainMissionIdList() {
- return disabledMainMissionIdList;
- }
-
- /**
- * repeated uint32 disabled_main_mission_id_list = 13;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedInt getMutableDisabledMainMissionIdList() {
- bitField0_ |= 0x00000004;
- return disabledMainMissionIdList;
- }
-
- /**
- * repeated uint32 disabled_main_mission_id_list = 13;
- * @param value the disabledMainMissionIdList to add
- * @return this
- */
- public GetMissionStatusScRsp addDisabledMainMissionIdList(final int value) {
- bitField0_ |= 0x00000004;
- disabledMainMissionIdList.add(value);
- return this;
- }
-
- /**
- * repeated uint32 disabled_main_mission_id_list = 13;
- * @param values the disabledMainMissionIdList to add
- * @return this
- */
- public GetMissionStatusScRsp addAllDisabledMainMissionIdList(final int... values) {
- bitField0_ |= 0x00000004;
- disabledMainMissionIdList.addAll(values);
- return this;
- }
-
- /**
- * repeated uint32 finished_main_mission_id_list = 14;
- * @return whether the finishedMainMissionIdList field is set
- */
- public boolean hasFinishedMainMissionIdList() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * repeated uint32 finished_main_mission_id_list = 14;
+ * repeated uint32 finished_main_mission_id_list = 6;
* @return this
*/
public GetMissionStatusScRsp clearFinishedMainMissionIdList() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000002;
finishedMainMissionIdList.clear();
return this;
}
/**
- * repeated uint32 finished_main_mission_id_list = 14;
+ * repeated uint32 finished_main_mission_id_list = 6;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -266,7 +130,7 @@ public final class GetMissionStatusScRspOuterClass {
}
/**
- * repeated uint32 finished_main_mission_id_list = 14;
+ * repeated uint32 finished_main_mission_id_list = 6;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -275,66 +139,66 @@ public final class GetMissionStatusScRspOuterClass {
* @return internal storage object for modifications
*/
public RepeatedInt getMutableFinishedMainMissionIdList() {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000002;
return finishedMainMissionIdList;
}
/**
- * repeated uint32 finished_main_mission_id_list = 14;
+ * repeated uint32 finished_main_mission_id_list = 6;
* @param value the finishedMainMissionIdList to add
* @return this
*/
public GetMissionStatusScRsp addFinishedMainMissionIdList(final int value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000002;
finishedMainMissionIdList.add(value);
return this;
}
/**
- * repeated uint32 finished_main_mission_id_list = 14;
+ * repeated uint32 finished_main_mission_id_list = 6;
* @param values the finishedMainMissionIdList to add
* @return this
*/
public GetMissionStatusScRsp addAllFinishedMainMissionIdList(final int... values) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000002;
finishedMainMissionIdList.addAll(values);
return this;
}
/**
- * repeated .Mission sub_mission_status_list = 5;
- * @return whether the subMissionStatusList field is set
+ * repeated uint32 disabled_main_mission_id_list = 10;
+ * @return whether the disabledMainMissionIdList field is set
*/
- public boolean hasSubMissionStatusList() {
- return (bitField0_ & 0x00000010) != 0;
+ public boolean hasDisabledMainMissionIdList() {
+ return (bitField0_ & 0x00000004) != 0;
}
/**
- * repeated .Mission sub_mission_status_list = 5;
+ * repeated uint32 disabled_main_mission_id_list = 10;
* @return this
*/
- public GetMissionStatusScRsp clearSubMissionStatusList() {
- bitField0_ &= ~0x00000010;
- subMissionStatusList.clear();
+ public GetMissionStatusScRsp clearDisabledMainMissionIdList() {
+ bitField0_ &= ~0x00000004;
+ disabledMainMissionIdList.clear();
return this;
}
/**
- * repeated .Mission sub_mission_status_list = 5;
+ * repeated uint32 disabled_main_mission_id_list = 10;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
*
- * Use {@link #getMutableSubMissionStatusList()} if you want to modify it.
+ * Use {@link #getMutableDisabledMainMissionIdList()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public RepeatedMessagerepeated .Mission sub_mission_status_list = 5;
+ * repeated uint32 disabled_main_mission_id_list = 10;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -342,54 +206,121 @@ public final class GetMissionStatusScRspOuterClass {
*
* @return internal storage object for modifications
*/
- public RepeatedMessagerepeated .Mission sub_mission_status_list = 5;
- * @param value the subMissionStatusList to add
+ * repeated uint32 disabled_main_mission_id_list = 10;
+ * @param value the disabledMainMissionIdList to add
* @return this
*/
- public GetMissionStatusScRsp addSubMissionStatusList(final MissionOuterClass.Mission value) {
- bitField0_ |= 0x00000010;
- subMissionStatusList.add(value);
+ public GetMissionStatusScRsp addDisabledMainMissionIdList(final int value) {
+ bitField0_ |= 0x00000004;
+ disabledMainMissionIdList.add(value);
return this;
}
/**
- * repeated .Mission sub_mission_status_list = 5;
- * @param values the subMissionStatusList to add
+ * repeated uint32 disabled_main_mission_id_list = 10;
+ * @param values the disabledMainMissionIdList to add
* @return this
*/
- public GetMissionStatusScRsp addAllSubMissionStatusList(
- final MissionOuterClass.Mission... values) {
- bitField0_ |= 0x00000010;
- subMissionStatusList.addAll(values);
+ public GetMissionStatusScRsp addAllDisabledMainMissionIdList(final int... values) {
+ bitField0_ |= 0x00000004;
+ disabledMainMissionIdList.addAll(values);
return this;
}
/**
- * repeated .Mission mission_event_status_list = 6;
+ * repeated uint32 unfinished_main_mission_id_list = 12;
+ * @return whether the unfinishedMainMissionIdList field is set
+ */
+ public boolean hasUnfinishedMainMissionIdList() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * repeated uint32 unfinished_main_mission_id_list = 12;
+ * @return this
+ */
+ public GetMissionStatusScRsp clearUnfinishedMainMissionIdList() {
+ bitField0_ &= ~0x00000008;
+ unfinishedMainMissionIdList.clear();
+ return this;
+ }
+
+ /**
+ * repeated uint32 unfinished_main_mission_id_list = 12;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableUnfinishedMainMissionIdList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedInt getUnfinishedMainMissionIdList() {
+ return unfinishedMainMissionIdList;
+ }
+
+ /**
+ * repeated uint32 unfinished_main_mission_id_list = 12;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedInt getMutableUnfinishedMainMissionIdList() {
+ bitField0_ |= 0x00000008;
+ return unfinishedMainMissionIdList;
+ }
+
+ /**
+ * repeated uint32 unfinished_main_mission_id_list = 12;
+ * @param value the unfinishedMainMissionIdList to add
+ * @return this
+ */
+ public GetMissionStatusScRsp addUnfinishedMainMissionIdList(final int value) {
+ bitField0_ |= 0x00000008;
+ unfinishedMainMissionIdList.add(value);
+ return this;
+ }
+
+ /**
+ * repeated uint32 unfinished_main_mission_id_list = 12;
+ * @param values the unfinishedMainMissionIdList to add
+ * @return this
+ */
+ public GetMissionStatusScRsp addAllUnfinishedMainMissionIdList(final int... values) {
+ bitField0_ |= 0x00000008;
+ unfinishedMainMissionIdList.addAll(values);
+ return this;
+ }
+
+ /**
+ * repeated .Mission mission_event_status_list = 1;
* @return whether the missionEventStatusList field is set
*/
public boolean hasMissionEventStatusList() {
- return (bitField0_ & 0x00000020) != 0;
+ return (bitField0_ & 0x00000010) != 0;
}
/**
- * repeated .Mission mission_event_status_list = 6;
+ * repeated .Mission mission_event_status_list = 1;
* @return this
*/
public GetMissionStatusScRsp clearMissionEventStatusList() {
- bitField0_ &= ~0x00000020;
+ bitField0_ &= ~0x00000010;
missionEventStatusList.clear();
return this;
}
/**
- * repeated .Mission mission_event_status_list = 6;
+ * repeated .Mission mission_event_status_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.
@@ -403,7 +334,7 @@ public final class GetMissionStatusScRspOuterClass {
}
/**
- * repeated .Mission mission_event_status_list = 6;
+ * repeated .Mission mission_event_status_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
@@ -412,44 +343,113 @@ public final class GetMissionStatusScRspOuterClass {
* @return internal storage object for modifications
*/
public RepeatedMessagerepeated .Mission mission_event_status_list = 6;
+ * repeated .Mission mission_event_status_list = 1;
* @param value the missionEventStatusList to add
* @return this
*/
public GetMissionStatusScRsp addMissionEventStatusList(final MissionOuterClass.Mission value) {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
missionEventStatusList.add(value);
return this;
}
/**
- * repeated .Mission mission_event_status_list = 6;
+ * repeated .Mission mission_event_status_list = 1;
* @param values the missionEventStatusList to add
* @return this
*/
public GetMissionStatusScRsp addAllMissionEventStatusList(
final MissionOuterClass.Mission... values) {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
missionEventStatusList.addAll(values);
return this;
}
+ /**
+ * repeated .Mission sub_mission_status_list = 14;
+ * @return whether the subMissionStatusList field is set
+ */
+ public boolean hasSubMissionStatusList() {
+ return (bitField0_ & 0x00000020) != 0;
+ }
+
+ /**
+ * repeated .Mission sub_mission_status_list = 14;
+ * @return this
+ */
+ public GetMissionStatusScRsp clearSubMissionStatusList() {
+ bitField0_ &= ~0x00000020;
+ subMissionStatusList.clear();
+ return this;
+ }
+
+ /**
+ * repeated .Mission sub_mission_status_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 #getMutableSubMissionStatusList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedMessagerepeated .Mission sub_mission_status_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 RepeatedMessagerepeated .Mission sub_mission_status_list = 14;
+ * @param value the subMissionStatusList to add
+ * @return this
+ */
+ public GetMissionStatusScRsp addSubMissionStatusList(final MissionOuterClass.Mission value) {
+ bitField0_ |= 0x00000020;
+ subMissionStatusList.add(value);
+ return this;
+ }
+
+ /**
+ * repeated .Mission sub_mission_status_list = 14;
+ * @param values the subMissionStatusList to add
+ * @return this
+ */
+ public GetMissionStatusScRsp addAllSubMissionStatusList(
+ final MissionOuterClass.Mission... values) {
+ bitField0_ |= 0x00000020;
+ subMissionStatusList.addAll(values);
+ return this;
+ }
+
@Override
public GetMissionStatusScRsp copyFrom(final GetMissionStatusScRsp other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
retcode = other.retcode;
- unfinishedMainMissionIdList.copyFrom(other.unfinishedMainMissionIdList);
- disabledMainMissionIdList.copyFrom(other.disabledMainMissionIdList);
finishedMainMissionIdList.copyFrom(other.finishedMainMissionIdList);
- subMissionStatusList.copyFrom(other.subMissionStatusList);
+ disabledMainMissionIdList.copyFrom(other.disabledMainMissionIdList);
+ unfinishedMainMissionIdList.copyFrom(other.unfinishedMainMissionIdList);
missionEventStatusList.copyFrom(other.missionEventStatusList);
+ subMissionStatusList.copyFrom(other.subMissionStatusList);
}
return this;
}
@@ -463,21 +463,21 @@ public final class GetMissionStatusScRspOuterClass {
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
- if (other.hasUnfinishedMainMissionIdList()) {
- getMutableUnfinishedMainMissionIdList().addAll(other.unfinishedMainMissionIdList);
+ if (other.hasFinishedMainMissionIdList()) {
+ getMutableFinishedMainMissionIdList().addAll(other.finishedMainMissionIdList);
}
if (other.hasDisabledMainMissionIdList()) {
getMutableDisabledMainMissionIdList().addAll(other.disabledMainMissionIdList);
}
- if (other.hasFinishedMainMissionIdList()) {
- getMutableFinishedMainMissionIdList().addAll(other.finishedMainMissionIdList);
- }
- if (other.hasSubMissionStatusList()) {
- getMutableSubMissionStatusList().addAll(other.subMissionStatusList);
+ if (other.hasUnfinishedMainMissionIdList()) {
+ getMutableUnfinishedMainMissionIdList().addAll(other.unfinishedMainMissionIdList);
}
if (other.hasMissionEventStatusList()) {
getMutableMissionEventStatusList().addAll(other.missionEventStatusList);
}
+ if (other.hasSubMissionStatusList()) {
+ getMutableSubMissionStatusList().addAll(other.subMissionStatusList);
+ }
return this;
}
@@ -489,11 +489,11 @@ public final class GetMissionStatusScRspOuterClass {
cachedSize = -1;
bitField0_ = 0;
retcode = 0;
- unfinishedMainMissionIdList.clear();
- disabledMainMissionIdList.clear();
finishedMainMissionIdList.clear();
- subMissionStatusList.clear();
+ disabledMainMissionIdList.clear();
+ unfinishedMainMissionIdList.clear();
missionEventStatusList.clear();
+ subMissionStatusList.clear();
return this;
}
@@ -504,11 +504,11 @@ public final class GetMissionStatusScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- unfinishedMainMissionIdList.clear();
- disabledMainMissionIdList.clear();
finishedMainMissionIdList.clear();
- subMissionStatusList.clearQuick();
+ disabledMainMissionIdList.clear();
+ unfinishedMainMissionIdList.clear();
missionEventStatusList.clearQuick();
+ subMissionStatusList.clearQuick();
return this;
}
@@ -523,47 +523,47 @@ public final class GetMissionStatusScRspOuterClass {
GetMissionStatusScRsp other = (GetMissionStatusScRsp) o;
return bitField0_ == other.bitField0_
&& (!hasRetcode() || retcode == other.retcode)
- && (!hasUnfinishedMainMissionIdList() || unfinishedMainMissionIdList.equals(other.unfinishedMainMissionIdList))
- && (!hasDisabledMainMissionIdList() || disabledMainMissionIdList.equals(other.disabledMainMissionIdList))
&& (!hasFinishedMainMissionIdList() || finishedMainMissionIdList.equals(other.finishedMainMissionIdList))
- && (!hasSubMissionStatusList() || subMissionStatusList.equals(other.subMissionStatusList))
- && (!hasMissionEventStatusList() || missionEventStatusList.equals(other.missionEventStatusList));
+ && (!hasDisabledMainMissionIdList() || disabledMainMissionIdList.equals(other.disabledMainMissionIdList))
+ && (!hasUnfinishedMainMissionIdList() || unfinishedMainMissionIdList.equals(other.unfinishedMainMissionIdList))
+ && (!hasMissionEventStatusList() || missionEventStatusList.equals(other.missionEventStatusList))
+ && (!hasSubMissionStatusList() || subMissionStatusList.equals(other.subMissionStatusList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- for (int i = 0; i < unfinishedMainMissionIdList.length(); i++) {
- output.writeRawByte((byte) 72);
- output.writeUInt32NoTag(unfinishedMainMissionIdList.array()[i]);
+ for (int i = 0; i < finishedMainMissionIdList.length(); i++) {
+ output.writeRawByte((byte) 48);
+ output.writeUInt32NoTag(finishedMainMissionIdList.array()[i]);
}
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < disabledMainMissionIdList.length(); i++) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(disabledMainMissionIdList.array()[i]);
}
}
if ((bitField0_ & 0x00000008) != 0) {
- for (int i = 0; i < finishedMainMissionIdList.length(); i++) {
- output.writeRawByte((byte) 112);
- output.writeUInt32NoTag(finishedMainMissionIdList.array()[i]);
+ for (int i = 0; i < unfinishedMainMissionIdList.length(); i++) {
+ output.writeRawByte((byte) 96);
+ output.writeUInt32NoTag(unfinishedMainMissionIdList.array()[i]);
}
}
if ((bitField0_ & 0x00000010) != 0) {
- for (int i = 0; i < subMissionStatusList.length(); i++) {
- output.writeRawByte((byte) 42);
- output.writeMessageNoTag(subMissionStatusList.get(i));
+ for (int i = 0; i < missionEventStatusList.length(); i++) {
+ output.writeRawByte((byte) 10);
+ output.writeMessageNoTag(missionEventStatusList.get(i));
}
}
if ((bitField0_ & 0x00000020) != 0) {
- for (int i = 0; i < missionEventStatusList.length(); i++) {
- output.writeRawByte((byte) 50);
- output.writeMessageNoTag(missionEventStatusList.get(i));
+ for (int i = 0; i < subMissionStatusList.length(); i++) {
+ output.writeRawByte((byte) 114);
+ output.writeMessageNoTag(subMissionStatusList.get(i));
}
}
}
@@ -575,19 +575,19 @@ public final class GetMissionStatusScRspOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += (1 * unfinishedMainMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unfinishedMainMissionIdList);
+ size += (1 * finishedMainMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(finishedMainMissionIdList);
}
if ((bitField0_ & 0x00000004) != 0) {
size += (1 * disabledMainMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(disabledMainMissionIdList);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += (1 * finishedMainMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(finishedMainMissionIdList);
+ size += (1 * unfinishedMainMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unfinishedMainMissionIdList);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += (1 * subMissionStatusList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(subMissionStatusList);
+ size += (1 * missionEventStatusList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(missionEventStatusList);
}
if ((bitField0_ & 0x00000020) != 0) {
- size += (1 * missionEventStatusList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(missionEventStatusList);
+ size += (1 * subMissionStatusList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(subMissionStatusList);
}
return size;
}
@@ -599,53 +599,53 @@ public final class GetMissionStatusScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
+ case 64: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 74) {
- break;
- }
- }
- case 74: {
- // unfinishedMainMissionIdList [packed=true]
- input.readPackedUInt32(unfinishedMainMissionIdList, tag);
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 106) {
- break;
- }
- }
- case 106: {
- // disabledMainMissionIdList [packed=true]
- input.readPackedUInt32(disabledMainMissionIdList, tag);
- bitField0_ |= 0x00000004;
- tag = input.readTag();
- if (tag != 114) {
- break;
- }
- }
- case 114: {
- // finishedMainMissionIdList [packed=true]
- input.readPackedUInt32(finishedMainMissionIdList, tag);
- bitField0_ |= 0x00000008;
- tag = input.readTag();
- if (tag != 42) {
- break;
- }
- }
- case 42: {
- // subMissionStatusList
- tag = input.readRepeatedMessage(subMissionStatusList, tag);
- bitField0_ |= 0x00000010;
if (tag != 50) {
break;
}
}
case 50: {
+ // finishedMainMissionIdList [packed=true]
+ input.readPackedUInt32(finishedMainMissionIdList, tag);
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 82) {
+ break;
+ }
+ }
+ case 82: {
+ // disabledMainMissionIdList [packed=true]
+ input.readPackedUInt32(disabledMainMissionIdList, tag);
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 98) {
+ break;
+ }
+ }
+ case 98: {
+ // unfinishedMainMissionIdList [packed=true]
+ input.readPackedUInt32(unfinishedMainMissionIdList, tag);
+ bitField0_ |= 0x00000008;
+ tag = input.readTag();
+ if (tag != 10) {
+ break;
+ }
+ }
+ case 10: {
// missionEventStatusList
tag = input.readRepeatedMessage(missionEventStatusList, tag);
+ bitField0_ |= 0x00000010;
+ if (tag != 114) {
+ break;
+ }
+ }
+ case 114: {
+ // subMissionStatusList
+ tag = input.readRepeatedMessage(subMissionStatusList, tag);
bitField0_ |= 0x00000020;
if (tag != 0) {
break;
@@ -661,21 +661,21 @@ public final class GetMissionStatusScRspOuterClass {
tag = input.readTag();
break;
}
- case 72: {
- // unfinishedMainMissionIdList [packed=false]
- tag = input.readRepeatedUInt32(unfinishedMainMissionIdList, tag);
+ case 48: {
+ // finishedMainMissionIdList [packed=false]
+ tag = input.readRepeatedUInt32(finishedMainMissionIdList, tag);
bitField0_ |= 0x00000002;
break;
}
- case 104: {
+ case 80: {
// disabledMainMissionIdList [packed=false]
tag = input.readRepeatedUInt32(disabledMainMissionIdList, tag);
bitField0_ |= 0x00000004;
break;
}
- case 112: {
- // finishedMainMissionIdList [packed=false]
- tag = input.readRepeatedUInt32(finishedMainMissionIdList, tag);
+ case 96: {
+ // unfinishedMainMissionIdList [packed=false]
+ tag = input.readRepeatedUInt32(unfinishedMainMissionIdList, tag);
bitField0_ |= 0x00000008;
break;
}
@@ -690,19 +690,19 @@ public final class GetMissionStatusScRspOuterClass {
output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRepeatedUInt32(FieldNames.unfinishedMainMissionIdList, unfinishedMainMissionIdList);
+ output.writeRepeatedUInt32(FieldNames.finishedMainMissionIdList, finishedMainMissionIdList);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRepeatedUInt32(FieldNames.disabledMainMissionIdList, disabledMainMissionIdList);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRepeatedUInt32(FieldNames.finishedMainMissionIdList, finishedMainMissionIdList);
+ output.writeRepeatedUInt32(FieldNames.unfinishedMainMissionIdList, unfinishedMainMissionIdList);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRepeatedMessage(FieldNames.subMissionStatusList, subMissionStatusList);
+ output.writeRepeatedMessage(FieldNames.missionEventStatusList, missionEventStatusList);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRepeatedMessage(FieldNames.missionEventStatusList, missionEventStatusList);
+ output.writeRepeatedMessage(FieldNames.subMissionStatusList, subMissionStatusList);
}
output.endObject();
}
@@ -725,11 +725,11 @@ public final class GetMissionStatusScRspOuterClass {
}
break;
}
- case 61133057:
- case 1704637629: {
- if (input.isAtField(FieldNames.unfinishedMainMissionIdList)) {
+ case 104231290:
+ case -1929023306: {
+ if (input.isAtField(FieldNames.finishedMainMissionIdList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedUInt32(unfinishedMainMissionIdList);
+ input.readRepeatedUInt32(finishedMainMissionIdList);
bitField0_ |= 0x00000002;
}
} else {
@@ -749,11 +749,11 @@ public final class GetMissionStatusScRspOuterClass {
}
break;
}
- case 104231290:
- case -1929023306: {
- if (input.isAtField(FieldNames.finishedMainMissionIdList)) {
+ case 61133057:
+ case 1704637629: {
+ if (input.isAtField(FieldNames.unfinishedMainMissionIdList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedUInt32(finishedMainMissionIdList);
+ input.readRepeatedUInt32(unfinishedMainMissionIdList);
bitField0_ |= 0x00000008;
}
} else {
@@ -761,23 +761,23 @@ public final class GetMissionStatusScRspOuterClass {
}
break;
}
- case -1842850820:
- case 1165580825: {
- if (input.isAtField(FieldNames.subMissionStatusList)) {
- if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(subMissionStatusList);
- bitField0_ |= 0x00000010;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 582053566:
case 1494751923: {
if (input.isAtField(FieldNames.missionEventStatusList)) {
if (!input.trySkipNullValue()) {
input.readRepeatedMessage(missionEventStatusList);
+ bitField0_ |= 0x00000010;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -1842850820:
+ case 1165580825: {
+ if (input.isAtField(FieldNames.subMissionStatusList)) {
+ if (!input.trySkipNullValue()) {
+ input.readRepeatedMessage(subMissionStatusList);
bitField0_ |= 0x00000020;
}
} else {
@@ -840,15 +840,15 @@ public final class GetMissionStatusScRspOuterClass {
static class FieldNames {
static final FieldName retcode = FieldName.forField("retcode");
- static final FieldName unfinishedMainMissionIdList = FieldName.forField("unfinishedMainMissionIdList", "unfinished_main_mission_id_list");
+ static final FieldName finishedMainMissionIdList = FieldName.forField("finishedMainMissionIdList", "finished_main_mission_id_list");
static final FieldName disabledMainMissionIdList = FieldName.forField("disabledMainMissionIdList", "disabled_main_mission_id_list");
- static final FieldName finishedMainMissionIdList = FieldName.forField("finishedMainMissionIdList", "finished_main_mission_id_list");
-
- static final FieldName subMissionStatusList = FieldName.forField("subMissionStatusList", "sub_mission_status_list");
+ static final FieldName unfinishedMainMissionIdList = FieldName.forField("unfinishedMainMissionIdList", "unfinished_main_mission_id_list");
static final FieldName missionEventStatusList = FieldName.forField("missionEventStatusList", "mission_event_status_list");
+
+ static final FieldName subMissionStatusList = FieldName.forField("subMissionStatusList", "sub_mission_status_list");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardCsReqOuterClass.java
index 56d92ea..6d69f06 100644
--- a/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class GetNpcTakenRewardCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 npc_id = 3;
+ * optional uint32 npc_id = 5;
*/
private int npcId;
@@ -34,7 +34,7 @@ public final class GetNpcTakenRewardCsReqOuterClass {
}
/**
- * optional uint32 npc_id = 3;
+ * optional uint32 npc_id = 5;
* @return whether the npcId field is set
*/
public boolean hasNpcId() {
@@ -42,7 +42,7 @@ public final class GetNpcTakenRewardCsReqOuterClass {
}
/**
- * optional uint32 npc_id = 3;
+ * optional uint32 npc_id = 5;
* @return this
*/
public GetNpcTakenRewardCsReq clearNpcId() {
@@ -52,7 +52,7 @@ public final class GetNpcTakenRewardCsReqOuterClass {
}
/**
- * optional uint32 npc_id = 3;
+ * optional uint32 npc_id = 5;
* @return the npcId
*/
public int getNpcId() {
@@ -60,7 +60,7 @@ public final class GetNpcTakenRewardCsReqOuterClass {
}
/**
- * optional uint32 npc_id = 3;
+ * optional uint32 npc_id = 5;
* @param value the npcId to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class GetNpcTakenRewardCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(npcId);
}
}
@@ -150,7 +150,7 @@ public final class GetNpcTakenRewardCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
+ case 40: {
// npcId
npcId = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardScRspOuterClass.java
index 82ec527..c3f6707 100644
--- a/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardScRspOuterClass.java
@@ -10,7 +10,6 @@ import us.hebi.quickbuf.MessageFactory;
import us.hebi.quickbuf.ProtoMessage;
import us.hebi.quickbuf.ProtoSink;
import us.hebi.quickbuf.ProtoSource;
-import us.hebi.quickbuf.RepeatedInt;
public final class GetNpcTakenRewardScRspOuterClass {
/**
@@ -20,19 +19,14 @@ public final class GetNpcTakenRewardScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 npc_id = 5;
- */
- private int npcId;
-
- /**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 3;
*/
private int retcode;
/**
- * repeated uint32 GGJBDJJGNIG = 7;
+ * optional uint32 npc_id = 8;
*/
- private final RepeatedInt gGJBDJJGNIG = RepeatedInt.newEmptyInstance();
+ private int npcId;
private GetNpcTakenRewardScRsp() {
}
@@ -45,62 +39,25 @@ public final class GetNpcTakenRewardScRspOuterClass {
}
/**
- * optional uint32 npc_id = 5;
- * @return whether the npcId field is set
+ * optional uint32 retcode = 3;
+ * @return whether the retcode field is set
*/
- public boolean hasNpcId() {
+ public boolean hasRetcode() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 npc_id = 5;
- * @return this
- */
- public GetNpcTakenRewardScRsp clearNpcId() {
- bitField0_ &= ~0x00000001;
- npcId = 0;
- return this;
- }
-
- /**
- * optional uint32 npc_id = 5;
- * @return the npcId
- */
- public int getNpcId() {
- return npcId;
- }
-
- /**
- * optional uint32 npc_id = 5;
- * @param value the npcId to set
- * @return this
- */
- public GetNpcTakenRewardScRsp setNpcId(final int value) {
- bitField0_ |= 0x00000001;
- npcId = value;
- return this;
- }
-
- /**
- * optional uint32 retcode = 8;
- * @return whether the retcode field is set
- */
- public boolean hasRetcode() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 3;
* @return this
*/
public GetNpcTakenRewardScRsp clearRetcode() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
retcode = 0;
return this;
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 3;
* @return the retcode
*/
public int getRetcode() {
@@ -108,81 +65,50 @@ public final class GetNpcTakenRewardScRspOuterClass {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 3;
* @param value the retcode to set
* @return this
*/
public GetNpcTakenRewardScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
retcode = value;
return this;
}
/**
- * repeated uint32 GGJBDJJGNIG = 7;
- * @return whether the gGJBDJJGNIG field is set
+ * optional uint32 npc_id = 8;
+ * @return whether the npcId field is set
*/
- public boolean hasGGJBDJJGNIG() {
- return (bitField0_ & 0x00000004) != 0;
+ public boolean hasNpcId() {
+ return (bitField0_ & 0x00000002) != 0;
}
/**
- * repeated uint32 GGJBDJJGNIG = 7;
+ * optional uint32 npc_id = 8;
* @return this
*/
- public GetNpcTakenRewardScRsp clearGGJBDJJGNIG() {
- bitField0_ &= ~0x00000004;
- gGJBDJJGNIG.clear();
+ public GetNpcTakenRewardScRsp clearNpcId() {
+ bitField0_ &= ~0x00000002;
+ npcId = 0;
return this;
}
/**
- * repeated uint32 GGJBDJJGNIG = 7;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableGGJBDJJGNIG()} if you want to modify it.
- *
- * @return internal storage object for reading
+ * optional uint32 npc_id = 8;
+ * @return the npcId
*/
- public RepeatedInt getGGJBDJJGNIG() {
- return gGJBDJJGNIG;
+ public int getNpcId() {
+ return npcId;
}
/**
- * repeated uint32 GGJBDJJGNIG = 7;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedInt getMutableGGJBDJJGNIG() {
- bitField0_ |= 0x00000004;
- return gGJBDJJGNIG;
- }
-
- /**
- * repeated uint32 GGJBDJJGNIG = 7;
- * @param value the gGJBDJJGNIG to add
+ * optional uint32 npc_id = 8;
+ * @param value the npcId to set
* @return this
*/
- public GetNpcTakenRewardScRsp addGGJBDJJGNIG(final int value) {
- bitField0_ |= 0x00000004;
- gGJBDJJGNIG.add(value);
- return this;
- }
-
- /**
- * repeated uint32 GGJBDJJGNIG = 7;
- * @param values the gGJBDJJGNIG to add
- * @return this
- */
- public GetNpcTakenRewardScRsp addAllGGJBDJJGNIG(final int... values) {
- bitField0_ |= 0x00000004;
- gGJBDJJGNIG.addAll(values);
+ public GetNpcTakenRewardScRsp setNpcId(final int value) {
+ bitField0_ |= 0x00000002;
+ npcId = value;
return this;
}
@@ -191,9 +117,8 @@ public final class GetNpcTakenRewardScRspOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- npcId = other.npcId;
retcode = other.retcode;
- gGJBDJJGNIG.copyFrom(other.gGJBDJJGNIG);
+ npcId = other.npcId;
}
return this;
}
@@ -204,14 +129,11 @@ public final class GetNpcTakenRewardScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasNpcId()) {
- setNpcId(other.npcId);
- }
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
- if (other.hasGGJBDJJGNIG()) {
- getMutableGGJBDJJGNIG().addAll(other.gGJBDJJGNIG);
+ if (other.hasNpcId()) {
+ setNpcId(other.npcId);
}
return this;
}
@@ -223,9 +145,8 @@ public final class GetNpcTakenRewardScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- npcId = 0;
retcode = 0;
- gGJBDJJGNIG.clear();
+ npcId = 0;
return this;
}
@@ -236,7 +157,6 @@ public final class GetNpcTakenRewardScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- gGJBDJJGNIG.clear();
return this;
}
@@ -250,26 +170,19 @@ public final class GetNpcTakenRewardScRspOuterClass {
}
GetNpcTakenRewardScRsp other = (GetNpcTakenRewardScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasNpcId() || npcId == other.npcId)
&& (!hasRetcode() || retcode == other.retcode)
- && (!hasGGJBDJJGNIG() || gGJBDJJGNIG.equals(other.gGJBDJJGNIG));
+ && (!hasNpcId() || npcId == other.npcId);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
- output.writeUInt32NoTag(npcId);
+ output.writeRawByte((byte) 24);
+ output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 64);
- output.writeUInt32NoTag(retcode);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- for (int i = 0; i < gGJBDJJGNIG.length(); i++) {
- output.writeRawByte((byte) 56);
- output.writeUInt32NoTag(gGJBDJJGNIG.array()[i]);
- }
+ output.writeUInt32NoTag(npcId);
}
}
@@ -277,13 +190,10 @@ public final class GetNpcTakenRewardScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(npcId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
- if ((bitField0_ & 0x00000004) != 0) {
- size += (1 * gGJBDJJGNIG.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(gGJBDJJGNIG);
+ if ((bitField0_ & 0x00000002) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(npcId);
}
return size;
}
@@ -295,9 +205,9 @@ public final class GetNpcTakenRewardScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
- // npcId
- npcId = input.readUInt32();
+ case 24: {
+ // retcode
+ retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
if (tag != 64) {
@@ -305,19 +215,10 @@ public final class GetNpcTakenRewardScRspOuterClass {
}
}
case 64: {
- // retcode
- retcode = input.readUInt32();
+ // npcId
+ npcId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 58) {
- break;
- }
- }
- case 58: {
- // gGJBDJJGNIG [packed=true]
- input.readPackedUInt32(gGJBDJJGNIG, tag);
- bitField0_ |= 0x00000004;
- tag = input.readTag();
if (tag != 0) {
break;
}
@@ -332,12 +233,6 @@ public final class GetNpcTakenRewardScRspOuterClass {
tag = input.readTag();
break;
}
- case 56: {
- // gGJBDJJGNIG [packed=false]
- tag = input.readRepeatedUInt32(gGJBDJJGNIG, tag);
- bitField0_ |= 0x00000004;
- break;
- }
}
}
}
@@ -346,13 +241,10 @@ public final class GetNpcTakenRewardScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.npcId, npcId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.retcode, retcode);
}
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRepeatedUInt32(FieldNames.gGJBDJJGNIG, gGJBDJJGNIG);
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeUInt32(FieldNames.npcId, npcId);
}
output.endObject();
}
@@ -364,11 +256,10 @@ public final class GetNpcTakenRewardScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 105021404:
- case -1039282375: {
- if (input.isAtField(FieldNames.npcId)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- npcId = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -376,10 +267,11 @@ public final class GetNpcTakenRewardScRspOuterClass {
}
break;
}
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case 105021404:
+ case -1039282375: {
+ if (input.isAtField(FieldNames.npcId)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ npcId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -387,17 +279,6 @@ public final class GetNpcTakenRewardScRspOuterClass {
}
break;
}
- case 1061434801: {
- if (input.isAtField(FieldNames.gGJBDJJGNIG)) {
- if (!input.trySkipNullValue()) {
- input.readRepeatedUInt32(gGJBDJJGNIG);
- bitField0_ |= 0x00000004;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
default: {
input.skipUnknownField();
break;
@@ -451,11 +332,9 @@ public final class GetNpcTakenRewardScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName npcId = FieldName.forField("npcId", "npc_id");
-
static final FieldName retcode = FieldName.forField("retcode");
- static final FieldName gGJBDJJGNIG = FieldName.forField("GGJBDJJGNIG");
+ static final FieldName npcId = FieldName.forField("npcId", "npc_id");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/GetPhoneDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPhoneDataScRspOuterClass.java
index 2dbe8d5..673d7e0 100644
--- a/src/generated/main/emu/lunarcore/proto/GetPhoneDataScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetPhoneDataScRspOuterClass.java
@@ -20,30 +20,30 @@ public final class GetPhoneDataScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 cur_phone_theme = 3;
+ * optional uint32 cur_phone_theme = 4;
*/
private int curPhoneTheme;
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 10;
*/
private int retcode;
/**
- * optional uint32 cur_chat_bubble = 13;
+ * optional uint32 cur_chat_bubble = 15;
*/
private int curChatBubble;
/**
- * repeated uint32 owned_phone_themes = 1;
- */
- private final RepeatedInt ownedPhoneThemes = RepeatedInt.newEmptyInstance();
-
- /**
- * repeated uint32 owned_chat_bubbles = 15;
+ * repeated uint32 owned_chat_bubbles = 6;
*/
private final RepeatedInt ownedChatBubbles = RepeatedInt.newEmptyInstance();
+ /**
+ * repeated uint32 owned_phone_themes = 7;
+ */
+ private final RepeatedInt ownedPhoneThemes = RepeatedInt.newEmptyInstance();
+
private GetPhoneDataScRsp() {
}
@@ -55,7 +55,7 @@ public final class GetPhoneDataScRspOuterClass {
}
/**
- * optional uint32 cur_phone_theme = 3;
+ * optional uint32 cur_phone_theme = 4;
* @return whether the curPhoneTheme field is set
*/
public boolean hasCurPhoneTheme() {
@@ -63,7 +63,7 @@ public final class GetPhoneDataScRspOuterClass {
}
/**
- * optional uint32 cur_phone_theme = 3;
+ * optional uint32 cur_phone_theme = 4;
* @return this
*/
public GetPhoneDataScRsp clearCurPhoneTheme() {
@@ -73,7 +73,7 @@ public final class GetPhoneDataScRspOuterClass {
}
/**
- * optional uint32 cur_phone_theme = 3;
+ * optional uint32 cur_phone_theme = 4;
* @return the curPhoneTheme
*/
public int getCurPhoneTheme() {
@@ -81,7 +81,7 @@ public final class GetPhoneDataScRspOuterClass {
}
/**
- * optional uint32 cur_phone_theme = 3;
+ * optional uint32 cur_phone_theme = 4;
* @param value the curPhoneTheme to set
* @return this
*/
@@ -92,7 +92,7 @@ public final class GetPhoneDataScRspOuterClass {
}
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 10;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -100,7 +100,7 @@ public final class GetPhoneDataScRspOuterClass {
}
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 10;
* @return this
*/
public GetPhoneDataScRsp clearRetcode() {
@@ -110,7 +110,7 @@ public final class GetPhoneDataScRspOuterClass {
}
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 10;
* @return the retcode
*/
public int getRetcode() {
@@ -118,7 +118,7 @@ public final class GetPhoneDataScRspOuterClass {
}
/**
- * optional uint32 retcode = 6;
+ * optional uint32 retcode = 10;
* @param value the retcode to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class GetPhoneDataScRspOuterClass {
}
/**
- * optional uint32 cur_chat_bubble = 13;
+ * optional uint32 cur_chat_bubble = 15;
* @return whether the curChatBubble field is set
*/
public boolean hasCurChatBubble() {
@@ -137,7 +137,7 @@ public final class GetPhoneDataScRspOuterClass {
}
/**
- * optional uint32 cur_chat_bubble = 13;
+ * optional uint32 cur_chat_bubble = 15;
* @return this
*/
public GetPhoneDataScRsp clearCurChatBubble() {
@@ -147,7 +147,7 @@ public final class GetPhoneDataScRspOuterClass {
}
/**
- * optional uint32 cur_chat_bubble = 13;
+ * optional uint32 cur_chat_bubble = 15;
* @return the curChatBubble
*/
public int getCurChatBubble() {
@@ -155,7 +155,7 @@ public final class GetPhoneDataScRspOuterClass {
}
/**
- * optional uint32 cur_chat_bubble = 13;
+ * optional uint32 cur_chat_bubble = 15;
* @param value the curChatBubble to set
* @return this
*/
@@ -166,93 +166,25 @@ public final class GetPhoneDataScRspOuterClass {
}
/**
- * repeated uint32 owned_phone_themes = 1;
- * @return whether the ownedPhoneThemes field is set
+ * repeated uint32 owned_chat_bubbles = 6;
+ * @return whether the ownedChatBubbles field is set
*/
- public boolean hasOwnedPhoneThemes() {
+ public boolean hasOwnedChatBubbles() {
return (bitField0_ & 0x00000008) != 0;
}
/**
- * repeated uint32 owned_phone_themes = 1;
- * @return this
- */
- public GetPhoneDataScRsp clearOwnedPhoneThemes() {
- bitField0_ &= ~0x00000008;
- ownedPhoneThemes.clear();
- return this;
- }
-
- /**
- * repeated uint32 owned_phone_themes = 1;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableOwnedPhoneThemes()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedInt getOwnedPhoneThemes() {
- return ownedPhoneThemes;
- }
-
- /**
- * repeated uint32 owned_phone_themes = 1;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedInt getMutableOwnedPhoneThemes() {
- bitField0_ |= 0x00000008;
- return ownedPhoneThemes;
- }
-
- /**
- * repeated uint32 owned_phone_themes = 1;
- * @param value the ownedPhoneThemes to add
- * @return this
- */
- public GetPhoneDataScRsp addOwnedPhoneThemes(final int value) {
- bitField0_ |= 0x00000008;
- ownedPhoneThemes.add(value);
- return this;
- }
-
- /**
- * repeated uint32 owned_phone_themes = 1;
- * @param values the ownedPhoneThemes to add
- * @return this
- */
- public GetPhoneDataScRsp addAllOwnedPhoneThemes(final int... values) {
- bitField0_ |= 0x00000008;
- ownedPhoneThemes.addAll(values);
- return this;
- }
-
- /**
- * repeated uint32 owned_chat_bubbles = 15;
- * @return whether the ownedChatBubbles field is set
- */
- public boolean hasOwnedChatBubbles() {
- return (bitField0_ & 0x00000010) != 0;
- }
-
- /**
- * repeated uint32 owned_chat_bubbles = 15;
+ * repeated uint32 owned_chat_bubbles = 6;
* @return this
*/
public GetPhoneDataScRsp clearOwnedChatBubbles() {
- bitField0_ &= ~0x00000010;
+ bitField0_ &= ~0x00000008;
ownedChatBubbles.clear();
return this;
}
/**
- * repeated uint32 owned_chat_bubbles = 15;
+ * repeated uint32 owned_chat_bubbles = 6;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -266,7 +198,7 @@ public final class GetPhoneDataScRspOuterClass {
}
/**
- * repeated uint32 owned_chat_bubbles = 15;
+ * repeated uint32 owned_chat_bubbles = 6;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -275,32 +207,100 @@ public final class GetPhoneDataScRspOuterClass {
* @return internal storage object for modifications
*/
public RepeatedInt getMutableOwnedChatBubbles() {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
return ownedChatBubbles;
}
/**
- * repeated uint32 owned_chat_bubbles = 15;
+ * repeated uint32 owned_chat_bubbles = 6;
* @param value the ownedChatBubbles to add
* @return this
*/
public GetPhoneDataScRsp addOwnedChatBubbles(final int value) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
ownedChatBubbles.add(value);
return this;
}
/**
- * repeated uint32 owned_chat_bubbles = 15;
+ * repeated uint32 owned_chat_bubbles = 6;
* @param values the ownedChatBubbles to add
* @return this
*/
public GetPhoneDataScRsp addAllOwnedChatBubbles(final int... values) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
ownedChatBubbles.addAll(values);
return this;
}
+ /**
+ * repeated uint32 owned_phone_themes = 7;
+ * @return whether the ownedPhoneThemes field is set
+ */
+ public boolean hasOwnedPhoneThemes() {
+ return (bitField0_ & 0x00000010) != 0;
+ }
+
+ /**
+ * repeated uint32 owned_phone_themes = 7;
+ * @return this
+ */
+ public GetPhoneDataScRsp clearOwnedPhoneThemes() {
+ bitField0_ &= ~0x00000010;
+ ownedPhoneThemes.clear();
+ return this;
+ }
+
+ /**
+ * repeated uint32 owned_phone_themes = 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 #getMutableOwnedPhoneThemes()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedInt getOwnedPhoneThemes() {
+ return ownedPhoneThemes;
+ }
+
+ /**
+ * repeated uint32 owned_phone_themes = 7;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedInt getMutableOwnedPhoneThemes() {
+ bitField0_ |= 0x00000010;
+ return ownedPhoneThemes;
+ }
+
+ /**
+ * repeated uint32 owned_phone_themes = 7;
+ * @param value the ownedPhoneThemes to add
+ * @return this
+ */
+ public GetPhoneDataScRsp addOwnedPhoneThemes(final int value) {
+ bitField0_ |= 0x00000010;
+ ownedPhoneThemes.add(value);
+ return this;
+ }
+
+ /**
+ * repeated uint32 owned_phone_themes = 7;
+ * @param values the ownedPhoneThemes to add
+ * @return this
+ */
+ public GetPhoneDataScRsp addAllOwnedPhoneThemes(final int... values) {
+ bitField0_ |= 0x00000010;
+ ownedPhoneThemes.addAll(values);
+ return this;
+ }
+
@Override
public GetPhoneDataScRsp copyFrom(final GetPhoneDataScRsp other) {
cachedSize = other.cachedSize;
@@ -309,8 +309,8 @@ public final class GetPhoneDataScRspOuterClass {
curPhoneTheme = other.curPhoneTheme;
retcode = other.retcode;
curChatBubble = other.curChatBubble;
- ownedPhoneThemes.copyFrom(other.ownedPhoneThemes);
ownedChatBubbles.copyFrom(other.ownedChatBubbles);
+ ownedPhoneThemes.copyFrom(other.ownedPhoneThemes);
}
return this;
}
@@ -330,12 +330,12 @@ public final class GetPhoneDataScRspOuterClass {
if (other.hasCurChatBubble()) {
setCurChatBubble(other.curChatBubble);
}
- if (other.hasOwnedPhoneThemes()) {
- getMutableOwnedPhoneThemes().addAll(other.ownedPhoneThemes);
- }
if (other.hasOwnedChatBubbles()) {
getMutableOwnedChatBubbles().addAll(other.ownedChatBubbles);
}
+ if (other.hasOwnedPhoneThemes()) {
+ getMutableOwnedPhoneThemes().addAll(other.ownedPhoneThemes);
+ }
return this;
}
@@ -349,8 +349,8 @@ public final class GetPhoneDataScRspOuterClass {
curPhoneTheme = 0;
retcode = 0;
curChatBubble = 0;
- ownedPhoneThemes.clear();
ownedChatBubbles.clear();
+ ownedPhoneThemes.clear();
return this;
}
@@ -361,8 +361,8 @@ public final class GetPhoneDataScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- ownedPhoneThemes.clear();
ownedChatBubbles.clear();
+ ownedPhoneThemes.clear();
return this;
}
@@ -379,34 +379,34 @@ public final class GetPhoneDataScRspOuterClass {
&& (!hasCurPhoneTheme() || curPhoneTheme == other.curPhoneTheme)
&& (!hasRetcode() || retcode == other.retcode)
&& (!hasCurChatBubble() || curChatBubble == other.curChatBubble)
- && (!hasOwnedPhoneThemes() || ownedPhoneThemes.equals(other.ownedPhoneThemes))
- && (!hasOwnedChatBubbles() || ownedChatBubbles.equals(other.ownedChatBubbles));
+ && (!hasOwnedChatBubbles() || ownedChatBubbles.equals(other.ownedChatBubbles))
+ && (!hasOwnedPhoneThemes() || ownedPhoneThemes.equals(other.ownedPhoneThemes));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(curPhoneTheme);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(curChatBubble);
}
if ((bitField0_ & 0x00000008) != 0) {
- for (int i = 0; i < ownedPhoneThemes.length(); i++) {
- output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(ownedPhoneThemes.array()[i]);
+ for (int i = 0; i < ownedChatBubbles.length(); i++) {
+ output.writeRawByte((byte) 48);
+ output.writeUInt32NoTag(ownedChatBubbles.array()[i]);
}
}
if ((bitField0_ & 0x00000010) != 0) {
- for (int i = 0; i < ownedChatBubbles.length(); i++) {
- output.writeRawByte((byte) 120);
- output.writeUInt32NoTag(ownedChatBubbles.array()[i]);
+ for (int i = 0; i < ownedPhoneThemes.length(); i++) {
+ output.writeRawByte((byte) 56);
+ output.writeUInt32NoTag(ownedPhoneThemes.array()[i]);
}
}
}
@@ -424,10 +424,10 @@ public final class GetPhoneDataScRspOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(curChatBubble);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += (1 * ownedPhoneThemes.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(ownedPhoneThemes);
+ size += (1 * ownedChatBubbles.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(ownedChatBubbles);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += (1 * ownedChatBubbles.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(ownedChatBubbles);
+ size += (1 * ownedPhoneThemes.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(ownedPhoneThemes);
}
return size;
}
@@ -439,45 +439,45 @@ public final class GetPhoneDataScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
+ case 32: {
// curPhoneTheme
curPhoneTheme = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 48) {
+ if (tag != 80) {
break;
}
}
- case 48: {
+ case 80: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 120) {
break;
}
}
- case 104: {
+ case 120: {
// curChatBubble
curChatBubble = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 10) {
+ if (tag != 50) {
break;
}
}
- case 10: {
- // ownedPhoneThemes [packed=true]
- input.readPackedUInt32(ownedPhoneThemes, tag);
- bitField0_ |= 0x00000008;
- tag = input.readTag();
- if (tag != 122) {
- break;
- }
- }
- case 122: {
+ case 50: {
// ownedChatBubbles [packed=true]
input.readPackedUInt32(ownedChatBubbles, tag);
+ bitField0_ |= 0x00000008;
+ tag = input.readTag();
+ if (tag != 58) {
+ break;
+ }
+ }
+ case 58: {
+ // ownedPhoneThemes [packed=true]
+ input.readPackedUInt32(ownedPhoneThemes, tag);
bitField0_ |= 0x00000010;
tag = input.readTag();
if (tag != 0) {
@@ -494,15 +494,15 @@ public final class GetPhoneDataScRspOuterClass {
tag = input.readTag();
break;
}
- case 8: {
- // ownedPhoneThemes [packed=false]
- tag = input.readRepeatedUInt32(ownedPhoneThemes, tag);
+ case 48: {
+ // ownedChatBubbles [packed=false]
+ tag = input.readRepeatedUInt32(ownedChatBubbles, tag);
bitField0_ |= 0x00000008;
break;
}
- case 120: {
- // ownedChatBubbles [packed=false]
- tag = input.readRepeatedUInt32(ownedChatBubbles, tag);
+ case 56: {
+ // ownedPhoneThemes [packed=false]
+ tag = input.readRepeatedUInt32(ownedPhoneThemes, tag);
bitField0_ |= 0x00000010;
break;
}
@@ -523,10 +523,10 @@ public final class GetPhoneDataScRspOuterClass {
output.writeUInt32(FieldNames.curChatBubble, curChatBubble);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRepeatedUInt32(FieldNames.ownedPhoneThemes, ownedPhoneThemes);
+ output.writeRepeatedUInt32(FieldNames.ownedChatBubbles, ownedChatBubbles);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRepeatedUInt32(FieldNames.ownedChatBubbles, ownedChatBubbles);
+ output.writeRepeatedUInt32(FieldNames.ownedPhoneThemes, ownedPhoneThemes);
}
output.endObject();
}
@@ -573,11 +573,11 @@ public final class GetPhoneDataScRspOuterClass {
}
break;
}
- case -512676109:
- case -1128638699: {
- if (input.isAtField(FieldNames.ownedPhoneThemes)) {
+ case -1579353334:
+ case -1491735846: {
+ if (input.isAtField(FieldNames.ownedChatBubbles)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedUInt32(ownedPhoneThemes);
+ input.readRepeatedUInt32(ownedChatBubbles);
bitField0_ |= 0x00000008;
}
} else {
@@ -585,11 +585,11 @@ public final class GetPhoneDataScRspOuterClass {
}
break;
}
- case -1579353334:
- case -1491735846: {
- if (input.isAtField(FieldNames.ownedChatBubbles)) {
+ case -512676109:
+ case -1128638699: {
+ if (input.isAtField(FieldNames.ownedPhoneThemes)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedUInt32(ownedChatBubbles);
+ input.readRepeatedUInt32(ownedPhoneThemes);
bitField0_ |= 0x00000010;
}
} else {
@@ -656,9 +656,9 @@ public final class GetPhoneDataScRspOuterClass {
static final FieldName curChatBubble = FieldName.forField("curChatBubble", "cur_chat_bubble");
- static final FieldName ownedPhoneThemes = FieldName.forField("ownedPhoneThemes", "owned_phone_themes");
-
static final FieldName ownedChatBubbles = FieldName.forField("ownedChatBubbles", "owned_chat_bubbles");
+
+ static final FieldName ownedPhoneThemes = FieldName.forField("ownedPhoneThemes", "owned_phone_themes");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java
index 3d94049..a9e0718 100644
--- a/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java
@@ -22,32 +22,32 @@ public final class GetPlayerBoardDataScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 current_head_icon_id = 10;
- */
- private int currentHeadIconId;
-
- /**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 8;
*/
private int retcode;
/**
- * optional .DisplayAvatarVec display_avatar_vec = 11;
+ * optional uint32 current_head_icon_id = 11;
+ */
+ private int currentHeadIconId;
+
+ /**
+ * optional .DisplayAvatarVec display_avatar_vec = 15;
*/
private final DisplayAvatarVecOuterClass.DisplayAvatarVec displayAvatarVec = DisplayAvatarVecOuterClass.DisplayAvatarVec.newInstance();
/**
- * optional string signature = 9;
+ * optional string signature = 5;
*/
private final Utf8String signature = Utf8String.newEmptyInstance();
/**
- * repeated uint32 display_support_avatar_vec = 15;
+ * repeated uint32 display_support_avatar_vec = 3;
*/
private final RepeatedInt displaySupportAvatarVec = RepeatedInt.newEmptyInstance();
/**
- * repeated .HeadIcon unlocked_head_icon_list = 3;
+ * repeated .HeadIcon unlocked_head_icon_list = 2;
*/
private final RepeatedMessageoptional uint32 current_head_icon_id = 10;
- * @return whether the currentHeadIconId field is set
+ * optional uint32 retcode = 8;
+ * @return whether the retcode field is set
*/
- public boolean hasCurrentHeadIconId() {
+ public boolean hasRetcode() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 current_head_icon_id = 10;
- * @return this
- */
- public GetPlayerBoardDataScRsp clearCurrentHeadIconId() {
- bitField0_ &= ~0x00000001;
- currentHeadIconId = 0;
- return this;
- }
-
- /**
- * optional uint32 current_head_icon_id = 10;
- * @return the currentHeadIconId
- */
- public int getCurrentHeadIconId() {
- return currentHeadIconId;
- }
-
- /**
- * optional uint32 current_head_icon_id = 10;
- * @param value the currentHeadIconId to set
- * @return this
- */
- public GetPlayerBoardDataScRsp setCurrentHeadIconId(final int value) {
- bitField0_ |= 0x00000001;
- currentHeadIconId = value;
- return this;
- }
-
- /**
- * optional uint32 retcode = 12;
- * @return whether the retcode field is set
- */
- public boolean hasRetcode() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 8;
* @return this
*/
public GetPlayerBoardDataScRsp clearRetcode() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
retcode = 0;
return this;
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 8;
* @return the retcode
*/
public int getRetcode() {
@@ -125,18 +88,55 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 8;
* @param value the retcode to set
* @return this
*/
public GetPlayerBoardDataScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
retcode = value;
return this;
}
/**
- * optional .DisplayAvatarVec display_avatar_vec = 11;
+ * optional uint32 current_head_icon_id = 11;
+ * @return whether the currentHeadIconId field is set
+ */
+ public boolean hasCurrentHeadIconId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 current_head_icon_id = 11;
+ * @return this
+ */
+ public GetPlayerBoardDataScRsp clearCurrentHeadIconId() {
+ bitField0_ &= ~0x00000002;
+ currentHeadIconId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 current_head_icon_id = 11;
+ * @return the currentHeadIconId
+ */
+ public int getCurrentHeadIconId() {
+ return currentHeadIconId;
+ }
+
+ /**
+ * optional uint32 current_head_icon_id = 11;
+ * @param value the currentHeadIconId to set
+ * @return this
+ */
+ public GetPlayerBoardDataScRsp setCurrentHeadIconId(final int value) {
+ bitField0_ |= 0x00000002;
+ currentHeadIconId = value;
+ return this;
+ }
+
+ /**
+ * optional .DisplayAvatarVec display_avatar_vec = 15;
* @return whether the displayAvatarVec field is set
*/
public boolean hasDisplayAvatarVec() {
@@ -144,7 +144,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * optional .DisplayAvatarVec display_avatar_vec = 11;
+ * optional .DisplayAvatarVec display_avatar_vec = 15;
* @return this
*/
public GetPlayerBoardDataScRsp clearDisplayAvatarVec() {
@@ -154,7 +154,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * optional .DisplayAvatarVec display_avatar_vec = 11;
+ * optional .DisplayAvatarVec display_avatar_vec = 15;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -168,7 +168,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * optional .DisplayAvatarVec display_avatar_vec = 11;
+ * optional .DisplayAvatarVec display_avatar_vec = 15;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -182,7 +182,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * optional .DisplayAvatarVec display_avatar_vec = 11;
+ * optional .DisplayAvatarVec display_avatar_vec = 15;
* @param value the displayAvatarVec to set
* @return this
*/
@@ -194,7 +194,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * optional string signature = 9;
+ * optional string signature = 5;
* @return whether the signature field is set
*/
public boolean hasSignature() {
@@ -202,7 +202,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * optional string signature = 9;
+ * optional string signature = 5;
* @return this
*/
public GetPlayerBoardDataScRsp clearSignature() {
@@ -212,7 +212,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * optional string signature = 9;
+ * optional string signature = 5;
* @return the signature
*/
public String getSignature() {
@@ -220,7 +220,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * optional string signature = 9;
+ * optional string signature = 5;
* @return internal {@code Utf8String} representation of signature for reading
*/
public Utf8String getSignatureBytes() {
@@ -228,7 +228,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * optional string signature = 9;
+ * optional string signature = 5;
* @return internal {@code Utf8String} representation of signature for modifications
*/
public Utf8String getMutableSignatureBytes() {
@@ -237,7 +237,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * optional string signature = 9;
+ * optional string signature = 5;
* @param value the signature to set
* @return this
*/
@@ -248,7 +248,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * optional string signature = 9;
+ * optional string signature = 5;
* @param value the signature to set
* @return this
*/
@@ -259,7 +259,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * repeated uint32 display_support_avatar_vec = 15;
+ * repeated uint32 display_support_avatar_vec = 3;
* @return whether the displaySupportAvatarVec field is set
*/
public boolean hasDisplaySupportAvatarVec() {
@@ -267,7 +267,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * repeated uint32 display_support_avatar_vec = 15;
+ * repeated uint32 display_support_avatar_vec = 3;
* @return this
*/
public GetPlayerBoardDataScRsp clearDisplaySupportAvatarVec() {
@@ -277,7 +277,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * repeated uint32 display_support_avatar_vec = 15;
+ * repeated uint32 display_support_avatar_vec = 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.
@@ -291,7 +291,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * repeated uint32 display_support_avatar_vec = 15;
+ * repeated uint32 display_support_avatar_vec = 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
@@ -305,7 +305,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * repeated uint32 display_support_avatar_vec = 15;
+ * repeated uint32 display_support_avatar_vec = 3;
* @param value the displaySupportAvatarVec to add
* @return this
*/
@@ -316,7 +316,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * repeated uint32 display_support_avatar_vec = 15;
+ * repeated uint32 display_support_avatar_vec = 3;
* @param values the displaySupportAvatarVec to add
* @return this
*/
@@ -327,7 +327,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * repeated .HeadIcon unlocked_head_icon_list = 3;
+ * repeated .HeadIcon unlocked_head_icon_list = 2;
* @return whether the unlockedHeadIconList field is set
*/
public boolean hasUnlockedHeadIconList() {
@@ -335,7 +335,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * repeated .HeadIcon unlocked_head_icon_list = 3;
+ * repeated .HeadIcon unlocked_head_icon_list = 2;
* @return this
*/
public GetPlayerBoardDataScRsp clearUnlockedHeadIconList() {
@@ -345,7 +345,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * repeated .HeadIcon unlocked_head_icon_list = 3;
+ * repeated .HeadIcon unlocked_head_icon_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.
@@ -359,7 +359,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * repeated .HeadIcon unlocked_head_icon_list = 3;
+ * repeated .HeadIcon unlocked_head_icon_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
@@ -373,7 +373,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * repeated .HeadIcon unlocked_head_icon_list = 3;
+ * repeated .HeadIcon unlocked_head_icon_list = 2;
* @param value the unlockedHeadIconList to add
* @return this
*/
@@ -385,7 +385,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
/**
- * repeated .HeadIcon unlocked_head_icon_list = 3;
+ * repeated .HeadIcon unlocked_head_icon_list = 2;
* @param values the unlockedHeadIconList to add
* @return this
*/
@@ -401,8 +401,8 @@ public final class GetPlayerBoardDataScRspOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- currentHeadIconId = other.currentHeadIconId;
retcode = other.retcode;
+ currentHeadIconId = other.currentHeadIconId;
displayAvatarVec.copyFrom(other.displayAvatarVec);
signature.copyFrom(other.signature);
displaySupportAvatarVec.copyFrom(other.displaySupportAvatarVec);
@@ -417,12 +417,12 @@ public final class GetPlayerBoardDataScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasCurrentHeadIconId()) {
- setCurrentHeadIconId(other.currentHeadIconId);
- }
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
+ if (other.hasCurrentHeadIconId()) {
+ setCurrentHeadIconId(other.currentHeadIconId);
+ }
if (other.hasDisplayAvatarVec()) {
getMutableDisplayAvatarVec().mergeFrom(other.displayAvatarVec);
}
@@ -445,8 +445,8 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- currentHeadIconId = 0;
retcode = 0;
+ currentHeadIconId = 0;
displayAvatarVec.clear();
signature.clear();
displaySupportAvatarVec.clear();
@@ -478,8 +478,8 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
GetPlayerBoardDataScRsp other = (GetPlayerBoardDataScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasCurrentHeadIconId() || currentHeadIconId == other.currentHeadIconId)
&& (!hasRetcode() || retcode == other.retcode)
+ && (!hasCurrentHeadIconId() || currentHeadIconId == other.currentHeadIconId)
&& (!hasDisplayAvatarVec() || displayAvatarVec.equals(other.displayAvatarVec))
&& (!hasSignature() || signature.equals(other.signature))
&& (!hasDisplaySupportAvatarVec() || displaySupportAvatarVec.equals(other.displaySupportAvatarVec))
@@ -489,30 +489,30 @@ public final class GetPlayerBoardDataScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(currentHeadIconId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(retcode);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 88);
+ output.writeUInt32NoTag(currentHeadIconId);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 90);
+ output.writeRawByte((byte) 122);
output.writeMessageNoTag(displayAvatarVec);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 74);
+ output.writeRawByte((byte) 42);
output.writeStringNoTag(signature);
}
if ((bitField0_ & 0x00000010) != 0) {
for (int i = 0; i < displaySupportAvatarVec.length(); i++) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(displaySupportAvatarVec.array()[i]);
}
}
if ((bitField0_ & 0x00000020) != 0) {
for (int i = 0; i < unlockedHeadIconList.length(); i++) {
- output.writeRawByte((byte) 26);
+ output.writeRawByte((byte) 18);
output.writeMessageNoTag(unlockedHeadIconList.get(i));
}
}
@@ -522,10 +522,10 @@ public final class GetPlayerBoardDataScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(currentHeadIconId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(currentHeadIconId);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(displayAvatarVec);
@@ -549,52 +549,52 @@ public final class GetPlayerBoardDataScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 80: {
- // currentHeadIconId
- currentHeadIconId = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 96) {
- break;
- }
- }
- case 96: {
+ case 64: {
// retcode
retcode = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 88) {
+ break;
+ }
+ }
+ case 88: {
+ // currentHeadIconId
+ currentHeadIconId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 90) {
- break;
- }
- }
- case 90: {
- // displayAvatarVec
- input.readMessage(displayAvatarVec);
- bitField0_ |= 0x00000004;
- tag = input.readTag();
- if (tag != 74) {
- break;
- }
- }
- case 74: {
- // signature
- input.readString(signature);
- bitField0_ |= 0x00000008;
- tag = input.readTag();
if (tag != 122) {
break;
}
}
case 122: {
- // displaySupportAvatarVec [packed=true]
- input.readPackedUInt32(displaySupportAvatarVec, tag);
- bitField0_ |= 0x00000010;
+ // displayAvatarVec
+ input.readMessage(displayAvatarVec);
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 42) {
+ break;
+ }
+ }
+ case 42: {
+ // signature
+ input.readString(signature);
+ bitField0_ |= 0x00000008;
tag = input.readTag();
if (tag != 26) {
break;
}
}
case 26: {
+ // displaySupportAvatarVec [packed=true]
+ input.readPackedUInt32(displaySupportAvatarVec, tag);
+ bitField0_ |= 0x00000010;
+ tag = input.readTag();
+ if (tag != 18) {
+ break;
+ }
+ }
+ case 18: {
// unlockedHeadIconList
tag = input.readRepeatedMessage(unlockedHeadIconList, tag);
bitField0_ |= 0x00000020;
@@ -612,7 +612,7 @@ public final class GetPlayerBoardDataScRspOuterClass {
tag = input.readTag();
break;
}
- case 120: {
+ case 24: {
// displaySupportAvatarVec [packed=false]
tag = input.readRepeatedUInt32(displaySupportAvatarVec, tag);
bitField0_ |= 0x00000010;
@@ -626,10 +626,10 @@ public final class GetPlayerBoardDataScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.currentHeadIconId, currentHeadIconId);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.currentHeadIconId, currentHeadIconId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeMessage(FieldNames.displayAvatarVec, displayAvatarVec);
@@ -653,11 +653,10 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 2107487181:
- case -1003133880: {
- if (input.isAtField(FieldNames.currentHeadIconId)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- currentHeadIconId = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -665,10 +664,11 @@ public final class GetPlayerBoardDataScRspOuterClass {
}
break;
}
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case 2107487181:
+ case -1003133880: {
+ if (input.isAtField(FieldNames.currentHeadIconId)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ currentHeadIconId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -776,10 +776,10 @@ public final class GetPlayerBoardDataScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName currentHeadIconId = FieldName.forField("currentHeadIconId", "current_head_icon_id");
-
static final FieldName retcode = FieldName.forField("retcode");
+ static final FieldName currentHeadIconId = FieldName.forField("currentHeadIconId", "current_head_icon_id");
+
static final FieldName displayAvatarVec = FieldName.forField("displayAvatarVec", "display_avatar_vec");
static final FieldName signature = FieldName.forField("signature");
diff --git a/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoScRspOuterClass.java
index 14ec163..97a9a84 100644
--- a/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoScRspOuterClass.java
@@ -19,12 +19,12 @@ public final class GetPlayerDetailInfoScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 9;
+ * optional uint32 retcode = 15;
*/
private int retcode;
/**
- * optional .PlayerDetailInfo player_detail_info = 5;
+ * optional .PlayerDetailInfo player_detail_info = 14;
*/
private final PlayerDetailInfoOuterClass.PlayerDetailInfo playerDetailInfo = PlayerDetailInfoOuterClass.PlayerDetailInfo.newInstance();
@@ -39,7 +39,7 @@ public final class GetPlayerDetailInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 9;
+ * optional uint32 retcode = 15;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -47,7 +47,7 @@ public final class GetPlayerDetailInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 9;
+ * optional uint32 retcode = 15;
* @return this
*/
public GetPlayerDetailInfoScRsp clearRetcode() {
@@ -57,7 +57,7 @@ public final class GetPlayerDetailInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 9;
+ * optional uint32 retcode = 15;
* @return the retcode
*/
public int getRetcode() {
@@ -65,7 +65,7 @@ public final class GetPlayerDetailInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 9;
+ * optional uint32 retcode = 15;
* @param value the retcode to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class GetPlayerDetailInfoScRspOuterClass {
}
/**
- * optional .PlayerDetailInfo player_detail_info = 5;
+ * optional .PlayerDetailInfo player_detail_info = 14;
* @return whether the playerDetailInfo field is set
*/
public boolean hasPlayerDetailInfo() {
@@ -84,7 +84,7 @@ public final class GetPlayerDetailInfoScRspOuterClass {
}
/**
- * optional .PlayerDetailInfo player_detail_info = 5;
+ * optional .PlayerDetailInfo player_detail_info = 14;
* @return this
*/
public GetPlayerDetailInfoScRsp clearPlayerDetailInfo() {
@@ -94,7 +94,7 @@ public final class GetPlayerDetailInfoScRspOuterClass {
}
/**
- * optional .PlayerDetailInfo player_detail_info = 5;
+ * optional .PlayerDetailInfo player_detail_info = 14;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class GetPlayerDetailInfoScRspOuterClass {
}
/**
- * optional .PlayerDetailInfo player_detail_info = 5;
+ * optional .PlayerDetailInfo player_detail_info = 14;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class GetPlayerDetailInfoScRspOuterClass {
}
/**
- * optional .PlayerDetailInfo player_detail_info = 5;
+ * optional .PlayerDetailInfo player_detail_info = 14;
* @param value the playerDetailInfo to set
* @return this
*/
@@ -199,11 +199,11 @@ public final class GetPlayerDetailInfoScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 42);
+ output.writeRawByte((byte) 114);
output.writeMessageNoTag(playerDetailInfo);
}
}
@@ -227,16 +227,16 @@ public final class GetPlayerDetailInfoScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 72: {
+ case 120: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 42) {
+ if (tag != 114) {
break;
}
}
- case 42: {
+ case 114: {
// playerDetailInfo
input.readMessage(playerDetailInfo);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryCsReqOuterClass.java
index 89ac472..6bcdf77 100644
--- a/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryCsReqOuterClass.java
@@ -19,12 +19,12 @@ public final class GetPrivateChatHistoryCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 to_uid = 9;
+ * optional uint32 to_uid = 5;
*/
private int toUid;
/**
- * optional uint32 sender_uid = 11;
+ * optional uint32 sender_uid = 9;
*/
private int senderUid;
@@ -39,7 +39,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass {
}
/**
- * optional uint32 to_uid = 9;
+ * optional uint32 to_uid = 5;
* @return whether the toUid field is set
*/
public boolean hasToUid() {
@@ -47,7 +47,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass {
}
/**
- * optional uint32 to_uid = 9;
+ * optional uint32 to_uid = 5;
* @return this
*/
public GetPrivateChatHistoryCsReq clearToUid() {
@@ -57,7 +57,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass {
}
/**
- * optional uint32 to_uid = 9;
+ * optional uint32 to_uid = 5;
* @return the toUid
*/
public int getToUid() {
@@ -65,7 +65,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass {
}
/**
- * optional uint32 to_uid = 9;
+ * optional uint32 to_uid = 5;
* @param value the toUid to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass {
}
/**
- * optional uint32 sender_uid = 11;
+ * optional uint32 sender_uid = 9;
* @return whether the senderUid field is set
*/
public boolean hasSenderUid() {
@@ -84,7 +84,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass {
}
/**
- * optional uint32 sender_uid = 11;
+ * optional uint32 sender_uid = 9;
* @return this
*/
public GetPrivateChatHistoryCsReq clearSenderUid() {
@@ -94,7 +94,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass {
}
/**
- * optional uint32 sender_uid = 11;
+ * optional uint32 sender_uid = 9;
* @return the senderUid
*/
public int getSenderUid() {
@@ -102,7 +102,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass {
}
/**
- * optional uint32 sender_uid = 11;
+ * optional uint32 sender_uid = 9;
* @param value the senderUid to set
* @return this
*/
@@ -177,11 +177,11 @@ public final class GetPrivateChatHistoryCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(toUid);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 72);
output.writeUInt32NoTag(senderUid);
}
}
@@ -205,16 +205,16 @@ public final class GetPrivateChatHistoryCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 72: {
+ case 40: {
// toUid
toUid = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 88) {
+ if (tag != 72) {
break;
}
}
- case 88: {
+ case 72: {
// senderUid
senderUid = input.readUInt32();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryScRspOuterClass.java
index 046765d..a797333 100644
--- a/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryScRspOuterClass.java
@@ -20,12 +20,7 @@ public final class GetPrivateChatHistoryScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 sender_uid = 5;
- */
- private int senderUid;
-
- /**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 4;
*/
private int retcode;
@@ -35,7 +30,12 @@ public final class GetPrivateChatHistoryScRspOuterClass {
private int toUid;
/**
- * repeated .Chat chat_list = 2;
+ * optional uint32 sender_uid = 13;
+ */
+ private int senderUid;
+
+ /**
+ * repeated .Chat chat_list = 8;
*/
private final RepeatedMessageoptional uint32 sender_uid = 5;
- * @return whether the senderUid field is set
+ * optional uint32 retcode = 4;
+ * @return whether the retcode field is set
*/
- public boolean hasSenderUid() {
+ public boolean hasRetcode() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 sender_uid = 5;
- * @return this
- */
- public GetPrivateChatHistoryScRsp clearSenderUid() {
- bitField0_ &= ~0x00000001;
- senderUid = 0;
- return this;
- }
-
- /**
- * optional uint32 sender_uid = 5;
- * @return the senderUid
- */
- public int getSenderUid() {
- return senderUid;
- }
-
- /**
- * optional uint32 sender_uid = 5;
- * @param value the senderUid to set
- * @return this
- */
- public GetPrivateChatHistoryScRsp setSenderUid(final int value) {
- bitField0_ |= 0x00000001;
- senderUid = value;
- return this;
- }
-
- /**
- * optional uint32 retcode = 8;
- * @return whether the retcode field is set
- */
- public boolean hasRetcode() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 4;
* @return this
*/
public GetPrivateChatHistoryScRsp clearRetcode() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
retcode = 0;
return this;
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 4;
* @return the retcode
*/
public int getRetcode() {
@@ -113,12 +76,12 @@ public final class GetPrivateChatHistoryScRspOuterClass {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 4;
* @param value the retcode to set
* @return this
*/
public GetPrivateChatHistoryScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
retcode = value;
return this;
}
@@ -128,7 +91,7 @@ public final class GetPrivateChatHistoryScRspOuterClass {
* @return whether the toUid field is set
*/
public boolean hasToUid() {
- return (bitField0_ & 0x00000004) != 0;
+ return (bitField0_ & 0x00000002) != 0;
}
/**
@@ -136,7 +99,7 @@ public final class GetPrivateChatHistoryScRspOuterClass {
* @return this
*/
public GetPrivateChatHistoryScRsp clearToUid() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
toUid = 0;
return this;
}
@@ -155,13 +118,50 @@ public final class GetPrivateChatHistoryScRspOuterClass {
* @return this
*/
public GetPrivateChatHistoryScRsp setToUid(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
toUid = value;
return this;
}
/**
- * repeated .Chat chat_list = 2;
+ * optional uint32 sender_uid = 13;
+ * @return whether the senderUid field is set
+ */
+ public boolean hasSenderUid() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 sender_uid = 13;
+ * @return this
+ */
+ public GetPrivateChatHistoryScRsp clearSenderUid() {
+ bitField0_ &= ~0x00000004;
+ senderUid = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 sender_uid = 13;
+ * @return the senderUid
+ */
+ public int getSenderUid() {
+ return senderUid;
+ }
+
+ /**
+ * optional uint32 sender_uid = 13;
+ * @param value the senderUid to set
+ * @return this
+ */
+ public GetPrivateChatHistoryScRsp setSenderUid(final int value) {
+ bitField0_ |= 0x00000004;
+ senderUid = value;
+ return this;
+ }
+
+ /**
+ * repeated .Chat chat_list = 8;
* @return whether the chatList field is set
*/
public boolean hasChatList() {
@@ -169,7 +169,7 @@ public final class GetPrivateChatHistoryScRspOuterClass {
}
/**
- * repeated .Chat chat_list = 2;
+ * repeated .Chat chat_list = 8;
* @return this
*/
public GetPrivateChatHistoryScRsp clearChatList() {
@@ -179,7 +179,7 @@ public final class GetPrivateChatHistoryScRspOuterClass {
}
/**
- * repeated .Chat chat_list = 2;
+ * repeated .Chat chat_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.
@@ -193,7 +193,7 @@ public final class GetPrivateChatHistoryScRspOuterClass {
}
/**
- * repeated .Chat chat_list = 2;
+ * repeated .Chat chat_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
@@ -207,7 +207,7 @@ public final class GetPrivateChatHistoryScRspOuterClass {
}
/**
- * repeated .Chat chat_list = 2;
+ * repeated .Chat chat_list = 8;
* @param value the chatList to add
* @return this
*/
@@ -218,7 +218,7 @@ public final class GetPrivateChatHistoryScRspOuterClass {
}
/**
- * repeated .Chat chat_list = 2;
+ * repeated .Chat chat_list = 8;
* @param values the chatList to add
* @return this
*/
@@ -233,9 +233,9 @@ public final class GetPrivateChatHistoryScRspOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- senderUid = other.senderUid;
retcode = other.retcode;
toUid = other.toUid;
+ senderUid = other.senderUid;
chatList.copyFrom(other.chatList);
}
return this;
@@ -247,15 +247,15 @@ public final class GetPrivateChatHistoryScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasSenderUid()) {
- setSenderUid(other.senderUid);
- }
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
if (other.hasToUid()) {
setToUid(other.toUid);
}
+ if (other.hasSenderUid()) {
+ setSenderUid(other.senderUid);
+ }
if (other.hasChatList()) {
getMutableChatList().addAll(other.chatList);
}
@@ -269,9 +269,9 @@ public final class GetPrivateChatHistoryScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- senderUid = 0;
retcode = 0;
toUid = 0;
+ senderUid = 0;
chatList.clear();
return this;
}
@@ -297,29 +297,29 @@ public final class GetPrivateChatHistoryScRspOuterClass {
}
GetPrivateChatHistoryScRsp other = (GetPrivateChatHistoryScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasSenderUid() || senderUid == other.senderUid)
&& (!hasRetcode() || retcode == other.retcode)
&& (!hasToUid() || toUid == other.toUid)
+ && (!hasSenderUid() || senderUid == other.senderUid)
&& (!hasChatList() || chatList.equals(other.chatList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
- output.writeUInt32NoTag(senderUid);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(retcode);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 72);
output.writeUInt32NoTag(toUid);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(senderUid);
+ }
if ((bitField0_ & 0x00000008) != 0) {
for (int i = 0; i < chatList.length(); i++) {
- output.writeRawByte((byte) 18);
+ output.writeRawByte((byte) 66);
output.writeMessageNoTag(chatList.get(i));
}
}
@@ -329,14 +329,14 @@ public final class GetPrivateChatHistoryScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid);
- }
- if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid);
+ }
if ((bitField0_ & 0x00000008) != 0) {
size += (1 * chatList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(chatList);
}
@@ -350,19 +350,10 @@ public final class GetPrivateChatHistoryScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
- // senderUid
- senderUid = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 64) {
- break;
- }
- }
- case 64: {
+ case 32: {
// retcode
retcode = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
if (tag != 72) {
break;
@@ -371,13 +362,22 @@ public final class GetPrivateChatHistoryScRspOuterClass {
case 72: {
// toUid
toUid = input.readUInt32();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 18) {
+ if (tag != 104) {
break;
}
}
- case 18: {
+ case 104: {
+ // senderUid
+ senderUid = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 66) {
+ break;
+ }
+ }
+ case 66: {
// chatList
tag = input.readRepeatedMessage(chatList, tag);
bitField0_ |= 0x00000008;
@@ -403,14 +403,14 @@ public final class GetPrivateChatHistoryScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.senderUid, senderUid);
- }
- if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.retcode, retcode);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.toUid, toUid);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeUInt32(FieldNames.senderUid, senderUid);
+ }
if ((bitField0_ & 0x00000008) != 0) {
output.writeRepeatedMessage(FieldNames.chatList, chatList);
}
@@ -424,23 +424,11 @@ public final class GetPrivateChatHistoryScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 32180699:
- case 997911366: {
- if (input.isAtField(FieldNames.senderUid)) {
- if (!input.trySkipNullValue()) {
- senderUid = input.readUInt32();
- bitField0_ |= 0x00000001;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 1097936398: {
if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
retcode = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
}
} else {
input.skipUnknownField();
@@ -452,6 +440,18 @@ public final class GetPrivateChatHistoryScRspOuterClass {
if (input.isAtField(FieldNames.toUid)) {
if (!input.trySkipNullValue()) {
toUid = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 32180699:
+ case 997911366: {
+ if (input.isAtField(FieldNames.senderUid)) {
+ if (!input.trySkipNullValue()) {
+ senderUid = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -524,12 +524,12 @@ public final class GetPrivateChatHistoryScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName senderUid = FieldName.forField("senderUid", "sender_uid");
-
static final FieldName retcode = FieldName.forField("retcode");
static final FieldName toUid = FieldName.forField("toUid", "to_uid");
+ static final FieldName senderUid = FieldName.forField("senderUid", "sender_uid");
+
static final FieldName chatList = FieldName.forField("chatList", "chat_list");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/GetQuestDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetQuestDataScRspOuterClass.java
index 73ce388..2726c7b 100644
--- a/src/generated/main/emu/lunarcore/proto/GetQuestDataScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetQuestDataScRspOuterClass.java
@@ -20,17 +20,17 @@ public final class GetQuestDataScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 2;
- */
- private int retcode;
-
- /**
- * optional uint32 total_achievement_exp = 11;
+ * optional uint32 total_achievement_exp = 6;
*/
private int totalAchievementExp;
/**
- * repeated .Quest quest_list = 3;
+ * optional uint32 retcode = 11;
+ */
+ private int retcode;
+
+ /**
+ * repeated .Quest quest_list = 10;
*/
private final RepeatedMessageoptional uint32 retcode = 2;
- * @return whether the retcode field is set
+ * optional uint32 total_achievement_exp = 6;
+ * @return whether the totalAchievementExp field is set
*/
- public boolean hasRetcode() {
+ public boolean hasTotalAchievementExp() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 retcode = 2;
- * @return this
- */
- public GetQuestDataScRsp clearRetcode() {
- bitField0_ &= ~0x00000001;
- retcode = 0;
- return this;
- }
-
- /**
- * optional uint32 retcode = 2;
- * @return the retcode
- */
- public int getRetcode() {
- return retcode;
- }
-
- /**
- * optional uint32 retcode = 2;
- * @param value the retcode to set
- * @return this
- */
- public GetQuestDataScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000001;
- retcode = value;
- return this;
- }
-
- /**
- * optional uint32 total_achievement_exp = 11;
- * @return whether the totalAchievementExp field is set
- */
- public boolean hasTotalAchievementExp() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 total_achievement_exp = 11;
+ * optional uint32 total_achievement_exp = 6;
* @return this
*/
public GetQuestDataScRsp clearTotalAchievementExp() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
totalAchievementExp = 0;
return this;
}
/**
- * optional uint32 total_achievement_exp = 11;
+ * optional uint32 total_achievement_exp = 6;
* @return the totalAchievementExp
*/
public int getTotalAchievementExp() {
@@ -108,18 +71,55 @@ public final class GetQuestDataScRspOuterClass {
}
/**
- * optional uint32 total_achievement_exp = 11;
+ * optional uint32 total_achievement_exp = 6;
* @param value the totalAchievementExp to set
* @return this
*/
public GetQuestDataScRsp setTotalAchievementExp(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
totalAchievementExp = value;
return this;
}
/**
- * repeated .Quest quest_list = 3;
+ * optional uint32 retcode = 11;
+ * @return whether the retcode field is set
+ */
+ public boolean hasRetcode() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 retcode = 11;
+ * @return this
+ */
+ public GetQuestDataScRsp clearRetcode() {
+ bitField0_ &= ~0x00000002;
+ retcode = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 retcode = 11;
+ * @return the retcode
+ */
+ public int getRetcode() {
+ return retcode;
+ }
+
+ /**
+ * optional uint32 retcode = 11;
+ * @param value the retcode to set
+ * @return this
+ */
+ public GetQuestDataScRsp setRetcode(final int value) {
+ bitField0_ |= 0x00000002;
+ retcode = value;
+ return this;
+ }
+
+ /**
+ * repeated .Quest quest_list = 10;
* @return whether the questList field is set
*/
public boolean hasQuestList() {
@@ -127,7 +127,7 @@ public final class GetQuestDataScRspOuterClass {
}
/**
- * repeated .Quest quest_list = 3;
+ * repeated .Quest quest_list = 10;
* @return this
*/
public GetQuestDataScRsp clearQuestList() {
@@ -137,7 +137,7 @@ public final class GetQuestDataScRspOuterClass {
}
/**
- * repeated .Quest quest_list = 3;
+ * repeated .Quest quest_list = 10;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -151,7 +151,7 @@ public final class GetQuestDataScRspOuterClass {
}
/**
- * repeated .Quest quest_list = 3;
+ * repeated .Quest quest_list = 10;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -165,7 +165,7 @@ public final class GetQuestDataScRspOuterClass {
}
/**
- * repeated .Quest quest_list = 3;
+ * repeated .Quest quest_list = 10;
* @param value the questList to add
* @return this
*/
@@ -176,7 +176,7 @@ public final class GetQuestDataScRspOuterClass {
}
/**
- * repeated .Quest quest_list = 3;
+ * repeated .Quest quest_list = 10;
* @param values the questList to add
* @return this
*/
@@ -191,8 +191,8 @@ public final class GetQuestDataScRspOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- retcode = other.retcode;
totalAchievementExp = other.totalAchievementExp;
+ retcode = other.retcode;
questList.copyFrom(other.questList);
}
return this;
@@ -204,12 +204,12 @@ public final class GetQuestDataScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasRetcode()) {
- setRetcode(other.retcode);
- }
if (other.hasTotalAchievementExp()) {
setTotalAchievementExp(other.totalAchievementExp);
}
+ if (other.hasRetcode()) {
+ setRetcode(other.retcode);
+ }
if (other.hasQuestList()) {
getMutableQuestList().addAll(other.questList);
}
@@ -223,8 +223,8 @@ public final class GetQuestDataScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- retcode = 0;
totalAchievementExp = 0;
+ retcode = 0;
questList.clear();
return this;
}
@@ -250,24 +250,24 @@ public final class GetQuestDataScRspOuterClass {
}
GetQuestDataScRsp other = (GetQuestDataScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasRetcode() || retcode == other.retcode)
&& (!hasTotalAchievementExp() || totalAchievementExp == other.totalAchievementExp)
+ && (!hasRetcode() || retcode == other.retcode)
&& (!hasQuestList() || questList.equals(other.questList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(retcode);
+ output.writeRawByte((byte) 48);
+ output.writeUInt32NoTag(totalAchievementExp);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 88);
- output.writeUInt32NoTag(totalAchievementExp);
+ output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < questList.length(); i++) {
- output.writeRawByte((byte) 26);
+ output.writeRawByte((byte) 82);
output.writeMessageNoTag(questList.get(i));
}
}
@@ -277,10 +277,10 @@ public final class GetQuestDataScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(totalAchievementExp);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(totalAchievementExp);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
size += (1 * questList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(questList);
@@ -295,9 +295,9 @@ public final class GetQuestDataScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
- // retcode
- retcode = input.readUInt32();
+ case 48: {
+ // totalAchievementExp
+ totalAchievementExp = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
if (tag != 88) {
@@ -305,15 +305,15 @@ public final class GetQuestDataScRspOuterClass {
}
}
case 88: {
- // totalAchievementExp
- totalAchievementExp = input.readUInt32();
+ // retcode
+ retcode = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 26) {
+ if (tag != 82) {
break;
}
}
- case 26: {
+ case 82: {
// questList
tag = input.readRepeatedMessage(questList, tag);
bitField0_ |= 0x00000004;
@@ -339,10 +339,10 @@ public final class GetQuestDataScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.totalAchievementExp, totalAchievementExp);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.totalAchievementExp, totalAchievementExp);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRepeatedMessage(FieldNames.questList, questList);
@@ -357,10 +357,11 @@ public final class GetQuestDataScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case 255336658:
+ case -1295039982: {
+ if (input.isAtField(FieldNames.totalAchievementExp)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ totalAchievementExp = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -368,11 +369,10 @@ public final class GetQuestDataScRspOuterClass {
}
break;
}
- case 255336658:
- case -1295039982: {
- if (input.isAtField(FieldNames.totalAchievementExp)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- totalAchievementExp = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -445,10 +445,10 @@ public final class GetQuestDataScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName retcode = FieldName.forField("retcode");
-
static final FieldName totalAchievementExp = FieldName.forField("totalAchievementExp", "total_achievement_exp");
+ static final FieldName retcode = FieldName.forField("retcode");
+
static final FieldName questList = FieldName.forField("questList", "quest_list");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/GetRogueBuffEnhanceInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRogueBuffEnhanceInfoScRspOuterClass.java
index b2f58d3..b2a5f5b 100644
--- a/src/generated/main/emu/lunarcore/proto/GetRogueBuffEnhanceInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetRogueBuffEnhanceInfoScRspOuterClass.java
@@ -19,12 +19,12 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 10;
*/
private int retcode;
/**
- * optional .RogueBuffEnhanceShopInfo shop_info = 5;
+ * optional .RogueBuffEnhanceShopInfo shop_info = 6;
*/
private final RogueBuffEnhanceShopInfoOuterClass.RogueBuffEnhanceShopInfo shopInfo = RogueBuffEnhanceShopInfoOuterClass.RogueBuffEnhanceShopInfo.newInstance();
@@ -39,7 +39,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 10;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -47,7 +47,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 10;
* @return this
*/
public GetRogueBuffEnhanceInfoScRsp clearRetcode() {
@@ -57,7 +57,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 10;
* @return the retcode
*/
public int getRetcode() {
@@ -65,7 +65,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 10;
* @param value the retcode to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass {
}
/**
- * optional .RogueBuffEnhanceShopInfo shop_info = 5;
+ * optional .RogueBuffEnhanceShopInfo shop_info = 6;
* @return whether the shopInfo field is set
*/
public boolean hasShopInfo() {
@@ -84,7 +84,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass {
}
/**
- * optional .RogueBuffEnhanceShopInfo shop_info = 5;
+ * optional .RogueBuffEnhanceShopInfo shop_info = 6;
* @return this
*/
public GetRogueBuffEnhanceInfoScRsp clearShopInfo() {
@@ -94,7 +94,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass {
}
/**
- * optional .RogueBuffEnhanceShopInfo shop_info = 5;
+ * optional .RogueBuffEnhanceShopInfo shop_info = 6;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass {
}
/**
- * optional .RogueBuffEnhanceShopInfo shop_info = 5;
+ * optional .RogueBuffEnhanceShopInfo shop_info = 6;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass {
}
/**
- * optional .RogueBuffEnhanceShopInfo shop_info = 5;
+ * optional .RogueBuffEnhanceShopInfo shop_info = 6;
* @param value the shopInfo to set
* @return this
*/
@@ -199,11 +199,11 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 42);
+ output.writeRawByte((byte) 50);
output.writeMessageNoTag(shopInfo);
}
}
@@ -227,16 +227,16 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 120: {
+ case 80: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 42) {
+ if (tag != 50) {
break;
}
}
- case 42: {
+ case 50: {
// shopInfo
input.readMessage(shopInfo);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetRogueHandbookDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRogueHandbookDataScRspOuterClass.java
index ef228e1..a7a7c2e 100644
--- a/src/generated/main/emu/lunarcore/proto/GetRogueHandbookDataScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetRogueHandbookDataScRspOuterClass.java
@@ -24,7 +24,7 @@ public final class GetRogueHandbookDataScRspOuterClass {
private int retcode;
/**
- * optional .RogueHandbookData handbook_info = 10;
+ * optional .RogueHandbookData handbook_info = 12;
*/
private final RogueHandbookDataOuterClass.RogueHandbookData handbookInfo = RogueHandbookDataOuterClass.RogueHandbookData.newInstance();
@@ -76,7 +76,7 @@ public final class GetRogueHandbookDataScRspOuterClass {
}
/**
- * optional .RogueHandbookData handbook_info = 10;
+ * optional .RogueHandbookData handbook_info = 12;
* @return whether the handbookInfo field is set
*/
public boolean hasHandbookInfo() {
@@ -84,7 +84,7 @@ public final class GetRogueHandbookDataScRspOuterClass {
}
/**
- * optional .RogueHandbookData handbook_info = 10;
+ * optional .RogueHandbookData handbook_info = 12;
* @return this
*/
public GetRogueHandbookDataScRsp clearHandbookInfo() {
@@ -94,7 +94,7 @@ public final class GetRogueHandbookDataScRspOuterClass {
}
/**
- * optional .RogueHandbookData handbook_info = 10;
+ * optional .RogueHandbookData handbook_info = 12;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class GetRogueHandbookDataScRspOuterClass {
}
/**
- * optional .RogueHandbookData handbook_info = 10;
+ * optional .RogueHandbookData handbook_info = 12;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class GetRogueHandbookDataScRspOuterClass {
}
/**
- * optional .RogueHandbookData handbook_info = 10;
+ * optional .RogueHandbookData handbook_info = 12;
* @param value the handbookInfo to set
* @return this
*/
@@ -203,7 +203,7 @@ public final class GetRogueHandbookDataScRspOuterClass {
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 82);
+ output.writeRawByte((byte) 98);
output.writeMessageNoTag(handbookInfo);
}
}
@@ -232,11 +232,11 @@ public final class GetRogueHandbookDataScRspOuterClass {
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 82) {
+ if (tag != 98) {
break;
}
}
- case 82: {
+ case 98: {
// handbookInfo
input.readMessage(handbookInfo);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetRogueInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRogueInfoScRspOuterClass.java
index eee51f0..697c665 100644
--- a/src/generated/main/emu/lunarcore/proto/GetRogueInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetRogueInfoScRspOuterClass.java
@@ -19,12 +19,12 @@ public final class GetRogueInfoScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 5;
*/
private int retcode;
/**
- * optional .RogueInfo rogue_info = 12;
+ * optional .RogueInfo rogue_info = 9;
*/
private final RogueInfoOuterClass.RogueInfo rogueInfo = RogueInfoOuterClass.RogueInfo.newInstance();
@@ -39,7 +39,7 @@ public final class GetRogueInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 5;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -47,7 +47,7 @@ public final class GetRogueInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 5;
* @return this
*/
public GetRogueInfoScRsp clearRetcode() {
@@ -57,7 +57,7 @@ public final class GetRogueInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 5;
* @return the retcode
*/
public int getRetcode() {
@@ -65,7 +65,7 @@ public final class GetRogueInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 5;
* @param value the retcode to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class GetRogueInfoScRspOuterClass {
}
/**
- * optional .RogueInfo rogue_info = 12;
+ * optional .RogueInfo rogue_info = 9;
* @return whether the rogueInfo field is set
*/
public boolean hasRogueInfo() {
@@ -84,7 +84,7 @@ public final class GetRogueInfoScRspOuterClass {
}
/**
- * optional .RogueInfo rogue_info = 12;
+ * optional .RogueInfo rogue_info = 9;
* @return this
*/
public GetRogueInfoScRsp clearRogueInfo() {
@@ -94,7 +94,7 @@ public final class GetRogueInfoScRspOuterClass {
}
/**
- * optional .RogueInfo rogue_info = 12;
+ * optional .RogueInfo rogue_info = 9;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class GetRogueInfoScRspOuterClass {
}
/**
- * optional .RogueInfo rogue_info = 12;
+ * optional .RogueInfo rogue_info = 9;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class GetRogueInfoScRspOuterClass {
}
/**
- * optional .RogueInfo rogue_info = 12;
+ * optional .RogueInfo rogue_info = 9;
* @param value the rogueInfo to set
* @return this
*/
@@ -198,11 +198,11 @@ public final class GetRogueInfoScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 98);
+ output.writeRawByte((byte) 74);
output.writeMessageNoTag(rogueInfo);
}
}
@@ -226,16 +226,16 @@ public final class GetRogueInfoScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
+ case 40: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 98) {
+ if (tag != 74) {
break;
}
}
- case 98: {
+ case 74: {
// rogueInfo
input.readMessage(rogueInfo);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetRogueInitialScoreScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRogueInitialScoreScRspOuterClass.java
index 6b17e68..6402ed8 100644
--- a/src/generated/main/emu/lunarcore/proto/GetRogueInitialScoreScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetRogueInitialScoreScRspOuterClass.java
@@ -24,7 +24,7 @@ public final class GetRogueInitialScoreScRspOuterClass {
private int retcode;
/**
- * optional .RogueScoreRewardInfo rogue_score_info = 4;
+ * optional .RogueScoreRewardInfo rogue_score_info = 9;
*/
private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo rogueScoreInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance();
@@ -76,7 +76,7 @@ public final class GetRogueInitialScoreScRspOuterClass {
}
/**
- * optional .RogueScoreRewardInfo rogue_score_info = 4;
+ * optional .RogueScoreRewardInfo rogue_score_info = 9;
* @return whether the rogueScoreInfo field is set
*/
public boolean hasRogueScoreInfo() {
@@ -84,7 +84,7 @@ public final class GetRogueInitialScoreScRspOuterClass {
}
/**
- * optional .RogueScoreRewardInfo rogue_score_info = 4;
+ * optional .RogueScoreRewardInfo rogue_score_info = 9;
* @return this
*/
public GetRogueInitialScoreScRsp clearRogueScoreInfo() {
@@ -94,7 +94,7 @@ public final class GetRogueInitialScoreScRspOuterClass {
}
/**
- * optional .RogueScoreRewardInfo rogue_score_info = 4;
+ * optional .RogueScoreRewardInfo rogue_score_info = 9;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class GetRogueInitialScoreScRspOuterClass {
}
/**
- * optional .RogueScoreRewardInfo rogue_score_info = 4;
+ * optional .RogueScoreRewardInfo rogue_score_info = 9;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class GetRogueInitialScoreScRspOuterClass {
}
/**
- * optional .RogueScoreRewardInfo rogue_score_info = 4;
+ * optional .RogueScoreRewardInfo rogue_score_info = 9;
* @param value the rogueScoreInfo to set
* @return this
*/
@@ -203,7 +203,7 @@ public final class GetRogueInitialScoreScRspOuterClass {
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 34);
+ output.writeRawByte((byte) 74);
output.writeMessageNoTag(rogueScoreInfo);
}
}
@@ -232,11 +232,11 @@ public final class GetRogueInitialScoreScRspOuterClass {
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 34) {
+ if (tag != 74) {
break;
}
}
- case 34: {
+ case 74: {
// rogueScoreInfo
input.readMessage(rogueScoreInfo);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetRogueScoreRewardInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRogueScoreRewardInfoScRspOuterClass.java
index e31a031..478d46d 100644
--- a/src/generated/main/emu/lunarcore/proto/GetRogueScoreRewardInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetRogueScoreRewardInfoScRspOuterClass.java
@@ -19,12 +19,12 @@ public final class GetRogueScoreRewardInfoScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 6;
*/
private int retcode;
/**
- * optional .RogueScoreRewardInfo score_reward_info = 2;
+ * optional .RogueScoreRewardInfo score_reward_info = 7;
*/
private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo scoreRewardInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance();
@@ -39,7 +39,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 6;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -47,7 +47,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 6;
* @return this
*/
public GetRogueScoreRewardInfoScRsp clearRetcode() {
@@ -57,7 +57,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 6;
* @return the retcode
*/
public int getRetcode() {
@@ -65,7 +65,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 retcode = 6;
* @param value the retcode to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass {
}
/**
- * optional .RogueScoreRewardInfo score_reward_info = 2;
+ * optional .RogueScoreRewardInfo score_reward_info = 7;
* @return whether the scoreRewardInfo field is set
*/
public boolean hasScoreRewardInfo() {
@@ -84,7 +84,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass {
}
/**
- * optional .RogueScoreRewardInfo score_reward_info = 2;
+ * optional .RogueScoreRewardInfo score_reward_info = 7;
* @return this
*/
public GetRogueScoreRewardInfoScRsp clearScoreRewardInfo() {
@@ -94,7 +94,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass {
}
/**
- * optional .RogueScoreRewardInfo score_reward_info = 2;
+ * optional .RogueScoreRewardInfo score_reward_info = 7;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass {
}
/**
- * optional .RogueScoreRewardInfo score_reward_info = 2;
+ * optional .RogueScoreRewardInfo score_reward_info = 7;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass {
}
/**
- * optional .RogueScoreRewardInfo score_reward_info = 2;
+ * optional .RogueScoreRewardInfo score_reward_info = 7;
* @param value the scoreRewardInfo to set
* @return this
*/
@@ -199,11 +199,11 @@ public final class GetRogueScoreRewardInfoScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 18);
+ output.writeRawByte((byte) 58);
output.writeMessageNoTag(scoreRewardInfo);
}
}
@@ -227,16 +227,16 @@ public final class GetRogueScoreRewardInfoScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 120: {
+ case 48: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 18) {
+ if (tag != 58) {
break;
}
}
- case 18: {
+ case 58: {
// scoreRewardInfo
input.readMessage(scoreRewardInfo);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetRogueTalentInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRogueTalentInfoScRspOuterClass.java
index 208f46b..65496a1 100644
--- a/src/generated/main/emu/lunarcore/proto/GetRogueTalentInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetRogueTalentInfoScRspOuterClass.java
@@ -19,12 +19,12 @@ public final class GetRogueTalentInfoScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 14;
+ * optional uint32 retcode = 1;
*/
private int retcode;
/**
- * optional .RogueTalentInfo talent_info = 13;
+ * optional .RogueTalentInfo talent_info = 10;
*/
private final RogueTalentInfoOuterClass.RogueTalentInfo talentInfo = RogueTalentInfoOuterClass.RogueTalentInfo.newInstance();
@@ -39,7 +39,7 @@ public final class GetRogueTalentInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 14;
+ * optional uint32 retcode = 1;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -47,7 +47,7 @@ public final class GetRogueTalentInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 14;
+ * optional uint32 retcode = 1;
* @return this
*/
public GetRogueTalentInfoScRsp clearRetcode() {
@@ -57,7 +57,7 @@ public final class GetRogueTalentInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 14;
+ * optional uint32 retcode = 1;
* @return the retcode
*/
public int getRetcode() {
@@ -65,7 +65,7 @@ public final class GetRogueTalentInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 14;
+ * optional uint32 retcode = 1;
* @param value the retcode to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class GetRogueTalentInfoScRspOuterClass {
}
/**
- * optional .RogueTalentInfo talent_info = 13;
+ * optional .RogueTalentInfo talent_info = 10;
* @return whether the talentInfo field is set
*/
public boolean hasTalentInfo() {
@@ -84,7 +84,7 @@ public final class GetRogueTalentInfoScRspOuterClass {
}
/**
- * optional .RogueTalentInfo talent_info = 13;
+ * optional .RogueTalentInfo talent_info = 10;
* @return this
*/
public GetRogueTalentInfoScRsp clearTalentInfo() {
@@ -94,7 +94,7 @@ public final class GetRogueTalentInfoScRspOuterClass {
}
/**
- * optional .RogueTalentInfo talent_info = 13;
+ * optional .RogueTalentInfo talent_info = 10;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class GetRogueTalentInfoScRspOuterClass {
}
/**
- * optional .RogueTalentInfo talent_info = 13;
+ * optional .RogueTalentInfo talent_info = 10;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class GetRogueTalentInfoScRspOuterClass {
}
/**
- * optional .RogueTalentInfo talent_info = 13;
+ * optional .RogueTalentInfo talent_info = 10;
* @param value the talentInfo to set
* @return this
*/
@@ -199,11 +199,11 @@ public final class GetRogueTalentInfoScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 106);
+ output.writeRawByte((byte) 82);
output.writeMessageNoTag(talentInfo);
}
}
@@ -227,16 +227,16 @@ public final class GetRogueTalentInfoScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 112: {
+ case 8: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 106) {
+ if (tag != 82) {
break;
}
}
- case 106: {
+ case 82: {
// talentInfo
input.readMessage(talentInfo);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetRollShopInfoCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRollShopInfoCsReqOuterClass.java
index 75e806d..b7844fb 100644
--- a/src/generated/main/emu/lunarcore/proto/GetRollShopInfoCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetRollShopInfoCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class GetRollShopInfoCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 roll_shop_id = 8;
+ * optional uint32 roll_shop_id = 12;
*/
private int rollShopId;
@@ -34,7 +34,7 @@ public final class GetRollShopInfoCsReqOuterClass {
}
/**
- * optional uint32 roll_shop_id = 8;
+ * optional uint32 roll_shop_id = 12;
* @return whether the rollShopId field is set
*/
public boolean hasRollShopId() {
@@ -42,7 +42,7 @@ public final class GetRollShopInfoCsReqOuterClass {
}
/**
- * optional uint32 roll_shop_id = 8;
+ * optional uint32 roll_shop_id = 12;
* @return this
*/
public GetRollShopInfoCsReq clearRollShopId() {
@@ -52,7 +52,7 @@ public final class GetRollShopInfoCsReqOuterClass {
}
/**
- * optional uint32 roll_shop_id = 8;
+ * optional uint32 roll_shop_id = 12;
* @return the rollShopId
*/
public int getRollShopId() {
@@ -60,7 +60,7 @@ public final class GetRollShopInfoCsReqOuterClass {
}
/**
- * optional uint32 roll_shop_id = 8;
+ * optional uint32 roll_shop_id = 12;
* @param value the rollShopId to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class GetRollShopInfoCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(rollShopId);
}
}
@@ -150,7 +150,7 @@ public final class GetRollShopInfoCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 64: {
+ case 96: {
// rollShopId
rollShopId = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/GetRollShopInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRollShopInfoScRspOuterClass.java
index 4aa453c..942a933 100644
--- a/src/generated/main/emu/lunarcore/proto/GetRollShopInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetRollShopInfoScRspOuterClass.java
@@ -20,20 +20,24 @@ public final class GetRollShopInfoScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 BBJIJINJAFK = 4;
+ * optional uint32 roll_shop_id = 9;
+ */
+ private int rollShopId;
+
+ /**
+ * + * gacha_random + *+ * + *
optional uint32 BBJIJINJAFK = 13;
*/
private int bBJIJINJAFK;
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 15;
*/
private int retcode;
- /**
- * optional uint32 roll_shop_id = 15;
- */
- private int rollShopId;
-
/**
* repeated uint32 DLPBJMPECFC = 8;
*/
@@ -50,99 +54,25 @@ public final class GetRollShopInfoScRspOuterClass {
}
/**
- * optional uint32 BBJIJINJAFK = 4;
- * @return whether the bBJIJINJAFK field is set
+ * optional uint32 roll_shop_id = 9;
+ * @return whether the rollShopId field is set
*/
- public boolean hasBBJIJINJAFK() {
+ public boolean hasRollShopId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 BBJIJINJAFK = 4;
- * @return this
- */
- public GetRollShopInfoScRsp clearBBJIJINJAFK() {
- bitField0_ &= ~0x00000001;
- bBJIJINJAFK = 0;
- return this;
- }
-
- /**
- * optional uint32 BBJIJINJAFK = 4;
- * @return the bBJIJINJAFK
- */
- public int getBBJIJINJAFK() {
- return bBJIJINJAFK;
- }
-
- /**
- * optional uint32 BBJIJINJAFK = 4;
- * @param value the bBJIJINJAFK to set
- * @return this
- */
- public GetRollShopInfoScRsp setBBJIJINJAFK(final int value) {
- bitField0_ |= 0x00000001;
- bBJIJINJAFK = value;
- return this;
- }
-
- /**
- * optional uint32 retcode = 5;
- * @return whether the retcode field is set
- */
- public boolean hasRetcode() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 retcode = 5;
- * @return this
- */
- public GetRollShopInfoScRsp clearRetcode() {
- bitField0_ &= ~0x00000002;
- retcode = 0;
- return this;
- }
-
- /**
- * optional uint32 retcode = 5;
- * @return the retcode
- */
- public int getRetcode() {
- return retcode;
- }
-
- /**
- * optional uint32 retcode = 5;
- * @param value the retcode to set
- * @return this
- */
- public GetRollShopInfoScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000002;
- retcode = value;
- return this;
- }
-
- /**
- * optional uint32 roll_shop_id = 15;
- * @return whether the rollShopId field is set
- */
- public boolean hasRollShopId() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 roll_shop_id = 15;
+ * optional uint32 roll_shop_id = 9;
* @return this
*/
public GetRollShopInfoScRsp clearRollShopId() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000001;
rollShopId = 0;
return this;
}
/**
- * optional uint32 roll_shop_id = 15;
+ * optional uint32 roll_shop_id = 9;
* @return the rollShopId
*/
public int getRollShopId() {
@@ -150,16 +80,106 @@ public final class GetRollShopInfoScRspOuterClass {
}
/**
- * optional uint32 roll_shop_id = 15;
+ * optional uint32 roll_shop_id = 9;
* @param value the rollShopId to set
* @return this
*/
public GetRollShopInfoScRsp setRollShopId(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
rollShopId = value;
return this;
}
+ /**
+ * + * gacha_random + *+ * + *
optional uint32 BBJIJINJAFK = 13;
+ * @return whether the bBJIJINJAFK field is set
+ */
+ public boolean hasBBJIJINJAFK() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * + * gacha_random + *+ * + *
optional uint32 BBJIJINJAFK = 13;
+ * @return this
+ */
+ public GetRollShopInfoScRsp clearBBJIJINJAFK() {
+ bitField0_ &= ~0x00000002;
+ bBJIJINJAFK = 0;
+ return this;
+ }
+
+ /**
+ * + * gacha_random + *+ * + *
optional uint32 BBJIJINJAFK = 13;
+ * @return the bBJIJINJAFK
+ */
+ public int getBBJIJINJAFK() {
+ return bBJIJINJAFK;
+ }
+
+ /**
+ * + * gacha_random + *+ * + *
optional uint32 BBJIJINJAFK = 13;
+ * @param value the bBJIJINJAFK to set
+ * @return this
+ */
+ public GetRollShopInfoScRsp setBBJIJINJAFK(final int value) {
+ bitField0_ |= 0x00000002;
+ bBJIJINJAFK = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 retcode = 15;
+ * @return whether the retcode field is set
+ */
+ public boolean hasRetcode() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 retcode = 15;
+ * @return this
+ */
+ public GetRollShopInfoScRsp clearRetcode() {
+ bitField0_ &= ~0x00000004;
+ retcode = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 retcode = 15;
+ * @return the retcode
+ */
+ public int getRetcode() {
+ return retcode;
+ }
+
+ /**
+ * optional uint32 retcode = 15;
+ * @param value the retcode to set
+ * @return this
+ */
+ public GetRollShopInfoScRsp setRetcode(final int value) {
+ bitField0_ |= 0x00000004;
+ retcode = value;
+ return this;
+ }
+
/**
* repeated uint32 DLPBJMPECFC = 8;
* @return whether the dLPBJMPECFC field is set
@@ -233,9 +253,9 @@ public final class GetRollShopInfoScRspOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
+ rollShopId = other.rollShopId;
bBJIJINJAFK = other.bBJIJINJAFK;
retcode = other.retcode;
- rollShopId = other.rollShopId;
dLPBJMPECFC.copyFrom(other.dLPBJMPECFC);
}
return this;
@@ -247,15 +267,15 @@ public final class GetRollShopInfoScRspOuterClass {
return this;
}
cachedSize = -1;
+ if (other.hasRollShopId()) {
+ setRollShopId(other.rollShopId);
+ }
if (other.hasBBJIJINJAFK()) {
setBBJIJINJAFK(other.bBJIJINJAFK);
}
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
- if (other.hasRollShopId()) {
- setRollShopId(other.rollShopId);
- }
if (other.hasDLPBJMPECFC()) {
getMutableDLPBJMPECFC().addAll(other.dLPBJMPECFC);
}
@@ -269,9 +289,9 @@ public final class GetRollShopInfoScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
+ rollShopId = 0;
bBJIJINJAFK = 0;
retcode = 0;
- rollShopId = 0;
dLPBJMPECFC.clear();
return this;
}
@@ -297,25 +317,25 @@ public final class GetRollShopInfoScRspOuterClass {
}
GetRollShopInfoScRsp other = (GetRollShopInfoScRsp) o;
return bitField0_ == other.bitField0_
+ && (!hasRollShopId() || rollShopId == other.rollShopId)
&& (!hasBBJIJINJAFK() || bBJIJINJAFK == other.bBJIJINJAFK)
&& (!hasRetcode() || retcode == other.retcode)
- && (!hasRollShopId() || rollShopId == other.rollShopId)
&& (!hasDLPBJMPECFC() || dLPBJMPECFC.equals(other.dLPBJMPECFC));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(bBJIJINJAFK);
+ output.writeRawByte((byte) 72);
+ output.writeUInt32NoTag(rollShopId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 40);
- output.writeUInt32NoTag(retcode);
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(bBJIJINJAFK);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 120);
- output.writeUInt32NoTag(rollShopId);
+ output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000008) != 0) {
for (int i = 0; i < dLPBJMPECFC.length(); i++) {
@@ -329,13 +349,13 @@ public final class GetRollShopInfoScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(bBJIJINJAFK);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(rollShopId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(bBJIJINJAFK);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(rollShopId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000008) != 0) {
size += (1 * dLPBJMPECFC.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(dLPBJMPECFC);
@@ -350,18 +370,18 @@ public final class GetRollShopInfoScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
- // bBJIJINJAFK
- bBJIJINJAFK = input.readUInt32();
+ case 72: {
+ // rollShopId
+ rollShopId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 40) {
+ if (tag != 104) {
break;
}
}
- case 40: {
- // retcode
- retcode = input.readUInt32();
+ case 104: {
+ // bBJIJINJAFK
+ bBJIJINJAFK = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 120) {
@@ -369,8 +389,8 @@ public final class GetRollShopInfoScRspOuterClass {
}
}
case 120: {
- // rollShopId
- rollShopId = input.readUInt32();
+ // retcode
+ retcode = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 66) {
@@ -410,13 +430,13 @@ public final class GetRollShopInfoScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.bBJIJINJAFK, bBJIJINJAFK);
+ output.writeUInt32(FieldNames.rollShopId, rollShopId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.bBJIJINJAFK, bBJIJINJAFK);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.rollShopId, rollShopId);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeRepeatedUInt32(FieldNames.dLPBJMPECFC, dLPBJMPECFC);
@@ -431,11 +451,23 @@ public final class GetRollShopInfoScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
+ case -904898162:
+ case -1612413630: {
+ if (input.isAtField(FieldNames.rollShopId)) {
+ if (!input.trySkipNullValue()) {
+ rollShopId = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case -1536175796: {
if (input.isAtField(FieldNames.bBJIJINJAFK)) {
if (!input.trySkipNullValue()) {
bBJIJINJAFK = input.readUInt32();
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
}
} else {
input.skipUnknownField();
@@ -446,18 +478,6 @@ public final class GetRollShopInfoScRspOuterClass {
if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
retcode = input.readUInt32();
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case -904898162:
- case -1612413630: {
- if (input.isAtField(FieldNames.rollShopId)) {
- if (!input.trySkipNullValue()) {
- rollShopId = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -529,12 +549,12 @@ public final class GetRollShopInfoScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
+ static final FieldName rollShopId = FieldName.forField("rollShopId", "roll_shop_id");
+
static final FieldName bBJIJINJAFK = FieldName.forField("BBJIJINJAFK");
static final FieldName retcode = FieldName.forField("retcode");
- static final FieldName rollShopId = FieldName.forField("rollShopId", "roll_shop_id");
-
static final FieldName dLPBJMPECFC = FieldName.forField("DLPBJMPECFC");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java
index 71806e2..a07cdd6 100644
--- a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java
@@ -20,12 +20,12 @@ public final class GetSceneMapInfoCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 entry_id = 4;
+ * optional uint32 entry_id = 11;
*/
private int entryId;
/**
- * repeated uint32 entry_id_list = 9;
+ * repeated uint32 entry_id_list = 1;
*/
private final RepeatedInt entryIdList = RepeatedInt.newEmptyInstance();
@@ -40,7 +40,7 @@ public final class GetSceneMapInfoCsReqOuterClass {
}
/**
- * optional uint32 entry_id = 4;
+ * optional uint32 entry_id = 11;
* @return whether the entryId field is set
*/
public boolean hasEntryId() {
@@ -48,7 +48,7 @@ public final class GetSceneMapInfoCsReqOuterClass {
}
/**
- * optional uint32 entry_id = 4;
+ * optional uint32 entry_id = 11;
* @return this
*/
public GetSceneMapInfoCsReq clearEntryId() {
@@ -58,7 +58,7 @@ public final class GetSceneMapInfoCsReqOuterClass {
}
/**
- * optional uint32 entry_id = 4;
+ * optional uint32 entry_id = 11;
* @return the entryId
*/
public int getEntryId() {
@@ -66,7 +66,7 @@ public final class GetSceneMapInfoCsReqOuterClass {
}
/**
- * optional uint32 entry_id = 4;
+ * optional uint32 entry_id = 11;
* @param value the entryId to set
* @return this
*/
@@ -77,7 +77,7 @@ public final class GetSceneMapInfoCsReqOuterClass {
}
/**
- * repeated uint32 entry_id_list = 9;
+ * repeated uint32 entry_id_list = 1;
* @return whether the entryIdList field is set
*/
public boolean hasEntryIdList() {
@@ -85,7 +85,7 @@ public final class GetSceneMapInfoCsReqOuterClass {
}
/**
- * repeated uint32 entry_id_list = 9;
+ * repeated uint32 entry_id_list = 1;
* @return this
*/
public GetSceneMapInfoCsReq clearEntryIdList() {
@@ -95,7 +95,7 @@ public final class GetSceneMapInfoCsReqOuterClass {
}
/**
- * repeated uint32 entry_id_list = 9;
+ * repeated uint32 entry_id_list = 1;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class GetSceneMapInfoCsReqOuterClass {
}
/**
- * repeated uint32 entry_id_list = 9;
+ * repeated uint32 entry_id_list = 1;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public final class GetSceneMapInfoCsReqOuterClass {
}
/**
- * repeated uint32 entry_id_list = 9;
+ * repeated uint32 entry_id_list = 1;
* @param value the entryIdList to add
* @return this
*/
@@ -134,7 +134,7 @@ public final class GetSceneMapInfoCsReqOuterClass {
}
/**
- * repeated uint32 entry_id_list = 9;
+ * repeated uint32 entry_id_list = 1;
* @param values the entryIdList to add
* @return this
*/
@@ -210,12 +210,12 @@ public final class GetSceneMapInfoCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(entryId);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < entryIdList.length(); i++) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(entryIdList.array()[i]);
}
}
@@ -240,16 +240,16 @@ public final class GetSceneMapInfoCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
+ case 88: {
// entryId
entryId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 74) {
+ if (tag != 10) {
break;
}
}
- case 74: {
+ case 10: {
// entryIdList [packed=true]
input.readPackedUInt32(entryIdList, tag);
bitField0_ |= 0x00000002;
@@ -268,7 +268,7 @@ public final class GetSceneMapInfoCsReqOuterClass {
tag = input.readTag();
break;
}
- case 72: {
+ case 8: {
// entryIdList [packed=false]
tag = input.readRepeatedUInt32(entryIdList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java
index 606cbc8..c724881 100644
--- a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java
@@ -21,49 +21,49 @@ public final class GetSceneMapInfoScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 cur_map_entry_id = 7;
- */
- private int curMapEntryId;
-
- /**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 1;
*/
private int retcode;
/**
- * optional uint32 entry_id = 15;
+ * optional uint32 entry_id = 6;
*/
private int entryId;
/**
- * repeated uint32 lighten_section_list = 1;
+ * optional uint32 cur_map_entry_id = 10;
*/
- private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance();
+ private int curMapEntryId;
/**
- * repeated uint32 unlocked_teleport_list = 14;
+ * repeated uint32 unlocked_teleport_list = 3;
*/
private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance();
/**
- * repeated .MazeGroup maze_group_list = 2;
+ * repeated uint32 lighten_section_list = 9;
*/
- private final RepeatedMessagerepeated .MazeProp maze_prop_list = 4;
+ * repeated .MazeMapData map_list = 2;
+ */
+ private final RepeatedMessagerepeated .MazeProp maze_prop_list = 8;
*/
private final RepeatedMessagerepeated .MazeChest unlocked_chest_list = 10;
+ * repeated .MazeGroup maze_group_list = 13;
*/
- private final RepeatedMessagerepeated .MazeMapData map_list = 12;
+ * repeated .MazeChest unlocked_chest_list = 14;
*/
- private final RepeatedMessageoptional uint32 cur_map_entry_id = 7;
- * @return whether the curMapEntryId field is set
+ * optional uint32 retcode = 1;
+ * @return whether the retcode field is set
*/
- public boolean hasCurMapEntryId() {
+ public boolean hasRetcode() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 cur_map_entry_id = 7;
- * @return this
- */
- public GetSceneMapInfoScRsp clearCurMapEntryId() {
- bitField0_ &= ~0x00000001;
- curMapEntryId = 0;
- return this;
- }
-
- /**
- * optional uint32 cur_map_entry_id = 7;
- * @return the curMapEntryId
- */
- public int getCurMapEntryId() {
- return curMapEntryId;
- }
-
- /**
- * optional uint32 cur_map_entry_id = 7;
- * @param value the curMapEntryId to set
- * @return this
- */
- public GetSceneMapInfoScRsp setCurMapEntryId(final int value) {
- bitField0_ |= 0x00000001;
- curMapEntryId = value;
- return this;
- }
-
- /**
- * optional uint32 retcode = 8;
- * @return whether the retcode field is set
- */
- public boolean hasRetcode() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 1;
* @return this
*/
public GetSceneMapInfoScRsp clearRetcode() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
retcode = 0;
return this;
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 1;
* @return the retcode
*/
public int getRetcode() {
@@ -139,36 +102,36 @@ public final class GetSceneMapInfoScRspOuterClass {
}
/**
- * optional uint32 retcode = 8;
+ * optional uint32 retcode = 1;
* @param value the retcode to set
* @return this
*/
public GetSceneMapInfoScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
retcode = value;
return this;
}
/**
- * optional uint32 entry_id = 15;
+ * optional uint32 entry_id = 6;
* @return whether the entryId field is set
*/
public boolean hasEntryId() {
- return (bitField0_ & 0x00000004) != 0;
+ return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 entry_id = 15;
+ * optional uint32 entry_id = 6;
* @return this
*/
public GetSceneMapInfoScRsp clearEntryId() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
entryId = 0;
return this;
}
/**
- * optional uint32 entry_id = 15;
+ * optional uint32 entry_id = 6;
* @return the entryId
*/
public int getEntryId() {
@@ -176,104 +139,73 @@ public final class GetSceneMapInfoScRspOuterClass {
}
/**
- * optional uint32 entry_id = 15;
+ * optional uint32 entry_id = 6;
* @param value the entryId to set
* @return this
*/
public GetSceneMapInfoScRsp setEntryId(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
entryId = value;
return this;
}
/**
- * repeated uint32 lighten_section_list = 1;
- * @return whether the lightenSectionList field is set
+ * optional uint32 cur_map_entry_id = 10;
+ * @return whether the curMapEntryId field is set
*/
- public boolean hasLightenSectionList() {
+ public boolean hasCurMapEntryId() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 cur_map_entry_id = 10;
+ * @return this
+ */
+ public GetSceneMapInfoScRsp clearCurMapEntryId() {
+ bitField0_ &= ~0x00000004;
+ curMapEntryId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 cur_map_entry_id = 10;
+ * @return the curMapEntryId
+ */
+ public int getCurMapEntryId() {
+ return curMapEntryId;
+ }
+
+ /**
+ * optional uint32 cur_map_entry_id = 10;
+ * @param value the curMapEntryId to set
+ * @return this
+ */
+ public GetSceneMapInfoScRsp setCurMapEntryId(final int value) {
+ bitField0_ |= 0x00000004;
+ curMapEntryId = value;
+ return this;
+ }
+
+ /**
+ * repeated uint32 unlocked_teleport_list = 3;
+ * @return whether the unlockedTeleportList field is set
+ */
+ public boolean hasUnlockedTeleportList() {
return (bitField0_ & 0x00000008) != 0;
}
/**
- * repeated uint32 lighten_section_list = 1;
- * @return this
- */
- public GetSceneMapInfoScRsp clearLightenSectionList() {
- bitField0_ &= ~0x00000008;
- lightenSectionList.clear();
- return this;
- }
-
- /**
- * repeated uint32 lighten_section_list = 1;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableLightenSectionList()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedInt getLightenSectionList() {
- return lightenSectionList;
- }
-
- /**
- * repeated uint32 lighten_section_list = 1;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedInt getMutableLightenSectionList() {
- bitField0_ |= 0x00000008;
- return lightenSectionList;
- }
-
- /**
- * repeated uint32 lighten_section_list = 1;
- * @param value the lightenSectionList to add
- * @return this
- */
- public GetSceneMapInfoScRsp addLightenSectionList(final int value) {
- bitField0_ |= 0x00000008;
- lightenSectionList.add(value);
- return this;
- }
-
- /**
- * repeated uint32 lighten_section_list = 1;
- * @param values the lightenSectionList to add
- * @return this
- */
- public GetSceneMapInfoScRsp addAllLightenSectionList(final int... values) {
- bitField0_ |= 0x00000008;
- lightenSectionList.addAll(values);
- return this;
- }
-
- /**
- * repeated uint32 unlocked_teleport_list = 14;
- * @return whether the unlockedTeleportList field is set
- */
- public boolean hasUnlockedTeleportList() {
- return (bitField0_ & 0x00000010) != 0;
- }
-
- /**
- * repeated uint32 unlocked_teleport_list = 14;
+ * repeated uint32 unlocked_teleport_list = 3;
* @return this
*/
public GetSceneMapInfoScRsp clearUnlockedTeleportList() {
- bitField0_ &= ~0x00000010;
+ bitField0_ &= ~0x00000008;
unlockedTeleportList.clear();
return this;
}
/**
- * repeated uint32 unlocked_teleport_list = 14;
+ * repeated uint32 unlocked_teleport_list = 3;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -287,7 +219,7 @@ public final class GetSceneMapInfoScRspOuterClass {
}
/**
- * repeated uint32 unlocked_teleport_list = 14;
+ * repeated uint32 unlocked_teleport_list = 3;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -296,257 +228,120 @@ public final class GetSceneMapInfoScRspOuterClass {
* @return internal storage object for modifications
*/
public RepeatedInt getMutableUnlockedTeleportList() {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
return unlockedTeleportList;
}
/**
- * repeated uint32 unlocked_teleport_list = 14;
+ * repeated uint32 unlocked_teleport_list = 3;
* @param value the unlockedTeleportList to add
* @return this
*/
public GetSceneMapInfoScRsp addUnlockedTeleportList(final int value) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
unlockedTeleportList.add(value);
return this;
}
/**
- * repeated uint32 unlocked_teleport_list = 14;
+ * repeated uint32 unlocked_teleport_list = 3;
* @param values the unlockedTeleportList to add
* @return this
*/
public GetSceneMapInfoScRsp addAllUnlockedTeleportList(final int... values) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
unlockedTeleportList.addAll(values);
return this;
}
/**
- * repeated .MazeGroup maze_group_list = 2;
- * @return whether the mazeGroupList field is set
+ * repeated uint32 lighten_section_list = 9;
+ * @return whether the lightenSectionList field is set
*/
- public boolean hasMazeGroupList() {
+ public boolean hasLightenSectionList() {
+ return (bitField0_ & 0x00000010) != 0;
+ }
+
+ /**
+ * repeated uint32 lighten_section_list = 9;
+ * @return this
+ */
+ public GetSceneMapInfoScRsp clearLightenSectionList() {
+ bitField0_ &= ~0x00000010;
+ lightenSectionList.clear();
+ return this;
+ }
+
+ /**
+ * repeated uint32 lighten_section_list = 9;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableLightenSectionList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedInt getLightenSectionList() {
+ return lightenSectionList;
+ }
+
+ /**
+ * repeated uint32 lighten_section_list = 9;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedInt getMutableLightenSectionList() {
+ bitField0_ |= 0x00000010;
+ return lightenSectionList;
+ }
+
+ /**
+ * repeated uint32 lighten_section_list = 9;
+ * @param value the lightenSectionList to add
+ * @return this
+ */
+ public GetSceneMapInfoScRsp addLightenSectionList(final int value) {
+ bitField0_ |= 0x00000010;
+ lightenSectionList.add(value);
+ return this;
+ }
+
+ /**
+ * repeated uint32 lighten_section_list = 9;
+ * @param values the lightenSectionList to add
+ * @return this
+ */
+ public GetSceneMapInfoScRsp addAllLightenSectionList(final int... values) {
+ bitField0_ |= 0x00000010;
+ lightenSectionList.addAll(values);
+ return this;
+ }
+
+ /**
+ * repeated .MazeMapData map_list = 2;
+ * @return whether the mapList field is set
+ */
+ public boolean hasMapList() {
return (bitField0_ & 0x00000020) != 0;
}
/**
- * repeated .MazeGroup maze_group_list = 2;
- * @return this
- */
- public GetSceneMapInfoScRsp clearMazeGroupList() {
- bitField0_ &= ~0x00000020;
- mazeGroupList.clear();
- return this;
- }
-
- /**
- * repeated .MazeGroup maze_group_list = 2;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableMazeGroupList()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedMessagerepeated .MazeGroup maze_group_list = 2;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedMessagerepeated .MazeGroup maze_group_list = 2;
- * @param value the mazeGroupList to add
- * @return this
- */
- public GetSceneMapInfoScRsp addMazeGroupList(final MazeGroupOuterClass.MazeGroup value) {
- bitField0_ |= 0x00000020;
- mazeGroupList.add(value);
- return this;
- }
-
- /**
- * repeated .MazeGroup maze_group_list = 2;
- * @param values the mazeGroupList to add
- * @return this
- */
- public GetSceneMapInfoScRsp addAllMazeGroupList(final MazeGroupOuterClass.MazeGroup... values) {
- bitField0_ |= 0x00000020;
- mazeGroupList.addAll(values);
- return this;
- }
-
- /**
- * repeated .MazeProp maze_prop_list = 4;
- * @return whether the mazePropList field is set
- */
- public boolean hasMazePropList() {
- return (bitField0_ & 0x00000040) != 0;
- }
-
- /**
- * repeated .MazeProp maze_prop_list = 4;
- * @return this
- */
- public GetSceneMapInfoScRsp clearMazePropList() {
- bitField0_ &= ~0x00000040;
- mazePropList.clear();
- return this;
- }
-
- /**
- * repeated .MazeProp maze_prop_list = 4;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableMazePropList()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedMessagerepeated .MazeProp maze_prop_list = 4;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedMessagerepeated .MazeProp maze_prop_list = 4;
- * @param value the mazePropList to add
- * @return this
- */
- public GetSceneMapInfoScRsp addMazePropList(final MazePropOuterClass.MazeProp value) {
- bitField0_ |= 0x00000040;
- mazePropList.add(value);
- return this;
- }
-
- /**
- * repeated .MazeProp maze_prop_list = 4;
- * @param values the mazePropList to add
- * @return this
- */
- public GetSceneMapInfoScRsp addAllMazePropList(final MazePropOuterClass.MazeProp... values) {
- bitField0_ |= 0x00000040;
- mazePropList.addAll(values);
- return this;
- }
-
- /**
- * repeated .MazeChest unlocked_chest_list = 10;
- * @return whether the unlockedChestList field is set
- */
- public boolean hasUnlockedChestList() {
- return (bitField0_ & 0x00000080) != 0;
- }
-
- /**
- * repeated .MazeChest unlocked_chest_list = 10;
- * @return this
- */
- public GetSceneMapInfoScRsp clearUnlockedChestList() {
- bitField0_ &= ~0x00000080;
- unlockedChestList.clear();
- return this;
- }
-
- /**
- * repeated .MazeChest unlocked_chest_list = 10;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableUnlockedChestList()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedMessagerepeated .MazeChest unlocked_chest_list = 10;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedMessagerepeated .MazeChest unlocked_chest_list = 10;
- * @param value the unlockedChestList to add
- * @return this
- */
- public GetSceneMapInfoScRsp addUnlockedChestList(final MazeChestOuterClass.MazeChest value) {
- bitField0_ |= 0x00000080;
- unlockedChestList.add(value);
- return this;
- }
-
- /**
- * repeated .MazeChest unlocked_chest_list = 10;
- * @param values the unlockedChestList to add
- * @return this
- */
- public GetSceneMapInfoScRsp addAllUnlockedChestList(
- final MazeChestOuterClass.MazeChest... values) {
- bitField0_ |= 0x00000080;
- unlockedChestList.addAll(values);
- return this;
- }
-
- /**
- * repeated .MazeMapData map_list = 12;
- * @return whether the mapList field is set
- */
- public boolean hasMapList() {
- return (bitField0_ & 0x00000100) != 0;
- }
-
- /**
- * repeated .MazeMapData map_list = 12;
+ * repeated .MazeMapData map_list = 2;
* @return this
*/
public GetSceneMapInfoScRsp clearMapList() {
- bitField0_ &= ~0x00000100;
+ bitField0_ &= ~0x00000020;
mapList.clear();
return this;
}
/**
- * repeated .MazeMapData map_list = 12;
+ * repeated .MazeMapData map_list = 2;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -560,7 +355,7 @@ public final class GetSceneMapInfoScRspOuterClass {
}
/**
- * repeated .MazeMapData map_list = 12;
+ * repeated .MazeMapData map_list = 2;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -569,46 +364,251 @@ public final class GetSceneMapInfoScRspOuterClass {
* @return internal storage object for modifications
*/
public RepeatedMessagerepeated .MazeMapData map_list = 12;
+ * repeated .MazeMapData map_list = 2;
* @param value the mapList to add
* @return this
*/
public GetSceneMapInfoScRsp addMapList(final MazeMapDataOuterClass.MazeMapData value) {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000020;
mapList.add(value);
return this;
}
/**
- * repeated .MazeMapData map_list = 12;
+ * repeated .MazeMapData map_list = 2;
* @param values the mapList to add
* @return this
*/
public GetSceneMapInfoScRsp addAllMapList(final MazeMapDataOuterClass.MazeMapData... values) {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000020;
mapList.addAll(values);
return this;
}
+ /**
+ * repeated .MazeProp maze_prop_list = 8;
+ * @return whether the mazePropList field is set
+ */
+ public boolean hasMazePropList() {
+ return (bitField0_ & 0x00000040) != 0;
+ }
+
+ /**
+ * repeated .MazeProp maze_prop_list = 8;
+ * @return this
+ */
+ public GetSceneMapInfoScRsp clearMazePropList() {
+ bitField0_ &= ~0x00000040;
+ mazePropList.clear();
+ return this;
+ }
+
+ /**
+ * repeated .MazeProp maze_prop_list = 8;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableMazePropList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedMessagerepeated .MazeProp maze_prop_list = 8;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedMessagerepeated .MazeProp maze_prop_list = 8;
+ * @param value the mazePropList to add
+ * @return this
+ */
+ public GetSceneMapInfoScRsp addMazePropList(final MazePropOuterClass.MazeProp value) {
+ bitField0_ |= 0x00000040;
+ mazePropList.add(value);
+ return this;
+ }
+
+ /**
+ * repeated .MazeProp maze_prop_list = 8;
+ * @param values the mazePropList to add
+ * @return this
+ */
+ public GetSceneMapInfoScRsp addAllMazePropList(final MazePropOuterClass.MazeProp... values) {
+ bitField0_ |= 0x00000040;
+ mazePropList.addAll(values);
+ return this;
+ }
+
+ /**
+ * repeated .MazeGroup maze_group_list = 13;
+ * @return whether the mazeGroupList field is set
+ */
+ public boolean hasMazeGroupList() {
+ return (bitField0_ & 0x00000080) != 0;
+ }
+
+ /**
+ * repeated .MazeGroup maze_group_list = 13;
+ * @return this
+ */
+ public GetSceneMapInfoScRsp clearMazeGroupList() {
+ bitField0_ &= ~0x00000080;
+ mazeGroupList.clear();
+ return this;
+ }
+
+ /**
+ * repeated .MazeGroup maze_group_list = 13;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableMazeGroupList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedMessagerepeated .MazeGroup maze_group_list = 13;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedMessagerepeated .MazeGroup maze_group_list = 13;
+ * @param value the mazeGroupList to add
+ * @return this
+ */
+ public GetSceneMapInfoScRsp addMazeGroupList(final MazeGroupOuterClass.MazeGroup value) {
+ bitField0_ |= 0x00000080;
+ mazeGroupList.add(value);
+ return this;
+ }
+
+ /**
+ * repeated .MazeGroup maze_group_list = 13;
+ * @param values the mazeGroupList to add
+ * @return this
+ */
+ public GetSceneMapInfoScRsp addAllMazeGroupList(final MazeGroupOuterClass.MazeGroup... values) {
+ bitField0_ |= 0x00000080;
+ mazeGroupList.addAll(values);
+ return this;
+ }
+
+ /**
+ * repeated .MazeChest unlocked_chest_list = 14;
+ * @return whether the unlockedChestList field is set
+ */
+ public boolean hasUnlockedChestList() {
+ return (bitField0_ & 0x00000100) != 0;
+ }
+
+ /**
+ * repeated .MazeChest unlocked_chest_list = 14;
+ * @return this
+ */
+ public GetSceneMapInfoScRsp clearUnlockedChestList() {
+ bitField0_ &= ~0x00000100;
+ unlockedChestList.clear();
+ return this;
+ }
+
+ /**
+ * repeated .MazeChest unlocked_chest_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 #getMutableUnlockedChestList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedMessagerepeated .MazeChest unlocked_chest_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 RepeatedMessagerepeated .MazeChest unlocked_chest_list = 14;
+ * @param value the unlockedChestList to add
+ * @return this
+ */
+ public GetSceneMapInfoScRsp addUnlockedChestList(final MazeChestOuterClass.MazeChest value) {
+ bitField0_ |= 0x00000100;
+ unlockedChestList.add(value);
+ return this;
+ }
+
+ /**
+ * repeated .MazeChest unlocked_chest_list = 14;
+ * @param values the unlockedChestList to add
+ * @return this
+ */
+ public GetSceneMapInfoScRsp addAllUnlockedChestList(
+ final MazeChestOuterClass.MazeChest... values) {
+ bitField0_ |= 0x00000100;
+ unlockedChestList.addAll(values);
+ return this;
+ }
+
@Override
public GetSceneMapInfoScRsp copyFrom(final GetSceneMapInfoScRsp other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- curMapEntryId = other.curMapEntryId;
retcode = other.retcode;
entryId = other.entryId;
- lightenSectionList.copyFrom(other.lightenSectionList);
+ curMapEntryId = other.curMapEntryId;
unlockedTeleportList.copyFrom(other.unlockedTeleportList);
- mazeGroupList.copyFrom(other.mazeGroupList);
- mazePropList.copyFrom(other.mazePropList);
- unlockedChestList.copyFrom(other.unlockedChestList);
+ lightenSectionList.copyFrom(other.lightenSectionList);
mapList.copyFrom(other.mapList);
+ mazePropList.copyFrom(other.mazePropList);
+ mazeGroupList.copyFrom(other.mazeGroupList);
+ unlockedChestList.copyFrom(other.unlockedChestList);
}
return this;
}
@@ -619,33 +619,33 @@ public final class GetSceneMapInfoScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasCurMapEntryId()) {
- setCurMapEntryId(other.curMapEntryId);
- }
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
if (other.hasEntryId()) {
setEntryId(other.entryId);
}
- if (other.hasLightenSectionList()) {
- getMutableLightenSectionList().addAll(other.lightenSectionList);
+ if (other.hasCurMapEntryId()) {
+ setCurMapEntryId(other.curMapEntryId);
}
if (other.hasUnlockedTeleportList()) {
getMutableUnlockedTeleportList().addAll(other.unlockedTeleportList);
}
- if (other.hasMazeGroupList()) {
- getMutableMazeGroupList().addAll(other.mazeGroupList);
+ if (other.hasLightenSectionList()) {
+ getMutableLightenSectionList().addAll(other.lightenSectionList);
+ }
+ if (other.hasMapList()) {
+ getMutableMapList().addAll(other.mapList);
}
if (other.hasMazePropList()) {
getMutableMazePropList().addAll(other.mazePropList);
}
+ if (other.hasMazeGroupList()) {
+ getMutableMazeGroupList().addAll(other.mazeGroupList);
+ }
if (other.hasUnlockedChestList()) {
getMutableUnlockedChestList().addAll(other.unlockedChestList);
}
- if (other.hasMapList()) {
- getMutableMapList().addAll(other.mapList);
- }
return this;
}
@@ -656,15 +656,15 @@ public final class GetSceneMapInfoScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- curMapEntryId = 0;
retcode = 0;
entryId = 0;
- lightenSectionList.clear();
+ curMapEntryId = 0;
unlockedTeleportList.clear();
- mazeGroupList.clear();
- mazePropList.clear();
- unlockedChestList.clear();
+ lightenSectionList.clear();
mapList.clear();
+ mazePropList.clear();
+ mazeGroupList.clear();
+ unlockedChestList.clear();
return this;
}
@@ -675,12 +675,12 @@ public final class GetSceneMapInfoScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- lightenSectionList.clear();
unlockedTeleportList.clear();
- mazeGroupList.clearQuick();
- mazePropList.clearQuick();
- unlockedChestList.clearQuick();
+ lightenSectionList.clear();
mapList.clearQuick();
+ mazePropList.clearQuick();
+ mazeGroupList.clearQuick();
+ unlockedChestList.clearQuick();
return this;
}
@@ -694,65 +694,65 @@ public final class GetSceneMapInfoScRspOuterClass {
}
GetSceneMapInfoScRsp other = (GetSceneMapInfoScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasCurMapEntryId() || curMapEntryId == other.curMapEntryId)
&& (!hasRetcode() || retcode == other.retcode)
&& (!hasEntryId() || entryId == other.entryId)
- && (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList))
+ && (!hasCurMapEntryId() || curMapEntryId == other.curMapEntryId)
&& (!hasUnlockedTeleportList() || unlockedTeleportList.equals(other.unlockedTeleportList))
- && (!hasMazeGroupList() || mazeGroupList.equals(other.mazeGroupList))
+ && (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList))
+ && (!hasMapList() || mapList.equals(other.mapList))
&& (!hasMazePropList() || mazePropList.equals(other.mazePropList))
- && (!hasUnlockedChestList() || unlockedChestList.equals(other.unlockedChestList))
- && (!hasMapList() || mapList.equals(other.mapList));
+ && (!hasMazeGroupList() || mazeGroupList.equals(other.mazeGroupList))
+ && (!hasUnlockedChestList() || unlockedChestList.equals(other.unlockedChestList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
- output.writeUInt32NoTag(curMapEntryId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(retcode);
}
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 120);
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(entryId);
}
- if ((bitField0_ & 0x00000008) != 0) {
- for (int i = 0; i < lightenSectionList.length(); i++) {
- output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(lightenSectionList.array()[i]);
- }
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 80);
+ output.writeUInt32NoTag(curMapEntryId);
}
- if ((bitField0_ & 0x00000010) != 0) {
+ if ((bitField0_ & 0x00000008) != 0) {
for (int i = 0; i < unlockedTeleportList.length(); i++) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(unlockedTeleportList.array()[i]);
}
}
+ if ((bitField0_ & 0x00000010) != 0) {
+ for (int i = 0; i < lightenSectionList.length(); i++) {
+ output.writeRawByte((byte) 72);
+ output.writeUInt32NoTag(lightenSectionList.array()[i]);
+ }
+ }
if ((bitField0_ & 0x00000020) != 0) {
- for (int i = 0; i < mazeGroupList.length(); i++) {
+ for (int i = 0; i < mapList.length(); i++) {
output.writeRawByte((byte) 18);
- output.writeMessageNoTag(mazeGroupList.get(i));
+ output.writeMessageNoTag(mapList.get(i));
}
}
if ((bitField0_ & 0x00000040) != 0) {
for (int i = 0; i < mazePropList.length(); i++) {
- output.writeRawByte((byte) 34);
+ output.writeRawByte((byte) 66);
output.writeMessageNoTag(mazePropList.get(i));
}
}
if ((bitField0_ & 0x00000080) != 0) {
- for (int i = 0; i < unlockedChestList.length(); i++) {
- output.writeRawByte((byte) 82);
- output.writeMessageNoTag(unlockedChestList.get(i));
+ for (int i = 0; i < mazeGroupList.length(); i++) {
+ output.writeRawByte((byte) 106);
+ output.writeMessageNoTag(mazeGroupList.get(i));
}
}
if ((bitField0_ & 0x00000100) != 0) {
- for (int i = 0; i < mapList.length(); i++) {
- output.writeRawByte((byte) 98);
- output.writeMessageNoTag(mapList.get(i));
+ for (int i = 0; i < unlockedChestList.length(); i++) {
+ output.writeRawByte((byte) 114);
+ output.writeMessageNoTag(unlockedChestList.get(i));
}
}
}
@@ -761,31 +761,31 @@ public final class GetSceneMapInfoScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(curMapEntryId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId);
}
- if ((bitField0_ & 0x00000008) != 0) {
- size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList);
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(curMapEntryId);
}
- if ((bitField0_ & 0x00000010) != 0) {
+ if ((bitField0_ & 0x00000008) != 0) {
size += (1 * unlockedTeleportList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unlockedTeleportList);
}
+ if ((bitField0_ & 0x00000010) != 0) {
+ size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList);
+ }
if ((bitField0_ & 0x00000020) != 0) {
- size += (1 * mazeGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeGroupList);
+ size += (1 * mapList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mapList);
}
if ((bitField0_ & 0x00000040) != 0) {
size += (1 * mazePropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazePropList);
}
if ((bitField0_ & 0x00000080) != 0) {
- size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList);
+ size += (1 * mazeGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeGroupList);
}
if ((bitField0_ & 0x00000100) != 0) {
- size += (1 * mapList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mapList);
+ size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList);
}
return size;
}
@@ -797,45 +797,45 @@ public final class GetSceneMapInfoScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
- // curMapEntryId
- curMapEntryId = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 64) {
- break;
- }
- }
- case 64: {
+ case 8: {
// retcode
retcode = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 48) {
break;
}
}
- case 120: {
+ case 48: {
// entryId
entryId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 80) {
+ break;
+ }
+ }
+ case 80: {
+ // curMapEntryId
+ curMapEntryId = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 10) {
+ if (tag != 26) {
break;
}
}
- case 10: {
- // lightenSectionList [packed=true]
- input.readPackedUInt32(lightenSectionList, tag);
- bitField0_ |= 0x00000008;
- tag = input.readTag();
- if (tag != 114) {
- break;
- }
- }
- case 114: {
+ case 26: {
// unlockedTeleportList [packed=true]
input.readPackedUInt32(unlockedTeleportList, tag);
+ bitField0_ |= 0x00000008;
+ tag = input.readTag();
+ if (tag != 74) {
+ break;
+ }
+ }
+ case 74: {
+ // lightenSectionList [packed=true]
+ input.readPackedUInt32(lightenSectionList, tag);
bitField0_ |= 0x00000010;
tag = input.readTag();
if (tag != 18) {
@@ -843,32 +843,32 @@ public final class GetSceneMapInfoScRspOuterClass {
}
}
case 18: {
- // mazeGroupList
- tag = input.readRepeatedMessage(mazeGroupList, tag);
+ // mapList
+ tag = input.readRepeatedMessage(mapList, tag);
bitField0_ |= 0x00000020;
- if (tag != 34) {
+ if (tag != 66) {
break;
}
}
- case 34: {
+ case 66: {
// mazePropList
tag = input.readRepeatedMessage(mazePropList, tag);
bitField0_ |= 0x00000040;
- if (tag != 82) {
+ if (tag != 106) {
break;
}
}
- case 82: {
+ case 106: {
+ // mazeGroupList
+ tag = input.readRepeatedMessage(mazeGroupList, tag);
+ bitField0_ |= 0x00000080;
+ if (tag != 114) {
+ break;
+ }
+ }
+ case 114: {
// unlockedChestList
tag = input.readRepeatedMessage(unlockedChestList, tag);
- bitField0_ |= 0x00000080;
- if (tag != 98) {
- break;
- }
- }
- case 98: {
- // mapList
- tag = input.readRepeatedMessage(mapList, tag);
bitField0_ |= 0x00000100;
if (tag != 0) {
break;
@@ -884,15 +884,15 @@ public final class GetSceneMapInfoScRspOuterClass {
tag = input.readTag();
break;
}
- case 8: {
- // lightenSectionList [packed=false]
- tag = input.readRepeatedUInt32(lightenSectionList, tag);
+ case 24: {
+ // unlockedTeleportList [packed=false]
+ tag = input.readRepeatedUInt32(unlockedTeleportList, tag);
bitField0_ |= 0x00000008;
break;
}
- case 112: {
- // unlockedTeleportList [packed=false]
- tag = input.readRepeatedUInt32(unlockedTeleportList, tag);
+ case 72: {
+ // lightenSectionList [packed=false]
+ tag = input.readRepeatedUInt32(lightenSectionList, tag);
bitField0_ |= 0x00000010;
break;
}
@@ -904,31 +904,31 @@ public final class GetSceneMapInfoScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.curMapEntryId, curMapEntryId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.retcode, retcode);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.entryId, entryId);
}
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList);
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeUInt32(FieldNames.curMapEntryId, curMapEntryId);
}
- if ((bitField0_ & 0x00000010) != 0) {
+ if ((bitField0_ & 0x00000008) != 0) {
output.writeRepeatedUInt32(FieldNames.unlockedTeleportList, unlockedTeleportList);
}
+ if ((bitField0_ & 0x00000010) != 0) {
+ output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList);
+ }
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRepeatedMessage(FieldNames.mazeGroupList, mazeGroupList);
+ output.writeRepeatedMessage(FieldNames.mapList, mapList);
}
if ((bitField0_ & 0x00000040) != 0) {
output.writeRepeatedMessage(FieldNames.mazePropList, mazePropList);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList);
+ output.writeRepeatedMessage(FieldNames.mazeGroupList, mazeGroupList);
}
if ((bitField0_ & 0x00000100) != 0) {
- output.writeRepeatedMessage(FieldNames.mapList, mapList);
+ output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList);
}
output.endObject();
}
@@ -940,23 +940,11 @@ public final class GetSceneMapInfoScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 764919441:
- case 2115673898: {
- if (input.isAtField(FieldNames.curMapEntryId)) {
- if (!input.trySkipNullValue()) {
- curMapEntryId = input.readUInt32();
- bitField0_ |= 0x00000001;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 1097936398: {
if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
retcode = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
}
} else {
input.skipUnknownField();
@@ -968,19 +956,19 @@ public final class GetSceneMapInfoScRspOuterClass {
if (input.isAtField(FieldNames.entryId)) {
if (!input.trySkipNullValue()) {
entryId = input.readUInt32();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
}
} else {
input.skipUnknownField();
}
break;
}
- case -1942343836:
- case 1328850360: {
- if (input.isAtField(FieldNames.lightenSectionList)) {
+ case 764919441:
+ case 2115673898: {
+ if (input.isAtField(FieldNames.curMapEntryId)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedUInt32(lightenSectionList);
- bitField0_ |= 0x00000008;
+ curMapEntryId = input.readUInt32();
+ bitField0_ |= 0x00000004;
}
} else {
input.skipUnknownField();
@@ -992,6 +980,18 @@ public final class GetSceneMapInfoScRspOuterClass {
if (input.isAtField(FieldNames.unlockedTeleportList)) {
if (!input.trySkipNullValue()) {
input.readRepeatedUInt32(unlockedTeleportList);
+ bitField0_ |= 0x00000008;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -1942343836:
+ case 1328850360: {
+ if (input.isAtField(FieldNames.lightenSectionList)) {
+ if (!input.trySkipNullValue()) {
+ input.readRepeatedUInt32(lightenSectionList);
bitField0_ |= 0x00000010;
}
} else {
@@ -999,11 +999,11 @@ public final class GetSceneMapInfoScRspOuterClass {
}
break;
}
- case -317054274:
- case 407435998: {
- if (input.isAtField(FieldNames.mazeGroupList)) {
+ case 836484122:
+ case 178830753: {
+ if (input.isAtField(FieldNames.mapList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(mazeGroupList);
+ input.readRepeatedMessage(mapList);
bitField0_ |= 0x00000020;
}
} else {
@@ -1023,11 +1023,11 @@ public final class GetSceneMapInfoScRspOuterClass {
}
break;
}
- case -337762404:
- case 231688696: {
- if (input.isAtField(FieldNames.unlockedChestList)) {
+ case -317054274:
+ case 407435998: {
+ if (input.isAtField(FieldNames.mazeGroupList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(unlockedChestList);
+ input.readRepeatedMessage(mazeGroupList);
bitField0_ |= 0x00000080;
}
} else {
@@ -1035,11 +1035,11 @@ public final class GetSceneMapInfoScRspOuterClass {
}
break;
}
- case 836484122:
- case 178830753: {
- if (input.isAtField(FieldNames.mapList)) {
+ case -337762404:
+ case 231688696: {
+ if (input.isAtField(FieldNames.unlockedChestList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(mapList);
+ input.readRepeatedMessage(unlockedChestList);
bitField0_ |= 0x00000100;
}
} else {
@@ -1100,23 +1100,23 @@ public final class GetSceneMapInfoScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName curMapEntryId = FieldName.forField("curMapEntryId", "cur_map_entry_id");
-
static final FieldName retcode = FieldName.forField("retcode");
static final FieldName entryId = FieldName.forField("entryId", "entry_id");
- static final FieldName lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_list");
+ static final FieldName curMapEntryId = FieldName.forField("curMapEntryId", "cur_map_entry_id");
static final FieldName unlockedTeleportList = FieldName.forField("unlockedTeleportList", "unlocked_teleport_list");
- static final FieldName mazeGroupList = FieldName.forField("mazeGroupList", "maze_group_list");
+ static final FieldName lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_list");
+
+ static final FieldName mapList = FieldName.forField("mapList", "map_list");
static final FieldName mazePropList = FieldName.forField("mazePropList", "maze_prop_list");
- static final FieldName unlockedChestList = FieldName.forField("unlockedChestList", "unlocked_chest_list");
+ static final FieldName mazeGroupList = FieldName.forField("mazeGroupList", "maze_group_list");
- static final FieldName mapList = FieldName.forField("mapList", "map_list");
+ static final FieldName unlockedChestList = FieldName.forField("unlockedChestList", "unlocked_chest_list");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/GetShopListCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetShopListCsReqOuterClass.java
index 2394832..7c0bae1 100644
--- a/src/generated/main/emu/lunarcore/proto/GetShopListCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetShopListCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class GetShopListCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 shop_type = 7;
+ * optional uint32 shop_type = 5;
*/
private int shopType;
@@ -34,7 +34,7 @@ public final class GetShopListCsReqOuterClass {
}
/**
- * optional uint32 shop_type = 7;
+ * optional uint32 shop_type = 5;
* @return whether the shopType field is set
*/
public boolean hasShopType() {
@@ -42,7 +42,7 @@ public final class GetShopListCsReqOuterClass {
}
/**
- * optional uint32 shop_type = 7;
+ * optional uint32 shop_type = 5;
* @return this
*/
public GetShopListCsReq clearShopType() {
@@ -52,7 +52,7 @@ public final class GetShopListCsReqOuterClass {
}
/**
- * optional uint32 shop_type = 7;
+ * optional uint32 shop_type = 5;
* @return the shopType
*/
public int getShopType() {
@@ -60,7 +60,7 @@ public final class GetShopListCsReqOuterClass {
}
/**
- * optional uint32 shop_type = 7;
+ * optional uint32 shop_type = 5;
* @param value the shopType to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class GetShopListCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(shopType);
}
}
@@ -150,7 +150,7 @@ public final class GetShopListCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
+ case 40: {
// shopType
shopType = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/GetShopListScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetShopListScRspOuterClass.java
index d95fe81..f608209 100644
--- a/src/generated/main/emu/lunarcore/proto/GetShopListScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetShopListScRspOuterClass.java
@@ -20,17 +20,17 @@ public final class GetShopListScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 1;
+ * optional uint32 retcode = 5;
*/
private int retcode;
/**
- * optional uint32 shop_type = 11;
+ * optional uint32 shop_type = 7;
*/
private int shopType;
/**
- * repeated .Shop shop_list = 7;
+ * repeated .Shop shop_list = 8;
*/
private final RepeatedMessageoptional uint32 retcode = 1;
+ * optional uint32 retcode = 5;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -53,7 +53,7 @@ public final class GetShopListScRspOuterClass {
}
/**
- * optional uint32 retcode = 1;
+ * optional uint32 retcode = 5;
* @return this
*/
public GetShopListScRsp clearRetcode() {
@@ -63,7 +63,7 @@ public final class GetShopListScRspOuterClass {
}
/**
- * optional uint32 retcode = 1;
+ * optional uint32 retcode = 5;
* @return the retcode
*/
public int getRetcode() {
@@ -71,7 +71,7 @@ public final class GetShopListScRspOuterClass {
}
/**
- * optional uint32 retcode = 1;
+ * optional uint32 retcode = 5;
* @param value the retcode to set
* @return this
*/
@@ -82,7 +82,7 @@ public final class GetShopListScRspOuterClass {
}
/**
- * optional uint32 shop_type = 11;
+ * optional uint32 shop_type = 7;
* @return whether the shopType field is set
*/
public boolean hasShopType() {
@@ -90,7 +90,7 @@ public final class GetShopListScRspOuterClass {
}
/**
- * optional uint32 shop_type = 11;
+ * optional uint32 shop_type = 7;
* @return this
*/
public GetShopListScRsp clearShopType() {
@@ -100,7 +100,7 @@ public final class GetShopListScRspOuterClass {
}
/**
- * optional uint32 shop_type = 11;
+ * optional uint32 shop_type = 7;
* @return the shopType
*/
public int getShopType() {
@@ -108,7 +108,7 @@ public final class GetShopListScRspOuterClass {
}
/**
- * optional uint32 shop_type = 11;
+ * optional uint32 shop_type = 7;
* @param value the shopType to set
* @return this
*/
@@ -119,7 +119,7 @@ public final class GetShopListScRspOuterClass {
}
/**
- * repeated .Shop shop_list = 7;
+ * repeated .Shop shop_list = 8;
* @return whether the shopList field is set
*/
public boolean hasShopList() {
@@ -127,7 +127,7 @@ public final class GetShopListScRspOuterClass {
}
/**
- * repeated .Shop shop_list = 7;
+ * repeated .Shop shop_list = 8;
* @return this
*/
public GetShopListScRsp clearShopList() {
@@ -137,7 +137,7 @@ public final class GetShopListScRspOuterClass {
}
/**
- * repeated .Shop shop_list = 7;
+ * repeated .Shop shop_list = 8;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -151,7 +151,7 @@ public final class GetShopListScRspOuterClass {
}
/**
- * repeated .Shop shop_list = 7;
+ * repeated .Shop shop_list = 8;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -165,7 +165,7 @@ public final class GetShopListScRspOuterClass {
}
/**
- * repeated .Shop shop_list = 7;
+ * repeated .Shop shop_list = 8;
* @param value the shopList to add
* @return this
*/
@@ -176,7 +176,7 @@ public final class GetShopListScRspOuterClass {
}
/**
- * repeated .Shop shop_list = 7;
+ * repeated .Shop shop_list = 8;
* @param values the shopList to add
* @return this
*/
@@ -258,16 +258,16 @@ public final class GetShopListScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(shopType);
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < shopList.length(); i++) {
- output.writeRawByte((byte) 58);
+ output.writeRawByte((byte) 66);
output.writeMessageNoTag(shopList.get(i));
}
}
@@ -295,25 +295,25 @@ public final class GetShopListScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 40: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 88) {
+ if (tag != 56) {
break;
}
}
- case 88: {
+ case 56: {
// shopType
shopType = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 58) {
+ if (tag != 66) {
break;
}
}
- case 58: {
+ case 66: {
// shopList
tag = input.readRepeatedMessage(shopList, tag);
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportCsReqOuterClass.java
index 6973675..bfa4941 100644
--- a/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportCsReqOuterClass.java
@@ -20,7 +20,7 @@ public final class GetUnlockTeleportCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated uint32 entry_id_list = 10;
+ * repeated uint32 entry_id_list = 1;
*/
private final RepeatedInt entryIdList = RepeatedInt.newEmptyInstance();
@@ -35,7 +35,7 @@ public final class GetUnlockTeleportCsReqOuterClass {
}
/**
- * repeated uint32 entry_id_list = 10;
+ * repeated uint32 entry_id_list = 1;
* @return whether the entryIdList field is set
*/
public boolean hasEntryIdList() {
@@ -43,7 +43,7 @@ public final class GetUnlockTeleportCsReqOuterClass {
}
/**
- * repeated uint32 entry_id_list = 10;
+ * repeated uint32 entry_id_list = 1;
* @return this
*/
public GetUnlockTeleportCsReq clearEntryIdList() {
@@ -53,7 +53,7 @@ public final class GetUnlockTeleportCsReqOuterClass {
}
/**
- * repeated uint32 entry_id_list = 10;
+ * repeated uint32 entry_id_list = 1;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class GetUnlockTeleportCsReqOuterClass {
}
/**
- * repeated uint32 entry_id_list = 10;
+ * repeated uint32 entry_id_list = 1;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class GetUnlockTeleportCsReqOuterClass {
}
/**
- * repeated uint32 entry_id_list = 10;
+ * repeated uint32 entry_id_list = 1;
* @param value the entryIdList to add
* @return this
*/
@@ -92,7 +92,7 @@ public final class GetUnlockTeleportCsReqOuterClass {
}
/**
- * repeated uint32 entry_id_list = 10;
+ * repeated uint32 entry_id_list = 1;
* @param values the entryIdList to add
* @return this
*/
@@ -163,7 +163,7 @@ public final class GetUnlockTeleportCsReqOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < entryIdList.length(); i++) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(entryIdList.array()[i]);
}
}
@@ -185,7 +185,7 @@ public final class GetUnlockTeleportCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 82: {
+ case 10: {
// entryIdList [packed=true]
input.readPackedUInt32(entryIdList, tag);
bitField0_ |= 0x00000001;
@@ -204,7 +204,7 @@ public final class GetUnlockTeleportCsReqOuterClass {
tag = input.readTag();
break;
}
- case 80: {
+ case 8: {
// entryIdList [packed=false]
tag = input.readRepeatedUInt32(entryIdList, tag);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportScRspOuterClass.java
index 14c58f9..e416237 100644
--- a/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportScRspOuterClass.java
@@ -20,12 +20,12 @@ public final class GetUnlockTeleportScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 12;
*/
private int retcode;
/**
- * repeated uint32 unlocked_teleport_list = 7;
+ * repeated uint32 unlocked_teleport_list = 8;
*/
private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance();
@@ -40,7 +40,7 @@ public final class GetUnlockTeleportScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 12;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public final class GetUnlockTeleportScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 12;
* @return this
*/
public GetUnlockTeleportScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public final class GetUnlockTeleportScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 12;
* @return the retcode
*/
public int getRetcode() {
@@ -66,7 +66,7 @@ public final class GetUnlockTeleportScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
+ * optional uint32 retcode = 12;
* @param value the retcode to set
* @return this
*/
@@ -77,7 +77,7 @@ public final class GetUnlockTeleportScRspOuterClass {
}
/**
- * repeated uint32 unlocked_teleport_list = 7;
+ * repeated uint32 unlocked_teleport_list = 8;
* @return whether the unlockedTeleportList field is set
*/
public boolean hasUnlockedTeleportList() {
@@ -85,7 +85,7 @@ public final class GetUnlockTeleportScRspOuterClass {
}
/**
- * repeated uint32 unlocked_teleport_list = 7;
+ * repeated uint32 unlocked_teleport_list = 8;
* @return this
*/
public GetUnlockTeleportScRsp clearUnlockedTeleportList() {
@@ -95,7 +95,7 @@ public final class GetUnlockTeleportScRspOuterClass {
}
/**
- * repeated uint32 unlocked_teleport_list = 7;
+ * repeated uint32 unlocked_teleport_list = 8;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class GetUnlockTeleportScRspOuterClass {
}
/**
- * repeated uint32 unlocked_teleport_list = 7;
+ * repeated uint32 unlocked_teleport_list = 8;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public final class GetUnlockTeleportScRspOuterClass {
}
/**
- * repeated uint32 unlocked_teleport_list = 7;
+ * repeated uint32 unlocked_teleport_list = 8;
* @param value the unlockedTeleportList to add
* @return this
*/
@@ -134,7 +134,7 @@ public final class GetUnlockTeleportScRspOuterClass {
}
/**
- * repeated uint32 unlocked_teleport_list = 7;
+ * repeated uint32 unlocked_teleport_list = 8;
* @param values the unlockedTeleportList to add
* @return this
*/
@@ -210,12 +210,12 @@ public final class GetUnlockTeleportScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < unlockedTeleportList.length(); i++) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(unlockedTeleportList.array()[i]);
}
}
@@ -240,16 +240,16 @@ public final class GetUnlockTeleportScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
+ case 96: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 58) {
+ if (tag != 66) {
break;
}
}
- case 58: {
+ case 66: {
// unlockedTeleportList [packed=true]
input.readPackedUInt32(unlockedTeleportList, tag);
bitField0_ |= 0x00000002;
@@ -268,7 +268,7 @@ public final class GetUnlockTeleportScRspOuterClass {
tag = input.readTag();
break;
}
- case 56: {
+ case 64: {
// unlockedTeleportList [packed=false]
tag = input.readRepeatedUInt32(unlockedTeleportList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/GoodsOuterClass.java b/src/generated/main/emu/lunarcore/proto/GoodsOuterClass.java
index 82dfbbd..08d5e7f 100644
--- a/src/generated/main/emu/lunarcore/proto/GoodsOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GoodsOuterClass.java
@@ -18,31 +18,31 @@ public final class GoodsOuterClass {
public static final class Goods extends ProtoMessageoptional int64 begin_time = 2;
+ */
+ private long beginTime;
+
/**
* optional int64 end_time = 3;
*/
private long endTime;
/**
- * optional int64 begin_time = 8;
- */
- private long beginTime;
-
- /**
- * optional uint32 item_id = 4;
+ * optional uint32 item_id = 6;
*/
private int itemId;
- /**
- * optional uint32 buy_times = 10;
- */
- private int buyTimes;
-
/**
* optional uint32 goods_id = 13;
*/
private int goodsId;
+ /**
+ * optional uint32 buy_times = 14;
+ */
+ private int buyTimes;
+
private Goods() {
}
@@ -53,12 +53,49 @@ public final class GoodsOuterClass {
return new Goods();
}
+ /**
+ * optional int64 begin_time = 2;
+ * @return whether the beginTime field is set
+ */
+ public boolean hasBeginTime() {
+ return (bitField0_ & 0x00000001) != 0;
+ }
+
+ /**
+ * optional int64 begin_time = 2;
+ * @return this
+ */
+ public Goods clearBeginTime() {
+ bitField0_ &= ~0x00000001;
+ beginTime = 0L;
+ return this;
+ }
+
+ /**
+ * optional int64 begin_time = 2;
+ * @return the beginTime
+ */
+ public long getBeginTime() {
+ return beginTime;
+ }
+
+ /**
+ * optional int64 begin_time = 2;
+ * @param value the beginTime to set
+ * @return this
+ */
+ public Goods setBeginTime(final long value) {
+ bitField0_ |= 0x00000001;
+ beginTime = value;
+ return this;
+ }
+
/**
* optional int64 end_time = 3;
* @return whether the endTime field is set
*/
public boolean hasEndTime() {
- return (bitField0_ & 0x00000001) != 0;
+ return (bitField0_ & 0x00000002) != 0;
}
/**
@@ -66,7 +103,7 @@ public final class GoodsOuterClass {
* @return this
*/
public Goods clearEndTime() {
- bitField0_ &= ~0x00000001;
+ bitField0_ &= ~0x00000002;
endTime = 0L;
return this;
}
@@ -85,50 +122,13 @@ public final class GoodsOuterClass {
* @return this
*/
public Goods setEndTime(final long value) {
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
endTime = value;
return this;
}
/**
- * optional int64 begin_time = 8;
- * @return whether the beginTime field is set
- */
- public boolean hasBeginTime() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional int64 begin_time = 8;
- * @return this
- */
- public Goods clearBeginTime() {
- bitField0_ &= ~0x00000002;
- beginTime = 0L;
- return this;
- }
-
- /**
- * optional int64 begin_time = 8;
- * @return the beginTime
- */
- public long getBeginTime() {
- return beginTime;
- }
-
- /**
- * optional int64 begin_time = 8;
- * @param value the beginTime to set
- * @return this
- */
- public Goods setBeginTime(final long value) {
- bitField0_ |= 0x00000002;
- beginTime = value;
- return this;
- }
-
- /**
- * optional uint32 item_id = 4;
+ * optional uint32 item_id = 6;
* @return whether the itemId field is set
*/
public boolean hasItemId() {
@@ -136,7 +136,7 @@ public final class GoodsOuterClass {
}
/**
- * optional uint32 item_id = 4;
+ * optional uint32 item_id = 6;
* @return this
*/
public Goods clearItemId() {
@@ -146,7 +146,7 @@ public final class GoodsOuterClass {
}
/**
- * optional uint32 item_id = 4;
+ * optional uint32 item_id = 6;
* @return the itemId
*/
public int getItemId() {
@@ -154,7 +154,7 @@ public final class GoodsOuterClass {
}
/**
- * optional uint32 item_id = 4;
+ * optional uint32 item_id = 6;
* @param value the itemId to set
* @return this
*/
@@ -164,49 +164,12 @@ public final class GoodsOuterClass {
return this;
}
- /**
- * optional uint32 buy_times = 10;
- * @return whether the buyTimes field is set
- */
- public boolean hasBuyTimes() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional uint32 buy_times = 10;
- * @return this
- */
- public Goods clearBuyTimes() {
- bitField0_ &= ~0x00000008;
- buyTimes = 0;
- return this;
- }
-
- /**
- * optional uint32 buy_times = 10;
- * @return the buyTimes
- */
- public int getBuyTimes() {
- return buyTimes;
- }
-
- /**
- * optional uint32 buy_times = 10;
- * @param value the buyTimes to set
- * @return this
- */
- public Goods setBuyTimes(final int value) {
- bitField0_ |= 0x00000008;
- buyTimes = value;
- return this;
- }
-
/**
* optional uint32 goods_id = 13;
* @return whether the goodsId field is set
*/
public boolean hasGoodsId() {
- return (bitField0_ & 0x00000010) != 0;
+ return (bitField0_ & 0x00000008) != 0;
}
/**
@@ -214,7 +177,7 @@ public final class GoodsOuterClass {
* @return this
*/
public Goods clearGoodsId() {
- bitField0_ &= ~0x00000010;
+ bitField0_ &= ~0x00000008;
goodsId = 0;
return this;
}
@@ -233,21 +196,58 @@ public final class GoodsOuterClass {
* @return this
*/
public Goods setGoodsId(final int value) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
goodsId = value;
return this;
}
+ /**
+ * optional uint32 buy_times = 14;
+ * @return whether the buyTimes field is set
+ */
+ public boolean hasBuyTimes() {
+ return (bitField0_ & 0x00000010) != 0;
+ }
+
+ /**
+ * optional uint32 buy_times = 14;
+ * @return this
+ */
+ public Goods clearBuyTimes() {
+ bitField0_ &= ~0x00000010;
+ buyTimes = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 buy_times = 14;
+ * @return the buyTimes
+ */
+ public int getBuyTimes() {
+ return buyTimes;
+ }
+
+ /**
+ * optional uint32 buy_times = 14;
+ * @param value the buyTimes to set
+ * @return this
+ */
+ public Goods setBuyTimes(final int value) {
+ bitField0_ |= 0x00000010;
+ buyTimes = value;
+ return this;
+ }
+
@Override
public Goods copyFrom(final Goods other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- endTime = other.endTime;
beginTime = other.beginTime;
+ endTime = other.endTime;
itemId = other.itemId;
- buyTimes = other.buyTimes;
goodsId = other.goodsId;
+ buyTimes = other.buyTimes;
}
return this;
}
@@ -258,21 +258,21 @@ public final class GoodsOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasEndTime()) {
- setEndTime(other.endTime);
- }
if (other.hasBeginTime()) {
setBeginTime(other.beginTime);
}
+ if (other.hasEndTime()) {
+ setEndTime(other.endTime);
+ }
if (other.hasItemId()) {
setItemId(other.itemId);
}
- if (other.hasBuyTimes()) {
- setBuyTimes(other.buyTimes);
- }
if (other.hasGoodsId()) {
setGoodsId(other.goodsId);
}
+ if (other.hasBuyTimes()) {
+ setBuyTimes(other.buyTimes);
+ }
return this;
}
@@ -283,11 +283,11 @@ public final class GoodsOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- endTime = 0L;
beginTime = 0L;
+ endTime = 0L;
itemId = 0;
- buyTimes = 0;
goodsId = 0;
+ buyTimes = 0;
return this;
}
@@ -311,54 +311,54 @@ public final class GoodsOuterClass {
}
Goods other = (Goods) o;
return bitField0_ == other.bitField0_
- && (!hasEndTime() || endTime == other.endTime)
&& (!hasBeginTime() || beginTime == other.beginTime)
+ && (!hasEndTime() || endTime == other.endTime)
&& (!hasItemId() || itemId == other.itemId)
- && (!hasBuyTimes() || buyTimes == other.buyTimes)
- && (!hasGoodsId() || goodsId == other.goodsId);
+ && (!hasGoodsId() || goodsId == other.goodsId)
+ && (!hasBuyTimes() || buyTimes == other.buyTimes);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
+ output.writeRawByte((byte) 16);
+ output.writeInt64NoTag(beginTime);
+ }
+ if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 24);
output.writeInt64NoTag(endTime);
}
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 64);
- output.writeInt64NoTag(beginTime);
- }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(itemId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(buyTimes);
- }
- if ((bitField0_ & 0x00000010) != 0) {
output.writeRawByte((byte) 104);
output.writeUInt32NoTag(goodsId);
}
+ if ((bitField0_ & 0x00000010) != 0) {
+ output.writeRawByte((byte) 112);
+ output.writeUInt32NoTag(buyTimes);
+ }
}
@Override
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeInt64SizeNoTag(endTime);
+ size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime);
+ size += 1 + ProtoSink.computeInt64SizeNoTag(endTime);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(buyTimes);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(buyTimes);
}
return size;
}
@@ -370,38 +370,29 @@ public final class GoodsOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
+ case 16: {
+ // beginTime
+ beginTime = input.readInt64();
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 24) {
+ break;
+ }
+ }
case 24: {
// endTime
endTime = input.readInt64();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 64) {
- break;
- }
- }
- case 64: {
- // beginTime
- beginTime = input.readInt64();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 32) {
+ if (tag != 48) {
break;
}
}
- case 32: {
+ case 48: {
// itemId
itemId = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 80) {
- break;
- }
- }
- case 80: {
- // buyTimes
- buyTimes = input.readUInt32();
- bitField0_ |= 0x00000008;
- tag = input.readTag();
if (tag != 104) {
break;
}
@@ -409,6 +400,15 @@ public final class GoodsOuterClass {
case 104: {
// goodsId
goodsId = input.readUInt32();
+ bitField0_ |= 0x00000008;
+ tag = input.readTag();
+ if (tag != 112) {
+ break;
+ }
+ }
+ case 112: {
+ // buyTimes
+ buyTimes = input.readUInt32();
bitField0_ |= 0x00000010;
tag = input.readTag();
if (tag != 0) {
@@ -433,19 +433,19 @@ public final class GoodsOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeInt64(FieldNames.endTime, endTime);
+ output.writeInt64(FieldNames.beginTime, beginTime);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeInt64(FieldNames.beginTime, beginTime);
+ output.writeInt64(FieldNames.endTime, endTime);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.itemId, itemId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.buyTimes, buyTimes);
+ output.writeUInt32(FieldNames.goodsId, goodsId);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeUInt32(FieldNames.goodsId, goodsId);
+ output.writeUInt32(FieldNames.buyTimes, buyTimes);
}
output.endObject();
}
@@ -457,11 +457,11 @@ public final class GoodsOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1607243192:
- case 1725551537: {
- if (input.isAtField(FieldNames.endTime)) {
+ case -1072839914:
+ case 1112183971: {
+ if (input.isAtField(FieldNames.beginTime)) {
if (!input.trySkipNullValue()) {
- endTime = input.readInt64();
+ beginTime = input.readInt64();
bitField0_ |= 0x00000001;
}
} else {
@@ -469,11 +469,11 @@ public final class GoodsOuterClass {
}
break;
}
- case -1072839914:
- case 1112183971: {
- if (input.isAtField(FieldNames.beginTime)) {
+ case -1607243192:
+ case 1725551537: {
+ if (input.isAtField(FieldNames.endTime)) {
if (!input.trySkipNullValue()) {
- beginTime = input.readInt64();
+ endTime = input.readInt64();
bitField0_ |= 0x00000002;
}
} else {
@@ -493,11 +493,11 @@ public final class GoodsOuterClass {
}
break;
}
- case -994591648:
- case -442602419: {
- if (input.isAtField(FieldNames.buyTimes)) {
+ case 207037201:
+ case 2123207332: {
+ if (input.isAtField(FieldNames.goodsId)) {
if (!input.trySkipNullValue()) {
- buyTimes = input.readUInt32();
+ goodsId = input.readUInt32();
bitField0_ |= 0x00000008;
}
} else {
@@ -505,11 +505,11 @@ public final class GoodsOuterClass {
}
break;
}
- case 207037201:
- case 2123207332: {
- if (input.isAtField(FieldNames.goodsId)) {
+ case -994591648:
+ case -442602419: {
+ if (input.isAtField(FieldNames.buyTimes)) {
if (!input.trySkipNullValue()) {
- goodsId = input.readUInt32();
+ buyTimes = input.readUInt32();
bitField0_ |= 0x00000010;
}
} else {
@@ -569,15 +569,15 @@ public final class GoodsOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName endTime = FieldName.forField("endTime", "end_time");
-
static final FieldName beginTime = FieldName.forField("beginTime", "begin_time");
+ static final FieldName endTime = FieldName.forField("endTime", "end_time");
+
static final FieldName itemId = FieldName.forField("itemId", "item_id");
- static final FieldName buyTimes = FieldName.forField("buyTimes", "buy_times");
-
static final FieldName goodsId = FieldName.forField("goodsId", "goods_id");
+
+ static final FieldName buyTimes = FieldName.forField("buyTimes", "buy_times");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/GroupStateChangeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GroupStateChangeCsReqOuterClass.java
index dba3509..152f823 100644
--- a/src/generated/main/emu/lunarcore/proto/GroupStateChangeCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GroupStateChangeCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class GroupStateChangeCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .GroupStateInfo group_state_info = 6;
+ * optional .GroupStateInfo group_state_info = 8;
*/
private final GroupStateInfoOuterClass.GroupStateInfo groupStateInfo = GroupStateInfoOuterClass.GroupStateInfo.newInstance();
@@ -34,7 +34,7 @@ public final class GroupStateChangeCsReqOuterClass {
}
/**
- * optional .GroupStateInfo group_state_info = 6;
+ * optional .GroupStateInfo group_state_info = 8;
* @return whether the groupStateInfo field is set
*/
public boolean hasGroupStateInfo() {
@@ -42,7 +42,7 @@ public final class GroupStateChangeCsReqOuterClass {
}
/**
- * optional .GroupStateInfo group_state_info = 6;
+ * optional .GroupStateInfo group_state_info = 8;
* @return this
*/
public GroupStateChangeCsReq clearGroupStateInfo() {
@@ -52,7 +52,7 @@ public final class GroupStateChangeCsReqOuterClass {
}
/**
- * optional .GroupStateInfo group_state_info = 6;
+ * optional .GroupStateInfo group_state_info = 8;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -66,7 +66,7 @@ public final class GroupStateChangeCsReqOuterClass {
}
/**
- * optional .GroupStateInfo group_state_info = 6;
+ * optional .GroupStateInfo group_state_info = 8;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -80,7 +80,7 @@ public final class GroupStateChangeCsReqOuterClass {
}
/**
- * optional .GroupStateInfo group_state_info = 6;
+ * optional .GroupStateInfo group_state_info = 8;
* @param value the groupStateInfo to set
* @return this
*/
@@ -151,7 +151,7 @@ public final class GroupStateChangeCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 50);
+ output.writeRawByte((byte) 66);
output.writeMessageNoTag(groupStateInfo);
}
}
@@ -172,7 +172,7 @@ public final class GroupStateChangeCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 50: {
+ case 66: {
// groupStateInfo
input.readMessage(groupStateInfo);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/GroupStateChangeScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/GroupStateChangeScNotifyOuterClass.java
index a302888..be254ee 100644
--- a/src/generated/main/emu/lunarcore/proto/GroupStateChangeScNotifyOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GroupStateChangeScNotifyOuterClass.java
@@ -19,7 +19,7 @@ public final class GroupStateChangeScNotifyOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .GroupStateInfo group_state_info = 1;
+ * optional .GroupStateInfo group_state_info = 7;
*/
private final GroupStateInfoOuterClass.GroupStateInfo groupStateInfo = GroupStateInfoOuterClass.GroupStateInfo.newInstance();
@@ -34,7 +34,7 @@ public final class GroupStateChangeScNotifyOuterClass {
}
/**
- * optional .GroupStateInfo group_state_info = 1;
+ * optional .GroupStateInfo group_state_info = 7;
* @return whether the groupStateInfo field is set
*/
public boolean hasGroupStateInfo() {
@@ -42,7 +42,7 @@ public final class GroupStateChangeScNotifyOuterClass {
}
/**
- * optional .GroupStateInfo group_state_info = 1;
+ * optional .GroupStateInfo group_state_info = 7;
* @return this
*/
public GroupStateChangeScNotify clearGroupStateInfo() {
@@ -52,7 +52,7 @@ public final class GroupStateChangeScNotifyOuterClass {
}
/**
- * optional .GroupStateInfo group_state_info = 1;
+ * optional .GroupStateInfo group_state_info = 7;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -66,7 +66,7 @@ public final class GroupStateChangeScNotifyOuterClass {
}
/**
- * optional .GroupStateInfo group_state_info = 1;
+ * optional .GroupStateInfo group_state_info = 7;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -80,7 +80,7 @@ public final class GroupStateChangeScNotifyOuterClass {
}
/**
- * optional .GroupStateInfo group_state_info = 1;
+ * optional .GroupStateInfo group_state_info = 7;
* @param value the groupStateInfo to set
* @return this
*/
@@ -151,7 +151,7 @@ public final class GroupStateChangeScNotifyOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 10);
+ output.writeRawByte((byte) 58);
output.writeMessageNoTag(groupStateInfo);
}
}
@@ -172,7 +172,7 @@ public final class GroupStateChangeScNotifyOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 10: {
+ case 58: {
// groupStateInfo
input.readMessage(groupStateInfo);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/GroupStateChangeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GroupStateChangeScRspOuterClass.java
index 3a7a9b6..97c1f97 100644
--- a/src/generated/main/emu/lunarcore/proto/GroupStateChangeScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GroupStateChangeScRspOuterClass.java
@@ -19,14 +19,14 @@ public final class GroupStateChangeScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 2;
+ * optional uint32 retcode = 15;
*/
private int retcode;
/**
- * optional .GroupStateInfo group_state_info = 1;
+ * optional .GroupStateInfo group_info = 8;
*/
- private final GroupStateInfoOuterClass.GroupStateInfo groupStateInfo = GroupStateInfoOuterClass.GroupStateInfo.newInstance();
+ private final GroupStateInfoOuterClass.GroupStateInfo groupInfo = GroupStateInfoOuterClass.GroupStateInfo.newInstance();
private GroupStateChangeScRsp() {
}
@@ -39,7 +39,7 @@ public final class GroupStateChangeScRspOuterClass {
}
/**
- * optional uint32 retcode = 2;
+ * optional uint32 retcode = 15;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -47,7 +47,7 @@ public final class GroupStateChangeScRspOuterClass {
}
/**
- * optional uint32 retcode = 2;
+ * optional uint32 retcode = 15;
* @return this
*/
public GroupStateChangeScRsp clearRetcode() {
@@ -57,7 +57,7 @@ public final class GroupStateChangeScRspOuterClass {
}
/**
- * optional uint32 retcode = 2;
+ * optional uint32 retcode = 15;
* @return the retcode
*/
public int getRetcode() {
@@ -65,7 +65,7 @@ public final class GroupStateChangeScRspOuterClass {
}
/**
- * optional uint32 retcode = 2;
+ * optional uint32 retcode = 15;
* @param value the retcode to set
* @return this
*/
@@ -76,39 +76,39 @@ public final class GroupStateChangeScRspOuterClass {
}
/**
- * optional .GroupStateInfo group_state_info = 1;
- * @return whether the groupStateInfo field is set
+ * optional .GroupStateInfo group_info = 8;
+ * @return whether the groupInfo field is set
*/
- public boolean hasGroupStateInfo() {
+ public boolean hasGroupInfo() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional .GroupStateInfo group_state_info = 1;
+ * optional .GroupStateInfo group_info = 8;
* @return this
*/
- public GroupStateChangeScRsp clearGroupStateInfo() {
+ public GroupStateChangeScRsp clearGroupInfo() {
bitField0_ &= ~0x00000002;
- groupStateInfo.clear();
+ groupInfo.clear();
return this;
}
/**
- * optional .GroupStateInfo group_state_info = 1;
+ * optional .GroupStateInfo group_info = 8;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
*
- * Use {@link #getMutableGroupStateInfo()} if you want to modify it.
+ * Use {@link #getMutableGroupInfo()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public GroupStateInfoOuterClass.GroupStateInfo getGroupStateInfo() {
- return groupStateInfo;
+ public GroupStateInfoOuterClass.GroupStateInfo getGroupInfo() {
+ return groupInfo;
}
/**
- * optional .GroupStateInfo group_state_info = 1;
+ * optional .GroupStateInfo group_info = 8;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -116,20 +116,19 @@ public final class GroupStateChangeScRspOuterClass {
*
* @return internal storage object for modifications
*/
- public GroupStateInfoOuterClass.GroupStateInfo getMutableGroupStateInfo() {
+ public GroupStateInfoOuterClass.GroupStateInfo getMutableGroupInfo() {
bitField0_ |= 0x00000002;
- return groupStateInfo;
+ return groupInfo;
}
/**
- * optional .GroupStateInfo group_state_info = 1;
- * @param value the groupStateInfo to set
+ * optional .GroupStateInfo group_info = 8;
+ * @param value the groupInfo to set
* @return this
*/
- public GroupStateChangeScRsp setGroupStateInfo(
- final GroupStateInfoOuterClass.GroupStateInfo value) {
+ public GroupStateChangeScRsp setGroupInfo(final GroupStateInfoOuterClass.GroupStateInfo value) {
bitField0_ |= 0x00000002;
- groupStateInfo.copyFrom(value);
+ groupInfo.copyFrom(value);
return this;
}
@@ -139,7 +138,7 @@ public final class GroupStateChangeScRspOuterClass {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
retcode = other.retcode;
- groupStateInfo.copyFrom(other.groupStateInfo);
+ groupInfo.copyFrom(other.groupInfo);
}
return this;
}
@@ -153,8 +152,8 @@ public final class GroupStateChangeScRspOuterClass {
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
- if (other.hasGroupStateInfo()) {
- getMutableGroupStateInfo().mergeFrom(other.groupStateInfo);
+ if (other.hasGroupInfo()) {
+ getMutableGroupInfo().mergeFrom(other.groupInfo);
}
return this;
}
@@ -167,7 +166,7 @@ public final class GroupStateChangeScRspOuterClass {
cachedSize = -1;
bitField0_ = 0;
retcode = 0;
- groupStateInfo.clear();
+ groupInfo.clear();
return this;
}
@@ -178,7 +177,7 @@ public final class GroupStateChangeScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- groupStateInfo.clearQuick();
+ groupInfo.clearQuick();
return this;
}
@@ -193,18 +192,18 @@ public final class GroupStateChangeScRspOuterClass {
GroupStateChangeScRsp other = (GroupStateChangeScRsp) o;
return bitField0_ == other.bitField0_
&& (!hasRetcode() || retcode == other.retcode)
- && (!hasGroupStateInfo() || groupStateInfo.equals(other.groupStateInfo));
+ && (!hasGroupInfo() || groupInfo.equals(other.groupInfo));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 10);
- output.writeMessageNoTag(groupStateInfo);
+ output.writeRawByte((byte) 66);
+ output.writeMessageNoTag(groupInfo);
}
}
@@ -215,7 +214,7 @@ public final class GroupStateChangeScRspOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(groupStateInfo);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(groupInfo);
}
return size;
}
@@ -227,18 +226,18 @@ public final class GroupStateChangeScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
+ case 120: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 10) {
+ if (tag != 66) {
break;
}
}
- case 10: {
- // groupStateInfo
- input.readMessage(groupStateInfo);
+ case 66: {
+ // groupInfo
+ input.readMessage(groupInfo);
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
@@ -266,7 +265,7 @@ public final class GroupStateChangeScRspOuterClass {
output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeMessage(FieldNames.groupStateInfo, groupStateInfo);
+ output.writeMessage(FieldNames.groupInfo, groupInfo);
}
output.endObject();
}
@@ -289,11 +288,11 @@ public final class GroupStateChangeScRspOuterClass {
}
break;
}
- case 1415312672:
- case 1198732636: {
- if (input.isAtField(FieldNames.groupStateInfo)) {
+ case -1483311155:
+ case 1282170478: {
+ if (input.isAtField(FieldNames.groupInfo)) {
if (!input.trySkipNullValue()) {
- input.readMessage(groupStateInfo);
+ input.readMessage(groupInfo);
bitField0_ |= 0x00000002;
}
} else {
@@ -356,7 +355,7 @@ public final class GroupStateChangeScRspOuterClass {
static class FieldNames {
static final FieldName retcode = FieldName.forField("retcode");
- static final FieldName groupStateInfo = FieldName.forField("groupStateInfo", "group_state_info");
+ static final FieldName groupInfo = FieldName.forField("groupInfo", "group_info");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/GroupStateInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/GroupStateInfoOuterClass.java
index bfc90c2..e9f76ad 100644
--- a/src/generated/main/emu/lunarcore/proto/GroupStateInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/GroupStateInfoOuterClass.java
@@ -19,25 +19,33 @@ public final class GroupStateInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 group_state = 4;
- */
- private int groupState;
-
- /**
- * optional uint32 player_uid = 6;
+ * + * OEKBJNJEEDF + *+ * + *
optional uint32 player_uid = 2;
*/
private int playerUid;
/**
- * optional uint32 group_id = 8;
+ * + * EMFPPBJCLGP + *+ * + *
optional uint32 group_state = 3;
*/
- private int groupId;
+ private int groupState;
/**
- * optional uint32 entry_id = 10;
+ * optional uint32 entry_id = 4;
*/
private int entryId;
+ /**
+ * optional uint32 group_id = 5;
+ */
+ private int groupId;
+
private GroupStateInfo() {
}
@@ -49,62 +57,37 @@ public final class GroupStateInfoOuterClass {
}
/**
- * optional uint32 group_state = 4;
- * @return whether the groupState field is set
+ * + * OEKBJNJEEDF + *+ * + *
optional uint32 player_uid = 2;
+ * @return whether the playerUid field is set
*/
- public boolean hasGroupState() {
+ public boolean hasPlayerUid() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 group_state = 4;
- * @return this
- */
- public GroupStateInfo clearGroupState() {
- bitField0_ &= ~0x00000001;
- groupState = 0;
- return this;
- }
-
- /**
- * optional uint32 group_state = 4;
- * @return the groupState
- */
- public int getGroupState() {
- return groupState;
- }
-
- /**
- * optional uint32 group_state = 4;
- * @param value the groupState to set
- * @return this
- */
- public GroupStateInfo setGroupState(final int value) {
- bitField0_ |= 0x00000001;
- groupState = value;
- return this;
- }
-
- /**
- * optional uint32 player_uid = 6;
- * @return whether the playerUid field is set
- */
- public boolean hasPlayerUid() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 player_uid = 6;
+ * + * OEKBJNJEEDF + *+ * + *
optional uint32 player_uid = 2;
* @return this
*/
public GroupStateInfo clearPlayerUid() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
playerUid = 0;
return this;
}
/**
- * optional uint32 player_uid = 6;
+ * + * OEKBJNJEEDF + *+ * + *
optional uint32 player_uid = 2;
* @return the playerUid
*/
public int getPlayerUid() {
@@ -112,73 +95,93 @@ public final class GroupStateInfoOuterClass {
}
/**
- * optional uint32 player_uid = 6;
+ * + * OEKBJNJEEDF + *+ * + *
optional uint32 player_uid = 2;
* @param value the playerUid to set
* @return this
*/
public GroupStateInfo setPlayerUid(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
playerUid = value;
return this;
}
/**
- * optional uint32 group_id = 8;
- * @return whether the groupId field is set
+ * + * EMFPPBJCLGP + *+ * + *
optional uint32 group_state = 3;
+ * @return whether the groupState field is set
*/
- public boolean hasGroupId() {
+ public boolean hasGroupState() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * + * EMFPPBJCLGP + *+ * + *
optional uint32 group_state = 3;
+ * @return this
+ */
+ public GroupStateInfo clearGroupState() {
+ bitField0_ &= ~0x00000002;
+ groupState = 0;
+ return this;
+ }
+
+ /**
+ * + * EMFPPBJCLGP + *+ * + *
optional uint32 group_state = 3;
+ * @return the groupState
+ */
+ public int getGroupState() {
+ return groupState;
+ }
+
+ /**
+ * + * EMFPPBJCLGP + *+ * + *
optional uint32 group_state = 3;
+ * @param value the groupState to set
+ * @return this
+ */
+ public GroupStateInfo setGroupState(final int value) {
+ bitField0_ |= 0x00000002;
+ groupState = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 entry_id = 4;
+ * @return whether the entryId field is set
+ */
+ public boolean hasEntryId() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 group_id = 8;
- * @return this
- */
- public GroupStateInfo clearGroupId() {
- bitField0_ &= ~0x00000004;
- groupId = 0;
- return this;
- }
-
- /**
- * optional uint32 group_id = 8;
- * @return the groupId
- */
- public int getGroupId() {
- return groupId;
- }
-
- /**
- * optional uint32 group_id = 8;
- * @param value the groupId to set
- * @return this
- */
- public GroupStateInfo setGroupId(final int value) {
- bitField0_ |= 0x00000004;
- groupId = value;
- return this;
- }
-
- /**
- * optional uint32 entry_id = 10;
- * @return whether the entryId field is set
- */
- public boolean hasEntryId() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional uint32 entry_id = 10;
+ * optional uint32 entry_id = 4;
* @return this
*/
public GroupStateInfo clearEntryId() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000004;
entryId = 0;
return this;
}
/**
- * optional uint32 entry_id = 10;
+ * optional uint32 entry_id = 4;
* @return the entryId
*/
public int getEntryId() {
@@ -186,25 +189,62 @@ public final class GroupStateInfoOuterClass {
}
/**
- * optional uint32 entry_id = 10;
+ * optional uint32 entry_id = 4;
* @param value the entryId to set
* @return this
*/
public GroupStateInfo setEntryId(final int value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
entryId = value;
return this;
}
+ /**
+ * optional uint32 group_id = 5;
+ * @return whether the groupId field is set
+ */
+ public boolean hasGroupId() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional uint32 group_id = 5;
+ * @return this
+ */
+ public GroupStateInfo clearGroupId() {
+ bitField0_ &= ~0x00000008;
+ groupId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 group_id = 5;
+ * @return the groupId
+ */
+ public int getGroupId() {
+ return groupId;
+ }
+
+ /**
+ * optional uint32 group_id = 5;
+ * @param value the groupId to set
+ * @return this
+ */
+ public GroupStateInfo setGroupId(final int value) {
+ bitField0_ |= 0x00000008;
+ groupId = value;
+ return this;
+ }
+
@Override
public GroupStateInfo copyFrom(final GroupStateInfo other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- groupState = other.groupState;
playerUid = other.playerUid;
- groupId = other.groupId;
+ groupState = other.groupState;
entryId = other.entryId;
+ groupId = other.groupId;
}
return this;
}
@@ -215,18 +255,18 @@ public final class GroupStateInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasGroupState()) {
- setGroupState(other.groupState);
- }
if (other.hasPlayerUid()) {
setPlayerUid(other.playerUid);
}
- if (other.hasGroupId()) {
- setGroupId(other.groupId);
+ if (other.hasGroupState()) {
+ setGroupState(other.groupState);
}
if (other.hasEntryId()) {
setEntryId(other.entryId);
}
+ if (other.hasGroupId()) {
+ setGroupId(other.groupId);
+ }
return this;
}
@@ -237,10 +277,10 @@ public final class GroupStateInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- groupState = 0;
playerUid = 0;
- groupId = 0;
+ groupState = 0;
entryId = 0;
+ groupId = 0;
return this;
}
@@ -264,29 +304,29 @@ public final class GroupStateInfoOuterClass {
}
GroupStateInfo other = (GroupStateInfo) o;
return bitField0_ == other.bitField0_
- && (!hasGroupState() || groupState == other.groupState)
&& (!hasPlayerUid() || playerUid == other.playerUid)
- && (!hasGroupId() || groupId == other.groupId)
- && (!hasEntryId() || entryId == other.entryId);
+ && (!hasGroupState() || groupState == other.groupState)
+ && (!hasEntryId() || entryId == other.entryId)
+ && (!hasGroupId() || groupId == other.groupId);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(groupState);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(playerUid);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 24);
+ output.writeUInt32NoTag(groupState);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 64);
- output.writeUInt32NoTag(groupId);
+ output.writeRawByte((byte) 32);
+ output.writeUInt32NoTag(entryId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(entryId);
+ output.writeRawByte((byte) 40);
+ output.writeUInt32NoTag(groupId);
}
}
@@ -294,16 +334,16 @@ public final class GroupStateInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(groupState);
- }
- if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(playerUid);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(groupState);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId);
}
return size;
}
@@ -315,36 +355,36 @@ public final class GroupStateInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
- // groupState
- groupState = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 48) {
- break;
- }
- }
- case 48: {
+ case 16: {
// playerUid
playerUid = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 24) {
+ break;
+ }
+ }
+ case 24: {
+ // groupState
+ groupState = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 64) {
+ if (tag != 32) {
break;
}
}
- case 64: {
- // groupId
- groupId = input.readUInt32();
- bitField0_ |= 0x00000004;
- tag = input.readTag();
- if (tag != 80) {
- break;
- }
- }
- case 80: {
+ case 32: {
// entryId
entryId = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 40) {
+ break;
+ }
+ }
+ case 40: {
+ // groupId
+ groupId = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
if (tag != 0) {
@@ -369,16 +409,16 @@ public final class GroupStateInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.groupState, groupState);
- }
- if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.playerUid, playerUid);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeUInt32(FieldNames.groupState, groupState);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.groupId, groupId);
+ output.writeUInt32(FieldNames.entryId, entryId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.entryId, entryId);
+ output.writeUInt32(FieldNames.groupId, groupId);
}
output.endObject();
}
@@ -390,11 +430,11 @@ public final class GroupStateInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 1271403858:
- case 1101988561: {
- if (input.isAtField(FieldNames.groupState)) {
+ case -1872053841:
+ case 2096182770: {
+ if (input.isAtField(FieldNames.playerUid)) {
if (!input.trySkipNullValue()) {
- groupState = input.readUInt32();
+ playerUid = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -402,11 +442,11 @@ public final class GroupStateInfoOuterClass {
}
break;
}
- case -1872053841:
- case 2096182770: {
- if (input.isAtField(FieldNames.playerUid)) {
+ case 1271403858:
+ case 1101988561: {
+ if (input.isAtField(FieldNames.groupState)) {
if (!input.trySkipNullValue()) {
- playerUid = input.readUInt32();
+ groupState = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -414,23 +454,23 @@ public final class GroupStateInfoOuterClass {
}
break;
}
- case 293428218:
- case 506361563: {
- if (input.isAtField(FieldNames.groupId)) {
- if (!input.trySkipNullValue()) {
- groupId = input.readUInt32();
- bitField0_ |= 0x00000004;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case -1591558867:
case -2093663224: {
if (input.isAtField(FieldNames.entryId)) {
if (!input.trySkipNullValue()) {
entryId = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 293428218:
+ case 506361563: {
+ if (input.isAtField(FieldNames.groupId)) {
+ if (!input.trySkipNullValue()) {
+ groupId = input.readUInt32();
bitField0_ |= 0x00000008;
}
} else {
@@ -491,13 +531,13 @@ public final class GroupStateInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName groupState = FieldName.forField("groupState", "group_state");
-
static final FieldName playerUid = FieldName.forField("playerUid", "player_uid");
- static final FieldName groupId = FieldName.forField("groupId", "group_id");
+ static final FieldName groupState = FieldName.forField("groupState", "group_state");
static final FieldName entryId = FieldName.forField("entryId", "entry_id");
+
+ static final FieldName groupId = FieldName.forField("groupId", "group_id");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/HandleFriendCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/HandleFriendCsReqOuterClass.java
index 57b05a6..a6887dd 100644
--- a/src/generated/main/emu/lunarcore/proto/HandleFriendCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/HandleFriendCsReqOuterClass.java
@@ -19,12 +19,12 @@ public final class HandleFriendCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 uid = 8;
+ * optional uint32 uid = 13;
*/
private int uid;
/**
- * optional bool handle_result = 9;
+ * optional bool handle_result = 3;
*/
private boolean handleResult;
@@ -39,7 +39,7 @@ public final class HandleFriendCsReqOuterClass {
}
/**
- * optional uint32 uid = 8;
+ * optional uint32 uid = 13;
* @return whether the uid field is set
*/
public boolean hasUid() {
@@ -47,7 +47,7 @@ public final class HandleFriendCsReqOuterClass {
}
/**
- * optional uint32 uid = 8;
+ * optional uint32 uid = 13;
* @return this
*/
public HandleFriendCsReq clearUid() {
@@ -57,7 +57,7 @@ public final class HandleFriendCsReqOuterClass {
}
/**
- * optional uint32 uid = 8;
+ * optional uint32 uid = 13;
* @return the uid
*/
public int getUid() {
@@ -65,7 +65,7 @@ public final class HandleFriendCsReqOuterClass {
}
/**
- * optional uint32 uid = 8;
+ * optional uint32 uid = 13;
* @param value the uid to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class HandleFriendCsReqOuterClass {
}
/**
- * optional bool handle_result = 9;
+ * optional bool handle_result = 3;
* @return whether the handleResult field is set
*/
public boolean hasHandleResult() {
@@ -84,7 +84,7 @@ public final class HandleFriendCsReqOuterClass {
}
/**
- * optional bool handle_result = 9;
+ * optional bool handle_result = 3;
* @return this
*/
public HandleFriendCsReq clearHandleResult() {
@@ -94,7 +94,7 @@ public final class HandleFriendCsReqOuterClass {
}
/**
- * optional bool handle_result = 9;
+ * optional bool handle_result = 3;
* @return the handleResult
*/
public boolean getHandleResult() {
@@ -102,7 +102,7 @@ public final class HandleFriendCsReqOuterClass {
}
/**
- * optional bool handle_result = 9;
+ * optional bool handle_result = 3;
* @param value the handleResult to set
* @return this
*/
@@ -177,11 +177,11 @@ public final class HandleFriendCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 104);
output.writeUInt32NoTag(uid);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 24);
output.writeBoolNoTag(handleResult);
}
}
@@ -205,16 +205,16 @@ public final class HandleFriendCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 64: {
+ case 104: {
// uid
uid = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 72) {
+ if (tag != 24) {
break;
}
}
- case 72: {
+ case 24: {
// handleResult
handleResult = input.readBool();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/HandleFriendScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/HandleFriendScRspOuterClass.java
index 3c6e6f8..76b8457 100644
--- a/src/generated/main/emu/lunarcore/proto/HandleFriendScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/HandleFriendScRspOuterClass.java
@@ -24,17 +24,17 @@ public final class HandleFriendScRspOuterClass {
private int uid;
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 14;
*/
private int retcode;
/**
- * optional bool handle_result = 5;
+ * optional bool handle_result = 15;
*/
private boolean handleResult;
/**
- * optional .FriendListInfo handle_friend_info = 14;
+ * optional .FriendListInfo handle_friend_info = 9;
*/
private final FriendListInfoOuterClass.FriendListInfo handleFriendInfo = FriendListInfoOuterClass.FriendListInfo.newInstance();
@@ -86,7 +86,7 @@ public final class HandleFriendScRspOuterClass {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 14;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -94,7 +94,7 @@ public final class HandleFriendScRspOuterClass {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 14;
* @return this
*/
public HandleFriendScRsp clearRetcode() {
@@ -104,7 +104,7 @@ public final class HandleFriendScRspOuterClass {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 14;
* @return the retcode
*/
public int getRetcode() {
@@ -112,7 +112,7 @@ public final class HandleFriendScRspOuterClass {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 14;
* @param value the retcode to set
* @return this
*/
@@ -123,7 +123,7 @@ public final class HandleFriendScRspOuterClass {
}
/**
- * optional bool handle_result = 5;
+ * optional bool handle_result = 15;
* @return whether the handleResult field is set
*/
public boolean hasHandleResult() {
@@ -131,7 +131,7 @@ public final class HandleFriendScRspOuterClass {
}
/**
- * optional bool handle_result = 5;
+ * optional bool handle_result = 15;
* @return this
*/
public HandleFriendScRsp clearHandleResult() {
@@ -141,7 +141,7 @@ public final class HandleFriendScRspOuterClass {
}
/**
- * optional bool handle_result = 5;
+ * optional bool handle_result = 15;
* @return the handleResult
*/
public boolean getHandleResult() {
@@ -149,7 +149,7 @@ public final class HandleFriendScRspOuterClass {
}
/**
- * optional bool handle_result = 5;
+ * optional bool handle_result = 15;
* @param value the handleResult to set
* @return this
*/
@@ -160,7 +160,7 @@ public final class HandleFriendScRspOuterClass {
}
/**
- * optional .FriendListInfo handle_friend_info = 14;
+ * optional .FriendListInfo handle_friend_info = 9;
* @return whether the handleFriendInfo field is set
*/
public boolean hasHandleFriendInfo() {
@@ -168,7 +168,7 @@ public final class HandleFriendScRspOuterClass {
}
/**
- * optional .FriendListInfo handle_friend_info = 14;
+ * optional .FriendListInfo handle_friend_info = 9;
* @return this
*/
public HandleFriendScRsp clearHandleFriendInfo() {
@@ -178,7 +178,7 @@ public final class HandleFriendScRspOuterClass {
}
/**
- * optional .FriendListInfo handle_friend_info = 14;
+ * optional .FriendListInfo handle_friend_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.
@@ -192,7 +192,7 @@ public final class HandleFriendScRspOuterClass {
}
/**
- * optional .FriendListInfo handle_friend_info = 14;
+ * optional .FriendListInfo handle_friend_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
@@ -206,7 +206,7 @@ public final class HandleFriendScRspOuterClass {
}
/**
- * optional .FriendListInfo handle_friend_info = 14;
+ * optional .FriendListInfo handle_friend_info = 9;
* @param value the handleFriendInfo to set
* @return this
*/
@@ -299,15 +299,15 @@ public final class HandleFriendScRspOuterClass {
output.writeUInt32NoTag(uid);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 112);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 120);
output.writeBoolNoTag(handleResult);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 114);
+ output.writeRawByte((byte) 74);
output.writeMessageNoTag(handleFriendInfo);
}
}
@@ -342,29 +342,29 @@ public final class HandleFriendScRspOuterClass {
uid = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 112) {
break;
}
}
- case 96: {
+ case 112: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 40) {
+ if (tag != 120) {
break;
}
}
- case 40: {
+ case 120: {
// handleResult
handleResult = input.readBool();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 114) {
+ if (tag != 74) {
break;
}
}
- case 114: {
+ case 74: {
// handleFriendInfo
input.readMessage(handleFriendInfo);
bitField0_ |= 0x00000008;
diff --git a/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionCsReqOuterClass.java
index a0702ee..31c0ef9 100644
--- a/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionCsReqOuterClass.java
@@ -19,34 +19,22 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .RogueMiracleSelectResult miracle_select_result = 1175;
- */
- private final RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult miracleSelectResult = RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult.newInstance();
-
- /**
- * - * JACBIHGHBBH GINJAHMNLMN = 21; - * DIALLJLHKEK NLCPCIOBHKN = 1424; - * OLNALBGNCPE NFPPMBBMMJL = 1886; - * JFCGPBHHKLD EFGNPNPEDEA = 220; - *- * - *
optional .RogueBonusSelectResult bonus_select_result = 1242;
- */
- private final RogueBonusSelectResultOuterClass.RogueBonusSelectResult bonusSelectResult = RogueBonusSelectResultOuterClass.RogueBonusSelectResult.newInstance();
-
- /**
- * - * JNJLFGDKHJC GKCFOFJCFLO = 907; - * FCCPIEBHDJA NLMFGNLNHJL = 1353; - *- * - *
optional .RogueBuffRollInfo roll_buff = 1414;
+ * optional .RogueBuffRollInfo roll_buff = 308;
*/
private final RogueBuffRollInfoOuterClass.RogueBuffRollInfo rollBuff = RogueBuffRollInfoOuterClass.RogueBuffRollInfo.newInstance();
/**
- * optional .RogueCommonBuffSelectResult buff_select_result = 1802;
+ * optional .RogueBonusSelectResult bonus_select_result = 1156;
+ */
+ private final RogueBonusSelectResultOuterClass.RogueBonusSelectResult bonusSelectResult = RogueBonusSelectResultOuterClass.RogueBonusSelectResult.newInstance();
+
+ /**
+ * optional .RogueMiracleSelectResult miracle_select_result = 1209;
+ */
+ private final RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult miracleSelectResult = RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult.newInstance();
+
+ /**
+ * optional .RogueCommonBuffSelectResult buff_select_result = 1586;
*/
private final RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult buffSelectResult = RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult.newInstance();
@@ -60,193 +48,72 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
return new HandleRogueCommonPendingActionCsReq();
}
+ public boolean hasPendingAction() {
+ return (((bitField0_ & 0x0000000f)) != 0);
+ }
+
+ public HandleRogueCommonPendingActionCsReq clearPendingAction() {
+ if (hasPendingAction()) {
+ clearRollBuff();
+ clearBonusSelectResult();
+ clearMiracleSelectResult();
+ clearBuffSelectResult();
+ }
+ return this;
+ }
+
+ private void clearPendingActionOtherRollBuff() {
+ if ((((bitField0_ & 0x0000000e)) != 0)) {
+ clearBonusSelectResult();
+ clearMiracleSelectResult();
+ clearBuffSelectResult();
+ }
+ }
+
+ private void clearPendingActionOtherBonusSelectResult() {
+ if ((((bitField0_ & 0x0000000d)) != 0)) {
+ clearRollBuff();
+ clearMiracleSelectResult();
+ clearBuffSelectResult();
+ }
+ }
+
+ private void clearPendingActionOtherMiracleSelectResult() {
+ if ((((bitField0_ & 0x0000000b)) != 0)) {
+ clearRollBuff();
+ clearBonusSelectResult();
+ clearBuffSelectResult();
+ }
+ }
+
+ private void clearPendingActionOtherBuffSelectResult() {
+ if ((((bitField0_ & 0x00000007)) != 0)) {
+ clearRollBuff();
+ clearBonusSelectResult();
+ clearMiracleSelectResult();
+ }
+ }
+
/**
- * optional .RogueMiracleSelectResult miracle_select_result = 1175;
- * @return whether the miracleSelectResult field is set
+ * optional .RogueBuffRollInfo roll_buff = 308;
+ * @return whether the rollBuff field is set
*/
- public boolean hasMiracleSelectResult() {
+ public boolean hasRollBuff() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional .RogueMiracleSelectResult miracle_select_result = 1175;
- * @return this
- */
- public HandleRogueCommonPendingActionCsReq clearMiracleSelectResult() {
- bitField0_ &= ~0x00000001;
- miracleSelectResult.clear();
- return this;
- }
-
- /**
- * optional .RogueMiracleSelectResult miracle_select_result = 1175;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableMiracleSelectResult()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult getMiracleSelectResult() {
- return miracleSelectResult;
- }
-
- /**
- * optional .RogueMiracleSelectResult miracle_select_result = 1175;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult getMutableMiracleSelectResult(
- ) {
- bitField0_ |= 0x00000001;
- return miracleSelectResult;
- }
-
- /**
- * optional .RogueMiracleSelectResult miracle_select_result = 1175;
- * @param value the miracleSelectResult to set
- * @return this
- */
- public HandleRogueCommonPendingActionCsReq setMiracleSelectResult(
- final RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult value) {
- bitField0_ |= 0x00000001;
- miracleSelectResult.copyFrom(value);
- return this;
- }
-
- /**
- * - * JACBIHGHBBH GINJAHMNLMN = 21; - * DIALLJLHKEK NLCPCIOBHKN = 1424; - * OLNALBGNCPE NFPPMBBMMJL = 1886; - * JFCGPBHHKLD EFGNPNPEDEA = 220; - *- * - *
optional .RogueBonusSelectResult bonus_select_result = 1242;
- * @return whether the bonusSelectResult field is set
- */
- public boolean hasBonusSelectResult() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * - * JACBIHGHBBH GINJAHMNLMN = 21; - * DIALLJLHKEK NLCPCIOBHKN = 1424; - * OLNALBGNCPE NFPPMBBMMJL = 1886; - * JFCGPBHHKLD EFGNPNPEDEA = 220; - *- * - *
optional .RogueBonusSelectResult bonus_select_result = 1242;
- * @return this
- */
- public HandleRogueCommonPendingActionCsReq clearBonusSelectResult() {
- bitField0_ &= ~0x00000002;
- bonusSelectResult.clear();
- return this;
- }
-
- /**
- * - * JACBIHGHBBH GINJAHMNLMN = 21; - * DIALLJLHKEK NLCPCIOBHKN = 1424; - * OLNALBGNCPE NFPPMBBMMJL = 1886; - * JFCGPBHHKLD EFGNPNPEDEA = 220; - *- * - *
optional .RogueBonusSelectResult bonus_select_result = 1242;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableBonusSelectResult()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RogueBonusSelectResultOuterClass.RogueBonusSelectResult getBonusSelectResult() {
- return bonusSelectResult;
- }
-
- /**
- * - * JACBIHGHBBH GINJAHMNLMN = 21; - * DIALLJLHKEK NLCPCIOBHKN = 1424; - * OLNALBGNCPE NFPPMBBMMJL = 1886; - * JFCGPBHHKLD EFGNPNPEDEA = 220; - *- * - *
optional .RogueBonusSelectResult bonus_select_result = 1242;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RogueBonusSelectResultOuterClass.RogueBonusSelectResult getMutableBonusSelectResult() {
- bitField0_ |= 0x00000002;
- return bonusSelectResult;
- }
-
- /**
- * - * JACBIHGHBBH GINJAHMNLMN = 21; - * DIALLJLHKEK NLCPCIOBHKN = 1424; - * OLNALBGNCPE NFPPMBBMMJL = 1886; - * JFCGPBHHKLD EFGNPNPEDEA = 220; - *- * - *
optional .RogueBonusSelectResult bonus_select_result = 1242;
- * @param value the bonusSelectResult to set
- * @return this
- */
- public HandleRogueCommonPendingActionCsReq setBonusSelectResult(
- final RogueBonusSelectResultOuterClass.RogueBonusSelectResult value) {
- bitField0_ |= 0x00000002;
- bonusSelectResult.copyFrom(value);
- return this;
- }
-
- /**
- * - * JNJLFGDKHJC GKCFOFJCFLO = 907; - * FCCPIEBHDJA NLMFGNLNHJL = 1353; - *- * - *
optional .RogueBuffRollInfo roll_buff = 1414;
- * @return whether the rollBuff field is set
- */
- public boolean hasRollBuff() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * - * JNJLFGDKHJC GKCFOFJCFLO = 907; - * FCCPIEBHDJA NLMFGNLNHJL = 1353; - *- * - *
optional .RogueBuffRollInfo roll_buff = 1414;
+ * optional .RogueBuffRollInfo roll_buff = 308;
* @return this
*/
public HandleRogueCommonPendingActionCsReq clearRollBuff() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000001;
rollBuff.clear();
return this;
}
/**
- * - * JNJLFGDKHJC GKCFOFJCFLO = 907; - * FCCPIEBHDJA NLMFGNLNHJL = 1353; - *- * - *
optional .RogueBuffRollInfo roll_buff = 1414;
+ * optional .RogueBuffRollInfo roll_buff = 308;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -260,12 +127,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
}
/**
- * - * JNJLFGDKHJC GKCFOFJCFLO = 907; - * FCCPIEBHDJA NLMFGNLNHJL = 1353; - *- * - *
optional .RogueBuffRollInfo roll_buff = 1414;
+ * optional .RogueBuffRollInfo roll_buff = 308;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -274,29 +136,147 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
* @return internal storage object for modifications
*/
public RogueBuffRollInfoOuterClass.RogueBuffRollInfo getMutableRollBuff() {
- bitField0_ |= 0x00000004;
+ clearPendingActionOtherRollBuff();
+ bitField0_ |= 0x00000001;
return rollBuff;
}
/**
- * - * JNJLFGDKHJC GKCFOFJCFLO = 907; - * FCCPIEBHDJA NLMFGNLNHJL = 1353; - *- * - *
optional .RogueBuffRollInfo roll_buff = 1414;
+ * optional .RogueBuffRollInfo roll_buff = 308;
* @param value the rollBuff to set
* @return this
*/
public HandleRogueCommonPendingActionCsReq setRollBuff(
final RogueBuffRollInfoOuterClass.RogueBuffRollInfo value) {
- bitField0_ |= 0x00000004;
+ clearPendingActionOtherRollBuff();
+ bitField0_ |= 0x00000001;
rollBuff.copyFrom(value);
return this;
}
/**
- * optional .RogueCommonBuffSelectResult buff_select_result = 1802;
+ * optional .RogueBonusSelectResult bonus_select_result = 1156;
+ * @return whether the bonusSelectResult field is set
+ */
+ public boolean hasBonusSelectResult() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional .RogueBonusSelectResult bonus_select_result = 1156;
+ * @return this
+ */
+ public HandleRogueCommonPendingActionCsReq clearBonusSelectResult() {
+ bitField0_ &= ~0x00000002;
+ bonusSelectResult.clear();
+ return this;
+ }
+
+ /**
+ * optional .RogueBonusSelectResult bonus_select_result = 1156;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableBonusSelectResult()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RogueBonusSelectResultOuterClass.RogueBonusSelectResult getBonusSelectResult() {
+ return bonusSelectResult;
+ }
+
+ /**
+ * optional .RogueBonusSelectResult bonus_select_result = 1156;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RogueBonusSelectResultOuterClass.RogueBonusSelectResult getMutableBonusSelectResult() {
+ clearPendingActionOtherBonusSelectResult();
+ bitField0_ |= 0x00000002;
+ return bonusSelectResult;
+ }
+
+ /**
+ * optional .RogueBonusSelectResult bonus_select_result = 1156;
+ * @param value the bonusSelectResult to set
+ * @return this
+ */
+ public HandleRogueCommonPendingActionCsReq setBonusSelectResult(
+ final RogueBonusSelectResultOuterClass.RogueBonusSelectResult value) {
+ clearPendingActionOtherBonusSelectResult();
+ bitField0_ |= 0x00000002;
+ bonusSelectResult.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional .RogueMiracleSelectResult miracle_select_result = 1209;
+ * @return whether the miracleSelectResult field is set
+ */
+ public boolean hasMiracleSelectResult() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional .RogueMiracleSelectResult miracle_select_result = 1209;
+ * @return this
+ */
+ public HandleRogueCommonPendingActionCsReq clearMiracleSelectResult() {
+ bitField0_ &= ~0x00000004;
+ miracleSelectResult.clear();
+ return this;
+ }
+
+ /**
+ * optional .RogueMiracleSelectResult miracle_select_result = 1209;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableMiracleSelectResult()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult getMiracleSelectResult() {
+ return miracleSelectResult;
+ }
+
+ /**
+ * optional .RogueMiracleSelectResult miracle_select_result = 1209;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult getMutableMiracleSelectResult(
+ ) {
+ clearPendingActionOtherMiracleSelectResult();
+ bitField0_ |= 0x00000004;
+ return miracleSelectResult;
+ }
+
+ /**
+ * optional .RogueMiracleSelectResult miracle_select_result = 1209;
+ * @param value the miracleSelectResult to set
+ * @return this
+ */
+ public HandleRogueCommonPendingActionCsReq setMiracleSelectResult(
+ final RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult value) {
+ clearPendingActionOtherMiracleSelectResult();
+ bitField0_ |= 0x00000004;
+ miracleSelectResult.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional .RogueCommonBuffSelectResult buff_select_result = 1586;
* @return whether the buffSelectResult field is set
*/
public boolean hasBuffSelectResult() {
@@ -304,7 +284,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
}
/**
- * optional .RogueCommonBuffSelectResult buff_select_result = 1802;
+ * optional .RogueCommonBuffSelectResult buff_select_result = 1586;
* @return this
*/
public HandleRogueCommonPendingActionCsReq clearBuffSelectResult() {
@@ -314,7 +294,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
}
/**
- * optional .RogueCommonBuffSelectResult buff_select_result = 1802;
+ * optional .RogueCommonBuffSelectResult buff_select_result = 1586;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -328,7 +308,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
}
/**
- * optional .RogueCommonBuffSelectResult buff_select_result = 1802;
+ * optional .RogueCommonBuffSelectResult buff_select_result = 1586;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -338,17 +318,19 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
*/
public RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult getMutableBuffSelectResult(
) {
+ clearPendingActionOtherBuffSelectResult();
bitField0_ |= 0x00000008;
return buffSelectResult;
}
/**
- * optional .RogueCommonBuffSelectResult buff_select_result = 1802;
+ * optional .RogueCommonBuffSelectResult buff_select_result = 1586;
* @param value the buffSelectResult to set
* @return this
*/
public HandleRogueCommonPendingActionCsReq setBuffSelectResult(
final RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult value) {
+ clearPendingActionOtherBuffSelectResult();
bitField0_ |= 0x00000008;
buffSelectResult.copyFrom(value);
return this;
@@ -360,9 +342,9 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- miracleSelectResult.copyFrom(other.miracleSelectResult);
- bonusSelectResult.copyFrom(other.bonusSelectResult);
rollBuff.copyFrom(other.rollBuff);
+ bonusSelectResult.copyFrom(other.bonusSelectResult);
+ miracleSelectResult.copyFrom(other.miracleSelectResult);
buffSelectResult.copyFrom(other.buffSelectResult);
}
return this;
@@ -375,14 +357,14 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasMiracleSelectResult()) {
- getMutableMiracleSelectResult().mergeFrom(other.miracleSelectResult);
+ if (other.hasRollBuff()) {
+ getMutableRollBuff().mergeFrom(other.rollBuff);
}
if (other.hasBonusSelectResult()) {
getMutableBonusSelectResult().mergeFrom(other.bonusSelectResult);
}
- if (other.hasRollBuff()) {
- getMutableRollBuff().mergeFrom(other.rollBuff);
+ if (other.hasMiracleSelectResult()) {
+ getMutableMiracleSelectResult().mergeFrom(other.miracleSelectResult);
}
if (other.hasBuffSelectResult()) {
getMutableBuffSelectResult().mergeFrom(other.buffSelectResult);
@@ -397,9 +379,9 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- miracleSelectResult.clear();
- bonusSelectResult.clear();
rollBuff.clear();
+ bonusSelectResult.clear();
+ miracleSelectResult.clear();
buffSelectResult.clear();
return this;
}
@@ -411,9 +393,9 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- miracleSelectResult.clearQuick();
- bonusSelectResult.clearQuick();
rollBuff.clearQuick();
+ bonusSelectResult.clearQuick();
+ miracleSelectResult.clearQuick();
buffSelectResult.clearQuick();
return this;
}
@@ -428,28 +410,28 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
}
HandleRogueCommonPendingActionCsReq other = (HandleRogueCommonPendingActionCsReq) o;
return bitField0_ == other.bitField0_
- && (!hasMiracleSelectResult() || miracleSelectResult.equals(other.miracleSelectResult))
- && (!hasBonusSelectResult() || bonusSelectResult.equals(other.bonusSelectResult))
&& (!hasRollBuff() || rollBuff.equals(other.rollBuff))
+ && (!hasBonusSelectResult() || bonusSelectResult.equals(other.bonusSelectResult))
+ && (!hasMiracleSelectResult() || miracleSelectResult.equals(other.miracleSelectResult))
&& (!hasBuffSelectResult() || buffSelectResult.equals(other.buffSelectResult));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawLittleEndian16((short) 18874);
- output.writeMessageNoTag(miracleSelectResult);
+ output.writeRawLittleEndian16((short) 5026);
+ output.writeMessageNoTag(rollBuff);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawLittleEndian16((short) 19922);
+ output.writeRawLittleEndian16((short) 18594);
output.writeMessageNoTag(bonusSelectResult);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawLittleEndian16((short) 22706);
- output.writeMessageNoTag(rollBuff);
+ output.writeRawLittleEndian16((short) 19402);
+ output.writeMessageNoTag(miracleSelectResult);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawLittleEndian16((short) 28882);
+ output.writeRawLittleEndian16((short) 25490);
output.writeMessageNoTag(buffSelectResult);
}
}
@@ -458,13 +440,13 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelectResult);
+ size += 2 + ProtoSink.computeMessageSizeNoTag(rollBuff);
}
if ((bitField0_ & 0x00000002) != 0) {
size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelectResult);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 2 + ProtoSink.computeMessageSizeNoTag(rollBuff);
+ size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelectResult);
}
if ((bitField0_ & 0x00000008) != 0) {
size += 2 + ProtoSink.computeMessageSizeNoTag(buffSelectResult);
@@ -480,35 +462,39 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 9402: {
- // miracleSelectResult
- input.readMessage(miracleSelectResult);
+ case 2466: {
+ // rollBuff
+ clearPendingActionOtherRollBuff();
+ input.readMessage(rollBuff);
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 9938) {
+ if (tag != 9250) {
break;
}
}
- case 9938: {
+ case 9250: {
// bonusSelectResult
+ clearPendingActionOtherBonusSelectResult();
input.readMessage(bonusSelectResult);
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 11314) {
+ if (tag != 9674) {
break;
}
}
- case 11314: {
- // rollBuff
- input.readMessage(rollBuff);
+ case 9674: {
+ // miracleSelectResult
+ clearPendingActionOtherMiracleSelectResult();
+ input.readMessage(miracleSelectResult);
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 14418) {
+ if (tag != 12690) {
break;
}
}
- case 14418: {
+ case 12690: {
// buffSelectResult
+ clearPendingActionOtherBuffSelectResult();
input.readMessage(buffSelectResult);
bitField0_ |= 0x00000008;
tag = input.readTag();
@@ -534,13 +520,13 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeMessage(FieldNames.miracleSelectResult, miracleSelectResult);
+ output.writeMessage(FieldNames.rollBuff, rollBuff);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeMessage(FieldNames.bonusSelectResult, bonusSelectResult);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeMessage(FieldNames.rollBuff, rollBuff);
+ output.writeMessage(FieldNames.miracleSelectResult, miracleSelectResult);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeMessage(FieldNames.buffSelectResult, buffSelectResult);
@@ -556,11 +542,12 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 961581898:
- case 1097144690: {
- if (input.isAtField(FieldNames.miracleSelectResult)) {
+ case -260653456:
+ case 535908053: {
+ if (input.isAtField(FieldNames.rollBuff)) {
if (!input.trySkipNullValue()) {
- input.readMessage(miracleSelectResult);
+ clearPendingActionOtherRollBuff();
+ input.readMessage(rollBuff);
bitField0_ |= 0x00000001;
}
} else {
@@ -572,6 +559,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
case 396692640: {
if (input.isAtField(FieldNames.bonusSelectResult)) {
if (!input.trySkipNullValue()) {
+ clearPendingActionOtherBonusSelectResult();
input.readMessage(bonusSelectResult);
bitField0_ |= 0x00000002;
}
@@ -580,11 +568,12 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
}
break;
}
- case -260653456:
- case 535908053: {
- if (input.isAtField(FieldNames.rollBuff)) {
+ case 961581898:
+ case 1097144690: {
+ if (input.isAtField(FieldNames.miracleSelectResult)) {
if (!input.trySkipNullValue()) {
- input.readMessage(rollBuff);
+ clearPendingActionOtherMiracleSelectResult();
+ input.readMessage(miracleSelectResult);
bitField0_ |= 0x00000004;
}
} else {
@@ -596,6 +585,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
case -839396908: {
if (input.isAtField(FieldNames.buffSelectResult)) {
if (!input.trySkipNullValue()) {
+ clearPendingActionOtherBuffSelectResult();
input.readMessage(buffSelectResult);
bitField0_ |= 0x00000008;
}
@@ -659,11 +649,11 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName miracleSelectResult = FieldName.forField("miracleSelectResult", "miracle_select_result");
+ static final FieldName rollBuff = FieldName.forField("rollBuff", "roll_buff");
static final FieldName bonusSelectResult = FieldName.forField("bonusSelectResult", "bonus_select_result");
- static final FieldName rollBuff = FieldName.forField("rollBuff", "roll_buff");
+ static final FieldName miracleSelectResult = FieldName.forField("miracleSelectResult", "miracle_select_result");
static final FieldName buffSelectResult = FieldName.forField("buffSelectResult", "buff_select_result");
}
diff --git a/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionScRspOuterClass.java
index 8243a03..5e2ec8c 100644
--- a/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionScRspOuterClass.java
@@ -19,7 +19,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 times = 5;
+ * optional uint32 times = 7;
*/
private int times;
@@ -29,37 +29,30 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
private int retcode;
/**
- * - * JNFKIKEOCDJ PMKFBIDBNMD = 278; - * NBBNKDNALML NHMMLPMPOGJ = 1188; - *- * - *
optional .RogueRerollBuff rogue_reroll_buff = 795;
+ * optional uint32 times2 = 14;
+ */
+ private int times2;
+
+ /**
+ * optional .RogueRerollBuff rogue_reroll_buff = 126;
*/
private final RogueRerollBuffOuterClass.RogueRerollBuff rogueRerollBuff = RogueRerollBuffOuterClass.RogueRerollBuff.newInstance();
/**
- * optional .RogueBuffSelect rogue_buff_select = 803;
+ * optional .RogueBonusSelect bonus_select = 392;
+ */
+ private final RogueBonusSelectOuterClass.RogueBonusSelect bonusSelect = RogueBonusSelectOuterClass.RogueBonusSelect.newInstance();
+
+ /**
+ * optional .RogueBuffSelect rogue_buff_select = 1087;
*/
private final RogueBuffSelectOuterClass.RogueBuffSelect rogueBuffSelect = RogueBuffSelectOuterClass.RogueBuffSelect.newInstance();
/**
- * optional .RogueMiracleSelect miracle_select = 830;
+ * optional .RogueMiracleSelect miracle_select = 2029;
*/
private final RogueMiracleSelectOuterClass.RogueMiracleSelect miracleSelect = RogueMiracleSelectOuterClass.RogueMiracleSelect.newInstance();
- /**
- * - * CAJPKNLHPKI EDNKJDKBFBK = 1063; - * HAAFONHLFGK LMMCDOMELIG = 703; - * CFEFNJGJLMO CLLEHKCPKPF = 337; - * IAAPDOPPHGN NIMIHAMIMDC = 283; - *- * - *
optional .RogueBonusSelect bonus_select = 1544;
- */
- private final RogueBonusSelectOuterClass.RogueBonusSelect bonusSelect = RogueBonusSelectOuterClass.RogueBonusSelect.newInstance();
-
private HandleRogueCommonPendingActionScRsp() {
}
@@ -71,7 +64,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
}
/**
- * optional uint32 times = 5;
+ * optional uint32 times = 7;
* @return whether the times field is set
*/
public boolean hasTimes() {
@@ -79,7 +72,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
}
/**
- * optional uint32 times = 5;
+ * optional uint32 times = 7;
* @return this
*/
public HandleRogueCommonPendingActionScRsp clearTimes() {
@@ -89,7 +82,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
}
/**
- * optional uint32 times = 5;
+ * optional uint32 times = 7;
* @return the times
*/
public int getTimes() {
@@ -97,7 +90,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
}
/**
- * optional uint32 times = 5;
+ * optional uint32 times = 7;
* @param value the times to set
* @return this
*/
@@ -145,40 +138,62 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
}
/**
- * - * JNFKIKEOCDJ PMKFBIDBNMD = 278; - * NBBNKDNALML NHMMLPMPOGJ = 1188; - *- * - *
optional .RogueRerollBuff rogue_reroll_buff = 795;
- * @return whether the rogueRerollBuff field is set
+ * optional uint32 times2 = 14;
+ * @return whether the times2 field is set
*/
- public boolean hasRogueRerollBuff() {
+ public boolean hasTimes2() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * - * JNFKIKEOCDJ PMKFBIDBNMD = 278; - * NBBNKDNALML NHMMLPMPOGJ = 1188; - *- * - *
optional .RogueRerollBuff rogue_reroll_buff = 795;
+ * optional uint32 times2 = 14;
+ * @return this
+ */
+ public HandleRogueCommonPendingActionScRsp clearTimes2() {
+ bitField0_ &= ~0x00000004;
+ times2 = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 times2 = 14;
+ * @return the times2
+ */
+ public int getTimes2() {
+ return times2;
+ }
+
+ /**
+ * optional uint32 times2 = 14;
+ * @param value the times2 to set
+ * @return this
+ */
+ public HandleRogueCommonPendingActionScRsp setTimes2(final int value) {
+ bitField0_ |= 0x00000004;
+ times2 = value;
+ return this;
+ }
+
+ /**
+ * optional .RogueRerollBuff rogue_reroll_buff = 126;
+ * @return whether the rogueRerollBuff field is set
+ */
+ public boolean hasRogueRerollBuff() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional .RogueRerollBuff rogue_reroll_buff = 126;
* @return this
*/
public HandleRogueCommonPendingActionScRsp clearRogueRerollBuff() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000008;
rogueRerollBuff.clear();
return this;
}
/**
- * - * JNFKIKEOCDJ PMKFBIDBNMD = 278; - * NBBNKDNALML NHMMLPMPOGJ = 1188; - *- * - *
optional .RogueRerollBuff rogue_reroll_buff = 795;
+ * optional .RogueRerollBuff rogue_reroll_buff = 126;
*
* This 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,12 +207,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
}
/**
- * - * JNFKIKEOCDJ PMKFBIDBNMD = 278; - * NBBNKDNALML NHMMLPMPOGJ = 1188; - *- * - *
optional .RogueRerollBuff rogue_reroll_buff = 795;
+ * optional .RogueRerollBuff rogue_reroll_buff = 126;
*
* 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,184 +216,42 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
* @return internal storage object for modifications
*/
public RogueRerollBuffOuterClass.RogueRerollBuff getMutableRogueRerollBuff() {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000008;
return rogueRerollBuff;
}
/**
- * - * JNFKIKEOCDJ PMKFBIDBNMD = 278; - * NBBNKDNALML NHMMLPMPOGJ = 1188; - *- * - *
optional .RogueRerollBuff rogue_reroll_buff = 795;
+ * optional .RogueRerollBuff rogue_reroll_buff = 126;
* @param value the rogueRerollBuff to set
* @return this
*/
public HandleRogueCommonPendingActionScRsp setRogueRerollBuff(
final RogueRerollBuffOuterClass.RogueRerollBuff value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000008;
rogueRerollBuff.copyFrom(value);
return this;
}
/**
- * optional .RogueBuffSelect rogue_buff_select = 803;
- * @return whether the rogueBuffSelect field is set
+ * optional .RogueBonusSelect bonus_select = 392;
+ * @return whether the bonusSelect field is set
*/
- public boolean hasRogueBuffSelect() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional .RogueBuffSelect rogue_buff_select = 803;
- * @return this
- */
- public HandleRogueCommonPendingActionScRsp clearRogueBuffSelect() {
- bitField0_ &= ~0x00000008;
- rogueBuffSelect.clear();
- return this;
- }
-
- /**
- * optional .RogueBuffSelect rogue_buff_select = 803;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableRogueBuffSelect()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RogueBuffSelectOuterClass.RogueBuffSelect getRogueBuffSelect() {
- return rogueBuffSelect;
- }
-
- /**
- * optional .RogueBuffSelect rogue_buff_select = 803;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RogueBuffSelectOuterClass.RogueBuffSelect getMutableRogueBuffSelect() {
- bitField0_ |= 0x00000008;
- return rogueBuffSelect;
- }
-
- /**
- * optional .RogueBuffSelect rogue_buff_select = 803;
- * @param value the rogueBuffSelect to set
- * @return this
- */
- public HandleRogueCommonPendingActionScRsp setRogueBuffSelect(
- final RogueBuffSelectOuterClass.RogueBuffSelect value) {
- bitField0_ |= 0x00000008;
- rogueBuffSelect.copyFrom(value);
- return this;
- }
-
- /**
- * optional .RogueMiracleSelect miracle_select = 830;
- * @return whether the miracleSelect field is set
- */
- public boolean hasMiracleSelect() {
+ public boolean hasBonusSelect() {
return (bitField0_ & 0x00000010) != 0;
}
/**
- * optional .RogueMiracleSelect miracle_select = 830;
- * @return this
- */
- public HandleRogueCommonPendingActionScRsp clearMiracleSelect() {
- bitField0_ &= ~0x00000010;
- miracleSelect.clear();
- return this;
- }
-
- /**
- * optional .RogueMiracleSelect miracle_select = 830;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableMiracleSelect()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RogueMiracleSelectOuterClass.RogueMiracleSelect getMiracleSelect() {
- return miracleSelect;
- }
-
- /**
- * optional .RogueMiracleSelect miracle_select = 830;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RogueMiracleSelectOuterClass.RogueMiracleSelect getMutableMiracleSelect() {
- bitField0_ |= 0x00000010;
- return miracleSelect;
- }
-
- /**
- * optional .RogueMiracleSelect miracle_select = 830;
- * @param value the miracleSelect to set
- * @return this
- */
- public HandleRogueCommonPendingActionScRsp setMiracleSelect(
- final RogueMiracleSelectOuterClass.RogueMiracleSelect value) {
- bitField0_ |= 0x00000010;
- miracleSelect.copyFrom(value);
- return this;
- }
-
- /**
- * - * CAJPKNLHPKI EDNKJDKBFBK = 1063; - * HAAFONHLFGK LMMCDOMELIG = 703; - * CFEFNJGJLMO CLLEHKCPKPF = 337; - * IAAPDOPPHGN NIMIHAMIMDC = 283; - *- * - *
optional .RogueBonusSelect bonus_select = 1544;
- * @return whether the bonusSelect field is set
- */
- public boolean hasBonusSelect() {
- return (bitField0_ & 0x00000020) != 0;
- }
-
- /**
- * - * CAJPKNLHPKI EDNKJDKBFBK = 1063; - * HAAFONHLFGK LMMCDOMELIG = 703; - * CFEFNJGJLMO CLLEHKCPKPF = 337; - * IAAPDOPPHGN NIMIHAMIMDC = 283; - *- * - *
optional .RogueBonusSelect bonus_select = 1544;
+ * optional .RogueBonusSelect bonus_select = 392;
* @return this
*/
public HandleRogueCommonPendingActionScRsp clearBonusSelect() {
- bitField0_ &= ~0x00000020;
+ bitField0_ &= ~0x00000010;
bonusSelect.clear();
return this;
}
/**
- * - * CAJPKNLHPKI EDNKJDKBFBK = 1063; - * HAAFONHLFGK LMMCDOMELIG = 703; - * CFEFNJGJLMO CLLEHKCPKPF = 337; - * IAAPDOPPHGN NIMIHAMIMDC = 283; - *- * - *
optional .RogueBonusSelect bonus_select = 1544;
+ * optional .RogueBonusSelect bonus_select = 392;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -397,14 +265,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
}
/**
- * - * CAJPKNLHPKI EDNKJDKBFBK = 1063; - * HAAFONHLFGK LMMCDOMELIG = 703; - * CFEFNJGJLMO CLLEHKCPKPF = 337; - * IAAPDOPPHGN NIMIHAMIMDC = 283; - *- * - *
optional .RogueBonusSelect bonus_select = 1544;
+ * optional .RogueBonusSelect bonus_select = 392;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -413,29 +274,138 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
* @return internal storage object for modifications
*/
public RogueBonusSelectOuterClass.RogueBonusSelect getMutableBonusSelect() {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
return bonusSelect;
}
/**
- * - * CAJPKNLHPKI EDNKJDKBFBK = 1063; - * HAAFONHLFGK LMMCDOMELIG = 703; - * CFEFNJGJLMO CLLEHKCPKPF = 337; - * IAAPDOPPHGN NIMIHAMIMDC = 283; - *- * - *
optional .RogueBonusSelect bonus_select = 1544;
+ * optional .RogueBonusSelect bonus_select = 392;
* @param value the bonusSelect to set
* @return this
*/
public HandleRogueCommonPendingActionScRsp setBonusSelect(
final RogueBonusSelectOuterClass.RogueBonusSelect value) {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
bonusSelect.copyFrom(value);
return this;
}
+ /**
+ * optional .RogueBuffSelect rogue_buff_select = 1087;
+ * @return whether the rogueBuffSelect field is set
+ */
+ public boolean hasRogueBuffSelect() {
+ return (bitField0_ & 0x00000020) != 0;
+ }
+
+ /**
+ * optional .RogueBuffSelect rogue_buff_select = 1087;
+ * @return this
+ */
+ public HandleRogueCommonPendingActionScRsp clearRogueBuffSelect() {
+ bitField0_ &= ~0x00000020;
+ rogueBuffSelect.clear();
+ return this;
+ }
+
+ /**
+ * optional .RogueBuffSelect rogue_buff_select = 1087;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableRogueBuffSelect()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RogueBuffSelectOuterClass.RogueBuffSelect getRogueBuffSelect() {
+ return rogueBuffSelect;
+ }
+
+ /**
+ * optional .RogueBuffSelect rogue_buff_select = 1087;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RogueBuffSelectOuterClass.RogueBuffSelect getMutableRogueBuffSelect() {
+ bitField0_ |= 0x00000020;
+ return rogueBuffSelect;
+ }
+
+ /**
+ * optional .RogueBuffSelect rogue_buff_select = 1087;
+ * @param value the rogueBuffSelect to set
+ * @return this
+ */
+ public HandleRogueCommonPendingActionScRsp setRogueBuffSelect(
+ final RogueBuffSelectOuterClass.RogueBuffSelect value) {
+ bitField0_ |= 0x00000020;
+ rogueBuffSelect.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional .RogueMiracleSelect miracle_select = 2029;
+ * @return whether the miracleSelect field is set
+ */
+ public boolean hasMiracleSelect() {
+ return (bitField0_ & 0x00000040) != 0;
+ }
+
+ /**
+ * optional .RogueMiracleSelect miracle_select = 2029;
+ * @return this
+ */
+ public HandleRogueCommonPendingActionScRsp clearMiracleSelect() {
+ bitField0_ &= ~0x00000040;
+ miracleSelect.clear();
+ return this;
+ }
+
+ /**
+ * optional .RogueMiracleSelect miracle_select = 2029;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableMiracleSelect()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RogueMiracleSelectOuterClass.RogueMiracleSelect getMiracleSelect() {
+ return miracleSelect;
+ }
+
+ /**
+ * optional .RogueMiracleSelect miracle_select = 2029;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RogueMiracleSelectOuterClass.RogueMiracleSelect getMutableMiracleSelect() {
+ bitField0_ |= 0x00000040;
+ return miracleSelect;
+ }
+
+ /**
+ * optional .RogueMiracleSelect miracle_select = 2029;
+ * @param value the miracleSelect to set
+ * @return this
+ */
+ public HandleRogueCommonPendingActionScRsp setMiracleSelect(
+ final RogueMiracleSelectOuterClass.RogueMiracleSelect value) {
+ bitField0_ |= 0x00000040;
+ miracleSelect.copyFrom(value);
+ return this;
+ }
+
@Override
public HandleRogueCommonPendingActionScRsp copyFrom(
final HandleRogueCommonPendingActionScRsp other) {
@@ -444,10 +414,11 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
bitField0_ = other.bitField0_;
times = other.times;
retcode = other.retcode;
+ times2 = other.times2;
rogueRerollBuff.copyFrom(other.rogueRerollBuff);
+ bonusSelect.copyFrom(other.bonusSelect);
rogueBuffSelect.copyFrom(other.rogueBuffSelect);
miracleSelect.copyFrom(other.miracleSelect);
- bonusSelect.copyFrom(other.bonusSelect);
}
return this;
}
@@ -465,18 +436,21 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
+ if (other.hasTimes2()) {
+ setTimes2(other.times2);
+ }
if (other.hasRogueRerollBuff()) {
getMutableRogueRerollBuff().mergeFrom(other.rogueRerollBuff);
}
+ if (other.hasBonusSelect()) {
+ getMutableBonusSelect().mergeFrom(other.bonusSelect);
+ }
if (other.hasRogueBuffSelect()) {
getMutableRogueBuffSelect().mergeFrom(other.rogueBuffSelect);
}
if (other.hasMiracleSelect()) {
getMutableMiracleSelect().mergeFrom(other.miracleSelect);
}
- if (other.hasBonusSelect()) {
- getMutableBonusSelect().mergeFrom(other.bonusSelect);
- }
return this;
}
@@ -489,10 +463,11 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
bitField0_ = 0;
times = 0;
retcode = 0;
+ times2 = 0;
rogueRerollBuff.clear();
+ bonusSelect.clear();
rogueBuffSelect.clear();
miracleSelect.clear();
- bonusSelect.clear();
return this;
}
@@ -504,9 +479,9 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
cachedSize = -1;
bitField0_ = 0;
rogueRerollBuff.clearQuick();
+ bonusSelect.clearQuick();
rogueBuffSelect.clearQuick();
miracleSelect.clearQuick();
- bonusSelect.clearQuick();
return this;
}
@@ -522,16 +497,17 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
return bitField0_ == other.bitField0_
&& (!hasTimes() || times == other.times)
&& (!hasRetcode() || retcode == other.retcode)
+ && (!hasTimes2() || times2 == other.times2)
&& (!hasRogueRerollBuff() || rogueRerollBuff.equals(other.rogueRerollBuff))
+ && (!hasBonusSelect() || bonusSelect.equals(other.bonusSelect))
&& (!hasRogueBuffSelect() || rogueBuffSelect.equals(other.rogueBuffSelect))
- && (!hasMiracleSelect() || miracleSelect.equals(other.miracleSelect))
- && (!hasBonusSelect() || bonusSelect.equals(other.bonusSelect));
+ && (!hasMiracleSelect() || miracleSelect.equals(other.miracleSelect));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(times);
}
if ((bitField0_ & 0x00000002) != 0) {
@@ -539,20 +515,24 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawLittleEndian16((short) 12762);
- output.writeMessageNoTag(rogueRerollBuff);
+ output.writeRawByte((byte) 112);
+ output.writeUInt32NoTag(times2);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawLittleEndian16((short) 12954);
- output.writeMessageNoTag(rogueBuffSelect);
+ output.writeRawLittleEndian16((short) 2034);
+ output.writeMessageNoTag(rogueRerollBuff);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawLittleEndian16((short) 13298);
- output.writeMessageNoTag(miracleSelect);
+ output.writeRawLittleEndian16((short) 6338);
+ output.writeMessageNoTag(bonusSelect);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawLittleEndian16((short) 24770);
- output.writeMessageNoTag(bonusSelect);
+ output.writeRawLittleEndian16((short) 17402);
+ output.writeMessageNoTag(rogueBuffSelect);
+ }
+ if ((bitField0_ & 0x00000040) != 0) {
+ output.writeRawLittleEndian16((short) 32490);
+ output.writeMessageNoTag(miracleSelect);
}
}
@@ -566,16 +546,19 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 2 + ProtoSink.computeMessageSizeNoTag(rogueRerollBuff);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(times2);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 2 + ProtoSink.computeMessageSizeNoTag(rogueBuffSelect);
+ size += 2 + ProtoSink.computeMessageSizeNoTag(rogueRerollBuff);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelect);
+ size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelect);
}
if ((bitField0_ & 0x00000020) != 0) {
- size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelect);
+ size += 2 + ProtoSink.computeMessageSizeNoTag(rogueBuffSelect);
+ }
+ if ((bitField0_ & 0x00000040) != 0) {
+ size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelect);
}
return size;
}
@@ -588,7 +571,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
+ case 56: {
// times
times = input.readUInt32();
bitField0_ |= 0x00000001;
@@ -602,42 +585,51 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
retcode = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 6362) {
+ if (tag != 112) {
break;
}
}
- case 6362: {
- // rogueRerollBuff
- input.readMessage(rogueRerollBuff);
+ case 112: {
+ // times2
+ times2 = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 6426) {
+ if (tag != 1010) {
break;
}
}
- case 6426: {
- // rogueBuffSelect
- input.readMessage(rogueBuffSelect);
+ case 1010: {
+ // rogueRerollBuff
+ input.readMessage(rogueRerollBuff);
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 6642) {
+ if (tag != 3138) {
break;
}
}
- case 6642: {
- // miracleSelect
- input.readMessage(miracleSelect);
- bitField0_ |= 0x00000010;
- tag = input.readTag();
- if (tag != 12354) {
- break;
- }
- }
- case 12354: {
+ case 3138: {
// bonusSelect
input.readMessage(bonusSelect);
+ bitField0_ |= 0x00000010;
+ tag = input.readTag();
+ if (tag != 8698) {
+ break;
+ }
+ }
+ case 8698: {
+ // rogueBuffSelect
+ input.readMessage(rogueBuffSelect);
bitField0_ |= 0x00000020;
tag = input.readTag();
+ if (tag != 16234) {
+ break;
+ }
+ }
+ case 16234: {
+ // miracleSelect
+ input.readMessage(miracleSelect);
+ bitField0_ |= 0x00000040;
+ tag = input.readTag();
if (tag != 0) {
break;
}
@@ -666,16 +658,19 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeMessage(FieldNames.rogueRerollBuff, rogueRerollBuff);
+ output.writeUInt32(FieldNames.times2, times2);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeMessage(FieldNames.rogueBuffSelect, rogueBuffSelect);
+ output.writeMessage(FieldNames.rogueRerollBuff, rogueRerollBuff);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeMessage(FieldNames.miracleSelect, miracleSelect);
+ output.writeMessage(FieldNames.bonusSelect, bonusSelect);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeMessage(FieldNames.bonusSelect, bonusSelect);
+ output.writeMessage(FieldNames.rogueBuffSelect, rogueBuffSelect);
+ }
+ if ((bitField0_ & 0x00000040) != 0) {
+ output.writeMessage(FieldNames.miracleSelect, miracleSelect);
}
output.endObject();
}
@@ -710,11 +705,10 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
}
break;
}
- case -620807395:
- case -555127011: {
- if (input.isAtField(FieldNames.rogueRerollBuff)) {
+ case -873668180: {
+ if (input.isAtField(FieldNames.times2)) {
if (!input.trySkipNullValue()) {
- input.readMessage(rogueRerollBuff);
+ times2 = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -722,11 +716,11 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
}
break;
}
- case -183502679:
- case -1750117501: {
- if (input.isAtField(FieldNames.rogueBuffSelect)) {
+ case -620807395:
+ case -555127011: {
+ if (input.isAtField(FieldNames.rogueRerollBuff)) {
if (!input.trySkipNullValue()) {
- input.readMessage(rogueBuffSelect);
+ input.readMessage(rogueRerollBuff);
bitField0_ |= 0x00000008;
}
} else {
@@ -734,23 +728,23 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
}
break;
}
- case 788622541:
- case 1132158090: {
- if (input.isAtField(FieldNames.miracleSelect)) {
- if (!input.trySkipNullValue()) {
- input.readMessage(miracleSelect);
- bitField0_ |= 0x00000010;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 1904635387:
case 1368817948: {
if (input.isAtField(FieldNames.bonusSelect)) {
if (!input.trySkipNullValue()) {
input.readMessage(bonusSelect);
+ bitField0_ |= 0x00000010;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -183502679:
+ case -1750117501: {
+ if (input.isAtField(FieldNames.rogueBuffSelect)) {
+ if (!input.trySkipNullValue()) {
+ input.readMessage(rogueBuffSelect);
bitField0_ |= 0x00000020;
}
} else {
@@ -758,6 +752,18 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
}
break;
}
+ case 788622541:
+ case 1132158090: {
+ if (input.isAtField(FieldNames.miracleSelect)) {
+ if (!input.trySkipNullValue()) {
+ input.readMessage(miracleSelect);
+ bitField0_ |= 0x00000040;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
default: {
input.skipUnknownField();
break;
@@ -817,13 +823,15 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
static final FieldName retcode = FieldName.forField("retcode");
+ static final FieldName times2 = FieldName.forField("times2");
+
static final FieldName rogueRerollBuff = FieldName.forField("rogueRerollBuff", "rogue_reroll_buff");
+ static final FieldName bonusSelect = FieldName.forField("bonusSelect", "bonus_select");
+
static final FieldName rogueBuffSelect = FieldName.forField("rogueBuffSelect", "rogue_buff_select");
static final FieldName miracleSelect = FieldName.forField("miracleSelect", "miracle_select");
-
- static final FieldName bonusSelect = FieldName.forField("bonusSelect", "bonus_select");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/HeadIconOuterClass.java b/src/generated/main/emu/lunarcore/proto/HeadIconOuterClass.java
index 455ec38..e1277db 100644
--- a/src/generated/main/emu/lunarcore/proto/HeadIconOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/HeadIconOuterClass.java
@@ -19,7 +19,7 @@ public final class HeadIconOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 id = 15;
+ * optional uint32 id = 8;
*/
private int id;
@@ -34,7 +34,7 @@ public final class HeadIconOuterClass {
}
/**
- * optional uint32 id = 15;
+ * optional uint32 id = 8;
* @return whether the id field is set
*/
public boolean hasId() {
@@ -42,7 +42,7 @@ public final class HeadIconOuterClass {
}
/**
- * optional uint32 id = 15;
+ * optional uint32 id = 8;
* @return this
*/
public HeadIcon clearId() {
@@ -52,7 +52,7 @@ public final class HeadIconOuterClass {
}
/**
- * optional uint32 id = 15;
+ * optional uint32 id = 8;
* @return the id
*/
public int getId() {
@@ -60,7 +60,7 @@ public final class HeadIconOuterClass {
}
/**
- * optional uint32 id = 15;
+ * optional uint32 id = 8;
* @param value the id to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class HeadIconOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(id);
}
}
@@ -150,7 +150,7 @@ public final class HeadIconOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 120: {
+ case 64: {
// id
id = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/HeroBasicTypeInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/HeroBasicTypeInfoOuterClass.java
index 80269e1..efe4320 100644
--- a/src/generated/main/emu/lunarcore/proto/HeroBasicTypeInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/HeroBasicTypeInfoOuterClass.java
@@ -20,17 +20,17 @@ public final class HeroBasicTypeInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 rank = 14;
+ * optional uint32 rank = 6;
*/
private int rank;
/**
- * optional .HeroBasicType basic_type = 2;
+ * optional .HeroBasicType basic_type = 14;
*/
private int basicType;
/**
- * repeated .AvatarSkillTree skill_tree_list = 15;
+ * repeated .AvatarSkillTree skill_tree_list = 12;
*/
private final RepeatedMessageoptional uint32 rank = 14;
+ * optional uint32 rank = 6;
* @return whether the rank field is set
*/
public boolean hasRank() {
@@ -53,7 +53,7 @@ public final class HeroBasicTypeInfoOuterClass {
}
/**
- * optional uint32 rank = 14;
+ * optional uint32 rank = 6;
* @return this
*/
public HeroBasicTypeInfo clearRank() {
@@ -63,7 +63,7 @@ public final class HeroBasicTypeInfoOuterClass {
}
/**
- * optional uint32 rank = 14;
+ * optional uint32 rank = 6;
* @return the rank
*/
public int getRank() {
@@ -71,7 +71,7 @@ public final class HeroBasicTypeInfoOuterClass {
}
/**
- * optional uint32 rank = 14;
+ * optional uint32 rank = 6;
* @param value the rank to set
* @return this
*/
@@ -82,7 +82,7 @@ public final class HeroBasicTypeInfoOuterClass {
}
/**
- * optional .HeroBasicType basic_type = 2;
+ * optional .HeroBasicType basic_type = 14;
* @return whether the basicType field is set
*/
public boolean hasBasicType() {
@@ -90,7 +90,7 @@ public final class HeroBasicTypeInfoOuterClass {
}
/**
- * optional .HeroBasicType basic_type = 2;
+ * optional .HeroBasicType basic_type = 14;
* @return this
*/
public HeroBasicTypeInfo clearBasicType() {
@@ -100,7 +100,7 @@ public final class HeroBasicTypeInfoOuterClass {
}
/**
- * optional .HeroBasicType basic_type = 2;
+ * optional .HeroBasicType basic_type = 14;
* @return the basicType
*/
public HeroBasicTypeOuterClass.HeroBasicType getBasicType() {
@@ -133,7 +133,7 @@ public final class HeroBasicTypeInfoOuterClass {
}
/**
- * optional .HeroBasicType basic_type = 2;
+ * optional .HeroBasicType basic_type = 14;
* @param value the basicType to set
* @return this
*/
@@ -144,7 +144,7 @@ public final class HeroBasicTypeInfoOuterClass {
}
/**
- * repeated .AvatarSkillTree skill_tree_list = 15;
+ * repeated .AvatarSkillTree skill_tree_list = 12;
* @return whether the skillTreeList field is set
*/
public boolean hasSkillTreeList() {
@@ -152,7 +152,7 @@ public final class HeroBasicTypeInfoOuterClass {
}
/**
- * repeated .AvatarSkillTree skill_tree_list = 15;
+ * repeated .AvatarSkillTree skill_tree_list = 12;
* @return this
*/
public HeroBasicTypeInfo clearSkillTreeList() {
@@ -162,7 +162,7 @@ public final class HeroBasicTypeInfoOuterClass {
}
/**
- * repeated .AvatarSkillTree skill_tree_list = 15;
+ * repeated .AvatarSkillTree skill_tree_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.
@@ -176,7 +176,7 @@ public final class HeroBasicTypeInfoOuterClass {
}
/**
- * repeated .AvatarSkillTree skill_tree_list = 15;
+ * repeated .AvatarSkillTree skill_tree_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
@@ -190,7 +190,7 @@ public final class HeroBasicTypeInfoOuterClass {
}
/**
- * repeated .AvatarSkillTree skill_tree_list = 15;
+ * repeated .AvatarSkillTree skill_tree_list = 12;
* @param value the skillTreeList to add
* @return this
*/
@@ -202,7 +202,7 @@ public final class HeroBasicTypeInfoOuterClass {
}
/**
- * repeated .AvatarSkillTree skill_tree_list = 15;
+ * repeated .AvatarSkillTree skill_tree_list = 12;
* @param values the skillTreeList to add
* @return this
*/
@@ -285,16 +285,16 @@ public final class HeroBasicTypeInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(rank);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 112);
output.writeEnumNoTag(basicType);
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < skillTreeList.length(); i++) {
- output.writeRawByte((byte) 122);
+ output.writeRawByte((byte) 98);
output.writeMessageNoTag(skillTreeList.get(i));
}
}
@@ -322,16 +322,16 @@ public final class HeroBasicTypeInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 112: {
+ case 48: {
// rank
rank = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 16) {
+ if (tag != 112) {
break;
}
}
- case 16: {
+ case 112: {
// basicType
final int value = input.readInt32();
if (HeroBasicTypeOuterClass.HeroBasicType.forNumber(value) != null) {
@@ -339,11 +339,11 @@ public final class HeroBasicTypeInfoOuterClass {
bitField0_ |= 0x00000002;
}
tag = input.readTag();
- if (tag != 122) {
+ if (tag != 98) {
break;
}
}
- case 122: {
+ case 98: {
// skillTreeList
tag = input.readRepeatedMessage(skillTreeList, tag);
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/InteractChargerScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/InteractChargerScRspOuterClass.java
index f674f54..aadc02f 100644
--- a/src/generated/main/emu/lunarcore/proto/InteractChargerScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/InteractChargerScRspOuterClass.java
@@ -19,16 +19,17 @@ public final class InteractChargerScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 11;
+ * optional uint32 retcode = 2;
*/
private int retcode;
/**
- * - * RotatorEnergyInfo energy_info = 6; - *- * - *
optional .ChargerInfo charger_info = 1;
+ * optional .RotatorEnergyInfo energy_info = 5;
+ */
+ private final RotatorEnergyInfoOuterClass.RotatorEnergyInfo energyInfo = RotatorEnergyInfoOuterClass.RotatorEnergyInfo.newInstance();
+
+ /**
+ * optional .ChargerInfo charger_info = 11;
*/
private final ChargerInfoOuterClass.ChargerInfo chargerInfo = ChargerInfoOuterClass.ChargerInfo.newInstance();
@@ -43,7 +44,7 @@ public final class InteractChargerScRspOuterClass {
}
/**
- * optional uint32 retcode = 11;
+ * optional uint32 retcode = 2;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -51,7 +52,7 @@ public final class InteractChargerScRspOuterClass {
}
/**
- * optional uint32 retcode = 11;
+ * optional uint32 retcode = 2;
* @return this
*/
public InteractChargerScRsp clearRetcode() {
@@ -61,7 +62,7 @@ public final class InteractChargerScRspOuterClass {
}
/**
- * optional uint32 retcode = 11;
+ * optional uint32 retcode = 2;
* @return the retcode
*/
public int getRetcode() {
@@ -69,7 +70,7 @@ public final class InteractChargerScRspOuterClass {
}
/**
- * optional uint32 retcode = 11;
+ * optional uint32 retcode = 2;
* @param value the retcode to set
* @return this
*/
@@ -80,37 +81,83 @@ public final class InteractChargerScRspOuterClass {
}
/**
- * - * RotatorEnergyInfo energy_info = 6; - *- * - *
optional .ChargerInfo charger_info = 1;
- * @return whether the chargerInfo field is set
+ * optional .RotatorEnergyInfo energy_info = 5;
+ * @return whether the energyInfo field is set
*/
- public boolean hasChargerInfo() {
+ public boolean hasEnergyInfo() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * - * RotatorEnergyInfo energy_info = 6; - *+ *
optional .RotatorEnergyInfo energy_info = 5;
+ * @return this
+ */
+ public InteractChargerScRsp clearEnergyInfo() {
+ bitField0_ &= ~0x00000002;
+ energyInfo.clear();
+ return this;
+ }
+
+ /**
+ * optional .RotatorEnergyInfo energy_info = 5;
*
- * optional .ChargerInfo charger_info = 1;
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableEnergyInfo()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RotatorEnergyInfoOuterClass.RotatorEnergyInfo getEnergyInfo() {
+ return energyInfo;
+ }
+
+ /**
+ * optional .RotatorEnergyInfo energy_info = 5;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RotatorEnergyInfoOuterClass.RotatorEnergyInfo getMutableEnergyInfo() {
+ bitField0_ |= 0x00000002;
+ return energyInfo;
+ }
+
+ /**
+ * optional .RotatorEnergyInfo energy_info = 5;
+ * @param value the energyInfo to set
+ * @return this
+ */
+ public InteractChargerScRsp setEnergyInfo(
+ final RotatorEnergyInfoOuterClass.RotatorEnergyInfo value) {
+ bitField0_ |= 0x00000002;
+ energyInfo.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional .ChargerInfo charger_info = 11;
+ * @return whether the chargerInfo field is set
+ */
+ public boolean hasChargerInfo() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional .ChargerInfo charger_info = 11;
* @return this
*/
public InteractChargerScRsp clearChargerInfo() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000004;
chargerInfo.clear();
return this;
}
/**
- * - * RotatorEnergyInfo energy_info = 6; - *- * - *
optional .ChargerInfo charger_info = 1;
+ * optional .ChargerInfo charger_info = 11;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -124,11 +171,7 @@ public final class InteractChargerScRspOuterClass {
}
/**
- * - * RotatorEnergyInfo energy_info = 6; - *- * - *
optional .ChargerInfo charger_info = 1;
+ * optional .ChargerInfo charger_info = 11;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -137,21 +180,17 @@ public final class InteractChargerScRspOuterClass {
* @return internal storage object for modifications
*/
public ChargerInfoOuterClass.ChargerInfo getMutableChargerInfo() {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
return chargerInfo;
}
/**
- * - * RotatorEnergyInfo energy_info = 6; - *- * - *
optional .ChargerInfo charger_info = 1;
+ * optional .ChargerInfo charger_info = 11;
* @param value the chargerInfo to set
* @return this
*/
public InteractChargerScRsp setChargerInfo(final ChargerInfoOuterClass.ChargerInfo value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
chargerInfo.copyFrom(value);
return this;
}
@@ -162,6 +201,7 @@ public final class InteractChargerScRspOuterClass {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
retcode = other.retcode;
+ energyInfo.copyFrom(other.energyInfo);
chargerInfo.copyFrom(other.chargerInfo);
}
return this;
@@ -176,6 +216,9 @@ public final class InteractChargerScRspOuterClass {
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
+ if (other.hasEnergyInfo()) {
+ getMutableEnergyInfo().mergeFrom(other.energyInfo);
+ }
if (other.hasChargerInfo()) {
getMutableChargerInfo().mergeFrom(other.chargerInfo);
}
@@ -190,6 +233,7 @@ public final class InteractChargerScRspOuterClass {
cachedSize = -1;
bitField0_ = 0;
retcode = 0;
+ energyInfo.clear();
chargerInfo.clear();
return this;
}
@@ -201,6 +245,7 @@ public final class InteractChargerScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
+ energyInfo.clearQuick();
chargerInfo.clearQuick();
return this;
}
@@ -216,17 +261,22 @@ public final class InteractChargerScRspOuterClass {
InteractChargerScRsp other = (InteractChargerScRsp) o;
return bitField0_ == other.bitField0_
&& (!hasRetcode() || retcode == other.retcode)
+ && (!hasEnergyInfo() || energyInfo.equals(other.energyInfo))
&& (!hasChargerInfo() || chargerInfo.equals(other.chargerInfo));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 10);
+ output.writeRawByte((byte) 42);
+ output.writeMessageNoTag(energyInfo);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 90);
output.writeMessageNoTag(chargerInfo);
}
}
@@ -238,6 +288,9 @@ public final class InteractChargerScRspOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
+ size += 1 + ProtoSink.computeMessageSizeNoTag(energyInfo);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(chargerInfo);
}
return size;
@@ -250,19 +303,28 @@ public final class InteractChargerScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 88: {
+ case 16: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 10) {
+ if (tag != 42) {
break;
}
}
- case 10: {
+ case 42: {
+ // energyInfo
+ input.readMessage(energyInfo);
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 90) {
+ break;
+ }
+ }
+ case 90: {
// chargerInfo
input.readMessage(chargerInfo);
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 0) {
break;
@@ -289,6 +351,9 @@ public final class InteractChargerScRspOuterClass {
output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
+ output.writeMessage(FieldNames.energyInfo, energyInfo);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
output.writeMessage(FieldNames.chargerInfo, chargerInfo);
}
output.endObject();
@@ -312,12 +377,24 @@ public final class InteractChargerScRspOuterClass {
}
break;
}
+ case 1464698710:
+ case -1818804219: {
+ if (input.isAtField(FieldNames.energyInfo)) {
+ if (!input.trySkipNullValue()) {
+ input.readMessage(energyInfo);
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case 1038073356:
case 2135678991: {
if (input.isAtField(FieldNames.chargerInfo)) {
if (!input.trySkipNullValue()) {
input.readMessage(chargerInfo);
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
}
} else {
input.skipUnknownField();
@@ -379,6 +456,8 @@ public final class InteractChargerScRspOuterClass {
static class FieldNames {
static final FieldName retcode = FieldName.forField("retcode");
+ static final FieldName energyInfo = FieldName.forField("energyInfo", "energy_info");
+
static final FieldName chargerInfo = FieldName.forField("chargerInfo", "charger_info");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java
index d6d1862..7bde3e0 100644
--- a/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java
@@ -19,12 +19,12 @@ public final class InteractPropCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 interact_id = 7;
+ * optional uint32 interact_id = 10;
*/
private int interactId;
/**
- * optional uint32 prop_entity_id = 15;
+ * optional uint32 prop_entity_id = 11;
*/
private int propEntityId;
@@ -39,7 +39,7 @@ public final class InteractPropCsReqOuterClass {
}
/**
- * optional uint32 interact_id = 7;
+ * optional uint32 interact_id = 10;
* @return whether the interactId field is set
*/
public boolean hasInteractId() {
@@ -47,7 +47,7 @@ public final class InteractPropCsReqOuterClass {
}
/**
- * optional uint32 interact_id = 7;
+ * optional uint32 interact_id = 10;
* @return this
*/
public InteractPropCsReq clearInteractId() {
@@ -57,7 +57,7 @@ public final class InteractPropCsReqOuterClass {
}
/**
- * optional uint32 interact_id = 7;
+ * optional uint32 interact_id = 10;
* @return the interactId
*/
public int getInteractId() {
@@ -65,7 +65,7 @@ public final class InteractPropCsReqOuterClass {
}
/**
- * optional uint32 interact_id = 7;
+ * optional uint32 interact_id = 10;
* @param value the interactId to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class InteractPropCsReqOuterClass {
}
/**
- * optional uint32 prop_entity_id = 15;
+ * optional uint32 prop_entity_id = 11;
* @return whether the propEntityId field is set
*/
public boolean hasPropEntityId() {
@@ -84,7 +84,7 @@ public final class InteractPropCsReqOuterClass {
}
/**
- * optional uint32 prop_entity_id = 15;
+ * optional uint32 prop_entity_id = 11;
* @return this
*/
public InteractPropCsReq clearPropEntityId() {
@@ -94,7 +94,7 @@ public final class InteractPropCsReqOuterClass {
}
/**
- * optional uint32 prop_entity_id = 15;
+ * optional uint32 prop_entity_id = 11;
* @return the propEntityId
*/
public int getPropEntityId() {
@@ -102,7 +102,7 @@ public final class InteractPropCsReqOuterClass {
}
/**
- * optional uint32 prop_entity_id = 15;
+ * optional uint32 prop_entity_id = 11;
* @param value the propEntityId to set
* @return this
*/
@@ -177,11 +177,11 @@ public final class InteractPropCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(interactId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(propEntityId);
}
}
@@ -205,16 +205,16 @@ public final class InteractPropCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
+ case 80: {
// interactId
interactId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 88) {
break;
}
}
- case 120: {
+ case 88: {
// propEntityId
propEntityId = input.readUInt32();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java
index 0a8cc94..145a23d 100644
--- a/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java
@@ -19,19 +19,19 @@ public final class InteractPropScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 prop_entity_id = 10;
+ * optional uint32 retcode = 5;
*/
- private int propEntityId;
+ private int retcode;
/**
- * optional uint32 prop_state = 14;
+ * optional uint32 prop_state = 7;
*/
private int propState;
/**
- * optional uint32 retcode = 15;
+ * optional uint32 prop_entity_id = 11;
*/
- private int retcode;
+ private int propEntityId;
private InteractPropScRsp() {
}
@@ -44,44 +44,44 @@ public final class InteractPropScRspOuterClass {
}
/**
- * optional uint32 prop_entity_id = 10;
- * @return whether the propEntityId field is set
+ * optional uint32 retcode = 5;
+ * @return whether the retcode field is set
*/
- public boolean hasPropEntityId() {
+ public boolean hasRetcode() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 prop_entity_id = 10;
+ * optional uint32 retcode = 5;
* @return this
*/
- public InteractPropScRsp clearPropEntityId() {
+ public InteractPropScRsp clearRetcode() {
bitField0_ &= ~0x00000001;
- propEntityId = 0;
+ retcode = 0;
return this;
}
/**
- * optional uint32 prop_entity_id = 10;
- * @return the propEntityId
+ * optional uint32 retcode = 5;
+ * @return the retcode
*/
- public int getPropEntityId() {
- return propEntityId;
+ public int getRetcode() {
+ return retcode;
}
/**
- * optional uint32 prop_entity_id = 10;
- * @param value the propEntityId to set
+ * optional uint32 retcode = 5;
+ * @param value the retcode to set
* @return this
*/
- public InteractPropScRsp setPropEntityId(final int value) {
+ public InteractPropScRsp setRetcode(final int value) {
bitField0_ |= 0x00000001;
- propEntityId = value;
+ retcode = value;
return this;
}
/**
- * optional uint32 prop_state = 14;
+ * optional uint32 prop_state = 7;
* @return whether the propState field is set
*/
public boolean hasPropState() {
@@ -89,7 +89,7 @@ public final class InteractPropScRspOuterClass {
}
/**
- * optional uint32 prop_state = 14;
+ * optional uint32 prop_state = 7;
* @return this
*/
public InteractPropScRsp clearPropState() {
@@ -99,7 +99,7 @@ public final class InteractPropScRspOuterClass {
}
/**
- * optional uint32 prop_state = 14;
+ * optional uint32 prop_state = 7;
* @return the propState
*/
public int getPropState() {
@@ -107,7 +107,7 @@ public final class InteractPropScRspOuterClass {
}
/**
- * optional uint32 prop_state = 14;
+ * optional uint32 prop_state = 7;
* @param value the propState to set
* @return this
*/
@@ -118,39 +118,39 @@ public final class InteractPropScRspOuterClass {
}
/**
- * optional uint32 retcode = 15;
- * @return whether the retcode field is set
+ * optional uint32 prop_entity_id = 11;
+ * @return whether the propEntityId field is set
*/
- public boolean hasRetcode() {
+ public boolean hasPropEntityId() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 retcode = 15;
+ * optional uint32 prop_entity_id = 11;
* @return this
*/
- public InteractPropScRsp clearRetcode() {
+ public InteractPropScRsp clearPropEntityId() {
bitField0_ &= ~0x00000004;
- retcode = 0;
+ propEntityId = 0;
return this;
}
/**
- * optional uint32 retcode = 15;
- * @return the retcode
+ * optional uint32 prop_entity_id = 11;
+ * @return the propEntityId
*/
- public int getRetcode() {
- return retcode;
+ public int getPropEntityId() {
+ return propEntityId;
}
/**
- * optional uint32 retcode = 15;
- * @param value the retcode to set
+ * optional uint32 prop_entity_id = 11;
+ * @param value the propEntityId to set
* @return this
*/
- public InteractPropScRsp setRetcode(final int value) {
+ public InteractPropScRsp setPropEntityId(final int value) {
bitField0_ |= 0x00000004;
- retcode = value;
+ propEntityId = value;
return this;
}
@@ -159,9 +159,9 @@ public final class InteractPropScRspOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- propEntityId = other.propEntityId;
- propState = other.propState;
retcode = other.retcode;
+ propState = other.propState;
+ propEntityId = other.propEntityId;
}
return this;
}
@@ -172,14 +172,14 @@ public final class InteractPropScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasPropEntityId()) {
- setPropEntityId(other.propEntityId);
+ if (other.hasRetcode()) {
+ setRetcode(other.retcode);
}
if (other.hasPropState()) {
setPropState(other.propState);
}
- if (other.hasRetcode()) {
- setRetcode(other.retcode);
+ if (other.hasPropEntityId()) {
+ setPropEntityId(other.propEntityId);
}
return this;
}
@@ -191,9 +191,9 @@ public final class InteractPropScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- propEntityId = 0;
- propState = 0;
retcode = 0;
+ propState = 0;
+ propEntityId = 0;
return this;
}
@@ -217,24 +217,24 @@ public final class InteractPropScRspOuterClass {
}
InteractPropScRsp other = (InteractPropScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasPropEntityId() || propEntityId == other.propEntityId)
+ && (!hasRetcode() || retcode == other.retcode)
&& (!hasPropState() || propState == other.propState)
- && (!hasRetcode() || retcode == other.retcode);
+ && (!hasPropEntityId() || propEntityId == other.propEntityId);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(propEntityId);
+ output.writeRawByte((byte) 40);
+ output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(propState);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 120);
- output.writeUInt32NoTag(retcode);
+ output.writeRawByte((byte) 88);
+ output.writeUInt32NoTag(propEntityId);
}
}
@@ -242,13 +242,13 @@ public final class InteractPropScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(propState);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId);
}
return size;
}
@@ -260,27 +260,27 @@ public final class InteractPropScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 80: {
- // propEntityId
- propEntityId = input.readUInt32();
+ case 40: {
+ // retcode
+ retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 112) {
+ if (tag != 56) {
break;
}
}
- case 112: {
+ case 56: {
// propState
propState = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 88) {
break;
}
}
- case 120: {
- // retcode
- retcode = input.readUInt32();
+ case 88: {
+ // propEntityId
+ propEntityId = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 0) {
@@ -305,13 +305,13 @@ public final class InteractPropScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.propEntityId, propEntityId);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.propState, propState);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.propEntityId, propEntityId);
}
output.endObject();
}
@@ -323,11 +323,10 @@ public final class InteractPropScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -68717343:
- case -57484005: {
- if (input.isAtField(FieldNames.propEntityId)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- propEntityId = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -347,10 +346,11 @@ public final class InteractPropScRspOuterClass {
}
break;
}
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case -68717343:
+ case -57484005: {
+ if (input.isAtField(FieldNames.propEntityId)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ propEntityId = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -411,11 +411,11 @@ public final class InteractPropScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id");
+ static final FieldName retcode = FieldName.forField("retcode");
static final FieldName propState = FieldName.forField("propState", "prop_state");
- static final FieldName retcode = FieldName.forField("retcode");
+ static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ItemCostOuterClass.java b/src/generated/main/emu/lunarcore/proto/ItemCostOuterClass.java
index 4d80e8a..98d3bcd 100644
--- a/src/generated/main/emu/lunarcore/proto/ItemCostOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ItemCostOuterClass.java
@@ -19,17 +19,17 @@ public final class ItemCostOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 equipment_unique_id = 8;
+ * optional uint32 equipment_unique_id = 4;
*/
private int equipmentUniqueId;
/**
- * optional uint32 relic_unique_id = 9;
+ * optional uint32 relic_unique_id = 10;
*/
private int relicUniqueId;
/**
- * optional .PileItem pile_item = 2;
+ * optional .PileItem pile_item = 14;
*/
private final PileItemOuterClass.PileItem pileItem = PileItemOuterClass.PileItem.newInstance();
@@ -44,7 +44,7 @@ public final class ItemCostOuterClass {
}
/**
- * optional uint32 equipment_unique_id = 8;
+ * optional uint32 equipment_unique_id = 4;
* @return whether the equipmentUniqueId field is set
*/
public boolean hasEquipmentUniqueId() {
@@ -52,7 +52,7 @@ public final class ItemCostOuterClass {
}
/**
- * optional uint32 equipment_unique_id = 8;
+ * optional uint32 equipment_unique_id = 4;
* @return this
*/
public ItemCost clearEquipmentUniqueId() {
@@ -62,7 +62,7 @@ public final class ItemCostOuterClass {
}
/**
- * optional uint32 equipment_unique_id = 8;
+ * optional uint32 equipment_unique_id = 4;
* @return the equipmentUniqueId
*/
public int getEquipmentUniqueId() {
@@ -70,7 +70,7 @@ public final class ItemCostOuterClass {
}
/**
- * optional uint32 equipment_unique_id = 8;
+ * optional uint32 equipment_unique_id = 4;
* @param value the equipmentUniqueId to set
* @return this
*/
@@ -81,7 +81,7 @@ public final class ItemCostOuterClass {
}
/**
- * optional uint32 relic_unique_id = 9;
+ * optional uint32 relic_unique_id = 10;
* @return whether the relicUniqueId field is set
*/
public boolean hasRelicUniqueId() {
@@ -89,7 +89,7 @@ public final class ItemCostOuterClass {
}
/**
- * optional uint32 relic_unique_id = 9;
+ * optional uint32 relic_unique_id = 10;
* @return this
*/
public ItemCost clearRelicUniqueId() {
@@ -99,7 +99,7 @@ public final class ItemCostOuterClass {
}
/**
- * optional uint32 relic_unique_id = 9;
+ * optional uint32 relic_unique_id = 10;
* @return the relicUniqueId
*/
public int getRelicUniqueId() {
@@ -107,7 +107,7 @@ public final class ItemCostOuterClass {
}
/**
- * optional uint32 relic_unique_id = 9;
+ * optional uint32 relic_unique_id = 10;
* @param value the relicUniqueId to set
* @return this
*/
@@ -118,7 +118,7 @@ public final class ItemCostOuterClass {
}
/**
- * optional .PileItem pile_item = 2;
+ * optional .PileItem pile_item = 14;
* @return whether the pileItem field is set
*/
public boolean hasPileItem() {
@@ -126,7 +126,7 @@ public final class ItemCostOuterClass {
}
/**
- * optional .PileItem pile_item = 2;
+ * optional .PileItem pile_item = 14;
* @return this
*/
public ItemCost clearPileItem() {
@@ -136,7 +136,7 @@ public final class ItemCostOuterClass {
}
/**
- * optional .PileItem pile_item = 2;
+ * optional .PileItem pile_item = 14;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -150,7 +150,7 @@ public final class ItemCostOuterClass {
}
/**
- * optional .PileItem pile_item = 2;
+ * optional .PileItem pile_item = 14;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -164,7 +164,7 @@ public final class ItemCostOuterClass {
}
/**
- * optional .PileItem pile_item = 2;
+ * optional .PileItem pile_item = 14;
* @param value the pileItem to set
* @return this
*/
@@ -246,15 +246,15 @@ public final class ItemCostOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(equipmentUniqueId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(relicUniqueId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 18);
+ output.writeRawByte((byte) 114);
output.writeMessageNoTag(pileItem);
}
}
@@ -281,25 +281,25 @@ public final class ItemCostOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 64: {
+ case 32: {
// equipmentUniqueId
equipmentUniqueId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 72) {
+ if (tag != 80) {
break;
}
}
- case 72: {
+ case 80: {
// relicUniqueId
relicUniqueId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 18) {
+ if (tag != 114) {
break;
}
}
- case 18: {
+ case 114: {
// pileItem
input.readMessage(pileItem);
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/ItemListOuterClass.java b/src/generated/main/emu/lunarcore/proto/ItemListOuterClass.java
index 84e6d19..eb69713 100644
--- a/src/generated/main/emu/lunarcore/proto/ItemListOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ItemListOuterClass.java
@@ -20,7 +20,7 @@ public final class ItemListOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated .Item item_list = 3;
+ * repeated .Item item_list = 4;
*/
private final RepeatedMessagerepeated .Item item_list = 3;
+ * repeated .Item item_list = 4;
* @return whether the itemList field is set
*/
public boolean hasItemList() {
@@ -43,7 +43,7 @@ public final class ItemListOuterClass {
}
/**
- * repeated .Item item_list = 3;
+ * repeated .Item item_list = 4;
* @return this
*/
public ItemList clearItemList() {
@@ -53,7 +53,7 @@ public final class ItemListOuterClass {
}
/**
- * repeated .Item item_list = 3;
+ * repeated .Item item_list = 4;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class ItemListOuterClass {
}
/**
- * repeated .Item item_list = 3;
+ * repeated .Item item_list = 4;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class ItemListOuterClass {
}
/**
- * repeated .Item item_list = 3;
+ * repeated .Item item_list = 4;
* @param value the itemList to add
* @return this
*/
@@ -92,7 +92,7 @@ public final class ItemListOuterClass {
}
/**
- * repeated .Item item_list = 3;
+ * repeated .Item item_list = 4;
* @param values the itemList to add
* @return this
*/
@@ -163,7 +163,7 @@ public final class ItemListOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < itemList.length(); i++) {
- output.writeRawByte((byte) 26);
+ output.writeRawByte((byte) 34);
output.writeMessageNoTag(itemList.get(i));
}
}
@@ -185,7 +185,7 @@ public final class ItemListOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 26: {
+ case 34: {
// itemList
tag = input.readRepeatedMessage(itemList, tag);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/ItemOuterClass.java b/src/generated/main/emu/lunarcore/proto/ItemOuterClass.java
index 11559e1..b8bb66e 100644
--- a/src/generated/main/emu/lunarcore/proto/ItemOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ItemOuterClass.java
@@ -19,39 +19,39 @@ public final class ItemOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 promotion = 1;
+ * optional uint32 unique_id = 2;
*/
- private int promotion;
+ private int uniqueId;
/**
- * optional uint32 rank = 2;
- */
- private int rank;
-
- /**
- * optional uint32 level = 7;
- */
- private int level;
-
- /**
- * optional uint32 num = 9;
- */
- private int num;
-
- /**
- * optional uint32 main_affix_id = 10;
+ * optional uint32 main_affix_id = 3;
*/
private int mainAffixId;
/**
- * optional uint32 item_id = 12;
+ * optional uint32 promotion = 4;
+ */
+ private int promotion;
+
+ /**
+ * optional uint32 item_id = 6;
*/
private int itemId;
/**
- * optional uint32 unique_id = 14;
+ * optional uint32 rank = 7;
*/
- private int uniqueId;
+ private int rank;
+
+ /**
+ * optional uint32 level = 10;
+ */
+ private int level;
+
+ /**
+ * optional uint32 num = 12;
+ */
+ private int num;
private Item() {
}
@@ -64,247 +64,25 @@ public final class ItemOuterClass {
}
/**
- * optional uint32 promotion = 1;
- * @return whether the promotion field is set
+ * optional uint32 unique_id = 2;
+ * @return whether the uniqueId field is set
*/
- public boolean hasPromotion() {
+ public boolean hasUniqueId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 promotion = 1;
- * @return this
- */
- public Item clearPromotion() {
- bitField0_ &= ~0x00000001;
- promotion = 0;
- return this;
- }
-
- /**
- * optional uint32 promotion = 1;
- * @return the promotion
- */
- public int getPromotion() {
- return promotion;
- }
-
- /**
- * optional uint32 promotion = 1;
- * @param value the promotion to set
- * @return this
- */
- public Item setPromotion(final int value) {
- bitField0_ |= 0x00000001;
- promotion = value;
- return this;
- }
-
- /**
- * optional uint32 rank = 2;
- * @return whether the rank field is set
- */
- public boolean hasRank() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 rank = 2;
- * @return this
- */
- public Item clearRank() {
- bitField0_ &= ~0x00000002;
- rank = 0;
- return this;
- }
-
- /**
- * optional uint32 rank = 2;
- * @return the rank
- */
- public int getRank() {
- return rank;
- }
-
- /**
- * optional uint32 rank = 2;
- * @param value the rank to set
- * @return this
- */
- public Item setRank(final int value) {
- bitField0_ |= 0x00000002;
- rank = value;
- return this;
- }
-
- /**
- * optional uint32 level = 7;
- * @return whether the level field is set
- */
- public boolean hasLevel() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 level = 7;
- * @return this
- */
- public Item clearLevel() {
- bitField0_ &= ~0x00000004;
- level = 0;
- return this;
- }
-
- /**
- * optional uint32 level = 7;
- * @return the level
- */
- public int getLevel() {
- return level;
- }
-
- /**
- * optional uint32 level = 7;
- * @param value the level to set
- * @return this
- */
- public Item setLevel(final int value) {
- bitField0_ |= 0x00000004;
- level = value;
- return this;
- }
-
- /**
- * optional uint32 num = 9;
- * @return whether the num field is set
- */
- public boolean hasNum() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional uint32 num = 9;
- * @return this
- */
- public Item clearNum() {
- bitField0_ &= ~0x00000008;
- num = 0;
- return this;
- }
-
- /**
- * optional uint32 num = 9;
- * @return the num
- */
- public int getNum() {
- return num;
- }
-
- /**
- * optional uint32 num = 9;
- * @param value the num to set
- * @return this
- */
- public Item setNum(final int value) {
- bitField0_ |= 0x00000008;
- num = value;
- return this;
- }
-
- /**
- * optional uint32 main_affix_id = 10;
- * @return whether the mainAffixId field is set
- */
- public boolean hasMainAffixId() {
- return (bitField0_ & 0x00000010) != 0;
- }
-
- /**
- * optional uint32 main_affix_id = 10;
- * @return this
- */
- public Item clearMainAffixId() {
- bitField0_ &= ~0x00000010;
- mainAffixId = 0;
- return this;
- }
-
- /**
- * optional uint32 main_affix_id = 10;
- * @return the mainAffixId
- */
- public int getMainAffixId() {
- return mainAffixId;
- }
-
- /**
- * optional uint32 main_affix_id = 10;
- * @param value the mainAffixId to set
- * @return this
- */
- public Item setMainAffixId(final int value) {
- bitField0_ |= 0x00000010;
- mainAffixId = value;
- return this;
- }
-
- /**
- * optional uint32 item_id = 12;
- * @return whether the itemId field is set
- */
- public boolean hasItemId() {
- return (bitField0_ & 0x00000020) != 0;
- }
-
- /**
- * optional uint32 item_id = 12;
- * @return this
- */
- public Item clearItemId() {
- bitField0_ &= ~0x00000020;
- itemId = 0;
- return this;
- }
-
- /**
- * optional uint32 item_id = 12;
- * @return the itemId
- */
- public int getItemId() {
- return itemId;
- }
-
- /**
- * optional uint32 item_id = 12;
- * @param value the itemId to set
- * @return this
- */
- public Item setItemId(final int value) {
- bitField0_ |= 0x00000020;
- itemId = value;
- return this;
- }
-
- /**
- * optional uint32 unique_id = 14;
- * @return whether the uniqueId field is set
- */
- public boolean hasUniqueId() {
- return (bitField0_ & 0x00000040) != 0;
- }
-
- /**
- * optional uint32 unique_id = 14;
+ * optional uint32 unique_id = 2;
* @return this
*/
public Item clearUniqueId() {
- bitField0_ &= ~0x00000040;
+ bitField0_ &= ~0x00000001;
uniqueId = 0;
return this;
}
/**
- * optional uint32 unique_id = 14;
+ * optional uint32 unique_id = 2;
* @return the uniqueId
*/
public int getUniqueId() {
@@ -312,28 +90,250 @@ public final class ItemOuterClass {
}
/**
- * optional uint32 unique_id = 14;
+ * optional uint32 unique_id = 2;
* @param value the uniqueId to set
* @return this
*/
public Item setUniqueId(final int value) {
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000001;
uniqueId = value;
return this;
}
+ /**
+ * optional uint32 main_affix_id = 3;
+ * @return whether the mainAffixId field is set
+ */
+ public boolean hasMainAffixId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 main_affix_id = 3;
+ * @return this
+ */
+ public Item clearMainAffixId() {
+ bitField0_ &= ~0x00000002;
+ mainAffixId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 main_affix_id = 3;
+ * @return the mainAffixId
+ */
+ public int getMainAffixId() {
+ return mainAffixId;
+ }
+
+ /**
+ * optional uint32 main_affix_id = 3;
+ * @param value the mainAffixId to set
+ * @return this
+ */
+ public Item setMainAffixId(final int value) {
+ bitField0_ |= 0x00000002;
+ mainAffixId = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 promotion = 4;
+ * @return whether the promotion field is set
+ */
+ public boolean hasPromotion() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 promotion = 4;
+ * @return this
+ */
+ public Item clearPromotion() {
+ bitField0_ &= ~0x00000004;
+ promotion = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 promotion = 4;
+ * @return the promotion
+ */
+ public int getPromotion() {
+ return promotion;
+ }
+
+ /**
+ * optional uint32 promotion = 4;
+ * @param value the promotion to set
+ * @return this
+ */
+ public Item setPromotion(final int value) {
+ bitField0_ |= 0x00000004;
+ promotion = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 item_id = 6;
+ * @return whether the itemId field is set
+ */
+ public boolean hasItemId() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional uint32 item_id = 6;
+ * @return this
+ */
+ public Item clearItemId() {
+ bitField0_ &= ~0x00000008;
+ itemId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 item_id = 6;
+ * @return the itemId
+ */
+ public int getItemId() {
+ return itemId;
+ }
+
+ /**
+ * optional uint32 item_id = 6;
+ * @param value the itemId to set
+ * @return this
+ */
+ public Item setItemId(final int value) {
+ bitField0_ |= 0x00000008;
+ itemId = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 rank = 7;
+ * @return whether the rank field is set
+ */
+ public boolean hasRank() {
+ return (bitField0_ & 0x00000010) != 0;
+ }
+
+ /**
+ * optional uint32 rank = 7;
+ * @return this
+ */
+ public Item clearRank() {
+ bitField0_ &= ~0x00000010;
+ rank = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 rank = 7;
+ * @return the rank
+ */
+ public int getRank() {
+ return rank;
+ }
+
+ /**
+ * optional uint32 rank = 7;
+ * @param value the rank to set
+ * @return this
+ */
+ public Item setRank(final int value) {
+ bitField0_ |= 0x00000010;
+ rank = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 level = 10;
+ * @return whether the level field is set
+ */
+ public boolean hasLevel() {
+ return (bitField0_ & 0x00000020) != 0;
+ }
+
+ /**
+ * optional uint32 level = 10;
+ * @return this
+ */
+ public Item clearLevel() {
+ bitField0_ &= ~0x00000020;
+ level = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 level = 10;
+ * @return the level
+ */
+ public int getLevel() {
+ return level;
+ }
+
+ /**
+ * optional uint32 level = 10;
+ * @param value the level to set
+ * @return this
+ */
+ public Item setLevel(final int value) {
+ bitField0_ |= 0x00000020;
+ level = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 num = 12;
+ * @return whether the num field is set
+ */
+ public boolean hasNum() {
+ return (bitField0_ & 0x00000040) != 0;
+ }
+
+ /**
+ * optional uint32 num = 12;
+ * @return this
+ */
+ public Item clearNum() {
+ bitField0_ &= ~0x00000040;
+ num = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 num = 12;
+ * @return the num
+ */
+ public int getNum() {
+ return num;
+ }
+
+ /**
+ * optional uint32 num = 12;
+ * @param value the num to set
+ * @return this
+ */
+ public Item setNum(final int value) {
+ bitField0_ |= 0x00000040;
+ num = value;
+ return this;
+ }
+
@Override
public Item copyFrom(final Item other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
+ uniqueId = other.uniqueId;
+ mainAffixId = other.mainAffixId;
promotion = other.promotion;
+ itemId = other.itemId;
rank = other.rank;
level = other.level;
num = other.num;
- mainAffixId = other.mainAffixId;
- itemId = other.itemId;
- uniqueId = other.uniqueId;
}
return this;
}
@@ -344,9 +344,18 @@ public final class ItemOuterClass {
return this;
}
cachedSize = -1;
+ if (other.hasUniqueId()) {
+ setUniqueId(other.uniqueId);
+ }
+ if (other.hasMainAffixId()) {
+ setMainAffixId(other.mainAffixId);
+ }
if (other.hasPromotion()) {
setPromotion(other.promotion);
}
+ if (other.hasItemId()) {
+ setItemId(other.itemId);
+ }
if (other.hasRank()) {
setRank(other.rank);
}
@@ -356,15 +365,6 @@ public final class ItemOuterClass {
if (other.hasNum()) {
setNum(other.num);
}
- if (other.hasMainAffixId()) {
- setMainAffixId(other.mainAffixId);
- }
- if (other.hasItemId()) {
- setItemId(other.itemId);
- }
- if (other.hasUniqueId()) {
- setUniqueId(other.uniqueId);
- }
return this;
}
@@ -375,13 +375,13 @@ public final class ItemOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
+ uniqueId = 0;
+ mainAffixId = 0;
promotion = 0;
+ itemId = 0;
rank = 0;
level = 0;
num = 0;
- mainAffixId = 0;
- itemId = 0;
- uniqueId = 0;
return this;
}
@@ -405,44 +405,44 @@ public final class ItemOuterClass {
}
Item other = (Item) o;
return bitField0_ == other.bitField0_
+ && (!hasUniqueId() || uniqueId == other.uniqueId)
+ && (!hasMainAffixId() || mainAffixId == other.mainAffixId)
&& (!hasPromotion() || promotion == other.promotion)
+ && (!hasItemId() || itemId == other.itemId)
&& (!hasRank() || rank == other.rank)
&& (!hasLevel() || level == other.level)
- && (!hasNum() || num == other.num)
- && (!hasMainAffixId() || mainAffixId == other.mainAffixId)
- && (!hasItemId() || itemId == other.itemId)
- && (!hasUniqueId() || uniqueId == other.uniqueId);
+ && (!hasNum() || num == other.num);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(promotion);
+ output.writeRawByte((byte) 16);
+ output.writeUInt32NoTag(uniqueId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(rank);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 56);
- output.writeUInt32NoTag(level);
- }
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 72);
- output.writeUInt32NoTag(num);
- }
- if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(mainAffixId);
}
- if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 96);
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 32);
+ output.writeUInt32NoTag(promotion);
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(itemId);
}
+ if ((bitField0_ & 0x00000010) != 0) {
+ output.writeRawByte((byte) 56);
+ output.writeUInt32NoTag(rank);
+ }
+ if ((bitField0_ & 0x00000020) != 0) {
+ output.writeRawByte((byte) 80);
+ output.writeUInt32NoTag(level);
+ }
if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawByte((byte) 112);
- output.writeUInt32NoTag(uniqueId);
+ output.writeRawByte((byte) 96);
+ output.writeUInt32NoTag(num);
}
}
@@ -450,25 +450,25 @@ public final class ItemOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(rank);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
- }
- if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(num);
- }
- if ((bitField0_ & 0x00000010) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId);
}
- if ((bitField0_ & 0x00000020) != 0) {
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion);
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId);
}
+ if ((bitField0_ & 0x00000010) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(rank);
+ }
+ if ((bitField0_ & 0x00000020) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
+ }
if ((bitField0_ & 0x00000040) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(num);
}
return size;
}
@@ -480,63 +480,63 @@ public final class ItemOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
- // promotion
- promotion = input.readUInt32();
+ case 16: {
+ // uniqueId
+ uniqueId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 16) {
+ if (tag != 24) {
break;
}
}
- case 16: {
- // rank
- rank = input.readUInt32();
+ case 24: {
+ // mainAffixId
+ mainAffixId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
+ if (tag != 32) {
+ break;
+ }
+ }
+ case 32: {
+ // promotion
+ promotion = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 48) {
+ break;
+ }
+ }
+ case 48: {
+ // itemId
+ itemId = input.readUInt32();
+ bitField0_ |= 0x00000008;
+ tag = input.readTag();
if (tag != 56) {
break;
}
}
case 56: {
- // level
- level = input.readUInt32();
- bitField0_ |= 0x00000004;
- tag = input.readTag();
- if (tag != 72) {
- break;
- }
- }
- case 72: {
- // num
- num = input.readUInt32();
- bitField0_ |= 0x00000008;
+ // rank
+ rank = input.readUInt32();
+ bitField0_ |= 0x00000010;
tag = input.readTag();
if (tag != 80) {
break;
}
}
case 80: {
- // mainAffixId
- mainAffixId = input.readUInt32();
- bitField0_ |= 0x00000010;
+ // level
+ level = input.readUInt32();
+ bitField0_ |= 0x00000020;
tag = input.readTag();
if (tag != 96) {
break;
}
}
case 96: {
- // itemId
- itemId = input.readUInt32();
- bitField0_ |= 0x00000020;
- tag = input.readTag();
- if (tag != 112) {
- break;
- }
- }
- case 112: {
- // uniqueId
- uniqueId = input.readUInt32();
+ // num
+ num = input.readUInt32();
bitField0_ |= 0x00000040;
tag = input.readTag();
if (tag != 0) {
@@ -561,25 +561,25 @@ public final class ItemOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.promotion, promotion);
+ output.writeUInt32(FieldNames.uniqueId, uniqueId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.rank, rank);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.level, level);
- }
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.num, num);
- }
- if ((bitField0_ & 0x00000010) != 0) {
output.writeUInt32(FieldNames.mainAffixId, mainAffixId);
}
- if ((bitField0_ & 0x00000020) != 0) {
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeUInt32(FieldNames.promotion, promotion);
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
output.writeUInt32(FieldNames.itemId, itemId);
}
+ if ((bitField0_ & 0x00000010) != 0) {
+ output.writeUInt32(FieldNames.rank, rank);
+ }
+ if ((bitField0_ & 0x00000020) != 0) {
+ output.writeUInt32(FieldNames.level, level);
+ }
if ((bitField0_ & 0x00000040) != 0) {
- output.writeUInt32(FieldNames.uniqueId, uniqueId);
+ output.writeUInt32(FieldNames.num, num);
}
output.endObject();
}
@@ -591,10 +591,11 @@ public final class ItemOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -799212381: {
- if (input.isAtField(FieldNames.promotion)) {
+ case -294460212:
+ case -538310583: {
+ if (input.isAtField(FieldNames.uniqueId)) {
if (!input.trySkipNullValue()) {
- promotion = input.readUInt32();
+ uniqueId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -602,45 +603,23 @@ public final class ItemOuterClass {
}
break;
}
- case 3492908: {
- if (input.isAtField(FieldNames.rank)) {
- if (!input.trySkipNullValue()) {
- rank = input.readUInt32();
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 102865796: {
- if (input.isAtField(FieldNames.level)) {
- if (!input.trySkipNullValue()) {
- level = input.readUInt32();
- bitField0_ |= 0x00000004;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 109446: {
- if (input.isAtField(FieldNames.num)) {
- if (!input.trySkipNullValue()) {
- num = input.readUInt32();
- bitField0_ |= 0x00000008;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case -1973876974:
case -1426712144: {
if (input.isAtField(FieldNames.mainAffixId)) {
if (!input.trySkipNullValue()) {
mainAffixId = input.readUInt32();
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -799212381: {
+ if (input.isAtField(FieldNames.promotion)) {
+ if (!input.trySkipNullValue()) {
+ promotion = input.readUInt32();
+ bitField0_ |= 0x00000004;
}
} else {
input.skipUnknownField();
@@ -652,6 +631,28 @@ public final class ItemOuterClass {
if (input.isAtField(FieldNames.itemId)) {
if (!input.trySkipNullValue()) {
itemId = input.readUInt32();
+ bitField0_ |= 0x00000008;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 3492908: {
+ if (input.isAtField(FieldNames.rank)) {
+ if (!input.trySkipNullValue()) {
+ rank = input.readUInt32();
+ bitField0_ |= 0x00000010;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 102865796: {
+ if (input.isAtField(FieldNames.level)) {
+ if (!input.trySkipNullValue()) {
+ level = input.readUInt32();
bitField0_ |= 0x00000020;
}
} else {
@@ -659,11 +660,10 @@ public final class ItemOuterClass {
}
break;
}
- case -294460212:
- case -538310583: {
- if (input.isAtField(FieldNames.uniqueId)) {
+ case 109446: {
+ if (input.isAtField(FieldNames.num)) {
if (!input.trySkipNullValue()) {
- uniqueId = input.readUInt32();
+ num = input.readUInt32();
bitField0_ |= 0x00000040;
}
} else {
@@ -723,19 +723,19 @@ public final class ItemOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
+ static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id");
+
+ static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id");
+
static final FieldName promotion = FieldName.forField("promotion");
+ static final FieldName itemId = FieldName.forField("itemId", "item_id");
+
static final FieldName rank = FieldName.forField("rank");
static final FieldName level = FieldName.forField("level");
static final FieldName num = FieldName.forField("num");
-
- static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id");
-
- static final FieldName itemId = FieldName.forField("itemId", "item_id");
-
- static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/JoinLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/JoinLineupCsReqOuterClass.java
index 3e12701..7f82a07 100644
--- a/src/generated/main/emu/lunarcore/proto/JoinLineupCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/JoinLineupCsReqOuterClass.java
@@ -19,37 +19,37 @@ public final class JoinLineupCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 slot = 3;
- */
- private int slot;
-
- /**
- * optional uint32 plane_id = 8;
- */
- private int planeId;
-
- /**
- * optional uint32 index = 11;
+ * optional uint32 index = 4;
*/
private int index;
/**
- * optional uint32 base_avatar_id = 12;
+ * optional uint32 base_avatar_id = 6;
*/
private int baseAvatarId;
+ /**
+ * optional uint32 plane_id = 11;
+ */
+ private int planeId;
+
+ /**
+ * optional uint32 slot = 14;
+ */
+ private int slot;
+
/**
* optional .ExtraLineupType extra_lineup_type = 9;
*/
private int extraLineupType;
/**
- * optional .AvatarType avatar_type = 13;
+ * optional .AvatarType avatar_type = 15;
*/
private int avatarType;
/**
- * optional bool is_virtual = 4;
+ * optional bool is_virtual = 3;
*/
private boolean isVirtual;
@@ -64,99 +64,25 @@ public final class JoinLineupCsReqOuterClass {
}
/**
- * optional uint32 slot = 3;
- * @return whether the slot field is set
+ * optional uint32 index = 4;
+ * @return whether the index field is set
*/
- public boolean hasSlot() {
+ public boolean hasIndex() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 slot = 3;
- * @return this
- */
- public JoinLineupCsReq clearSlot() {
- bitField0_ &= ~0x00000001;
- slot = 0;
- return this;
- }
-
- /**
- * optional uint32 slot = 3;
- * @return the slot
- */
- public int getSlot() {
- return slot;
- }
-
- /**
- * optional uint32 slot = 3;
- * @param value the slot to set
- * @return this
- */
- public JoinLineupCsReq setSlot(final int value) {
- bitField0_ |= 0x00000001;
- slot = value;
- return this;
- }
-
- /**
- * optional uint32 plane_id = 8;
- * @return whether the planeId field is set
- */
- public boolean hasPlaneId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 plane_id = 8;
- * @return this
- */
- public JoinLineupCsReq clearPlaneId() {
- bitField0_ &= ~0x00000002;
- planeId = 0;
- return this;
- }
-
- /**
- * optional uint32 plane_id = 8;
- * @return the planeId
- */
- public int getPlaneId() {
- return planeId;
- }
-
- /**
- * optional uint32 plane_id = 8;
- * @param value the planeId to set
- * @return this
- */
- public JoinLineupCsReq setPlaneId(final int value) {
- bitField0_ |= 0x00000002;
- planeId = value;
- return this;
- }
-
- /**
- * optional uint32 index = 11;
- * @return whether the index field is set
- */
- public boolean hasIndex() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 index = 11;
+ * optional uint32 index = 4;
* @return this
*/
public JoinLineupCsReq clearIndex() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000001;
index = 0;
return this;
}
/**
- * optional uint32 index = 11;
+ * optional uint32 index = 4;
* @return the index
*/
public int getIndex() {
@@ -164,36 +90,36 @@ public final class JoinLineupCsReqOuterClass {
}
/**
- * optional uint32 index = 11;
+ * optional uint32 index = 4;
* @param value the index to set
* @return this
*/
public JoinLineupCsReq setIndex(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
index = value;
return this;
}
/**
- * optional uint32 base_avatar_id = 12;
+ * optional uint32 base_avatar_id = 6;
* @return whether the baseAvatarId field is set
*/
public boolean hasBaseAvatarId() {
- return (bitField0_ & 0x00000008) != 0;
+ return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 base_avatar_id = 12;
+ * optional uint32 base_avatar_id = 6;
* @return this
*/
public JoinLineupCsReq clearBaseAvatarId() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000002;
baseAvatarId = 0;
return this;
}
/**
- * optional uint32 base_avatar_id = 12;
+ * optional uint32 base_avatar_id = 6;
* @return the baseAvatarId
*/
public int getBaseAvatarId() {
@@ -201,16 +127,90 @@ public final class JoinLineupCsReqOuterClass {
}
/**
- * optional uint32 base_avatar_id = 12;
+ * optional uint32 base_avatar_id = 6;
* @param value the baseAvatarId to set
* @return this
*/
public JoinLineupCsReq setBaseAvatarId(final int value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000002;
baseAvatarId = value;
return this;
}
+ /**
+ * optional uint32 plane_id = 11;
+ * @return whether the planeId field is set
+ */
+ public boolean hasPlaneId() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 plane_id = 11;
+ * @return this
+ */
+ public JoinLineupCsReq clearPlaneId() {
+ bitField0_ &= ~0x00000004;
+ planeId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 plane_id = 11;
+ * @return the planeId
+ */
+ public int getPlaneId() {
+ return planeId;
+ }
+
+ /**
+ * optional uint32 plane_id = 11;
+ * @param value the planeId to set
+ * @return this
+ */
+ public JoinLineupCsReq setPlaneId(final int value) {
+ bitField0_ |= 0x00000004;
+ planeId = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 slot = 14;
+ * @return whether the slot field is set
+ */
+ public boolean hasSlot() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional uint32 slot = 14;
+ * @return this
+ */
+ public JoinLineupCsReq clearSlot() {
+ bitField0_ &= ~0x00000008;
+ slot = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 slot = 14;
+ * @return the slot
+ */
+ public int getSlot() {
+ return slot;
+ }
+
+ /**
+ * optional uint32 slot = 14;
+ * @param value the slot to set
+ * @return this
+ */
+ public JoinLineupCsReq setSlot(final int value) {
+ bitField0_ |= 0x00000008;
+ slot = value;
+ return this;
+ }
+
/**
* optional .ExtraLineupType extra_lineup_type = 9;
* @return whether the extraLineupType field is set
@@ -275,7 +275,7 @@ public final class JoinLineupCsReqOuterClass {
}
/**
- * optional .AvatarType avatar_type = 13;
+ * optional .AvatarType avatar_type = 15;
* @return whether the avatarType field is set
*/
public boolean hasAvatarType() {
@@ -283,7 +283,7 @@ public final class JoinLineupCsReqOuterClass {
}
/**
- * optional .AvatarType avatar_type = 13;
+ * optional .AvatarType avatar_type = 15;
* @return this
*/
public JoinLineupCsReq clearAvatarType() {
@@ -293,7 +293,7 @@ public final class JoinLineupCsReqOuterClass {
}
/**
- * optional .AvatarType avatar_type = 13;
+ * optional .AvatarType avatar_type = 15;
* @return the avatarType
*/
public AvatarTypeOuterClass.AvatarType getAvatarType() {
@@ -326,7 +326,7 @@ public final class JoinLineupCsReqOuterClass {
}
/**
- * optional .AvatarType avatar_type = 13;
+ * optional .AvatarType avatar_type = 15;
* @param value the avatarType to set
* @return this
*/
@@ -337,7 +337,7 @@ public final class JoinLineupCsReqOuterClass {
}
/**
- * optional bool is_virtual = 4;
+ * optional bool is_virtual = 3;
* @return whether the isVirtual field is set
*/
public boolean hasIsVirtual() {
@@ -345,7 +345,7 @@ public final class JoinLineupCsReqOuterClass {
}
/**
- * optional bool is_virtual = 4;
+ * optional bool is_virtual = 3;
* @return this
*/
public JoinLineupCsReq clearIsVirtual() {
@@ -355,7 +355,7 @@ public final class JoinLineupCsReqOuterClass {
}
/**
- * optional bool is_virtual = 4;
+ * optional bool is_virtual = 3;
* @return the isVirtual
*/
public boolean getIsVirtual() {
@@ -363,7 +363,7 @@ public final class JoinLineupCsReqOuterClass {
}
/**
- * optional bool is_virtual = 4;
+ * optional bool is_virtual = 3;
* @param value the isVirtual to set
* @return this
*/
@@ -378,10 +378,10 @@ public final class JoinLineupCsReqOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- slot = other.slot;
- planeId = other.planeId;
index = other.index;
baseAvatarId = other.baseAvatarId;
+ planeId = other.planeId;
+ slot = other.slot;
extraLineupType = other.extraLineupType;
avatarType = other.avatarType;
isVirtual = other.isVirtual;
@@ -395,18 +395,18 @@ public final class JoinLineupCsReqOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasSlot()) {
- setSlot(other.slot);
- }
- if (other.hasPlaneId()) {
- setPlaneId(other.planeId);
- }
if (other.hasIndex()) {
setIndex(other.index);
}
if (other.hasBaseAvatarId()) {
setBaseAvatarId(other.baseAvatarId);
}
+ if (other.hasPlaneId()) {
+ setPlaneId(other.planeId);
+ }
+ if (other.hasSlot()) {
+ setSlot(other.slot);
+ }
if (other.hasExtraLineupType()) {
setExtraLineupTypeValue(other.extraLineupType);
}
@@ -426,10 +426,10 @@ public final class JoinLineupCsReqOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- slot = 0;
- planeId = 0;
index = 0;
baseAvatarId = 0;
+ planeId = 0;
+ slot = 0;
extraLineupType = 0;
avatarType = 0;
isVirtual = false;
@@ -456,10 +456,10 @@ public final class JoinLineupCsReqOuterClass {
}
JoinLineupCsReq other = (JoinLineupCsReq) o;
return bitField0_ == other.bitField0_
- && (!hasSlot() || slot == other.slot)
- && (!hasPlaneId() || planeId == other.planeId)
&& (!hasIndex() || index == other.index)
&& (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
+ && (!hasPlaneId() || planeId == other.planeId)
+ && (!hasSlot() || slot == other.slot)
&& (!hasExtraLineupType() || extraLineupType == other.extraLineupType)
&& (!hasAvatarType() || avatarType == other.avatarType)
&& (!hasIsVirtual() || isVirtual == other.isVirtual);
@@ -468,31 +468,31 @@ public final class JoinLineupCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(slot);
+ output.writeRawByte((byte) 32);
+ output.writeUInt32NoTag(index);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 64);
- output.writeUInt32NoTag(planeId);
+ output.writeRawByte((byte) 48);
+ output.writeUInt32NoTag(baseAvatarId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 88);
- output.writeUInt32NoTag(index);
+ output.writeUInt32NoTag(planeId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 96);
- output.writeUInt32NoTag(baseAvatarId);
+ output.writeRawByte((byte) 112);
+ output.writeUInt32NoTag(slot);
}
if ((bitField0_ & 0x00000010) != 0) {
output.writeRawByte((byte) 72);
output.writeEnumNoTag(extraLineupType);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 120);
output.writeEnumNoTag(avatarType);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 24);
output.writeBoolNoTag(isVirtual);
}
}
@@ -501,17 +501,17 @@ public final class JoinLineupCsReqOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(slot);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId);
- }
- if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(index);
}
- if ((bitField0_ & 0x00000008) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId);
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(slot);
+ }
if ((bitField0_ & 0x00000010) != 0) {
size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType);
}
@@ -531,18 +531,18 @@ public final class JoinLineupCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
- // slot
- slot = input.readUInt32();
+ case 32: {
+ // index
+ index = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 64) {
+ if (tag != 48) {
break;
}
}
- case 64: {
- // planeId
- planeId = input.readUInt32();
+ case 48: {
+ // baseAvatarId
+ baseAvatarId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 88) {
@@ -550,17 +550,17 @@ public final class JoinLineupCsReqOuterClass {
}
}
case 88: {
- // index
- index = input.readUInt32();
+ // planeId
+ planeId = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 112) {
break;
}
}
- case 96: {
- // baseAvatarId
- baseAvatarId = input.readUInt32();
+ case 112: {
+ // slot
+ slot = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
if (tag != 72) {
@@ -575,11 +575,11 @@ public final class JoinLineupCsReqOuterClass {
bitField0_ |= 0x00000010;
}
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 120) {
break;
}
}
- case 104: {
+ case 120: {
// avatarType
final int value = input.readInt32();
if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) {
@@ -587,11 +587,11 @@ public final class JoinLineupCsReqOuterClass {
bitField0_ |= 0x00000020;
}
tag = input.readTag();
- if (tag != 32) {
+ if (tag != 24) {
break;
}
}
- case 32: {
+ case 24: {
// isVirtual
isVirtual = input.readBool();
bitField0_ |= 0x00000040;
@@ -618,17 +618,17 @@ public final class JoinLineupCsReqOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.slot, slot);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.planeId, planeId);
- }
- if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.index, index);
}
- if ((bitField0_ & 0x00000008) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeUInt32(FieldNames.planeId, planeId);
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeUInt32(FieldNames.slot, slot);
+ }
if ((bitField0_ & 0x00000010) != 0) {
output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter());
}
@@ -648,34 +648,11 @@ public final class JoinLineupCsReqOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 3533310: {
- if (input.isAtField(FieldNames.slot)) {
- if (!input.trySkipNullValue()) {
- slot = input.readUInt32();
- bitField0_ |= 0x00000001;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case -493896553:
- case 1869097438: {
- if (input.isAtField(FieldNames.planeId)) {
- if (!input.trySkipNullValue()) {
- planeId = input.readUInt32();
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 100346066: {
if (input.isAtField(FieldNames.index)) {
if (!input.trySkipNullValue()) {
index = input.readUInt32();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
}
} else {
input.skipUnknownField();
@@ -687,6 +664,29 @@ public final class JoinLineupCsReqOuterClass {
if (input.isAtField(FieldNames.baseAvatarId)) {
if (!input.trySkipNullValue()) {
baseAvatarId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -493896553:
+ case 1869097438: {
+ if (input.isAtField(FieldNames.planeId)) {
+ if (!input.trySkipNullValue()) {
+ planeId = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 3533310: {
+ if (input.isAtField(FieldNames.slot)) {
+ if (!input.trySkipNullValue()) {
+ slot = input.readUInt32();
bitField0_ |= 0x00000008;
}
} else {
@@ -793,14 +793,14 @@ public final class JoinLineupCsReqOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName slot = FieldName.forField("slot");
-
- static final FieldName planeId = FieldName.forField("planeId", "plane_id");
-
static final FieldName index = FieldName.forField("index");
static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
+ static final FieldName planeId = FieldName.forField("planeId", "plane_id");
+
+ static final FieldName slot = FieldName.forField("slot");
+
static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type");
static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type");
diff --git a/src/generated/main/emu/lunarcore/proto/LeaveRogueScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/LeaveRogueScRspOuterClass.java
index d27cfa2..37d6cb8 100644
--- a/src/generated/main/emu/lunarcore/proto/LeaveRogueScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/LeaveRogueScRspOuterClass.java
@@ -19,25 +19,25 @@ public final class LeaveRogueScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 12;
*/
private int retcode;
/**
- * optional .RogueInfo rogue_info = 8;
+ * optional .RogueInfo rogue_info = 1;
*/
private final RogueInfoOuterClass.RogueInfo rogueInfo = RogueInfoOuterClass.RogueInfo.newInstance();
/**
- * optional .SceneInfo scene = 10;
- */
- private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance();
-
- /**
- * optional .LineupInfo lineup = 15;
+ * optional .LineupInfo lineup = 10;
*/
private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance();
+ /**
+ * optional .SceneInfo scene = 15;
+ */
+ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance();
+
private LeaveRogueScRsp() {
}
@@ -49,7 +49,7 @@ public final class LeaveRogueScRspOuterClass {
}
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 12;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -57,7 +57,7 @@ public final class LeaveRogueScRspOuterClass {
}
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 12;
* @return this
*/
public LeaveRogueScRsp clearRetcode() {
@@ -67,7 +67,7 @@ public final class LeaveRogueScRspOuterClass {
}
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 12;
* @return the retcode
*/
public int getRetcode() {
@@ -75,7 +75,7 @@ public final class LeaveRogueScRspOuterClass {
}
/**
- * optional uint32 retcode = 5;
+ * optional uint32 retcode = 12;
* @param value the retcode to set
* @return this
*/
@@ -86,7 +86,7 @@ public final class LeaveRogueScRspOuterClass {
}
/**
- * optional .RogueInfo rogue_info = 8;
+ * optional .RogueInfo rogue_info = 1;
* @return whether the rogueInfo field is set
*/
public boolean hasRogueInfo() {
@@ -94,7 +94,7 @@ public final class LeaveRogueScRspOuterClass {
}
/**
- * optional .RogueInfo rogue_info = 8;
+ * optional .RogueInfo rogue_info = 1;
* @return this
*/
public LeaveRogueScRsp clearRogueInfo() {
@@ -104,7 +104,7 @@ public final class LeaveRogueScRspOuterClass {
}
/**
- * optional .RogueInfo rogue_info = 8;
+ * optional .RogueInfo rogue_info = 1;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -118,7 +118,7 @@ public final class LeaveRogueScRspOuterClass {
}
/**
- * optional .RogueInfo rogue_info = 8;
+ * optional .RogueInfo rogue_info = 1;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -132,7 +132,7 @@ public final class LeaveRogueScRspOuterClass {
}
/**
- * optional .RogueInfo rogue_info = 8;
+ * optional .RogueInfo rogue_info = 1;
* @param value the rogueInfo to set
* @return this
*/
@@ -143,82 +143,25 @@ public final class LeaveRogueScRspOuterClass {
}
/**
- * optional .SceneInfo scene = 10;
- * @return whether the scene field is set
+ * optional .LineupInfo lineup = 10;
+ * @return whether the lineup field is set
*/
- public boolean hasScene() {
+ public boolean hasLineup() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional .SceneInfo scene = 10;
- * @return this
- */
- public LeaveRogueScRsp clearScene() {
- bitField0_ &= ~0x00000004;
- scene.clear();
- return this;
- }
-
- /**
- * optional .SceneInfo scene = 10;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableScene()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public SceneInfoOuterClass.SceneInfo getScene() {
- return scene;
- }
-
- /**
- * optional .SceneInfo scene = 10;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public SceneInfoOuterClass.SceneInfo getMutableScene() {
- bitField0_ |= 0x00000004;
- return scene;
- }
-
- /**
- * optional .SceneInfo scene = 10;
- * @param value the scene to set
- * @return this
- */
- public LeaveRogueScRsp setScene(final SceneInfoOuterClass.SceneInfo value) {
- bitField0_ |= 0x00000004;
- scene.copyFrom(value);
- return this;
- }
-
- /**
- * optional .LineupInfo lineup = 15;
- * @return whether the lineup field is set
- */
- public boolean hasLineup() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional .LineupInfo lineup = 15;
+ * optional .LineupInfo lineup = 10;
* @return this
*/
public LeaveRogueScRsp clearLineup() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000004;
lineup.clear();
return this;
}
/**
- * optional .LineupInfo lineup = 15;
+ * optional .LineupInfo lineup = 10;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -232,7 +175,7 @@ public final class LeaveRogueScRspOuterClass {
}
/**
- * optional .LineupInfo lineup = 15;
+ * optional .LineupInfo lineup = 10;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -241,21 +184,78 @@ public final class LeaveRogueScRspOuterClass {
* @return internal storage object for modifications
*/
public LineupInfoOuterClass.LineupInfo getMutableLineup() {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
return lineup;
}
/**
- * optional .LineupInfo lineup = 15;
+ * optional .LineupInfo lineup = 10;
* @param value the lineup to set
* @return this
*/
public LeaveRogueScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
lineup.copyFrom(value);
return this;
}
+ /**
+ * optional .SceneInfo scene = 15;
+ * @return whether the scene field is set
+ */
+ public boolean hasScene() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional .SceneInfo scene = 15;
+ * @return this
+ */
+ public LeaveRogueScRsp clearScene() {
+ bitField0_ &= ~0x00000008;
+ scene.clear();
+ return this;
+ }
+
+ /**
+ * 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.
+ *
+ * Use {@link #getMutableScene()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public SceneInfoOuterClass.SceneInfo getScene() {
+ return scene;
+ }
+
+ /**
+ * 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
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public SceneInfoOuterClass.SceneInfo getMutableScene() {
+ bitField0_ |= 0x00000008;
+ return scene;
+ }
+
+ /**
+ * optional .SceneInfo scene = 15;
+ * @param value the scene to set
+ * @return this
+ */
+ public LeaveRogueScRsp setScene(final SceneInfoOuterClass.SceneInfo value) {
+ bitField0_ |= 0x00000008;
+ scene.copyFrom(value);
+ return this;
+ }
+
@Override
public LeaveRogueScRsp copyFrom(final LeaveRogueScRsp other) {
cachedSize = other.cachedSize;
@@ -263,8 +263,8 @@ public final class LeaveRogueScRspOuterClass {
bitField0_ = other.bitField0_;
retcode = other.retcode;
rogueInfo.copyFrom(other.rogueInfo);
- scene.copyFrom(other.scene);
lineup.copyFrom(other.lineup);
+ scene.copyFrom(other.scene);
}
return this;
}
@@ -281,12 +281,12 @@ public final class LeaveRogueScRspOuterClass {
if (other.hasRogueInfo()) {
getMutableRogueInfo().mergeFrom(other.rogueInfo);
}
- if (other.hasScene()) {
- getMutableScene().mergeFrom(other.scene);
- }
if (other.hasLineup()) {
getMutableLineup().mergeFrom(other.lineup);
}
+ if (other.hasScene()) {
+ getMutableScene().mergeFrom(other.scene);
+ }
return this;
}
@@ -299,8 +299,8 @@ public final class LeaveRogueScRspOuterClass {
bitField0_ = 0;
retcode = 0;
rogueInfo.clear();
- scene.clear();
lineup.clear();
+ scene.clear();
return this;
}
@@ -312,8 +312,8 @@ public final class LeaveRogueScRspOuterClass {
cachedSize = -1;
bitField0_ = 0;
rogueInfo.clearQuick();
- scene.clearQuick();
lineup.clearQuick();
+ scene.clearQuick();
return this;
}
@@ -329,27 +329,27 @@ public final class LeaveRogueScRspOuterClass {
return bitField0_ == other.bitField0_
&& (!hasRetcode() || retcode == other.retcode)
&& (!hasRogueInfo() || rogueInfo.equals(other.rogueInfo))
- && (!hasScene() || scene.equals(other.scene))
- && (!hasLineup() || lineup.equals(other.lineup));
+ && (!hasLineup() || lineup.equals(other.lineup))
+ && (!hasScene() || scene.equals(other.scene));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 66);
+ output.writeRawByte((byte) 10);
output.writeMessageNoTag(rogueInfo);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 82);
- output.writeMessageNoTag(scene);
+ output.writeMessageNoTag(lineup);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeRawByte((byte) 122);
- output.writeMessageNoTag(lineup);
+ output.writeMessageNoTag(scene);
}
}
@@ -363,10 +363,10 @@ public final class LeaveRogueScRspOuterClass {
size += 1 + ProtoSink.computeMessageSizeNoTag(rogueInfo);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(scene);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(lineup);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(lineup);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(scene);
}
return size;
}
@@ -378,16 +378,16 @@ public final class LeaveRogueScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
+ case 96: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 66) {
+ if (tag != 10) {
break;
}
}
- case 66: {
+ case 10: {
// rogueInfo
input.readMessage(rogueInfo);
bitField0_ |= 0x00000002;
@@ -397,8 +397,8 @@ public final class LeaveRogueScRspOuterClass {
}
}
case 82: {
- // scene
- input.readMessage(scene);
+ // lineup
+ input.readMessage(lineup);
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 122) {
@@ -406,8 +406,8 @@ public final class LeaveRogueScRspOuterClass {
}
}
case 122: {
- // lineup
- input.readMessage(lineup);
+ // scene
+ input.readMessage(scene);
bitField0_ |= 0x00000008;
tag = input.readTag();
if (tag != 0) {
@@ -438,10 +438,10 @@ public final class LeaveRogueScRspOuterClass {
output.writeMessage(FieldNames.rogueInfo, rogueInfo);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeMessage(FieldNames.scene, scene);
+ output.writeMessage(FieldNames.lineup, lineup);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeMessage(FieldNames.lineup, lineup);
+ output.writeMessage(FieldNames.scene, scene);
}
output.endObject();
}
@@ -476,10 +476,10 @@ public final class LeaveRogueScRspOuterClass {
}
break;
}
- case 109254796: {
- if (input.isAtField(FieldNames.scene)) {
+ case -1102671473: {
+ if (input.isAtField(FieldNames.lineup)) {
if (!input.trySkipNullValue()) {
- input.readMessage(scene);
+ input.readMessage(lineup);
bitField0_ |= 0x00000004;
}
} else {
@@ -487,10 +487,10 @@ public final class LeaveRogueScRspOuterClass {
}
break;
}
- case -1102671473: {
- if (input.isAtField(FieldNames.lineup)) {
+ case 109254796: {
+ if (input.isAtField(FieldNames.scene)) {
if (!input.trySkipNullValue()) {
- input.readMessage(lineup);
+ input.readMessage(scene);
bitField0_ |= 0x00000008;
}
} else {
@@ -555,9 +555,9 @@ public final class LeaveRogueScRspOuterClass {
static final FieldName rogueInfo = FieldName.forField("rogueInfo", "rogue_info");
- static final FieldName scene = FieldName.forField("scene");
-
static final FieldName lineup = FieldName.forField("lineup");
+
+ static final FieldName scene = FieldName.forField("scene");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java
index faf85b8..e314ce6 100644
--- a/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java
@@ -29,22 +29,22 @@ public final class LineupAvatarOuterClass {
private int hp;
/**
- * optional uint32 satiety = 7;
+ * optional uint32 satiety = 12;
*/
private int satiety;
/**
- * optional uint32 slot = 14;
+ * optional uint32 slot = 13;
*/
private int slot;
/**
- * optional .AvatarType avatar_type = 12;
+ * optional .AvatarType avatar_type = 8;
*/
private int avatarType;
/**
- * optional .SpBarInfo sp_bar = 13;
+ * optional .SpBarInfo sp_bar = 14;
*/
private final SpBarInfoOuterClass.SpBarInfo spBar = SpBarInfoOuterClass.SpBarInfo.newInstance();
@@ -133,7 +133,7 @@ public final class LineupAvatarOuterClass {
}
/**
- * optional uint32 satiety = 7;
+ * optional uint32 satiety = 12;
* @return whether the satiety field is set
*/
public boolean hasSatiety() {
@@ -141,7 +141,7 @@ public final class LineupAvatarOuterClass {
}
/**
- * optional uint32 satiety = 7;
+ * optional uint32 satiety = 12;
* @return this
*/
public LineupAvatar clearSatiety() {
@@ -151,7 +151,7 @@ public final class LineupAvatarOuterClass {
}
/**
- * optional uint32 satiety = 7;
+ * optional uint32 satiety = 12;
* @return the satiety
*/
public int getSatiety() {
@@ -159,7 +159,7 @@ public final class LineupAvatarOuterClass {
}
/**
- * optional uint32 satiety = 7;
+ * optional uint32 satiety = 12;
* @param value the satiety to set
* @return this
*/
@@ -170,7 +170,7 @@ public final class LineupAvatarOuterClass {
}
/**
- * optional uint32 slot = 14;
+ * optional uint32 slot = 13;
* @return whether the slot field is set
*/
public boolean hasSlot() {
@@ -178,7 +178,7 @@ public final class LineupAvatarOuterClass {
}
/**
- * optional uint32 slot = 14;
+ * optional uint32 slot = 13;
* @return this
*/
public LineupAvatar clearSlot() {
@@ -188,7 +188,7 @@ public final class LineupAvatarOuterClass {
}
/**
- * optional uint32 slot = 14;
+ * optional uint32 slot = 13;
* @return the slot
*/
public int getSlot() {
@@ -196,7 +196,7 @@ public final class LineupAvatarOuterClass {
}
/**
- * optional uint32 slot = 14;
+ * optional uint32 slot = 13;
* @param value the slot to set
* @return this
*/
@@ -207,7 +207,7 @@ public final class LineupAvatarOuterClass {
}
/**
- * optional .AvatarType avatar_type = 12;
+ * optional .AvatarType avatar_type = 8;
* @return whether the avatarType field is set
*/
public boolean hasAvatarType() {
@@ -215,7 +215,7 @@ public final class LineupAvatarOuterClass {
}
/**
- * optional .AvatarType avatar_type = 12;
+ * optional .AvatarType avatar_type = 8;
* @return this
*/
public LineupAvatar clearAvatarType() {
@@ -225,7 +225,7 @@ public final class LineupAvatarOuterClass {
}
/**
- * optional .AvatarType avatar_type = 12;
+ * optional .AvatarType avatar_type = 8;
* @return the avatarType
*/
public AvatarTypeOuterClass.AvatarType getAvatarType() {
@@ -258,7 +258,7 @@ public final class LineupAvatarOuterClass {
}
/**
- * optional .AvatarType avatar_type = 12;
+ * optional .AvatarType avatar_type = 8;
* @param value the avatarType to set
* @return this
*/
@@ -269,7 +269,7 @@ public final class LineupAvatarOuterClass {
}
/**
- * optional .SpBarInfo sp_bar = 13;
+ * optional .SpBarInfo sp_bar = 14;
* @return whether the spBar field is set
*/
public boolean hasSpBar() {
@@ -277,7 +277,7 @@ public final class LineupAvatarOuterClass {
}
/**
- * optional .SpBarInfo sp_bar = 13;
+ * optional .SpBarInfo sp_bar = 14;
* @return this
*/
public LineupAvatar clearSpBar() {
@@ -287,7 +287,7 @@ public final class LineupAvatarOuterClass {
}
/**
- * optional .SpBarInfo sp_bar = 13;
+ * optional .SpBarInfo sp_bar = 14;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -301,7 +301,7 @@ public final class LineupAvatarOuterClass {
}
/**
- * optional .SpBarInfo sp_bar = 13;
+ * optional .SpBarInfo sp_bar = 14;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -315,7 +315,7 @@ public final class LineupAvatarOuterClass {
}
/**
- * optional .SpBarInfo sp_bar = 13;
+ * optional .SpBarInfo sp_bar = 14;
* @param value the spBar to set
* @return this
*/
@@ -423,19 +423,19 @@ public final class LineupAvatarOuterClass {
output.writeUInt32NoTag(hp);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(satiety);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 104);
output.writeUInt32NoTag(slot);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 64);
output.writeEnumNoTag(avatarType);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 106);
+ output.writeRawByte((byte) 114);
output.writeMessageNoTag(spBar);
}
}
@@ -485,29 +485,29 @@ public final class LineupAvatarOuterClass {
hp = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 56) {
- break;
- }
- }
- case 56: {
- // satiety
- satiety = input.readUInt32();
- bitField0_ |= 0x00000004;
- tag = input.readTag();
- if (tag != 112) {
- break;
- }
- }
- case 112: {
- // slot
- slot = input.readUInt32();
- bitField0_ |= 0x00000008;
- tag = input.readTag();
if (tag != 96) {
break;
}
}
case 96: {
+ // satiety
+ satiety = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 104) {
+ break;
+ }
+ }
+ case 104: {
+ // slot
+ slot = input.readUInt32();
+ bitField0_ |= 0x00000008;
+ tag = input.readTag();
+ if (tag != 64) {
+ break;
+ }
+ }
+ case 64: {
// avatarType
final int value = input.readInt32();
if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) {
@@ -515,11 +515,11 @@ public final class LineupAvatarOuterClass {
bitField0_ |= 0x00000010;
}
tag = input.readTag();
- if (tag != 106) {
+ if (tag != 114) {
break;
}
}
- case 106: {
+ case 114: {
// spBar
input.readMessage(spBar);
bitField0_ |= 0x00000020;
diff --git a/src/generated/main/emu/lunarcore/proto/LineupInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/LineupInfoOuterClass.java
index 5f9c804..de41a0f 100644
--- a/src/generated/main/emu/lunarcore/proto/LineupInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/LineupInfoOuterClass.java
@@ -21,47 +21,47 @@ public final class LineupInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 plane_id = 1;
- */
- private int planeId;
-
- /**
- * optional uint32 leader_slot = 3;
- */
- private int leaderSlot;
-
- /**
- * optional uint32 index = 7;
+ * optional uint32 index = 4;
*/
private int index;
/**
- * optional uint32 mp = 8;
- */
- private int mp;
-
- /**
- * optional uint32 max_mp = 9;
+ * optional uint32 max_mp = 6;
*/
private int maxMp;
/**
- * optional .ExtraLineupType extra_lineup_type = 6;
+ * optional uint32 leader_slot = 7;
+ */
+ private int leaderSlot;
+
+ /**
+ * optional uint32 mp = 9;
+ */
+ private int mp;
+
+ /**
+ * optional uint32 plane_id = 11;
+ */
+ private int planeId;
+
+ /**
+ * optional .ExtraLineupType extra_lineup_type = 13;
*/
private int extraLineupType;
/**
- * optional bool is_virtual = 2;
+ * optional bool is_virtual = 8;
*/
private boolean isVirtual;
/**
- * optional string name = 15;
+ * optional string name = 1;
*/
private final Utf8String name = Utf8String.newEmptyInstance();
/**
- * repeated .LineupAvatar avatar_list = 11;
+ * repeated .LineupAvatar avatar_list = 15;
*/
private final RepeatedMessageoptional uint32 plane_id = 1;
- * @return whether the planeId field is set
+ * optional uint32 index = 4;
+ * @return whether the index field is set
*/
- public boolean hasPlaneId() {
+ public boolean hasIndex() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 plane_id = 1;
- * @return this
- */
- public LineupInfo clearPlaneId() {
- bitField0_ &= ~0x00000001;
- planeId = 0;
- return this;
- }
-
- /**
- * optional uint32 plane_id = 1;
- * @return the planeId
- */
- public int getPlaneId() {
- return planeId;
- }
-
- /**
- * optional uint32 plane_id = 1;
- * @param value the planeId to set
- * @return this
- */
- public LineupInfo setPlaneId(final int value) {
- bitField0_ |= 0x00000001;
- planeId = value;
- return this;
- }
-
- /**
- * optional uint32 leader_slot = 3;
- * @return whether the leaderSlot field is set
- */
- public boolean hasLeaderSlot() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 leader_slot = 3;
- * @return this
- */
- public LineupInfo clearLeaderSlot() {
- bitField0_ &= ~0x00000002;
- leaderSlot = 0;
- return this;
- }
-
- /**
- * optional uint32 leader_slot = 3;
- * @return the leaderSlot
- */
- public int getLeaderSlot() {
- return leaderSlot;
- }
-
- /**
- * optional uint32 leader_slot = 3;
- * @param value the leaderSlot to set
- * @return this
- */
- public LineupInfo setLeaderSlot(final int value) {
- bitField0_ |= 0x00000002;
- leaderSlot = value;
- return this;
- }
-
- /**
- * optional uint32 index = 7;
- * @return whether the index field is set
- */
- public boolean hasIndex() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 index = 7;
+ * optional uint32 index = 4;
* @return this
*/
public LineupInfo clearIndex() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000001;
index = 0;
return this;
}
/**
- * optional uint32 index = 7;
+ * optional uint32 index = 4;
* @return the index
*/
public int getIndex() {
@@ -176,18 +102,92 @@ public final class LineupInfoOuterClass {
}
/**
- * optional uint32 index = 7;
+ * optional uint32 index = 4;
* @param value the index to set
* @return this
*/
public LineupInfo setIndex(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
index = value;
return this;
}
/**
- * optional uint32 mp = 8;
+ * optional uint32 max_mp = 6;
+ * @return whether the maxMp field is set
+ */
+ public boolean hasMaxMp() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 max_mp = 6;
+ * @return this
+ */
+ public LineupInfo clearMaxMp() {
+ bitField0_ &= ~0x00000002;
+ maxMp = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 max_mp = 6;
+ * @return the maxMp
+ */
+ public int getMaxMp() {
+ return maxMp;
+ }
+
+ /**
+ * optional uint32 max_mp = 6;
+ * @param value the maxMp to set
+ * @return this
+ */
+ public LineupInfo setMaxMp(final int value) {
+ bitField0_ |= 0x00000002;
+ maxMp = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 leader_slot = 7;
+ * @return whether the leaderSlot field is set
+ */
+ public boolean hasLeaderSlot() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 leader_slot = 7;
+ * @return this
+ */
+ public LineupInfo clearLeaderSlot() {
+ bitField0_ &= ~0x00000004;
+ leaderSlot = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 leader_slot = 7;
+ * @return the leaderSlot
+ */
+ public int getLeaderSlot() {
+ return leaderSlot;
+ }
+
+ /**
+ * optional uint32 leader_slot = 7;
+ * @param value the leaderSlot to set
+ * @return this
+ */
+ public LineupInfo setLeaderSlot(final int value) {
+ bitField0_ |= 0x00000004;
+ leaderSlot = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 mp = 9;
* @return whether the mp field is set
*/
public boolean hasMp() {
@@ -195,7 +195,7 @@ public final class LineupInfoOuterClass {
}
/**
- * optional uint32 mp = 8;
+ * optional uint32 mp = 9;
* @return this
*/
public LineupInfo clearMp() {
@@ -205,7 +205,7 @@ public final class LineupInfoOuterClass {
}
/**
- * optional uint32 mp = 8;
+ * optional uint32 mp = 9;
* @return the mp
*/
public int getMp() {
@@ -213,7 +213,7 @@ public final class LineupInfoOuterClass {
}
/**
- * optional uint32 mp = 8;
+ * optional uint32 mp = 9;
* @param value the mp to set
* @return this
*/
@@ -224,44 +224,44 @@ public final class LineupInfoOuterClass {
}
/**
- * optional uint32 max_mp = 9;
- * @return whether the maxMp field is set
+ * optional uint32 plane_id = 11;
+ * @return whether the planeId field is set
*/
- public boolean hasMaxMp() {
+ public boolean hasPlaneId() {
return (bitField0_ & 0x00000010) != 0;
}
/**
- * optional uint32 max_mp = 9;
+ * optional uint32 plane_id = 11;
* @return this
*/
- public LineupInfo clearMaxMp() {
+ public LineupInfo clearPlaneId() {
bitField0_ &= ~0x00000010;
- maxMp = 0;
+ planeId = 0;
return this;
}
/**
- * optional uint32 max_mp = 9;
- * @return the maxMp
+ * optional uint32 plane_id = 11;
+ * @return the planeId
*/
- public int getMaxMp() {
- return maxMp;
+ public int getPlaneId() {
+ return planeId;
}
/**
- * optional uint32 max_mp = 9;
- * @param value the maxMp to set
+ * optional uint32 plane_id = 11;
+ * @param value the planeId to set
* @return this
*/
- public LineupInfo setMaxMp(final int value) {
+ public LineupInfo setPlaneId(final int value) {
bitField0_ |= 0x00000010;
- maxMp = value;
+ planeId = value;
return this;
}
/**
- * optional .ExtraLineupType extra_lineup_type = 6;
+ * optional .ExtraLineupType extra_lineup_type = 13;
* @return whether the extraLineupType field is set
*/
public boolean hasExtraLineupType() {
@@ -269,7 +269,7 @@ public final class LineupInfoOuterClass {
}
/**
- * optional .ExtraLineupType extra_lineup_type = 6;
+ * optional .ExtraLineupType extra_lineup_type = 13;
* @return this
*/
public LineupInfo clearExtraLineupType() {
@@ -279,7 +279,7 @@ public final class LineupInfoOuterClass {
}
/**
- * optional .ExtraLineupType extra_lineup_type = 6;
+ * optional .ExtraLineupType extra_lineup_type = 13;
* @return the extraLineupType
*/
public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() {
@@ -312,7 +312,7 @@ public final class LineupInfoOuterClass {
}
/**
- * optional .ExtraLineupType extra_lineup_type = 6;
+ * optional .ExtraLineupType extra_lineup_type = 13;
* @param value the extraLineupType to set
* @return this
*/
@@ -323,7 +323,7 @@ public final class LineupInfoOuterClass {
}
/**
- * optional bool is_virtual = 2;
+ * optional bool is_virtual = 8;
* @return whether the isVirtual field is set
*/
public boolean hasIsVirtual() {
@@ -331,7 +331,7 @@ public final class LineupInfoOuterClass {
}
/**
- * optional bool is_virtual = 2;
+ * optional bool is_virtual = 8;
* @return this
*/
public LineupInfo clearIsVirtual() {
@@ -341,7 +341,7 @@ public final class LineupInfoOuterClass {
}
/**
- * optional bool is_virtual = 2;
+ * optional bool is_virtual = 8;
* @return the isVirtual
*/
public boolean getIsVirtual() {
@@ -349,7 +349,7 @@ public final class LineupInfoOuterClass {
}
/**
- * optional bool is_virtual = 2;
+ * optional bool is_virtual = 8;
* @param value the isVirtual to set
* @return this
*/
@@ -360,7 +360,7 @@ public final class LineupInfoOuterClass {
}
/**
- * optional string name = 15;
+ * optional string name = 1;
* @return whether the name field is set
*/
public boolean hasName() {
@@ -368,7 +368,7 @@ public final class LineupInfoOuterClass {
}
/**
- * optional string name = 15;
+ * optional string name = 1;
* @return this
*/
public LineupInfo clearName() {
@@ -378,7 +378,7 @@ public final class LineupInfoOuterClass {
}
/**
- * optional string name = 15;
+ * optional string name = 1;
* @return the name
*/
public String getName() {
@@ -386,7 +386,7 @@ public final class LineupInfoOuterClass {
}
/**
- * optional string name = 15;
+ * optional string name = 1;
* @return internal {@code Utf8String} representation of name for reading
*/
public Utf8String getNameBytes() {
@@ -394,7 +394,7 @@ public final class LineupInfoOuterClass {
}
/**
- * optional string name = 15;
+ * optional string name = 1;
* @return internal {@code Utf8String} representation of name for modifications
*/
public Utf8String getMutableNameBytes() {
@@ -403,7 +403,7 @@ public final class LineupInfoOuterClass {
}
/**
- * optional string name = 15;
+ * optional string name = 1;
* @param value the name to set
* @return this
*/
@@ -414,7 +414,7 @@ public final class LineupInfoOuterClass {
}
/**
- * optional string name = 15;
+ * optional string name = 1;
* @param value the name to set
* @return this
*/
@@ -425,7 +425,7 @@ public final class LineupInfoOuterClass {
}
/**
- * repeated .LineupAvatar avatar_list = 11;
+ * repeated .LineupAvatar avatar_list = 15;
* @return whether the avatarList field is set
*/
public boolean hasAvatarList() {
@@ -433,7 +433,7 @@ public final class LineupInfoOuterClass {
}
/**
- * repeated .LineupAvatar avatar_list = 11;
+ * repeated .LineupAvatar avatar_list = 15;
* @return this
*/
public LineupInfo clearAvatarList() {
@@ -443,7 +443,7 @@ public final class LineupInfoOuterClass {
}
/**
- * repeated .LineupAvatar avatar_list = 11;
+ * repeated .LineupAvatar avatar_list = 15;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -457,7 +457,7 @@ public final class LineupInfoOuterClass {
}
/**
- * repeated .LineupAvatar avatar_list = 11;
+ * repeated .LineupAvatar avatar_list = 15;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -471,7 +471,7 @@ public final class LineupInfoOuterClass {
}
/**
- * repeated .LineupAvatar avatar_list = 11;
+ * repeated .LineupAvatar avatar_list = 15;
* @param value the avatarList to add
* @return this
*/
@@ -482,7 +482,7 @@ public final class LineupInfoOuterClass {
}
/**
- * repeated .LineupAvatar avatar_list = 11;
+ * repeated .LineupAvatar avatar_list = 15;
* @param values the avatarList to add
* @return this
*/
@@ -497,11 +497,11 @@ public final class LineupInfoOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- planeId = other.planeId;
- leaderSlot = other.leaderSlot;
index = other.index;
- mp = other.mp;
maxMp = other.maxMp;
+ leaderSlot = other.leaderSlot;
+ mp = other.mp;
+ planeId = other.planeId;
extraLineupType = other.extraLineupType;
isVirtual = other.isVirtual;
name.copyFrom(other.name);
@@ -516,20 +516,20 @@ public final class LineupInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasPlaneId()) {
- setPlaneId(other.planeId);
+ if (other.hasIndex()) {
+ setIndex(other.index);
+ }
+ if (other.hasMaxMp()) {
+ setMaxMp(other.maxMp);
}
if (other.hasLeaderSlot()) {
setLeaderSlot(other.leaderSlot);
}
- if (other.hasIndex()) {
- setIndex(other.index);
- }
if (other.hasMp()) {
setMp(other.mp);
}
- if (other.hasMaxMp()) {
- setMaxMp(other.maxMp);
+ if (other.hasPlaneId()) {
+ setPlaneId(other.planeId);
}
if (other.hasExtraLineupType()) {
setExtraLineupTypeValue(other.extraLineupType);
@@ -553,11 +553,11 @@ public final class LineupInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- planeId = 0;
- leaderSlot = 0;
index = 0;
- mp = 0;
maxMp = 0;
+ leaderSlot = 0;
+ mp = 0;
+ planeId = 0;
extraLineupType = 0;
isVirtual = false;
name.clear();
@@ -587,11 +587,11 @@ public final class LineupInfoOuterClass {
}
LineupInfo other = (LineupInfo) o;
return bitField0_ == other.bitField0_
- && (!hasPlaneId() || planeId == other.planeId)
- && (!hasLeaderSlot() || leaderSlot == other.leaderSlot)
&& (!hasIndex() || index == other.index)
- && (!hasMp() || mp == other.mp)
&& (!hasMaxMp() || maxMp == other.maxMp)
+ && (!hasLeaderSlot() || leaderSlot == other.leaderSlot)
+ && (!hasMp() || mp == other.mp)
+ && (!hasPlaneId() || planeId == other.planeId)
&& (!hasExtraLineupType() || extraLineupType == other.extraLineupType)
&& (!hasIsVirtual() || isVirtual == other.isVirtual)
&& (!hasName() || name.equals(other.name))
@@ -601,40 +601,40 @@ public final class LineupInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(planeId);
+ output.writeRawByte((byte) 32);
+ output.writeUInt32NoTag(index);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(leaderSlot);
+ output.writeRawByte((byte) 48);
+ output.writeUInt32NoTag(maxMp);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 56);
- output.writeUInt32NoTag(index);
+ output.writeUInt32NoTag(leaderSlot);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 72);
output.writeUInt32NoTag(mp);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 72);
- output.writeUInt32NoTag(maxMp);
+ output.writeRawByte((byte) 88);
+ output.writeUInt32NoTag(planeId);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 104);
output.writeEnumNoTag(extraLineupType);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 64);
output.writeBoolNoTag(isVirtual);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRawByte((byte) 122);
+ output.writeRawByte((byte) 10);
output.writeStringNoTag(name);
}
if ((bitField0_ & 0x00000100) != 0) {
for (int i = 0; i < avatarList.length(); i++) {
- output.writeRawByte((byte) 90);
+ output.writeRawByte((byte) 122);
output.writeMessageNoTag(avatarList.get(i));
}
}
@@ -644,19 +644,19 @@ public final class LineupInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(index);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(maxMp);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(index);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot);
}
if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(mp);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(maxMp);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId);
}
if ((bitField0_ & 0x00000020) != 0) {
size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType);
@@ -680,18 +680,18 @@ public final class LineupInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
- // planeId
- planeId = input.readUInt32();
+ case 32: {
+ // index
+ index = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 24) {
+ if (tag != 48) {
break;
}
}
- case 24: {
- // leaderSlot
- leaderSlot = input.readUInt32();
+ case 48: {
+ // maxMp
+ maxMp = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 56) {
@@ -699,33 +699,33 @@ public final class LineupInfoOuterClass {
}
}
case 56: {
- // index
- index = input.readUInt32();
+ // leaderSlot
+ leaderSlot = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 64) {
- break;
- }
- }
- case 64: {
- // mp
- mp = input.readUInt32();
- bitField0_ |= 0x00000008;
- tag = input.readTag();
if (tag != 72) {
break;
}
}
case 72: {
- // maxMp
- maxMp = input.readUInt32();
- bitField0_ |= 0x00000010;
+ // mp
+ mp = input.readUInt32();
+ bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 48) {
+ if (tag != 88) {
break;
}
}
- case 48: {
+ case 88: {
+ // planeId
+ planeId = input.readUInt32();
+ bitField0_ |= 0x00000010;
+ tag = input.readTag();
+ if (tag != 104) {
+ break;
+ }
+ }
+ case 104: {
// extraLineupType
final int value = input.readInt32();
if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) {
@@ -733,29 +733,29 @@ public final class LineupInfoOuterClass {
bitField0_ |= 0x00000020;
}
tag = input.readTag();
- if (tag != 16) {
+ if (tag != 64) {
break;
}
}
- case 16: {
+ case 64: {
// isVirtual
isVirtual = input.readBool();
bitField0_ |= 0x00000040;
tag = input.readTag();
+ if (tag != 10) {
+ break;
+ }
+ }
+ case 10: {
+ // name
+ input.readString(name);
+ bitField0_ |= 0x00000080;
+ tag = input.readTag();
if (tag != 122) {
break;
}
}
case 122: {
- // name
- input.readString(name);
- bitField0_ |= 0x00000080;
- tag = input.readTag();
- if (tag != 90) {
- break;
- }
- }
- case 90: {
// avatarList
tag = input.readRepeatedMessage(avatarList, tag);
bitField0_ |= 0x00000100;
@@ -781,19 +781,19 @@ public final class LineupInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.planeId, planeId);
+ output.writeUInt32(FieldNames.index, index);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.leaderSlot, leaderSlot);
+ output.writeUInt32(FieldNames.maxMp, maxMp);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.index, index);
+ output.writeUInt32(FieldNames.leaderSlot, leaderSlot);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeUInt32(FieldNames.mp, mp);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeUInt32(FieldNames.maxMp, maxMp);
+ output.writeUInt32(FieldNames.planeId, planeId);
}
if ((bitField0_ & 0x00000020) != 0) {
output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter());
@@ -817,11 +817,10 @@ public final class LineupInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -493896553:
- case 1869097438: {
- if (input.isAtField(FieldNames.planeId)) {
+ case 100346066: {
+ if (input.isAtField(FieldNames.index)) {
if (!input.trySkipNullValue()) {
- planeId = input.readUInt32();
+ index = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -829,22 +828,23 @@ public final class LineupInfoOuterClass {
}
break;
}
+ case 103671335:
+ case -1081138594: {
+ if (input.isAtField(FieldNames.maxMp)) {
+ if (!input.trySkipNullValue()) {
+ maxMp = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case 1191442087:
case -1708713100: {
if (input.isAtField(FieldNames.leaderSlot)) {
if (!input.trySkipNullValue()) {
leaderSlot = input.readUInt32();
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 100346066: {
- if (input.isAtField(FieldNames.index)) {
- if (!input.trySkipNullValue()) {
- index = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -863,11 +863,11 @@ public final class LineupInfoOuterClass {
}
break;
}
- case 103671335:
- case -1081138594: {
- if (input.isAtField(FieldNames.maxMp)) {
+ case -493896553:
+ case 1869097438: {
+ if (input.isAtField(FieldNames.planeId)) {
if (!input.trySkipNullValue()) {
- maxMp = input.readUInt32();
+ planeId = input.readUInt32();
bitField0_ |= 0x00000010;
}
} else {
@@ -979,15 +979,15 @@ public final class LineupInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName planeId = FieldName.forField("planeId", "plane_id");
+ static final FieldName index = FieldName.forField("index");
+
+ static final FieldName maxMp = FieldName.forField("maxMp", "max_mp");
static final FieldName leaderSlot = FieldName.forField("leaderSlot", "leader_slot");
- static final FieldName index = FieldName.forField("index");
-
static final FieldName mp = FieldName.forField("mp");
- static final FieldName maxMp = FieldName.forField("maxMp", "max_mp");
+ static final FieldName planeId = FieldName.forField("planeId", "plane_id");
static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type");
diff --git a/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java
index a9fd5ee..6110aa5 100644
--- a/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java
@@ -18,18 +18,18 @@ public final class LineupSlotDataOuterClass {
public static final class LineupSlotData extends ProtoMessageoptional uint32 id = 4;
- */
- private int id;
-
/**
* optional uint32 slot = 11;
*/
private int slot;
/**
- * optional .AvatarType avatar_type = 1;
+ * optional uint32 id = 15;
+ */
+ private int id;
+
+ /**
+ * optional .AvatarType avatar_type = 14;
*/
private int avatarType;
@@ -43,49 +43,12 @@ public final class LineupSlotDataOuterClass {
return new LineupSlotData();
}
- /**
- * optional uint32 id = 4;
- * @return whether the id field is set
- */
- public boolean hasId() {
- return (bitField0_ & 0x00000001) != 0;
- }
-
- /**
- * optional uint32 id = 4;
- * @return this
- */
- public LineupSlotData clearId() {
- bitField0_ &= ~0x00000001;
- id = 0;
- return this;
- }
-
- /**
- * optional uint32 id = 4;
- * @return the id
- */
- public int getId() {
- return id;
- }
-
- /**
- * optional uint32 id = 4;
- * @param value the id to set
- * @return this
- */
- public LineupSlotData setId(final int value) {
- bitField0_ |= 0x00000001;
- id = value;
- return this;
- }
-
/**
* optional uint32 slot = 11;
* @return whether the slot field is set
*/
public boolean hasSlot() {
- return (bitField0_ & 0x00000002) != 0;
+ return (bitField0_ & 0x00000001) != 0;
}
/**
@@ -93,7 +56,7 @@ public final class LineupSlotDataOuterClass {
* @return this
*/
public LineupSlotData clearSlot() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
slot = 0;
return this;
}
@@ -112,13 +75,50 @@ public final class LineupSlotDataOuterClass {
* @return this
*/
public LineupSlotData setSlot(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
slot = value;
return this;
}
/**
- * optional .AvatarType avatar_type = 1;
+ * optional uint32 id = 15;
+ * @return whether the id field is set
+ */
+ public boolean hasId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 id = 15;
+ * @return this
+ */
+ public LineupSlotData clearId() {
+ bitField0_ &= ~0x00000002;
+ id = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 id = 15;
+ * @return the id
+ */
+ public int getId() {
+ return id;
+ }
+
+ /**
+ * optional uint32 id = 15;
+ * @param value the id to set
+ * @return this
+ */
+ public LineupSlotData setId(final int value) {
+ bitField0_ |= 0x00000002;
+ id = value;
+ return this;
+ }
+
+ /**
+ * optional .AvatarType avatar_type = 14;
* @return whether the avatarType field is set
*/
public boolean hasAvatarType() {
@@ -126,7 +126,7 @@ public final class LineupSlotDataOuterClass {
}
/**
- * optional .AvatarType avatar_type = 1;
+ * optional .AvatarType avatar_type = 14;
* @return this
*/
public LineupSlotData clearAvatarType() {
@@ -136,7 +136,7 @@ public final class LineupSlotDataOuterClass {
}
/**
- * optional .AvatarType avatar_type = 1;
+ * optional .AvatarType avatar_type = 14;
* @return the avatarType
*/
public AvatarTypeOuterClass.AvatarType getAvatarType() {
@@ -169,7 +169,7 @@ public final class LineupSlotDataOuterClass {
}
/**
- * optional .AvatarType avatar_type = 1;
+ * optional .AvatarType avatar_type = 14;
* @param value the avatarType to set
* @return this
*/
@@ -184,8 +184,8 @@ public final class LineupSlotDataOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- id = other.id;
slot = other.slot;
+ id = other.id;
avatarType = other.avatarType;
}
return this;
@@ -197,12 +197,12 @@ public final class LineupSlotDataOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasId()) {
- setId(other.id);
- }
if (other.hasSlot()) {
setSlot(other.slot);
}
+ if (other.hasId()) {
+ setId(other.id);
+ }
if (other.hasAvatarType()) {
setAvatarTypeValue(other.avatarType);
}
@@ -216,8 +216,8 @@ public final class LineupSlotDataOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- id = 0;
slot = 0;
+ id = 0;
avatarType = 0;
return this;
}
@@ -242,23 +242,23 @@ public final class LineupSlotDataOuterClass {
}
LineupSlotData other = (LineupSlotData) o;
return bitField0_ == other.bitField0_
- && (!hasId() || id == other.id)
&& (!hasSlot() || slot == other.slot)
+ && (!hasId() || id == other.id)
&& (!hasAvatarType() || avatarType == other.avatarType);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(id);
- }
- if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 88);
output.writeUInt32NoTag(slot);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 120);
+ output.writeUInt32NoTag(id);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 112);
output.writeEnumNoTag(avatarType);
}
}
@@ -267,10 +267,10 @@ public final class LineupSlotDataOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(id);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(slot);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(slot);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(id);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType);
@@ -285,25 +285,25 @@ public final class LineupSlotDataOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
- // id
- id = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 88) {
- break;
- }
- }
case 88: {
// slot
slot = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 8) {
+ if (tag != 120) {
break;
}
}
- case 8: {
+ case 120: {
+ // id
+ id = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 112) {
+ break;
+ }
+ }
+ case 112: {
// avatarType
final int value = input.readInt32();
if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) {
@@ -333,10 +333,10 @@ public final class LineupSlotDataOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.id, id);
+ output.writeUInt32(FieldNames.slot, slot);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.slot, slot);
+ output.writeUInt32(FieldNames.id, id);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter());
@@ -351,10 +351,10 @@ public final class LineupSlotDataOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 3355: {
- if (input.isAtField(FieldNames.id)) {
+ case 3533310: {
+ if (input.isAtField(FieldNames.slot)) {
if (!input.trySkipNullValue()) {
- id = input.readUInt32();
+ slot = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -362,10 +362,10 @@ public final class LineupSlotDataOuterClass {
}
break;
}
- case 3533310: {
- if (input.isAtField(FieldNames.slot)) {
+ case 3355: {
+ if (input.isAtField(FieldNames.id)) {
if (!input.trySkipNullValue()) {
- slot = input.readUInt32();
+ id = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -443,10 +443,10 @@ public final class LineupSlotDataOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName id = FieldName.forField("id");
-
static final FieldName slot = FieldName.forField("slot");
+ static final FieldName id = FieldName.forField("id");
+
static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/LockEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/LockEquipmentCsReqOuterClass.java
index 2c88167..517ad61 100644
--- a/src/generated/main/emu/lunarcore/proto/LockEquipmentCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/LockEquipmentCsReqOuterClass.java
@@ -20,12 +20,12 @@ public final class LockEquipmentCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional bool is_protected = 1;
+ * optional bool is_protected = 9;
*/
private boolean isProtected;
/**
- * repeated uint32 equipment_id_list = 8;
+ * repeated uint32 equipment_id_list = 13;
*/
private final RepeatedInt equipmentIdList = RepeatedInt.newEmptyInstance();
@@ -40,7 +40,7 @@ public final class LockEquipmentCsReqOuterClass {
}
/**
- * optional bool is_protected = 1;
+ * optional bool is_protected = 9;
* @return whether the isProtected field is set
*/
public boolean hasIsProtected() {
@@ -48,7 +48,7 @@ public final class LockEquipmentCsReqOuterClass {
}
/**
- * optional bool is_protected = 1;
+ * optional bool is_protected = 9;
* @return this
*/
public LockEquipmentCsReq clearIsProtected() {
@@ -58,7 +58,7 @@ public final class LockEquipmentCsReqOuterClass {
}
/**
- * optional bool is_protected = 1;
+ * optional bool is_protected = 9;
* @return the isProtected
*/
public boolean getIsProtected() {
@@ -66,7 +66,7 @@ public final class LockEquipmentCsReqOuterClass {
}
/**
- * optional bool is_protected = 1;
+ * optional bool is_protected = 9;
* @param value the isProtected to set
* @return this
*/
@@ -77,7 +77,7 @@ public final class LockEquipmentCsReqOuterClass {
}
/**
- * repeated uint32 equipment_id_list = 8;
+ * repeated uint32 equipment_id_list = 13;
* @return whether the equipmentIdList field is set
*/
public boolean hasEquipmentIdList() {
@@ -85,7 +85,7 @@ public final class LockEquipmentCsReqOuterClass {
}
/**
- * repeated uint32 equipment_id_list = 8;
+ * repeated uint32 equipment_id_list = 13;
* @return this
*/
public LockEquipmentCsReq clearEquipmentIdList() {
@@ -95,7 +95,7 @@ public final class LockEquipmentCsReqOuterClass {
}
/**
- * repeated uint32 equipment_id_list = 8;
+ * repeated uint32 equipment_id_list = 13;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class LockEquipmentCsReqOuterClass {
}
/**
- * repeated uint32 equipment_id_list = 8;
+ * repeated uint32 equipment_id_list = 13;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public final class LockEquipmentCsReqOuterClass {
}
/**
- * repeated uint32 equipment_id_list = 8;
+ * repeated uint32 equipment_id_list = 13;
* @param value the equipmentIdList to add
* @return this
*/
@@ -134,7 +134,7 @@ public final class LockEquipmentCsReqOuterClass {
}
/**
- * repeated uint32 equipment_id_list = 8;
+ * repeated uint32 equipment_id_list = 13;
* @param values the equipmentIdList to add
* @return this
*/
@@ -210,12 +210,12 @@ public final class LockEquipmentCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 72);
output.writeBoolNoTag(isProtected);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < equipmentIdList.length(); i++) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 104);
output.writeUInt32NoTag(equipmentIdList.array()[i]);
}
}
@@ -240,16 +240,16 @@ public final class LockEquipmentCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 72: {
// isProtected
isProtected = input.readBool();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 66) {
+ if (tag != 106) {
break;
}
}
- case 66: {
+ case 106: {
// equipmentIdList [packed=true]
input.readPackedUInt32(equipmentIdList, tag);
bitField0_ |= 0x00000002;
@@ -268,7 +268,7 @@ public final class LockEquipmentCsReqOuterClass {
tag = input.readTag();
break;
}
- case 64: {
+ case 104: {
// equipmentIdList [packed=false]
tag = input.readRepeatedUInt32(equipmentIdList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/LockEquipmentScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/LockEquipmentScRspOuterClass.java
index 030c99e..2116c83 100644
--- a/src/generated/main/emu/lunarcore/proto/LockEquipmentScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/LockEquipmentScRspOuterClass.java
@@ -19,7 +19,7 @@ public final class LockEquipmentScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 10;
*/
private int retcode;
@@ -34,7 +34,7 @@ public final class LockEquipmentScRspOuterClass {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 10;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -42,7 +42,7 @@ public final class LockEquipmentScRspOuterClass {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 10;
* @return this
*/
public LockEquipmentScRsp clearRetcode() {
@@ -52,7 +52,7 @@ public final class LockEquipmentScRspOuterClass {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 10;
* @return the retcode
*/
public int getRetcode() {
@@ -60,7 +60,7 @@ public final class LockEquipmentScRspOuterClass {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 10;
* @param value the retcode to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class LockEquipmentScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(retcode);
}
}
@@ -150,7 +150,7 @@ public final class LockEquipmentScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 96: {
+ case 80: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/LockRelicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/LockRelicCsReqOuterClass.java
index 43d8023..80a9301 100644
--- a/src/generated/main/emu/lunarcore/proto/LockRelicCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/LockRelicCsReqOuterClass.java
@@ -19,12 +19,12 @@ public final class LockRelicCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 relic_unique_id = 2;
+ * optional uint32 relic_unique_id = 10;
*/
private int relicUniqueId;
/**
- * optional bool is_protected = 11;
+ * optional bool is_protected = 9;
*/
private boolean isProtected;
@@ -39,7 +39,7 @@ public final class LockRelicCsReqOuterClass {
}
/**
- * optional uint32 relic_unique_id = 2;
+ * optional uint32 relic_unique_id = 10;
* @return whether the relicUniqueId field is set
*/
public boolean hasRelicUniqueId() {
@@ -47,7 +47,7 @@ public final class LockRelicCsReqOuterClass {
}
/**
- * optional uint32 relic_unique_id = 2;
+ * optional uint32 relic_unique_id = 10;
* @return this
*/
public LockRelicCsReq clearRelicUniqueId() {
@@ -57,7 +57,7 @@ public final class LockRelicCsReqOuterClass {
}
/**
- * optional uint32 relic_unique_id = 2;
+ * optional uint32 relic_unique_id = 10;
* @return the relicUniqueId
*/
public int getRelicUniqueId() {
@@ -65,7 +65,7 @@ public final class LockRelicCsReqOuterClass {
}
/**
- * optional uint32 relic_unique_id = 2;
+ * optional uint32 relic_unique_id = 10;
* @param value the relicUniqueId to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class LockRelicCsReqOuterClass {
}
/**
- * optional bool is_protected = 11;
+ * optional bool is_protected = 9;
* @return whether the isProtected field is set
*/
public boolean hasIsProtected() {
@@ -84,7 +84,7 @@ public final class LockRelicCsReqOuterClass {
}
/**
- * optional bool is_protected = 11;
+ * optional bool is_protected = 9;
* @return this
*/
public LockRelicCsReq clearIsProtected() {
@@ -94,7 +94,7 @@ public final class LockRelicCsReqOuterClass {
}
/**
- * optional bool is_protected = 11;
+ * optional bool is_protected = 9;
* @return the isProtected
*/
public boolean getIsProtected() {
@@ -102,7 +102,7 @@ public final class LockRelicCsReqOuterClass {
}
/**
- * optional bool is_protected = 11;
+ * optional bool is_protected = 9;
* @param value the isProtected to set
* @return this
*/
@@ -177,11 +177,11 @@ public final class LockRelicCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(relicUniqueId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 72);
output.writeBoolNoTag(isProtected);
}
}
@@ -205,16 +205,16 @@ public final class LockRelicCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
+ case 80: {
// relicUniqueId
relicUniqueId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 88) {
+ if (tag != 72) {
break;
}
}
- case 88: {
+ case 72: {
// isProtected
isProtected = input.readBool();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/LockRelicScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/LockRelicScRspOuterClass.java
index 2072f64..a78474d 100644
--- a/src/generated/main/emu/lunarcore/proto/LockRelicScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/LockRelicScRspOuterClass.java
@@ -19,15 +19,15 @@ public final class LockRelicScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 relic_unique_id = 3;
- */
- private int relicUniqueId;
-
- /**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 7;
*/
private int retcode;
+ /**
+ * optional uint32 relic_unique_id = 15;
+ */
+ private int relicUniqueId;
+
private LockRelicScRsp() {
}
@@ -39,62 +39,25 @@ public final class LockRelicScRspOuterClass {
}
/**
- * optional uint32 relic_unique_id = 3;
- * @return whether the relicUniqueId field is set
+ * optional uint32 retcode = 7;
+ * @return whether the retcode field is set
*/
- public boolean hasRelicUniqueId() {
+ public boolean hasRetcode() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 relic_unique_id = 3;
- * @return this
- */
- public LockRelicScRsp clearRelicUniqueId() {
- bitField0_ &= ~0x00000001;
- relicUniqueId = 0;
- return this;
- }
-
- /**
- * optional uint32 relic_unique_id = 3;
- * @return the relicUniqueId
- */
- public int getRelicUniqueId() {
- return relicUniqueId;
- }
-
- /**
- * optional uint32 relic_unique_id = 3;
- * @param value the relicUniqueId to set
- * @return this
- */
- public LockRelicScRsp setRelicUniqueId(final int value) {
- bitField0_ |= 0x00000001;
- relicUniqueId = value;
- return this;
- }
-
- /**
- * optional uint32 retcode = 4;
- * @return whether the retcode field is set
- */
- public boolean hasRetcode() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 7;
* @return this
*/
public LockRelicScRsp clearRetcode() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
retcode = 0;
return this;
}
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 7;
* @return the retcode
*/
public int getRetcode() {
@@ -102,23 +65,60 @@ public final class LockRelicScRspOuterClass {
}
/**
- * optional uint32 retcode = 4;
+ * optional uint32 retcode = 7;
* @param value the retcode to set
* @return this
*/
public LockRelicScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
retcode = value;
return this;
}
+ /**
+ * optional uint32 relic_unique_id = 15;
+ * @return whether the relicUniqueId field is set
+ */
+ public boolean hasRelicUniqueId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 relic_unique_id = 15;
+ * @return this
+ */
+ public LockRelicScRsp clearRelicUniqueId() {
+ bitField0_ &= ~0x00000002;
+ relicUniqueId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 relic_unique_id = 15;
+ * @return the relicUniqueId
+ */
+ public int getRelicUniqueId() {
+ return relicUniqueId;
+ }
+
+ /**
+ * optional uint32 relic_unique_id = 15;
+ * @param value the relicUniqueId to set
+ * @return this
+ */
+ public LockRelicScRsp setRelicUniqueId(final int value) {
+ bitField0_ |= 0x00000002;
+ relicUniqueId = value;
+ return this;
+ }
+
@Override
public LockRelicScRsp copyFrom(final LockRelicScRsp other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- relicUniqueId = other.relicUniqueId;
retcode = other.retcode;
+ relicUniqueId = other.relicUniqueId;
}
return this;
}
@@ -129,12 +129,12 @@ public final class LockRelicScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasRelicUniqueId()) {
- setRelicUniqueId(other.relicUniqueId);
- }
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
+ if (other.hasRelicUniqueId()) {
+ setRelicUniqueId(other.relicUniqueId);
+ }
return this;
}
@@ -145,8 +145,8 @@ public final class LockRelicScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- relicUniqueId = 0;
retcode = 0;
+ relicUniqueId = 0;
return this;
}
@@ -170,19 +170,19 @@ public final class LockRelicScRspOuterClass {
}
LockRelicScRsp other = (LockRelicScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasRelicUniqueId() || relicUniqueId == other.relicUniqueId)
- && (!hasRetcode() || retcode == other.retcode);
+ && (!hasRetcode() || retcode == other.retcode)
+ && (!hasRelicUniqueId() || relicUniqueId == other.relicUniqueId);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(relicUniqueId);
+ output.writeRawByte((byte) 56);
+ output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(retcode);
+ output.writeRawByte((byte) 120);
+ output.writeUInt32NoTag(relicUniqueId);
}
}
@@ -190,10 +190,10 @@ public final class LockRelicScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(relicUniqueId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(relicUniqueId);
}
return size;
}
@@ -205,18 +205,18 @@ public final class LockRelicScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
- // relicUniqueId
- relicUniqueId = input.readUInt32();
+ case 56: {
+ // retcode
+ retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 32) {
+ if (tag != 120) {
break;
}
}
- case 32: {
- // retcode
- retcode = input.readUInt32();
+ case 120: {
+ // relicUniqueId
+ relicUniqueId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
@@ -241,10 +241,10 @@ public final class LockRelicScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.relicUniqueId, relicUniqueId);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.relicUniqueId, relicUniqueId);
}
output.endObject();
}
@@ -256,11 +256,10 @@ public final class LockRelicScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1966200481:
- case 49648253: {
- if (input.isAtField(FieldNames.relicUniqueId)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- relicUniqueId = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -268,10 +267,11 @@ public final class LockRelicScRspOuterClass {
}
break;
}
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case -1966200481:
+ case 49648253: {
+ if (input.isAtField(FieldNames.relicUniqueId)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ relicUniqueId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -332,9 +332,9 @@ public final class LockRelicScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName relicUniqueId = FieldName.forField("relicUniqueId", "relic_unique_id");
-
static final FieldName retcode = FieldName.forField("retcode");
+
+ static final FieldName relicUniqueId = FieldName.forField("relicUniqueId", "relic_unique_id");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/MarkAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/MarkAvatarCsReqOuterClass.java
new file mode 100644
index 0000000..0097b91
--- /dev/null
+++ b/src/generated/main/emu/lunarcore/proto/MarkAvatarCsReqOuterClass.java
@@ -0,0 +1,341 @@
+// 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 MarkAvatarCsReqOuterClass {
+ /**
+ * Protobuf type {@code MarkAvatarCsReq}
+ */
+ public static final class MarkAvatarCsReq extends ProtoMessageoptional uint32 avatar_id = 9;
+ */
+ private int avatarId;
+
+ /**
+ * optional bool is_marked = 10;
+ */
+ private boolean isMarked;
+
+ private MarkAvatarCsReq() {
+ }
+
+ /**
+ * @return a new empty instance of {@code MarkAvatarCsReq}
+ */
+ public static MarkAvatarCsReq newInstance() {
+ return new MarkAvatarCsReq();
+ }
+
+ /**
+ * optional uint32 avatar_id = 9;
+ * @return whether the avatarId field is set
+ */
+ public boolean hasAvatarId() {
+ return (bitField0_ & 0x00000001) != 0;
+ }
+
+ /**
+ * optional uint32 avatar_id = 9;
+ * @return this
+ */
+ public MarkAvatarCsReq clearAvatarId() {
+ bitField0_ &= ~0x00000001;
+ avatarId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 avatar_id = 9;
+ * @return the avatarId
+ */
+ public int getAvatarId() {
+ return avatarId;
+ }
+
+ /**
+ * optional uint32 avatar_id = 9;
+ * @param value the avatarId to set
+ * @return this
+ */
+ public MarkAvatarCsReq setAvatarId(final int value) {
+ bitField0_ |= 0x00000001;
+ avatarId = value;
+ return this;
+ }
+
+ /**
+ * optional bool is_marked = 10;
+ * @return whether the isMarked field is set
+ */
+ public boolean hasIsMarked() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional bool is_marked = 10;
+ * @return this
+ */
+ public MarkAvatarCsReq clearIsMarked() {
+ bitField0_ &= ~0x00000002;
+ isMarked = false;
+ return this;
+ }
+
+ /**
+ * optional bool is_marked = 10;
+ * @return the isMarked
+ */
+ public boolean getIsMarked() {
+ return isMarked;
+ }
+
+ /**
+ * optional bool is_marked = 10;
+ * @param value the isMarked to set
+ * @return this
+ */
+ public MarkAvatarCsReq setIsMarked(final boolean value) {
+ bitField0_ |= 0x00000002;
+ isMarked = value;
+ return this;
+ }
+
+ @Override
+ public MarkAvatarCsReq copyFrom(final MarkAvatarCsReq other) {
+ cachedSize = other.cachedSize;
+ if ((bitField0_ | other.bitField0_) != 0) {
+ bitField0_ = other.bitField0_;
+ avatarId = other.avatarId;
+ isMarked = other.isMarked;
+ }
+ return this;
+ }
+
+ @Override
+ public MarkAvatarCsReq mergeFrom(final MarkAvatarCsReq other) {
+ if (other.isEmpty()) {
+ return this;
+ }
+ cachedSize = -1;
+ if (other.hasAvatarId()) {
+ setAvatarId(other.avatarId);
+ }
+ if (other.hasIsMarked()) {
+ setIsMarked(other.isMarked);
+ }
+ return this;
+ }
+
+ @Override
+ public MarkAvatarCsReq clear() {
+ if (isEmpty()) {
+ return this;
+ }
+ cachedSize = -1;
+ bitField0_ = 0;
+ avatarId = 0;
+ isMarked = false;
+ return this;
+ }
+
+ @Override
+ public MarkAvatarCsReq 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 MarkAvatarCsReq)) {
+ return false;
+ }
+ MarkAvatarCsReq other = (MarkAvatarCsReq) o;
+ return bitField0_ == other.bitField0_
+ && (!hasAvatarId() || avatarId == other.avatarId)
+ && (!hasIsMarked() || isMarked == other.isMarked);
+ }
+
+ @Override
+ public void writeTo(final ProtoSink output) throws IOException {
+ if ((bitField0_ & 0x00000001) != 0) {
+ output.writeRawByte((byte) 72);
+ output.writeUInt32NoTag(avatarId);
+ }
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 80);
+ output.writeBoolNoTag(isMarked);
+ }
+ }
+
+ @Override
+ protected int computeSerializedSize() {
+ int size = 0;
+ if ((bitField0_ & 0x00000001) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId);
+ }
+ if ((bitField0_ & 0x00000002) != 0) {
+ size += 2;
+ }
+ return size;
+ }
+
+ @Override
+ @SuppressWarnings("fallthrough")
+ public MarkAvatarCsReq mergeFrom(final ProtoSource input) throws IOException {
+ // Enabled Fall-Through Optimization (QuickBuffers)
+ int tag = input.readTag();
+ while (true) {
+ switch (tag) {
+ case 72: {
+ // avatarId
+ avatarId = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 80) {
+ break;
+ }
+ }
+ case 80: {
+ // isMarked
+ isMarked = input.readBool();
+ 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.writeBool(FieldNames.isMarked, isMarked);
+ }
+ output.endObject();
+ }
+
+ @Override
+ public MarkAvatarCsReq 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 -407271946:
+ case -617266975: {
+ if (input.isAtField(FieldNames.isMarked)) {
+ if (!input.trySkipNullValue()) {
+ isMarked = input.readBool();
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ default: {
+ input.skipUnknownField();
+ break;
+ }
+ }
+ }
+ input.endObject();
+ return this;
+ }
+
+ @Override
+ public MarkAvatarCsReq clone() {
+ return new MarkAvatarCsReq().copyFrom(this);
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return ((bitField0_) == 0);
+ }
+
+ public static MarkAvatarCsReq parseFrom(final byte[] data) throws
+ InvalidProtocolBufferException {
+ return ProtoMessage.mergeFrom(new MarkAvatarCsReq(), data).checkInitialized();
+ }
+
+ public static MarkAvatarCsReq parseFrom(final ProtoSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new MarkAvatarCsReq(), input).checkInitialized();
+ }
+
+ public static MarkAvatarCsReq parseFrom(final JsonSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new MarkAvatarCsReq(), input).checkInitialized();
+ }
+
+ /**
+ * @return factory for creating MarkAvatarCsReq messages
+ */
+ public static MessageFactoryoptional uint32 retcode = 7;
+ */
+ private int retcode;
+
+ /**
+ * optional uint32 avatar_id = 8;
+ */
+ private int avatarId;
+
+ /**
+ * optional bool is_marked = 14;
+ */
+ private boolean isMarked;
+
+ private MarkAvatarScRsp() {
+ }
+
+ /**
+ * @return a new empty instance of {@code MarkAvatarScRsp}
+ */
+ public static MarkAvatarScRsp newInstance() {
+ return new MarkAvatarScRsp();
+ }
+
+ /**
+ * optional uint32 retcode = 7;
+ * @return whether the retcode field is set
+ */
+ public boolean hasRetcode() {
+ return (bitField0_ & 0x00000001) != 0;
+ }
+
+ /**
+ * optional uint32 retcode = 7;
+ * @return this
+ */
+ public MarkAvatarScRsp clearRetcode() {
+ bitField0_ &= ~0x00000001;
+ retcode = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 retcode = 7;
+ * @return the retcode
+ */
+ public int getRetcode() {
+ return retcode;
+ }
+
+ /**
+ * optional uint32 retcode = 7;
+ * @param value the retcode to set
+ * @return this
+ */
+ public MarkAvatarScRsp setRetcode(final int value) {
+ bitField0_ |= 0x00000001;
+ retcode = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 avatar_id = 8;
+ * @return whether the avatarId field is set
+ */
+ public boolean hasAvatarId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 avatar_id = 8;
+ * @return this
+ */
+ public MarkAvatarScRsp clearAvatarId() {
+ bitField0_ &= ~0x00000002;
+ 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 MarkAvatarScRsp setAvatarId(final int value) {
+ bitField0_ |= 0x00000002;
+ avatarId = value;
+ return this;
+ }
+
+ /**
+ * optional bool is_marked = 14;
+ * @return whether the isMarked field is set
+ */
+ public boolean hasIsMarked() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional bool is_marked = 14;
+ * @return this
+ */
+ public MarkAvatarScRsp clearIsMarked() {
+ bitField0_ &= ~0x00000004;
+ isMarked = false;
+ return this;
+ }
+
+ /**
+ * optional bool is_marked = 14;
+ * @return the isMarked
+ */
+ public boolean getIsMarked() {
+ return isMarked;
+ }
+
+ /**
+ * optional bool is_marked = 14;
+ * @param value the isMarked to set
+ * @return this
+ */
+ public MarkAvatarScRsp setIsMarked(final boolean value) {
+ bitField0_ |= 0x00000004;
+ isMarked = value;
+ return this;
+ }
+
+ @Override
+ public MarkAvatarScRsp copyFrom(final MarkAvatarScRsp other) {
+ cachedSize = other.cachedSize;
+ if ((bitField0_ | other.bitField0_) != 0) {
+ bitField0_ = other.bitField0_;
+ retcode = other.retcode;
+ avatarId = other.avatarId;
+ isMarked = other.isMarked;
+ }
+ return this;
+ }
+
+ @Override
+ public MarkAvatarScRsp mergeFrom(final MarkAvatarScRsp other) {
+ if (other.isEmpty()) {
+ return this;
+ }
+ cachedSize = -1;
+ if (other.hasRetcode()) {
+ setRetcode(other.retcode);
+ }
+ if (other.hasAvatarId()) {
+ setAvatarId(other.avatarId);
+ }
+ if (other.hasIsMarked()) {
+ setIsMarked(other.isMarked);
+ }
+ return this;
+ }
+
+ @Override
+ public MarkAvatarScRsp clear() {
+ if (isEmpty()) {
+ return this;
+ }
+ cachedSize = -1;
+ bitField0_ = 0;
+ retcode = 0;
+ avatarId = 0;
+ isMarked = false;
+ return this;
+ }
+
+ @Override
+ public MarkAvatarScRsp 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 MarkAvatarScRsp)) {
+ return false;
+ }
+ MarkAvatarScRsp other = (MarkAvatarScRsp) o;
+ return bitField0_ == other.bitField0_
+ && (!hasRetcode() || retcode == other.retcode)
+ && (!hasAvatarId() || avatarId == other.avatarId)
+ && (!hasIsMarked() || isMarked == other.isMarked);
+ }
+
+ @Override
+ public void writeTo(final ProtoSink output) throws IOException {
+ if ((bitField0_ & 0x00000001) != 0) {
+ output.writeRawByte((byte) 56);
+ output.writeUInt32NoTag(retcode);
+ }
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 64);
+ output.writeUInt32NoTag(avatarId);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 112);
+ output.writeBoolNoTag(isMarked);
+ }
+ }
+
+ @Override
+ protected int computeSerializedSize() {
+ int size = 0;
+ if ((bitField0_ & 0x00000001) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ }
+ if ((bitField0_ & 0x00000002) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += 2;
+ }
+ return size;
+ }
+
+ @Override
+ @SuppressWarnings("fallthrough")
+ public MarkAvatarScRsp mergeFrom(final ProtoSource input) throws IOException {
+ // Enabled Fall-Through Optimization (QuickBuffers)
+ int tag = input.readTag();
+ while (true) {
+ switch (tag) {
+ case 56: {
+ // retcode
+ retcode = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 64) {
+ break;
+ }
+ }
+ case 64: {
+ // avatarId
+ avatarId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 112) {
+ break;
+ }
+ }
+ case 112: {
+ // isMarked
+ isMarked = 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.retcode, retcode);
+ }
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeUInt32(FieldNames.avatarId, avatarId);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeBool(FieldNames.isMarked, isMarked);
+ }
+ output.endObject();
+ }
+
+ @Override
+ public MarkAvatarScRsp mergeFrom(final JsonSource input) throws IOException {
+ if (!input.beginObject()) {
+ return this;
+ }
+ while (!input.isAtEnd()) {
+ switch (input.readFieldHash()) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
+ if (!input.trySkipNullValue()) {
+ retcode = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 1787287636:
+ case -428636735: {
+ if (input.isAtField(FieldNames.avatarId)) {
+ if (!input.trySkipNullValue()) {
+ avatarId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -407271946:
+ case -617266975: {
+ if (input.isAtField(FieldNames.isMarked)) {
+ if (!input.trySkipNullValue()) {
+ isMarked = input.readBool();
+ bitField0_ |= 0x00000004;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ default: {
+ input.skipUnknownField();
+ break;
+ }
+ }
+ }
+ input.endObject();
+ return this;
+ }
+
+ @Override
+ public MarkAvatarScRsp clone() {
+ return new MarkAvatarScRsp().copyFrom(this);
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return ((bitField0_) == 0);
+ }
+
+ public static MarkAvatarScRsp parseFrom(final byte[] data) throws
+ InvalidProtocolBufferException {
+ return ProtoMessage.mergeFrom(new MarkAvatarScRsp(), data).checkInitialized();
+ }
+
+ public static MarkAvatarScRsp parseFrom(final ProtoSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new MarkAvatarScRsp(), input).checkInitialized();
+ }
+
+ public static MarkAvatarScRsp parseFrom(final JsonSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new MarkAvatarScRsp(), input).checkInitialized();
+ }
+
+ /**
+ * @return factory for creating MarkAvatarScRsp messages
+ */
+ public static MessageFactoryoptional uint32 id = 12;
+ * optional uint32 id = 1;
*/
private int id;
@@ -34,7 +34,7 @@ public final class MarkReadMailCsReqOuterClass {
}
/**
- * optional uint32 id = 12;
+ * optional uint32 id = 1;
* @return whether the id field is set
*/
public boolean hasId() {
@@ -42,7 +42,7 @@ public final class MarkReadMailCsReqOuterClass {
}
/**
- * optional uint32 id = 12;
+ * optional uint32 id = 1;
* @return this
*/
public MarkReadMailCsReq clearId() {
@@ -52,7 +52,7 @@ public final class MarkReadMailCsReqOuterClass {
}
/**
- * optional uint32 id = 12;
+ * optional uint32 id = 1;
* @return the id
*/
public int getId() {
@@ -60,7 +60,7 @@ public final class MarkReadMailCsReqOuterClass {
}
/**
- * optional uint32 id = 12;
+ * optional uint32 id = 1;
* @param value the id to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class MarkReadMailCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(id);
}
}
@@ -150,7 +150,7 @@ public final class MarkReadMailCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 96: {
+ case 8: {
// id
id = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/MarkReadMailScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/MarkReadMailScRspOuterClass.java
index e6aa069..894b924 100644
--- a/src/generated/main/emu/lunarcore/proto/MarkReadMailScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/MarkReadMailScRspOuterClass.java
@@ -19,15 +19,15 @@ public final class MarkReadMailScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 2;
- */
- private int retcode;
-
- /**
- * optional uint32 id = 9;
+ * optional uint32 id = 1;
*/
private int id;
+ /**
+ * optional uint32 retcode = 5;
+ */
+ private int retcode;
+
private MarkReadMailScRsp() {
}
@@ -39,62 +39,25 @@ public final class MarkReadMailScRspOuterClass {
}
/**
- * optional uint32 retcode = 2;
- * @return whether the retcode field is set
+ * optional uint32 id = 1;
+ * @return whether the id field is set
*/
- public boolean hasRetcode() {
+ public boolean hasId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 retcode = 2;
- * @return this
- */
- public MarkReadMailScRsp clearRetcode() {
- bitField0_ &= ~0x00000001;
- retcode = 0;
- return this;
- }
-
- /**
- * optional uint32 retcode = 2;
- * @return the retcode
- */
- public int getRetcode() {
- return retcode;
- }
-
- /**
- * optional uint32 retcode = 2;
- * @param value the retcode to set
- * @return this
- */
- public MarkReadMailScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000001;
- retcode = value;
- return this;
- }
-
- /**
- * optional uint32 id = 9;
- * @return whether the id field is set
- */
- public boolean hasId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 id = 9;
+ * optional uint32 id = 1;
* @return this
*/
public MarkReadMailScRsp clearId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
id = 0;
return this;
}
/**
- * optional uint32 id = 9;
+ * optional uint32 id = 1;
* @return the id
*/
public int getId() {
@@ -102,23 +65,60 @@ public final class MarkReadMailScRspOuterClass {
}
/**
- * optional uint32 id = 9;
+ * optional uint32 id = 1;
* @param value the id to set
* @return this
*/
public MarkReadMailScRsp setId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
id = value;
return this;
}
+ /**
+ * optional uint32 retcode = 5;
+ * @return whether the retcode field is set
+ */
+ public boolean hasRetcode() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 retcode = 5;
+ * @return this
+ */
+ public MarkReadMailScRsp clearRetcode() {
+ bitField0_ &= ~0x00000002;
+ retcode = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 retcode = 5;
+ * @return the retcode
+ */
+ public int getRetcode() {
+ return retcode;
+ }
+
+ /**
+ * optional uint32 retcode = 5;
+ * @param value the retcode to set
+ * @return this
+ */
+ public MarkReadMailScRsp setRetcode(final int value) {
+ bitField0_ |= 0x00000002;
+ retcode = value;
+ return this;
+ }
+
@Override
public MarkReadMailScRsp copyFrom(final MarkReadMailScRsp other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- retcode = other.retcode;
id = other.id;
+ retcode = other.retcode;
}
return this;
}
@@ -129,12 +129,12 @@ public final class MarkReadMailScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasRetcode()) {
- setRetcode(other.retcode);
- }
if (other.hasId()) {
setId(other.id);
}
+ if (other.hasRetcode()) {
+ setRetcode(other.retcode);
+ }
return this;
}
@@ -145,8 +145,8 @@ public final class MarkReadMailScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- retcode = 0;
id = 0;
+ retcode = 0;
return this;
}
@@ -170,19 +170,19 @@ public final class MarkReadMailScRspOuterClass {
}
MarkReadMailScRsp other = (MarkReadMailScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasRetcode() || retcode == other.retcode)
- && (!hasId() || id == other.id);
+ && (!hasId() || id == other.id)
+ && (!hasRetcode() || retcode == other.retcode);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(retcode);
+ output.writeRawByte((byte) 8);
+ output.writeUInt32NoTag(id);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 72);
- output.writeUInt32NoTag(id);
+ output.writeRawByte((byte) 40);
+ output.writeUInt32NoTag(retcode);
}
}
@@ -190,10 +190,10 @@ public final class MarkReadMailScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(id);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(id);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
return size;
}
@@ -205,18 +205,18 @@ public final class MarkReadMailScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
- // retcode
- retcode = input.readUInt32();
+ case 8: {
+ // id
+ id = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 72) {
+ if (tag != 40) {
break;
}
}
- case 72: {
- // id
- id = input.readUInt32();
+ case 40: {
+ // retcode
+ retcode = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
@@ -241,10 +241,10 @@ public final class MarkReadMailScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.id, id);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.id, id);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
output.endObject();
}
@@ -256,10 +256,10 @@ public final class MarkReadMailScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case 3355: {
+ if (input.isAtField(FieldNames.id)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ id = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -267,10 +267,10 @@ public final class MarkReadMailScRspOuterClass {
}
break;
}
- case 3355: {
- if (input.isAtField(FieldNames.id)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- id = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -331,9 +331,9 @@ public final class MarkReadMailScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName retcode = FieldName.forField("retcode");
-
static final FieldName id = FieldName.forField("id");
+
+ static final FieldName retcode = FieldName.forField("retcode");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/MaterialOuterClass.java b/src/generated/main/emu/lunarcore/proto/MaterialOuterClass.java
index 560c7fc..fdb1f8e 100644
--- a/src/generated/main/emu/lunarcore/proto/MaterialOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/MaterialOuterClass.java
@@ -19,12 +19,12 @@ public final class MaterialOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 tid = 2;
+ * optional uint32 tid = 12;
*/
private int tid;
/**
- * optional uint32 num = 6;
+ * optional uint32 num = 15;
*/
private int num;
@@ -39,7 +39,7 @@ public final class MaterialOuterClass {
}
/**
- * optional uint32 tid = 2;
+ * optional uint32 tid = 12;
* @return whether the tid field is set
*/
public boolean hasTid() {
@@ -47,7 +47,7 @@ public final class MaterialOuterClass {
}
/**
- * optional uint32 tid = 2;
+ * optional uint32 tid = 12;
* @return this
*/
public Material clearTid() {
@@ -57,7 +57,7 @@ public final class MaterialOuterClass {
}
/**
- * optional uint32 tid = 2;
+ * optional uint32 tid = 12;
* @return the tid
*/
public int getTid() {
@@ -65,7 +65,7 @@ public final class MaterialOuterClass {
}
/**
- * optional uint32 tid = 2;
+ * optional uint32 tid = 12;
* @param value the tid to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class MaterialOuterClass {
}
/**
- * optional uint32 num = 6;
+ * optional uint32 num = 15;
* @return whether the num field is set
*/
public boolean hasNum() {
@@ -84,7 +84,7 @@ public final class MaterialOuterClass {
}
/**
- * optional uint32 num = 6;
+ * optional uint32 num = 15;
* @return this
*/
public Material clearNum() {
@@ -94,7 +94,7 @@ public final class MaterialOuterClass {
}
/**
- * optional uint32 num = 6;
+ * optional uint32 num = 15;
* @return the num
*/
public int getNum() {
@@ -102,7 +102,7 @@ public final class MaterialOuterClass {
}
/**
- * optional uint32 num = 6;
+ * optional uint32 num = 15;
* @param value the num to set
* @return this
*/
@@ -177,11 +177,11 @@ public final class MaterialOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(tid);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(num);
}
}
@@ -205,16 +205,16 @@ public final class MaterialOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
+ case 96: {
// tid
tid = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 48) {
+ if (tag != 120) {
break;
}
}
- case 48: {
+ case 120: {
// num
num = input.readUInt32();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/MazeChestOuterClass.java b/src/generated/main/emu/lunarcore/proto/MazeChestOuterClass.java
index 6705e8b..5956b2e 100644
--- a/src/generated/main/emu/lunarcore/proto/MazeChestOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/MazeChestOuterClass.java
@@ -19,17 +19,17 @@ public final class MazeChestOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 unlocked_amount_list = 2;
- */
- private int unlockedAmountList;
-
- /**
- * optional uint32 total_amount_list = 7;
+ * optional uint32 total_amount_list = 2;
*/
private int totalAmountList;
/**
- * optional .MapInfoChestType map_info_chest_type = 1;
+ * optional uint32 unlocked_amount_list = 11;
+ */
+ private int unlockedAmountList;
+
+ /**
+ * optional .MapInfoChestType map_info_chest_type = 3;
*/
private int mapInfoChestType;
@@ -44,62 +44,25 @@ public final class MazeChestOuterClass {
}
/**
- * optional uint32 unlocked_amount_list = 2;
- * @return whether the unlockedAmountList field is set
+ * optional uint32 total_amount_list = 2;
+ * @return whether the totalAmountList field is set
*/
- public boolean hasUnlockedAmountList() {
+ public boolean hasTotalAmountList() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 unlocked_amount_list = 2;
- * @return this
- */
- public MazeChest clearUnlockedAmountList() {
- bitField0_ &= ~0x00000001;
- unlockedAmountList = 0;
- return this;
- }
-
- /**
- * optional uint32 unlocked_amount_list = 2;
- * @return the unlockedAmountList
- */
- public int getUnlockedAmountList() {
- return unlockedAmountList;
- }
-
- /**
- * optional uint32 unlocked_amount_list = 2;
- * @param value the unlockedAmountList to set
- * @return this
- */
- public MazeChest setUnlockedAmountList(final int value) {
- bitField0_ |= 0x00000001;
- unlockedAmountList = value;
- return this;
- }
-
- /**
- * optional uint32 total_amount_list = 7;
- * @return whether the totalAmountList field is set
- */
- public boolean hasTotalAmountList() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 total_amount_list = 7;
+ * optional uint32 total_amount_list = 2;
* @return this
*/
public MazeChest clearTotalAmountList() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
totalAmountList = 0;
return this;
}
/**
- * optional uint32 total_amount_list = 7;
+ * optional uint32 total_amount_list = 2;
* @return the totalAmountList
*/
public int getTotalAmountList() {
@@ -107,18 +70,55 @@ public final class MazeChestOuterClass {
}
/**
- * optional uint32 total_amount_list = 7;
+ * optional uint32 total_amount_list = 2;
* @param value the totalAmountList to set
* @return this
*/
public MazeChest setTotalAmountList(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
totalAmountList = value;
return this;
}
/**
- * optional .MapInfoChestType map_info_chest_type = 1;
+ * optional uint32 unlocked_amount_list = 11;
+ * @return whether the unlockedAmountList field is set
+ */
+ public boolean hasUnlockedAmountList() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 unlocked_amount_list = 11;
+ * @return this
+ */
+ public MazeChest clearUnlockedAmountList() {
+ bitField0_ &= ~0x00000002;
+ unlockedAmountList = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 unlocked_amount_list = 11;
+ * @return the unlockedAmountList
+ */
+ public int getUnlockedAmountList() {
+ return unlockedAmountList;
+ }
+
+ /**
+ * optional uint32 unlocked_amount_list = 11;
+ * @param value the unlockedAmountList to set
+ * @return this
+ */
+ public MazeChest setUnlockedAmountList(final int value) {
+ bitField0_ |= 0x00000002;
+ unlockedAmountList = value;
+ return this;
+ }
+
+ /**
+ * optional .MapInfoChestType map_info_chest_type = 3;
* @return whether the mapInfoChestType field is set
*/
public boolean hasMapInfoChestType() {
@@ -126,7 +126,7 @@ public final class MazeChestOuterClass {
}
/**
- * optional .MapInfoChestType map_info_chest_type = 1;
+ * optional .MapInfoChestType map_info_chest_type = 3;
* @return this
*/
public MazeChest clearMapInfoChestType() {
@@ -136,7 +136,7 @@ public final class MazeChestOuterClass {
}
/**
- * optional .MapInfoChestType map_info_chest_type = 1;
+ * optional .MapInfoChestType map_info_chest_type = 3;
* @return the mapInfoChestType
*/
public MapInfoChestTypeOuterClass.MapInfoChestType getMapInfoChestType() {
@@ -169,7 +169,7 @@ public final class MazeChestOuterClass {
}
/**
- * optional .MapInfoChestType map_info_chest_type = 1;
+ * optional .MapInfoChestType map_info_chest_type = 3;
* @param value the mapInfoChestType to set
* @return this
*/
@@ -184,8 +184,8 @@ public final class MazeChestOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- unlockedAmountList = other.unlockedAmountList;
totalAmountList = other.totalAmountList;
+ unlockedAmountList = other.unlockedAmountList;
mapInfoChestType = other.mapInfoChestType;
}
return this;
@@ -197,12 +197,12 @@ public final class MazeChestOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasUnlockedAmountList()) {
- setUnlockedAmountList(other.unlockedAmountList);
- }
if (other.hasTotalAmountList()) {
setTotalAmountList(other.totalAmountList);
}
+ if (other.hasUnlockedAmountList()) {
+ setUnlockedAmountList(other.unlockedAmountList);
+ }
if (other.hasMapInfoChestType()) {
setMapInfoChestTypeValue(other.mapInfoChestType);
}
@@ -216,8 +216,8 @@ public final class MazeChestOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- unlockedAmountList = 0;
totalAmountList = 0;
+ unlockedAmountList = 0;
mapInfoChestType = 0;
return this;
}
@@ -242,8 +242,8 @@ public final class MazeChestOuterClass {
}
MazeChest other = (MazeChest) o;
return bitField0_ == other.bitField0_
- && (!hasUnlockedAmountList() || unlockedAmountList == other.unlockedAmountList)
&& (!hasTotalAmountList() || totalAmountList == other.totalAmountList)
+ && (!hasUnlockedAmountList() || unlockedAmountList == other.unlockedAmountList)
&& (!hasMapInfoChestType() || mapInfoChestType == other.mapInfoChestType);
}
@@ -251,14 +251,14 @@ public final class MazeChestOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(unlockedAmountList);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 56);
output.writeUInt32NoTag(totalAmountList);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 88);
+ output.writeUInt32NoTag(unlockedAmountList);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 24);
output.writeEnumNoTag(mapInfoChestType);
}
}
@@ -267,10 +267,10 @@ public final class MazeChestOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockedAmountList);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(totalAmountList);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(totalAmountList);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockedAmountList);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeEnumSizeNoTag(mapInfoChestType);
@@ -286,24 +286,24 @@ public final class MazeChestOuterClass {
while (true) {
switch (tag) {
case 16: {
- // unlockedAmountList
- unlockedAmountList = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 56) {
- break;
- }
- }
- case 56: {
// totalAmountList
totalAmountList = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 8) {
+ if (tag != 88) {
break;
}
}
- case 8: {
+ case 88: {
+ // unlockedAmountList
+ unlockedAmountList = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 24) {
+ break;
+ }
+ }
+ case 24: {
// mapInfoChestType
final int value = input.readInt32();
if (MapInfoChestTypeOuterClass.MapInfoChestType.forNumber(value) != null) {
@@ -333,10 +333,10 @@ public final class MazeChestOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.unlockedAmountList, unlockedAmountList);
+ output.writeUInt32(FieldNames.totalAmountList, totalAmountList);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.totalAmountList, totalAmountList);
+ output.writeUInt32(FieldNames.unlockedAmountList, unlockedAmountList);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeEnum(FieldNames.mapInfoChestType, mapInfoChestType, MapInfoChestTypeOuterClass.MapInfoChestType.converter());
@@ -351,11 +351,11 @@ public final class MazeChestOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -47476647:
- case -941040439: {
- if (input.isAtField(FieldNames.unlockedAmountList)) {
+ case -1767834758:
+ case -642776150: {
+ if (input.isAtField(FieldNames.totalAmountList)) {
if (!input.trySkipNullValue()) {
- unlockedAmountList = input.readUInt32();
+ totalAmountList = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -363,11 +363,11 @@ public final class MazeChestOuterClass {
}
break;
}
- case -1767834758:
- case -642776150: {
- if (input.isAtField(FieldNames.totalAmountList)) {
+ case -47476647:
+ case -941040439: {
+ if (input.isAtField(FieldNames.unlockedAmountList)) {
if (!input.trySkipNullValue()) {
- totalAmountList = input.readUInt32();
+ unlockedAmountList = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -444,10 +444,10 @@ public final class MazeChestOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName unlockedAmountList = FieldName.forField("unlockedAmountList", "unlocked_amount_list");
-
static final FieldName totalAmountList = FieldName.forField("totalAmountList", "total_amount_list");
+ static final FieldName unlockedAmountList = FieldName.forField("unlockedAmountList", "unlocked_amount_list");
+
static final FieldName mapInfoChestType = FieldName.forField("mapInfoChestType", "map_info_chest_type");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/MazeGroupOuterClass.java b/src/generated/main/emu/lunarcore/proto/MazeGroupOuterClass.java
index 039e8d0..0cba92c 100644
--- a/src/generated/main/emu/lunarcore/proto/MazeGroupOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/MazeGroupOuterClass.java
@@ -19,7 +19,7 @@ public final class MazeGroupOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional int64 modify_time = 3;
+ * optional int64 modify_time = 14;
*/
private long modifyTime;
@@ -39,7 +39,7 @@ public final class MazeGroupOuterClass {
}
/**
- * optional int64 modify_time = 3;
+ * optional int64 modify_time = 14;
* @return whether the modifyTime field is set
*/
public boolean hasModifyTime() {
@@ -47,7 +47,7 @@ public final class MazeGroupOuterClass {
}
/**
- * optional int64 modify_time = 3;
+ * optional int64 modify_time = 14;
* @return this
*/
public MazeGroup clearModifyTime() {
@@ -57,7 +57,7 @@ public final class MazeGroupOuterClass {
}
/**
- * optional int64 modify_time = 3;
+ * optional int64 modify_time = 14;
* @return the modifyTime
*/
public long getModifyTime() {
@@ -65,7 +65,7 @@ public final class MazeGroupOuterClass {
}
/**
- * optional int64 modify_time = 3;
+ * optional int64 modify_time = 14;
* @param value the modifyTime to set
* @return this
*/
@@ -177,7 +177,7 @@ public final class MazeGroupOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 112);
output.writeInt64NoTag(modifyTime);
}
if ((bitField0_ & 0x00000002) != 0) {
@@ -205,7 +205,7 @@ public final class MazeGroupOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
+ case 112: {
// modifyTime
modifyTime = input.readInt64();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/MazeMapDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/MazeMapDataOuterClass.java
index 497f1ff..8adcc97 100644
--- a/src/generated/main/emu/lunarcore/proto/MazeMapDataOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/MazeMapDataOuterClass.java
@@ -21,45 +21,45 @@ public final class MazeMapDataOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 11;
+ * optional uint32 retcode = 4;
*/
private int retcode;
+ /**
+ * optional uint32 entry_id = 12;
+ */
+ private int entryId;
+
/**
* optional uint32 cur_map_entry_id = 14;
*/
private int curMapEntryId;
/**
- * optional uint32 entry_id = 15;
- */
- private int entryId;
-
- /**
- * repeated uint32 unlocked_teleport_list = 2;
- */
- private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance();
-
- /**
- * repeated uint32 lighten_section_list = 9;
+ * repeated uint32 lighten_section_list = 10;
*/
private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance();
/**
- * repeated .MazeGroup maze_group_list = 1;
+ * repeated uint32 unlocked_teleport_list = 13;
+ */
+ private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance();
+
+ /**
+ * repeated .MazeGroup maze_group_list = 2;
*/
private final RepeatedMessagerepeated .MazeProp maze_prop_list = 10;
- */
- private final RepeatedMessagerepeated .MazeChest unlocked_chest_list = 13;
+ * repeated .MazeChest unlocked_chest_list = 6;
*/
private final RepeatedMessagerepeated .MazeProp maze_prop_list = 15;
+ */
+ private final RepeatedMessageoptional uint32 retcode = 11;
+ * optional uint32 retcode = 4;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -79,7 +79,7 @@ public final class MazeMapDataOuterClass {
}
/**
- * optional uint32 retcode = 11;
+ * optional uint32 retcode = 4;
* @return this
*/
public MazeMapData clearRetcode() {
@@ -89,7 +89,7 @@ public final class MazeMapDataOuterClass {
}
/**
- * optional uint32 retcode = 11;
+ * optional uint32 retcode = 4;
* @return the retcode
*/
public int getRetcode() {
@@ -97,7 +97,7 @@ public final class MazeMapDataOuterClass {
}
/**
- * optional uint32 retcode = 11;
+ * optional uint32 retcode = 4;
* @param value the retcode to set
* @return this
*/
@@ -107,12 +107,49 @@ public final class MazeMapDataOuterClass {
return this;
}
+ /**
+ * optional uint32 entry_id = 12;
+ * @return whether the entryId field is set
+ */
+ public boolean hasEntryId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 entry_id = 12;
+ * @return this
+ */
+ public MazeMapData clearEntryId() {
+ bitField0_ &= ~0x00000002;
+ entryId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 entry_id = 12;
+ * @return the entryId
+ */
+ public int getEntryId() {
+ return entryId;
+ }
+
+ /**
+ * optional uint32 entry_id = 12;
+ * @param value the entryId to set
+ * @return this
+ */
+ public MazeMapData setEntryId(final int value) {
+ bitField0_ |= 0x00000002;
+ entryId = value;
+ return this;
+ }
+
/**
* optional uint32 cur_map_entry_id = 14;
* @return whether the curMapEntryId field is set
*/
public boolean hasCurMapEntryId() {
- return (bitField0_ & 0x00000002) != 0;
+ return (bitField0_ & 0x00000004) != 0;
}
/**
@@ -120,7 +157,7 @@ public final class MazeMapDataOuterClass {
* @return this
*/
public MazeMapData clearCurMapEntryId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000004;
curMapEntryId = 0;
return this;
}
@@ -139,136 +176,31 @@ public final class MazeMapDataOuterClass {
* @return this
*/
public MazeMapData setCurMapEntryId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
curMapEntryId = value;
return this;
}
/**
- * optional uint32 entry_id = 15;
- * @return whether the entryId field is set
+ * repeated uint32 lighten_section_list = 10;
+ * @return whether the lightenSectionList field is set
*/
- public boolean hasEntryId() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 entry_id = 15;
- * @return this
- */
- public MazeMapData clearEntryId() {
- bitField0_ &= ~0x00000004;
- entryId = 0;
- return this;
- }
-
- /**
- * optional uint32 entry_id = 15;
- * @return the entryId
- */
- public int getEntryId() {
- return entryId;
- }
-
- /**
- * optional uint32 entry_id = 15;
- * @param value the entryId to set
- * @return this
- */
- public MazeMapData setEntryId(final int value) {
- bitField0_ |= 0x00000004;
- entryId = value;
- return this;
- }
-
- /**
- * repeated uint32 unlocked_teleport_list = 2;
- * @return whether the unlockedTeleportList field is set
- */
- public boolean hasUnlockedTeleportList() {
+ public boolean hasLightenSectionList() {
return (bitField0_ & 0x00000008) != 0;
}
/**
- * repeated uint32 unlocked_teleport_list = 2;
- * @return this
- */
- public MazeMapData clearUnlockedTeleportList() {
- bitField0_ &= ~0x00000008;
- unlockedTeleportList.clear();
- return this;
- }
-
- /**
- * repeated uint32 unlocked_teleport_list = 2;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableUnlockedTeleportList()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedInt getUnlockedTeleportList() {
- return unlockedTeleportList;
- }
-
- /**
- * repeated uint32 unlocked_teleport_list = 2;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedInt getMutableUnlockedTeleportList() {
- bitField0_ |= 0x00000008;
- return unlockedTeleportList;
- }
-
- /**
- * repeated uint32 unlocked_teleport_list = 2;
- * @param value the unlockedTeleportList to add
- * @return this
- */
- public MazeMapData addUnlockedTeleportList(final int value) {
- bitField0_ |= 0x00000008;
- unlockedTeleportList.add(value);
- return this;
- }
-
- /**
- * repeated uint32 unlocked_teleport_list = 2;
- * @param values the unlockedTeleportList to add
- * @return this
- */
- public MazeMapData addAllUnlockedTeleportList(final int... values) {
- bitField0_ |= 0x00000008;
- unlockedTeleportList.addAll(values);
- return this;
- }
-
- /**
- * repeated uint32 lighten_section_list = 9;
- * @return whether the lightenSectionList field is set
- */
- public boolean hasLightenSectionList() {
- return (bitField0_ & 0x00000010) != 0;
- }
-
- /**
- * repeated uint32 lighten_section_list = 9;
+ * repeated uint32 lighten_section_list = 10;
* @return this
*/
public MazeMapData clearLightenSectionList() {
- bitField0_ &= ~0x00000010;
+ bitField0_ &= ~0x00000008;
lightenSectionList.clear();
return this;
}
/**
- * repeated uint32 lighten_section_list = 9;
+ * repeated uint32 lighten_section_list = 10;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -282,7 +214,7 @@ public final class MazeMapDataOuterClass {
}
/**
- * repeated uint32 lighten_section_list = 9;
+ * repeated uint32 lighten_section_list = 10;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -291,34 +223,102 @@ public final class MazeMapDataOuterClass {
* @return internal storage object for modifications
*/
public RepeatedInt getMutableLightenSectionList() {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
return lightenSectionList;
}
/**
- * repeated uint32 lighten_section_list = 9;
+ * repeated uint32 lighten_section_list = 10;
* @param value the lightenSectionList to add
* @return this
*/
public MazeMapData addLightenSectionList(final int value) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
lightenSectionList.add(value);
return this;
}
/**
- * repeated uint32 lighten_section_list = 9;
+ * repeated uint32 lighten_section_list = 10;
* @param values the lightenSectionList to add
* @return this
*/
public MazeMapData addAllLightenSectionList(final int... values) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
lightenSectionList.addAll(values);
return this;
}
/**
- * repeated .MazeGroup maze_group_list = 1;
+ * repeated uint32 unlocked_teleport_list = 13;
+ * @return whether the unlockedTeleportList field is set
+ */
+ public boolean hasUnlockedTeleportList() {
+ return (bitField0_ & 0x00000010) != 0;
+ }
+
+ /**
+ * repeated uint32 unlocked_teleport_list = 13;
+ * @return this
+ */
+ public MazeMapData clearUnlockedTeleportList() {
+ bitField0_ &= ~0x00000010;
+ unlockedTeleportList.clear();
+ return this;
+ }
+
+ /**
+ * repeated uint32 unlocked_teleport_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 #getMutableUnlockedTeleportList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedInt getUnlockedTeleportList() {
+ return unlockedTeleportList;
+ }
+
+ /**
+ * repeated uint32 unlocked_teleport_list = 13;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedInt getMutableUnlockedTeleportList() {
+ bitField0_ |= 0x00000010;
+ return unlockedTeleportList;
+ }
+
+ /**
+ * repeated uint32 unlocked_teleport_list = 13;
+ * @param value the unlockedTeleportList to add
+ * @return this
+ */
+ public MazeMapData addUnlockedTeleportList(final int value) {
+ bitField0_ |= 0x00000010;
+ unlockedTeleportList.add(value);
+ return this;
+ }
+
+ /**
+ * repeated uint32 unlocked_teleport_list = 13;
+ * @param values the unlockedTeleportList to add
+ * @return this
+ */
+ public MazeMapData addAllUnlockedTeleportList(final int... values) {
+ bitField0_ |= 0x00000010;
+ unlockedTeleportList.addAll(values);
+ return this;
+ }
+
+ /**
+ * repeated .MazeGroup maze_group_list = 2;
* @return whether the mazeGroupList field is set
*/
public boolean hasMazeGroupList() {
@@ -326,7 +326,7 @@ public final class MazeMapDataOuterClass {
}
/**
- * repeated .MazeGroup maze_group_list = 1;
+ * repeated .MazeGroup maze_group_list = 2;
* @return this
*/
public MazeMapData clearMazeGroupList() {
@@ -336,7 +336,7 @@ public final class MazeMapDataOuterClass {
}
/**
- * repeated .MazeGroup maze_group_list = 1;
+ * repeated .MazeGroup maze_group_list = 2;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -350,7 +350,7 @@ public final class MazeMapDataOuterClass {
}
/**
- * repeated .MazeGroup maze_group_list = 1;
+ * repeated .MazeGroup maze_group_list = 2;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -364,7 +364,7 @@ public final class MazeMapDataOuterClass {
}
/**
- * repeated .MazeGroup maze_group_list = 1;
+ * repeated .MazeGroup maze_group_list = 2;
* @param value the mazeGroupList to add
* @return this
*/
@@ -375,7 +375,7 @@ public final class MazeMapDataOuterClass {
}
/**
- * repeated .MazeGroup maze_group_list = 1;
+ * repeated .MazeGroup maze_group_list = 2;
* @param values the mazeGroupList to add
* @return this
*/
@@ -386,93 +386,25 @@ public final class MazeMapDataOuterClass {
}
/**
- * repeated .MazeProp maze_prop_list = 10;
- * @return whether the mazePropList field is set
+ * repeated .MazeChest unlocked_chest_list = 6;
+ * @return whether the unlockedChestList field is set
*/
- public boolean hasMazePropList() {
+ public boolean hasUnlockedChestList() {
return (bitField0_ & 0x00000040) != 0;
}
/**
- * repeated .MazeProp maze_prop_list = 10;
- * @return this
- */
- public MazeMapData clearMazePropList() {
- bitField0_ &= ~0x00000040;
- mazePropList.clear();
- return this;
- }
-
- /**
- * repeated .MazeProp maze_prop_list = 10;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableMazePropList()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedMessagerepeated .MazeProp maze_prop_list = 10;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedMessagerepeated .MazeProp maze_prop_list = 10;
- * @param value the mazePropList to add
- * @return this
- */
- public MazeMapData addMazePropList(final MazePropOuterClass.MazeProp value) {
- bitField0_ |= 0x00000040;
- mazePropList.add(value);
- return this;
- }
-
- /**
- * repeated .MazeProp maze_prop_list = 10;
- * @param values the mazePropList to add
- * @return this
- */
- public MazeMapData addAllMazePropList(final MazePropOuterClass.MazeProp... values) {
- bitField0_ |= 0x00000040;
- mazePropList.addAll(values);
- return this;
- }
-
- /**
- * repeated .MazeChest unlocked_chest_list = 13;
- * @return whether the unlockedChestList field is set
- */
- public boolean hasUnlockedChestList() {
- return (bitField0_ & 0x00000080) != 0;
- }
-
- /**
- * repeated .MazeChest unlocked_chest_list = 13;
+ * repeated .MazeChest unlocked_chest_list = 6;
* @return this
*/
public MazeMapData clearUnlockedChestList() {
- bitField0_ &= ~0x00000080;
+ bitField0_ &= ~0x00000040;
unlockedChestList.clear();
return this;
}
/**
- * repeated .MazeChest unlocked_chest_list = 13;
+ * repeated .MazeChest unlocked_chest_list = 6;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -486,7 +418,7 @@ public final class MazeMapDataOuterClass {
}
/**
- * repeated .MazeChest unlocked_chest_list = 13;
+ * repeated .MazeChest unlocked_chest_list = 6;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -495,45 +427,113 @@ public final class MazeMapDataOuterClass {
* @return internal storage object for modifications
*/
public RepeatedMessagerepeated .MazeChest unlocked_chest_list = 13;
+ * repeated .MazeChest unlocked_chest_list = 6;
* @param value the unlockedChestList to add
* @return this
*/
public MazeMapData addUnlockedChestList(final MazeChestOuterClass.MazeChest value) {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000040;
unlockedChestList.add(value);
return this;
}
/**
- * repeated .MazeChest unlocked_chest_list = 13;
+ * repeated .MazeChest unlocked_chest_list = 6;
* @param values the unlockedChestList to add
* @return this
*/
public MazeMapData addAllUnlockedChestList(final MazeChestOuterClass.MazeChest... values) {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000040;
unlockedChestList.addAll(values);
return this;
}
+ /**
+ * repeated .MazeProp maze_prop_list = 15;
+ * @return whether the mazePropList field is set
+ */
+ public boolean hasMazePropList() {
+ return (bitField0_ & 0x00000080) != 0;
+ }
+
+ /**
+ * repeated .MazeProp maze_prop_list = 15;
+ * @return this
+ */
+ public MazeMapData clearMazePropList() {
+ bitField0_ &= ~0x00000080;
+ mazePropList.clear();
+ return this;
+ }
+
+ /**
+ * repeated .MazeProp maze_prop_list = 15;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableMazePropList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedMessagerepeated .MazeProp maze_prop_list = 15;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedMessagerepeated .MazeProp maze_prop_list = 15;
+ * @param value the mazePropList to add
+ * @return this
+ */
+ public MazeMapData addMazePropList(final MazePropOuterClass.MazeProp value) {
+ bitField0_ |= 0x00000080;
+ mazePropList.add(value);
+ return this;
+ }
+
+ /**
+ * repeated .MazeProp maze_prop_list = 15;
+ * @param values the mazePropList to add
+ * @return this
+ */
+ public MazeMapData addAllMazePropList(final MazePropOuterClass.MazeProp... values) {
+ bitField0_ |= 0x00000080;
+ mazePropList.addAll(values);
+ return this;
+ }
+
@Override
public MazeMapData copyFrom(final MazeMapData other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
retcode = other.retcode;
- curMapEntryId = other.curMapEntryId;
entryId = other.entryId;
- unlockedTeleportList.copyFrom(other.unlockedTeleportList);
+ curMapEntryId = other.curMapEntryId;
lightenSectionList.copyFrom(other.lightenSectionList);
+ unlockedTeleportList.copyFrom(other.unlockedTeleportList);
mazeGroupList.copyFrom(other.mazeGroupList);
- mazePropList.copyFrom(other.mazePropList);
unlockedChestList.copyFrom(other.unlockedChestList);
+ mazePropList.copyFrom(other.mazePropList);
}
return this;
}
@@ -547,27 +547,27 @@ public final class MazeMapDataOuterClass {
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
- if (other.hasCurMapEntryId()) {
- setCurMapEntryId(other.curMapEntryId);
- }
if (other.hasEntryId()) {
setEntryId(other.entryId);
}
- if (other.hasUnlockedTeleportList()) {
- getMutableUnlockedTeleportList().addAll(other.unlockedTeleportList);
+ if (other.hasCurMapEntryId()) {
+ setCurMapEntryId(other.curMapEntryId);
}
if (other.hasLightenSectionList()) {
getMutableLightenSectionList().addAll(other.lightenSectionList);
}
+ if (other.hasUnlockedTeleportList()) {
+ getMutableUnlockedTeleportList().addAll(other.unlockedTeleportList);
+ }
if (other.hasMazeGroupList()) {
getMutableMazeGroupList().addAll(other.mazeGroupList);
}
- if (other.hasMazePropList()) {
- getMutableMazePropList().addAll(other.mazePropList);
- }
if (other.hasUnlockedChestList()) {
getMutableUnlockedChestList().addAll(other.unlockedChestList);
}
+ if (other.hasMazePropList()) {
+ getMutableMazePropList().addAll(other.mazePropList);
+ }
return this;
}
@@ -579,13 +579,13 @@ public final class MazeMapDataOuterClass {
cachedSize = -1;
bitField0_ = 0;
retcode = 0;
- curMapEntryId = 0;
entryId = 0;
- unlockedTeleportList.clear();
+ curMapEntryId = 0;
lightenSectionList.clear();
+ unlockedTeleportList.clear();
mazeGroupList.clear();
- mazePropList.clear();
unlockedChestList.clear();
+ mazePropList.clear();
return this;
}
@@ -596,11 +596,11 @@ public final class MazeMapDataOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- unlockedTeleportList.clear();
lightenSectionList.clear();
+ unlockedTeleportList.clear();
mazeGroupList.clearQuick();
- mazePropList.clearQuick();
unlockedChestList.clearQuick();
+ mazePropList.clearQuick();
return this;
}
@@ -615,57 +615,57 @@ public final class MazeMapDataOuterClass {
MazeMapData other = (MazeMapData) o;
return bitField0_ == other.bitField0_
&& (!hasRetcode() || retcode == other.retcode)
- && (!hasCurMapEntryId() || curMapEntryId == other.curMapEntryId)
&& (!hasEntryId() || entryId == other.entryId)
- && (!hasUnlockedTeleportList() || unlockedTeleportList.equals(other.unlockedTeleportList))
+ && (!hasCurMapEntryId() || curMapEntryId == other.curMapEntryId)
&& (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList))
+ && (!hasUnlockedTeleportList() || unlockedTeleportList.equals(other.unlockedTeleportList))
&& (!hasMazeGroupList() || mazeGroupList.equals(other.mazeGroupList))
- && (!hasMazePropList() || mazePropList.equals(other.mazePropList))
- && (!hasUnlockedChestList() || unlockedChestList.equals(other.unlockedChestList));
+ && (!hasUnlockedChestList() || unlockedChestList.equals(other.unlockedChestList))
+ && (!hasMazePropList() || mazePropList.equals(other.mazePropList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 96);
+ output.writeUInt32NoTag(entryId);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 112);
output.writeUInt32NoTag(curMapEntryId);
}
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 120);
- output.writeUInt32NoTag(entryId);
- }
if ((bitField0_ & 0x00000008) != 0) {
- for (int i = 0; i < unlockedTeleportList.length(); i++) {
- output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(unlockedTeleportList.array()[i]);
+ for (int i = 0; i < lightenSectionList.length(); i++) {
+ output.writeRawByte((byte) 80);
+ output.writeUInt32NoTag(lightenSectionList.array()[i]);
}
}
if ((bitField0_ & 0x00000010) != 0) {
- for (int i = 0; i < lightenSectionList.length(); i++) {
- output.writeRawByte((byte) 72);
- output.writeUInt32NoTag(lightenSectionList.array()[i]);
+ for (int i = 0; i < unlockedTeleportList.length(); i++) {
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(unlockedTeleportList.array()[i]);
}
}
if ((bitField0_ & 0x00000020) != 0) {
for (int i = 0; i < mazeGroupList.length(); i++) {
- output.writeRawByte((byte) 10);
+ output.writeRawByte((byte) 18);
output.writeMessageNoTag(mazeGroupList.get(i));
}
}
if ((bitField0_ & 0x00000040) != 0) {
- for (int i = 0; i < mazePropList.length(); i++) {
- output.writeRawByte((byte) 82);
- output.writeMessageNoTag(mazePropList.get(i));
+ for (int i = 0; i < unlockedChestList.length(); i++) {
+ output.writeRawByte((byte) 50);
+ output.writeMessageNoTag(unlockedChestList.get(i));
}
}
if ((bitField0_ & 0x00000080) != 0) {
- for (int i = 0; i < unlockedChestList.length(); i++) {
- output.writeRawByte((byte) 106);
- output.writeMessageNoTag(unlockedChestList.get(i));
+ for (int i = 0; i < mazePropList.length(); i++) {
+ output.writeRawByte((byte) 122);
+ output.writeMessageNoTag(mazePropList.get(i));
}
}
}
@@ -677,25 +677,25 @@ public final class MazeMapDataOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(curMapEntryId);
- }
- if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(curMapEntryId);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- size += (1 * unlockedTeleportList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unlockedTeleportList);
+ size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList);
+ size += (1 * unlockedTeleportList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unlockedTeleportList);
}
if ((bitField0_ & 0x00000020) != 0) {
size += (1 * mazeGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeGroupList);
}
if ((bitField0_ & 0x00000040) != 0) {
- size += (1 * mazePropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazePropList);
+ size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList);
}
if ((bitField0_ & 0x00000080) != 0) {
- size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList);
+ size += (1 * mazePropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazePropList);
}
return size;
}
@@ -707,11 +707,20 @@ public final class MazeMapDataOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 88: {
+ case 32: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
+ if (tag != 96) {
+ break;
+ }
+ }
+ case 96: {
+ // entryId
+ entryId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
if (tag != 112) {
break;
}
@@ -719,58 +728,49 @@ public final class MazeMapDataOuterClass {
case 112: {
// curMapEntryId
curMapEntryId = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 82) {
break;
}
}
- case 120: {
- // entryId
- entryId = input.readUInt32();
- bitField0_ |= 0x00000004;
+ case 82: {
+ // lightenSectionList [packed=true]
+ input.readPackedUInt32(lightenSectionList, tag);
+ bitField0_ |= 0x00000008;
+ tag = input.readTag();
+ if (tag != 106) {
+ break;
+ }
+ }
+ case 106: {
+ // unlockedTeleportList [packed=true]
+ input.readPackedUInt32(unlockedTeleportList, tag);
+ bitField0_ |= 0x00000010;
tag = input.readTag();
if (tag != 18) {
break;
}
}
case 18: {
- // unlockedTeleportList [packed=true]
- input.readPackedUInt32(unlockedTeleportList, tag);
- bitField0_ |= 0x00000008;
- tag = input.readTag();
- if (tag != 74) {
- break;
- }
- }
- case 74: {
- // lightenSectionList [packed=true]
- input.readPackedUInt32(lightenSectionList, tag);
- bitField0_ |= 0x00000010;
- tag = input.readTag();
- if (tag != 10) {
- break;
- }
- }
- case 10: {
// mazeGroupList
tag = input.readRepeatedMessage(mazeGroupList, tag);
bitField0_ |= 0x00000020;
- if (tag != 82) {
+ if (tag != 50) {
break;
}
}
- case 82: {
- // mazePropList
- tag = input.readRepeatedMessage(mazePropList, tag);
- bitField0_ |= 0x00000040;
- if (tag != 106) {
- break;
- }
- }
- case 106: {
+ case 50: {
// unlockedChestList
tag = input.readRepeatedMessage(unlockedChestList, tag);
+ bitField0_ |= 0x00000040;
+ if (tag != 122) {
+ break;
+ }
+ }
+ case 122: {
+ // mazePropList
+ tag = input.readRepeatedMessage(mazePropList, tag);
bitField0_ |= 0x00000080;
if (tag != 0) {
break;
@@ -786,15 +786,15 @@ public final class MazeMapDataOuterClass {
tag = input.readTag();
break;
}
- case 16: {
- // unlockedTeleportList [packed=false]
- tag = input.readRepeatedUInt32(unlockedTeleportList, tag);
+ case 80: {
+ // lightenSectionList [packed=false]
+ tag = input.readRepeatedUInt32(lightenSectionList, tag);
bitField0_ |= 0x00000008;
break;
}
- case 72: {
- // lightenSectionList [packed=false]
- tag = input.readRepeatedUInt32(lightenSectionList, tag);
+ case 104: {
+ // unlockedTeleportList [packed=false]
+ tag = input.readRepeatedUInt32(unlockedTeleportList, tag);
bitField0_ |= 0x00000010;
break;
}
@@ -809,25 +809,25 @@ public final class MazeMapDataOuterClass {
output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.curMapEntryId, curMapEntryId);
- }
- if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.entryId, entryId);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeUInt32(FieldNames.curMapEntryId, curMapEntryId);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRepeatedUInt32(FieldNames.unlockedTeleportList, unlockedTeleportList);
+ output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList);
+ output.writeRepeatedUInt32(FieldNames.unlockedTeleportList, unlockedTeleportList);
}
if ((bitField0_ & 0x00000020) != 0) {
output.writeRepeatedMessage(FieldNames.mazeGroupList, mazeGroupList);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeRepeatedMessage(FieldNames.mazePropList, mazePropList);
+ output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList);
+ output.writeRepeatedMessage(FieldNames.mazePropList, mazePropList);
}
output.endObject();
}
@@ -850,11 +850,11 @@ public final class MazeMapDataOuterClass {
}
break;
}
- case 764919441:
- case 2115673898: {
- if (input.isAtField(FieldNames.curMapEntryId)) {
+ case -1591558867:
+ case -2093663224: {
+ if (input.isAtField(FieldNames.entryId)) {
if (!input.trySkipNullValue()) {
- curMapEntryId = input.readUInt32();
+ entryId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -862,11 +862,11 @@ public final class MazeMapDataOuterClass {
}
break;
}
- case -1591558867:
- case -2093663224: {
- if (input.isAtField(FieldNames.entryId)) {
+ case 764919441:
+ case 2115673898: {
+ if (input.isAtField(FieldNames.curMapEntryId)) {
if (!input.trySkipNullValue()) {
- entryId = input.readUInt32();
+ curMapEntryId = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -874,23 +874,23 @@ public final class MazeMapDataOuterClass {
}
break;
}
- case 856936684:
- case -10753834: {
- if (input.isAtField(FieldNames.unlockedTeleportList)) {
- if (!input.trySkipNullValue()) {
- input.readRepeatedUInt32(unlockedTeleportList);
- bitField0_ |= 0x00000008;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case -1942343836:
case 1328850360: {
if (input.isAtField(FieldNames.lightenSectionList)) {
if (!input.trySkipNullValue()) {
input.readRepeatedUInt32(lightenSectionList);
+ bitField0_ |= 0x00000008;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 856936684:
+ case -10753834: {
+ if (input.isAtField(FieldNames.unlockedTeleportList)) {
+ if (!input.trySkipNullValue()) {
+ input.readRepeatedUInt32(unlockedTeleportList);
bitField0_ |= 0x00000010;
}
} else {
@@ -910,11 +910,11 @@ public final class MazeMapDataOuterClass {
}
break;
}
- case 1676123008:
- case 1875839866: {
- if (input.isAtField(FieldNames.mazePropList)) {
+ case -337762404:
+ case 231688696: {
+ if (input.isAtField(FieldNames.unlockedChestList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(mazePropList);
+ input.readRepeatedMessage(unlockedChestList);
bitField0_ |= 0x00000040;
}
} else {
@@ -922,11 +922,11 @@ public final class MazeMapDataOuterClass {
}
break;
}
- case -337762404:
- case 231688696: {
- if (input.isAtField(FieldNames.unlockedChestList)) {
+ case 1676123008:
+ case 1875839866: {
+ if (input.isAtField(FieldNames.mazePropList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(unlockedChestList);
+ input.readRepeatedMessage(mazePropList);
bitField0_ |= 0x00000080;
}
} else {
@@ -988,19 +988,19 @@ public final class MazeMapDataOuterClass {
static class FieldNames {
static final FieldName retcode = FieldName.forField("retcode");
- static final FieldName curMapEntryId = FieldName.forField("curMapEntryId", "cur_map_entry_id");
-
static final FieldName entryId = FieldName.forField("entryId", "entry_id");
- static final FieldName unlockedTeleportList = FieldName.forField("unlockedTeleportList", "unlocked_teleport_list");
+ static final FieldName curMapEntryId = FieldName.forField("curMapEntryId", "cur_map_entry_id");
static final FieldName lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_list");
+ static final FieldName unlockedTeleportList = FieldName.forField("unlockedTeleportList", "unlocked_teleport_list");
+
static final FieldName mazeGroupList = FieldName.forField("mazeGroupList", "maze_group_list");
- static final FieldName mazePropList = FieldName.forField("mazePropList", "maze_prop_list");
-
static final FieldName unlockedChestList = FieldName.forField("unlockedChestList", "unlocked_chest_list");
+
+ static final FieldName mazePropList = FieldName.forField("mazePropList", "maze_prop_list");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/MazePropOuterClass.java b/src/generated/main/emu/lunarcore/proto/MazePropOuterClass.java
index 12997d4..c60d62d 100644
--- a/src/generated/main/emu/lunarcore/proto/MazePropOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/MazePropOuterClass.java
@@ -19,20 +19,20 @@ public final class MazePropOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 group_id = 1;
- */
- private int groupId;
-
- /**
- * optional uint32 config_id = 4;
+ * optional uint32 config_id = 1;
*/
private int configId;
/**
- * optional uint32 state = 7;
+ * optional uint32 state = 12;
*/
private int state;
+ /**
+ * optional uint32 group_id = 15;
+ */
+ private int groupId;
+
private MazeProp() {
}
@@ -44,62 +44,25 @@ public final class MazePropOuterClass {
}
/**
- * optional uint32 group_id = 1;
- * @return whether the groupId field is set
+ * optional uint32 config_id = 1;
+ * @return whether the configId field is set
*/
- public boolean hasGroupId() {
+ public boolean hasConfigId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 group_id = 1;
- * @return this
- */
- public MazeProp 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 MazeProp setGroupId(final int value) {
- bitField0_ |= 0x00000001;
- groupId = value;
- return this;
- }
-
- /**
- * optional uint32 config_id = 4;
- * @return whether the configId field is set
- */
- public boolean hasConfigId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 config_id = 4;
+ * optional uint32 config_id = 1;
* @return this
*/
public MazeProp clearConfigId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
configId = 0;
return this;
}
/**
- * optional uint32 config_id = 4;
+ * optional uint32 config_id = 1;
* @return the configId
*/
public int getConfigId() {
@@ -107,36 +70,36 @@ public final class MazePropOuterClass {
}
/**
- * optional uint32 config_id = 4;
+ * optional uint32 config_id = 1;
* @param value the configId to set
* @return this
*/
public MazeProp setConfigId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
configId = value;
return this;
}
/**
- * optional uint32 state = 7;
+ * optional uint32 state = 12;
* @return whether the state field is set
*/
public boolean hasState() {
- return (bitField0_ & 0x00000004) != 0;
+ return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 state = 7;
+ * optional uint32 state = 12;
* @return this
*/
public MazeProp clearState() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
state = 0;
return this;
}
/**
- * optional uint32 state = 7;
+ * optional uint32 state = 12;
* @return the state
*/
public int getState() {
@@ -144,24 +107,61 @@ public final class MazePropOuterClass {
}
/**
- * optional uint32 state = 7;
+ * optional uint32 state = 12;
* @param value the state to set
* @return this
*/
public MazeProp setState(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
state = value;
return this;
}
+ /**
+ * optional uint32 group_id = 15;
+ * @return whether the groupId field is set
+ */
+ public boolean hasGroupId() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 group_id = 15;
+ * @return this
+ */
+ public MazeProp clearGroupId() {
+ bitField0_ &= ~0x00000004;
+ groupId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 group_id = 15;
+ * @return the groupId
+ */
+ public int getGroupId() {
+ return groupId;
+ }
+
+ /**
+ * optional uint32 group_id = 15;
+ * @param value the groupId to set
+ * @return this
+ */
+ public MazeProp setGroupId(final int value) {
+ bitField0_ |= 0x00000004;
+ groupId = value;
+ return this;
+ }
+
@Override
public MazeProp copyFrom(final MazeProp other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- groupId = other.groupId;
configId = other.configId;
state = other.state;
+ groupId = other.groupId;
}
return this;
}
@@ -172,15 +172,15 @@ public final class MazePropOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasGroupId()) {
- setGroupId(other.groupId);
- }
if (other.hasConfigId()) {
setConfigId(other.configId);
}
if (other.hasState()) {
setState(other.state);
}
+ if (other.hasGroupId()) {
+ setGroupId(other.groupId);
+ }
return this;
}
@@ -191,9 +191,9 @@ public final class MazePropOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- groupId = 0;
configId = 0;
state = 0;
+ groupId = 0;
return this;
}
@@ -217,39 +217,39 @@ public final class MazePropOuterClass {
}
MazeProp other = (MazeProp) o;
return bitField0_ == other.bitField0_
- && (!hasGroupId() || groupId == other.groupId)
&& (!hasConfigId() || configId == other.configId)
- && (!hasState() || state == other.state);
+ && (!hasState() || state == other.state)
+ && (!hasGroupId() || groupId == other.groupId);
}
@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) 32);
output.writeUInt32NoTag(configId);
}
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 56);
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(state);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 120);
+ output.writeUInt32NoTag(groupId);
+ }
}
@Override
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(configId);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(state);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId);
+ }
return size;
}
@@ -261,26 +261,26 @@ public final class MazePropOuterClass {
while (true) {
switch (tag) {
case 8: {
- // groupId
- groupId = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 32) {
- break;
- }
- }
- case 32: {
// configId
configId = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 56) {
+ if (tag != 96) {
break;
}
}
- case 56: {
+ case 96: {
// state
state = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 120) {
+ break;
+ }
+ }
+ case 120: {
+ // groupId
+ groupId = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 0) {
@@ -305,14 +305,14 @@ public final class MazePropOuterClass {
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.configId, configId);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.state, state);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeUInt32(FieldNames.groupId, groupId);
+ }
output.endObject();
}
@@ -323,24 +323,12 @@ public final class MazePropOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 293428218:
- case 506361563: {
- if (input.isAtField(FieldNames.groupId)) {
- if (!input.trySkipNullValue()) {
- groupId = input.readUInt32();
- bitField0_ |= 0x00000001;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case -580140035:
case -804450504: {
if (input.isAtField(FieldNames.configId)) {
if (!input.trySkipNullValue()) {
configId = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
}
} else {
input.skipUnknownField();
@@ -351,6 +339,18 @@ public final class MazePropOuterClass {
if (input.isAtField(FieldNames.state)) {
if (!input.trySkipNullValue()) {
state = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 293428218:
+ case 506361563: {
+ if (input.isAtField(FieldNames.groupId)) {
+ if (!input.trySkipNullValue()) {
+ groupId = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -410,11 +410,11 @@ public final class MazePropOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName groupId = FieldName.forField("groupId", "group_id");
-
static final FieldName configId = FieldName.forField("configId", "config_id");
static final FieldName state = FieldName.forField("state");
+
+ static final FieldName groupId = FieldName.forField("groupId", "group_id");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/MissionOuterClass.java b/src/generated/main/emu/lunarcore/proto/MissionOuterClass.java
index 5fcd3cb..d81dc18 100644
--- a/src/generated/main/emu/lunarcore/proto/MissionOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/MissionOuterClass.java
@@ -19,17 +19,17 @@ public final class MissionOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 progress = 3;
- */
- private int progress;
-
- /**
- * optional uint32 id = 4;
+ * optional uint32 id = 1;
*/
private int id;
/**
- * optional .MissionStatus status = 1;
+ * optional uint32 progress = 8;
+ */
+ private int progress;
+
+ /**
+ * optional .MissionStatus status = 10;
*/
private int status;
@@ -44,62 +44,25 @@ public final class MissionOuterClass {
}
/**
- * optional uint32 progress = 3;
- * @return whether the progress field is set
+ * optional uint32 id = 1;
+ * @return whether the id field is set
*/
- public boolean hasProgress() {
+ public boolean hasId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 progress = 3;
- * @return this
- */
- public Mission clearProgress() {
- bitField0_ &= ~0x00000001;
- progress = 0;
- return this;
- }
-
- /**
- * optional uint32 progress = 3;
- * @return the progress
- */
- public int getProgress() {
- return progress;
- }
-
- /**
- * optional uint32 progress = 3;
- * @param value the progress to set
- * @return this
- */
- public Mission setProgress(final int value) {
- bitField0_ |= 0x00000001;
- progress = value;
- return this;
- }
-
- /**
- * optional uint32 id = 4;
- * @return whether the id field is set
- */
- public boolean hasId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 id = 4;
+ * optional uint32 id = 1;
* @return this
*/
public Mission clearId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
id = 0;
return this;
}
/**
- * optional uint32 id = 4;
+ * optional uint32 id = 1;
* @return the id
*/
public int getId() {
@@ -107,18 +70,55 @@ public final class MissionOuterClass {
}
/**
- * optional uint32 id = 4;
+ * optional uint32 id = 1;
* @param value the id to set
* @return this
*/
public Mission setId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
id = value;
return this;
}
/**
- * optional .MissionStatus status = 1;
+ * optional uint32 progress = 8;
+ * @return whether the progress field is set
+ */
+ public boolean hasProgress() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 progress = 8;
+ * @return this
+ */
+ public Mission clearProgress() {
+ bitField0_ &= ~0x00000002;
+ progress = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 progress = 8;
+ * @return the progress
+ */
+ public int getProgress() {
+ return progress;
+ }
+
+ /**
+ * optional uint32 progress = 8;
+ * @param value the progress to set
+ * @return this
+ */
+ public Mission setProgress(final int value) {
+ bitField0_ |= 0x00000002;
+ progress = value;
+ return this;
+ }
+
+ /**
+ * optional .MissionStatus status = 10;
* @return whether the status field is set
*/
public boolean hasStatus() {
@@ -126,7 +126,7 @@ public final class MissionOuterClass {
}
/**
- * optional .MissionStatus status = 1;
+ * optional .MissionStatus status = 10;
* @return this
*/
public Mission clearStatus() {
@@ -136,7 +136,7 @@ public final class MissionOuterClass {
}
/**
- * optional .MissionStatus status = 1;
+ * optional .MissionStatus status = 10;
* @return the status
*/
public MissionStatusOuterClass.MissionStatus getStatus() {
@@ -169,7 +169,7 @@ public final class MissionOuterClass {
}
/**
- * optional .MissionStatus status = 1;
+ * optional .MissionStatus status = 10;
* @param value the status to set
* @return this
*/
@@ -184,8 +184,8 @@ public final class MissionOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- progress = other.progress;
id = other.id;
+ progress = other.progress;
status = other.status;
}
return this;
@@ -197,12 +197,12 @@ public final class MissionOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasProgress()) {
- setProgress(other.progress);
- }
if (other.hasId()) {
setId(other.id);
}
+ if (other.hasProgress()) {
+ setProgress(other.progress);
+ }
if (other.hasStatus()) {
setStatusValue(other.status);
}
@@ -216,8 +216,8 @@ public final class MissionOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- progress = 0;
id = 0;
+ progress = 0;
status = 0;
return this;
}
@@ -242,23 +242,23 @@ public final class MissionOuterClass {
}
Mission other = (Mission) o;
return bitField0_ == other.bitField0_
- && (!hasProgress() || progress == other.progress)
&& (!hasId() || id == other.id)
+ && (!hasProgress() || progress == other.progress)
&& (!hasStatus() || status == other.status);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(progress);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(id);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 64);
+ output.writeUInt32NoTag(progress);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 80);
output.writeEnumNoTag(status);
}
}
@@ -267,10 +267,10 @@ public final class MissionOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(progress);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(id);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(id);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(progress);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeEnumSizeNoTag(status);
@@ -285,25 +285,25 @@ public final class MissionOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
- // progress
- progress = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 32) {
- break;
- }
- }
- case 32: {
+ case 8: {
// id
id = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 8) {
+ if (tag != 64) {
break;
}
}
- case 8: {
+ case 64: {
+ // progress
+ progress = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 80) {
+ break;
+ }
+ }
+ case 80: {
// status
final int value = input.readInt32();
if (MissionStatusOuterClass.MissionStatus.forNumber(value) != null) {
@@ -333,10 +333,10 @@ public final class MissionOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.progress, progress);
+ output.writeUInt32(FieldNames.id, id);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.id, id);
+ output.writeUInt32(FieldNames.progress, progress);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeEnum(FieldNames.status, status, MissionStatusOuterClass.MissionStatus.converter());
@@ -351,10 +351,10 @@ public final class MissionOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1001078227: {
- if (input.isAtField(FieldNames.progress)) {
+ case 3355: {
+ if (input.isAtField(FieldNames.id)) {
if (!input.trySkipNullValue()) {
- progress = input.readUInt32();
+ id = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -362,10 +362,10 @@ public final class MissionOuterClass {
}
break;
}
- case 3355: {
- if (input.isAtField(FieldNames.id)) {
+ case -1001078227: {
+ if (input.isAtField(FieldNames.progress)) {
if (!input.trySkipNullValue()) {
- id = input.readUInt32();
+ progress = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -441,10 +441,10 @@ public final class MissionOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName progress = FieldName.forField("progress");
-
static final FieldName id = FieldName.forField("id");
+ static final FieldName progress = FieldName.forField("progress");
+
static final FieldName status = FieldName.forField("status");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/MissionSyncOuterClass.java b/src/generated/main/emu/lunarcore/proto/MissionSyncOuterClass.java
new file mode 100644
index 0000000..14ea218
--- /dev/null
+++ b/src/generated/main/emu/lunarcore/proto/MissionSyncOuterClass.java
@@ -0,0 +1,739 @@
+// Code generated by protocol buffer compiler. Do not edit!
+package emu.lunarcore.proto;
+
+import java.io.IOException;
+import us.hebi.quickbuf.FieldName;
+import us.hebi.quickbuf.InvalidProtocolBufferException;
+import us.hebi.quickbuf.JsonSink;
+import us.hebi.quickbuf.JsonSource;
+import us.hebi.quickbuf.MessageFactory;
+import us.hebi.quickbuf.ProtoMessage;
+import us.hebi.quickbuf.ProtoSink;
+import us.hebi.quickbuf.ProtoSource;
+import us.hebi.quickbuf.RepeatedInt;
+import us.hebi.quickbuf.RepeatedMessage;
+
+public final class MissionSyncOuterClass {
+ /**
+ * Protobuf type {@code MissionSync}
+ */
+ public static final class MissionSync extends ProtoMessage+ * could be also 1 or 14 + *+ * + *
repeated uint32 main_mission_id = 4;
+ */
+ private final RepeatedInt mainMissionId = RepeatedInt.newEmptyInstance();
+
+ /**
+ * + * COLOAGDIBCC + *+ * + *
repeated uint32 COLOAGDIBCC = 7;
+ */
+ private final RepeatedInt cOLOAGDIBCC = RepeatedInt.newEmptyInstance();
+
+ /**
+ * + * LMHJAPFMKDI + *+ * + *
repeated uint32 LMHJAPFMKDI = 10;
+ */
+ private final RepeatedInt lMHJAPFMKDI = RepeatedInt.newEmptyInstance();
+
+ /**
+ * repeated .Mission mission_list = 11;
+ */
+ private final RepeatedMessage+ * could be also 1 or 14 + *+ * + *
repeated uint32 main_mission_id = 4;
+ * @return whether the mainMissionId field is set
+ */
+ public boolean hasMainMissionId() {
+ return (bitField0_ & 0x00000001) != 0;
+ }
+
+ /**
+ * + * could be also 1 or 14 + *+ * + *
repeated uint32 main_mission_id = 4;
+ * @return this
+ */
+ public MissionSync clearMainMissionId() {
+ bitField0_ &= ~0x00000001;
+ mainMissionId.clear();
+ return this;
+ }
+
+ /**
+ * + * could be also 1 or 14 + *+ * + *
repeated uint32 main_mission_id = 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 #getMutableMainMissionId()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedInt getMainMissionId() {
+ return mainMissionId;
+ }
+
+ /**
+ * + * could be also 1 or 14 + *+ * + *
repeated uint32 main_mission_id = 4;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedInt getMutableMainMissionId() {
+ bitField0_ |= 0x00000001;
+ return mainMissionId;
+ }
+
+ /**
+ * + * could be also 1 or 14 + *+ * + *
repeated uint32 main_mission_id = 4;
+ * @param value the mainMissionId to add
+ * @return this
+ */
+ public MissionSync addMainMissionId(final int value) {
+ bitField0_ |= 0x00000001;
+ mainMissionId.add(value);
+ return this;
+ }
+
+ /**
+ * + * could be also 1 or 14 + *+ * + *
repeated uint32 main_mission_id = 4;
+ * @param values the mainMissionId to add
+ * @return this
+ */
+ public MissionSync addAllMainMissionId(final int... values) {
+ bitField0_ |= 0x00000001;
+ mainMissionId.addAll(values);
+ return this;
+ }
+
+ /**
+ * + * COLOAGDIBCC + *+ * + *
repeated uint32 COLOAGDIBCC = 7;
+ * @return whether the cOLOAGDIBCC field is set
+ */
+ public boolean hasCOLOAGDIBCC() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * + * COLOAGDIBCC + *+ * + *
repeated uint32 COLOAGDIBCC = 7;
+ * @return this
+ */
+ public MissionSync clearCOLOAGDIBCC() {
+ bitField0_ &= ~0x00000002;
+ cOLOAGDIBCC.clear();
+ return this;
+ }
+
+ /**
+ * + * COLOAGDIBCC + *+ * + *
repeated uint32 COLOAGDIBCC = 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 #getMutableCOLOAGDIBCC()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedInt getCOLOAGDIBCC() {
+ return cOLOAGDIBCC;
+ }
+
+ /**
+ * + * COLOAGDIBCC + *+ * + *
repeated uint32 COLOAGDIBCC = 7;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedInt getMutableCOLOAGDIBCC() {
+ bitField0_ |= 0x00000002;
+ return cOLOAGDIBCC;
+ }
+
+ /**
+ * + * COLOAGDIBCC + *+ * + *
repeated uint32 COLOAGDIBCC = 7;
+ * @param value the cOLOAGDIBCC to add
+ * @return this
+ */
+ public MissionSync addCOLOAGDIBCC(final int value) {
+ bitField0_ |= 0x00000002;
+ cOLOAGDIBCC.add(value);
+ return this;
+ }
+
+ /**
+ * + * COLOAGDIBCC + *+ * + *
repeated uint32 COLOAGDIBCC = 7;
+ * @param values the cOLOAGDIBCC to add
+ * @return this
+ */
+ public MissionSync addAllCOLOAGDIBCC(final int... values) {
+ bitField0_ |= 0x00000002;
+ cOLOAGDIBCC.addAll(values);
+ return this;
+ }
+
+ /**
+ * + * LMHJAPFMKDI + *+ * + *
repeated uint32 LMHJAPFMKDI = 10;
+ * @return whether the lMHJAPFMKDI field is set
+ */
+ public boolean hasLMHJAPFMKDI() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * + * LMHJAPFMKDI + *+ * + *
repeated uint32 LMHJAPFMKDI = 10;
+ * @return this
+ */
+ public MissionSync clearLMHJAPFMKDI() {
+ bitField0_ &= ~0x00000004;
+ lMHJAPFMKDI.clear();
+ return this;
+ }
+
+ /**
+ * + * LMHJAPFMKDI + *+ * + *
repeated uint32 LMHJAPFMKDI = 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 #getMutableLMHJAPFMKDI()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedInt getLMHJAPFMKDI() {
+ return lMHJAPFMKDI;
+ }
+
+ /**
+ * + * LMHJAPFMKDI + *+ * + *
repeated uint32 LMHJAPFMKDI = 10;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedInt getMutableLMHJAPFMKDI() {
+ bitField0_ |= 0x00000004;
+ return lMHJAPFMKDI;
+ }
+
+ /**
+ * + * LMHJAPFMKDI + *+ * + *
repeated uint32 LMHJAPFMKDI = 10;
+ * @param value the lMHJAPFMKDI to add
+ * @return this
+ */
+ public MissionSync addLMHJAPFMKDI(final int value) {
+ bitField0_ |= 0x00000004;
+ lMHJAPFMKDI.add(value);
+ return this;
+ }
+
+ /**
+ * + * LMHJAPFMKDI + *+ * + *
repeated uint32 LMHJAPFMKDI = 10;
+ * @param values the lMHJAPFMKDI to add
+ * @return this
+ */
+ public MissionSync addAllLMHJAPFMKDI(final int... values) {
+ bitField0_ |= 0x00000004;
+ lMHJAPFMKDI.addAll(values);
+ return this;
+ }
+
+ /**
+ * repeated .Mission mission_list = 11;
+ * @return whether the missionList field is set
+ */
+ public boolean hasMissionList() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * repeated .Mission mission_list = 11;
+ * @return this
+ */
+ public MissionSync clearMissionList() {
+ bitField0_ &= ~0x00000008;
+ missionList.clear();
+ return this;
+ }
+
+ /**
+ * repeated .Mission mission_list = 11;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableMissionList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedMessagerepeated .Mission mission_list = 11;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedMessagerepeated .Mission mission_list = 11;
+ * @param value the missionList to add
+ * @return this
+ */
+ public MissionSync addMissionList(final MissionOuterClass.Mission value) {
+ bitField0_ |= 0x00000008;
+ missionList.add(value);
+ return this;
+ }
+
+ /**
+ * repeated .Mission mission_list = 11;
+ * @param values the missionList to add
+ * @return this
+ */
+ public MissionSync addAllMissionList(final MissionOuterClass.Mission... values) {
+ bitField0_ |= 0x00000008;
+ missionList.addAll(values);
+ return this;
+ }
+
+ @Override
+ public MissionSync copyFrom(final MissionSync other) {
+ cachedSize = other.cachedSize;
+ if ((bitField0_ | other.bitField0_) != 0) {
+ bitField0_ = other.bitField0_;
+ mainMissionId.copyFrom(other.mainMissionId);
+ cOLOAGDIBCC.copyFrom(other.cOLOAGDIBCC);
+ lMHJAPFMKDI.copyFrom(other.lMHJAPFMKDI);
+ missionList.copyFrom(other.missionList);
+ }
+ return this;
+ }
+
+ @Override
+ public MissionSync mergeFrom(final MissionSync other) {
+ if (other.isEmpty()) {
+ return this;
+ }
+ cachedSize = -1;
+ if (other.hasMainMissionId()) {
+ getMutableMainMissionId().addAll(other.mainMissionId);
+ }
+ if (other.hasCOLOAGDIBCC()) {
+ getMutableCOLOAGDIBCC().addAll(other.cOLOAGDIBCC);
+ }
+ if (other.hasLMHJAPFMKDI()) {
+ getMutableLMHJAPFMKDI().addAll(other.lMHJAPFMKDI);
+ }
+ if (other.hasMissionList()) {
+ getMutableMissionList().addAll(other.missionList);
+ }
+ return this;
+ }
+
+ @Override
+ public MissionSync clear() {
+ if (isEmpty()) {
+ return this;
+ }
+ cachedSize = -1;
+ bitField0_ = 0;
+ mainMissionId.clear();
+ cOLOAGDIBCC.clear();
+ lMHJAPFMKDI.clear();
+ missionList.clear();
+ return this;
+ }
+
+ @Override
+ public MissionSync clearQuick() {
+ if (isEmpty()) {
+ return this;
+ }
+ cachedSize = -1;
+ bitField0_ = 0;
+ mainMissionId.clear();
+ cOLOAGDIBCC.clear();
+ lMHJAPFMKDI.clear();
+ missionList.clearQuick();
+ return this;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ }
+ if (!(o instanceof MissionSync)) {
+ return false;
+ }
+ MissionSync other = (MissionSync) o;
+ return bitField0_ == other.bitField0_
+ && (!hasMainMissionId() || mainMissionId.equals(other.mainMissionId))
+ && (!hasCOLOAGDIBCC() || cOLOAGDIBCC.equals(other.cOLOAGDIBCC))
+ && (!hasLMHJAPFMKDI() || lMHJAPFMKDI.equals(other.lMHJAPFMKDI))
+ && (!hasMissionList() || missionList.equals(other.missionList));
+ }
+
+ @Override
+ public void writeTo(final ProtoSink output) throws IOException {
+ if ((bitField0_ & 0x00000001) != 0) {
+ for (int i = 0; i < mainMissionId.length(); i++) {
+ output.writeRawByte((byte) 32);
+ output.writeUInt32NoTag(mainMissionId.array()[i]);
+ }
+ }
+ if ((bitField0_ & 0x00000002) != 0) {
+ for (int i = 0; i < cOLOAGDIBCC.length(); i++) {
+ output.writeRawByte((byte) 56);
+ output.writeUInt32NoTag(cOLOAGDIBCC.array()[i]);
+ }
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
+ for (int i = 0; i < lMHJAPFMKDI.length(); i++) {
+ output.writeRawByte((byte) 80);
+ output.writeUInt32NoTag(lMHJAPFMKDI.array()[i]);
+ }
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
+ for (int i = 0; i < missionList.length(); i++) {
+ output.writeRawByte((byte) 90);
+ output.writeMessageNoTag(missionList.get(i));
+ }
+ }
+ }
+
+ @Override
+ protected int computeSerializedSize() {
+ int size = 0;
+ if ((bitField0_ & 0x00000001) != 0) {
+ size += (1 * mainMissionId.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(mainMissionId);
+ }
+ if ((bitField0_ & 0x00000002) != 0) {
+ size += (1 * cOLOAGDIBCC.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(cOLOAGDIBCC);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += (1 * lMHJAPFMKDI.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lMHJAPFMKDI);
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
+ size += (1 * missionList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(missionList);
+ }
+ return size;
+ }
+
+ @Override
+ @SuppressWarnings("fallthrough")
+ public MissionSync mergeFrom(final ProtoSource input) throws IOException {
+ // Enabled Fall-Through Optimization (QuickBuffers)
+ int tag = input.readTag();
+ while (true) {
+ switch (tag) {
+ case 34: {
+ // mainMissionId [packed=true]
+ input.readPackedUInt32(mainMissionId, tag);
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 58) {
+ break;
+ }
+ }
+ case 58: {
+ // cOLOAGDIBCC [packed=true]
+ input.readPackedUInt32(cOLOAGDIBCC, tag);
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 82) {
+ break;
+ }
+ }
+ case 82: {
+ // lMHJAPFMKDI [packed=true]
+ input.readPackedUInt32(lMHJAPFMKDI, tag);
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 90) {
+ break;
+ }
+ }
+ case 90: {
+ // missionList
+ tag = input.readRepeatedMessage(missionList, tag);
+ bitField0_ |= 0x00000008;
+ if (tag != 0) {
+ break;
+ }
+ }
+ case 0: {
+ return this;
+ }
+ default: {
+ if (!input.skipField(tag)) {
+ return this;
+ }
+ tag = input.readTag();
+ break;
+ }
+ case 32: {
+ // mainMissionId [packed=false]
+ tag = input.readRepeatedUInt32(mainMissionId, tag);
+ bitField0_ |= 0x00000001;
+ break;
+ }
+ case 56: {
+ // cOLOAGDIBCC [packed=false]
+ tag = input.readRepeatedUInt32(cOLOAGDIBCC, tag);
+ bitField0_ |= 0x00000002;
+ break;
+ }
+ case 80: {
+ // lMHJAPFMKDI [packed=false]
+ tag = input.readRepeatedUInt32(lMHJAPFMKDI, tag);
+ bitField0_ |= 0x00000004;
+ break;
+ }
+ }
+ }
+ }
+
+ @Override
+ public void writeTo(final JsonSink output) throws IOException {
+ output.beginObject();
+ if ((bitField0_ & 0x00000001) != 0) {
+ output.writeRepeatedUInt32(FieldNames.mainMissionId, mainMissionId);
+ }
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRepeatedUInt32(FieldNames.cOLOAGDIBCC, cOLOAGDIBCC);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRepeatedUInt32(FieldNames.lMHJAPFMKDI, lMHJAPFMKDI);
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeRepeatedMessage(FieldNames.missionList, missionList);
+ }
+ output.endObject();
+ }
+
+ @Override
+ public MissionSync mergeFrom(final JsonSource input) throws IOException {
+ if (!input.beginObject()) {
+ return this;
+ }
+ while (!input.isAtEnd()) {
+ switch (input.readFieldHash()) {
+ case 1124848142:
+ case 885892852: {
+ if (input.isAtField(FieldNames.mainMissionId)) {
+ if (!input.trySkipNullValue()) {
+ input.readRepeatedUInt32(mainMissionId);
+ bitField0_ |= 0x00000001;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 1490029384: {
+ if (input.isAtField(FieldNames.cOLOAGDIBCC)) {
+ if (!input.trySkipNullValue()) {
+ input.readRepeatedUInt32(cOLOAGDIBCC);
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 1665766775: {
+ if (input.isAtField(FieldNames.lMHJAPFMKDI)) {
+ if (!input.trySkipNullValue()) {
+ input.readRepeatedUInt32(lMHJAPFMKDI);
+ bitField0_ |= 0x00000004;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 1383006282:
+ case -58851471: {
+ if (input.isAtField(FieldNames.missionList)) {
+ if (!input.trySkipNullValue()) {
+ input.readRepeatedMessage(missionList);
+ bitField0_ |= 0x00000008;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ default: {
+ input.skipUnknownField();
+ break;
+ }
+ }
+ }
+ input.endObject();
+ return this;
+ }
+
+ @Override
+ public MissionSync clone() {
+ return new MissionSync().copyFrom(this);
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return ((bitField0_) == 0);
+ }
+
+ public static MissionSync parseFrom(final byte[] data) throws InvalidProtocolBufferException {
+ return ProtoMessage.mergeFrom(new MissionSync(), data).checkInitialized();
+ }
+
+ public static MissionSync parseFrom(final ProtoSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new MissionSync(), input).checkInitialized();
+ }
+
+ public static MissionSync parseFrom(final JsonSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new MissionSync(), input).checkInitialized();
+ }
+
+ /**
+ * @return factory for creating MissionSync messages
+ */
+ public static MessageFactoryoptional uint32 monster_id = 2;
+ * optional uint32 monster_id = 10;
*/
private int monsterId;
/**
- * optional uint32 num = 9;
+ * optional uint32 num = 14;
*/
private int num;
@@ -39,7 +39,7 @@ public final class MonsterArchiveOuterClass {
}
/**
- * optional uint32 monster_id = 2;
+ * optional uint32 monster_id = 10;
* @return whether the monsterId field is set
*/
public boolean hasMonsterId() {
@@ -47,7 +47,7 @@ public final class MonsterArchiveOuterClass {
}
/**
- * optional uint32 monster_id = 2;
+ * optional uint32 monster_id = 10;
* @return this
*/
public MonsterArchive clearMonsterId() {
@@ -57,7 +57,7 @@ public final class MonsterArchiveOuterClass {
}
/**
- * optional uint32 monster_id = 2;
+ * optional uint32 monster_id = 10;
* @return the monsterId
*/
public int getMonsterId() {
@@ -65,7 +65,7 @@ public final class MonsterArchiveOuterClass {
}
/**
- * optional uint32 monster_id = 2;
+ * optional uint32 monster_id = 10;
* @param value the monsterId to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class MonsterArchiveOuterClass {
}
/**
- * optional uint32 num = 9;
+ * optional uint32 num = 14;
* @return whether the num field is set
*/
public boolean hasNum() {
@@ -84,7 +84,7 @@ public final class MonsterArchiveOuterClass {
}
/**
- * optional uint32 num = 9;
+ * optional uint32 num = 14;
* @return this
*/
public MonsterArchive clearNum() {
@@ -94,7 +94,7 @@ public final class MonsterArchiveOuterClass {
}
/**
- * optional uint32 num = 9;
+ * optional uint32 num = 14;
* @return the num
*/
public int getNum() {
@@ -102,7 +102,7 @@ public final class MonsterArchiveOuterClass {
}
/**
- * optional uint32 num = 9;
+ * optional uint32 num = 14;
* @param value the num to set
* @return this
*/
@@ -177,11 +177,11 @@ public final class MonsterArchiveOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(monsterId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 112);
output.writeUInt32NoTag(num);
}
}
@@ -205,16 +205,16 @@ public final class MonsterArchiveOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
+ case 80: {
// monsterId
monsterId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 72) {
+ if (tag != 112) {
break;
}
}
- case 72: {
+ case 112: {
// num
num = input.readUInt32();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java
index 0305f02..5493f13 100644
--- a/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java
@@ -19,12 +19,12 @@ public final class MotionInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .Vector rot = 2;
+ * optional .Vector rot = 4;
*/
private final VectorOuterClass.Vector rot = VectorOuterClass.Vector.newInstance();
/**
- * optional .Vector pos = 6;
+ * optional .Vector pos = 12;
*/
private final VectorOuterClass.Vector pos = VectorOuterClass.Vector.newInstance();
@@ -39,7 +39,7 @@ public final class MotionInfoOuterClass {
}
/**
- * optional .Vector rot = 2;
+ * optional .Vector rot = 4;
* @return whether the rot field is set
*/
public boolean hasRot() {
@@ -47,7 +47,7 @@ public final class MotionInfoOuterClass {
}
/**
- * optional .Vector rot = 2;
+ * optional .Vector rot = 4;
* @return this
*/
public MotionInfo clearRot() {
@@ -57,7 +57,7 @@ public final class MotionInfoOuterClass {
}
/**
- * optional .Vector rot = 2;
+ * optional .Vector rot = 4;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -71,7 +71,7 @@ public final class MotionInfoOuterClass {
}
/**
- * optional .Vector rot = 2;
+ * optional .Vector rot = 4;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -85,7 +85,7 @@ public final class MotionInfoOuterClass {
}
/**
- * optional .Vector rot = 2;
+ * optional .Vector rot = 4;
* @param value the rot to set
* @return this
*/
@@ -96,7 +96,7 @@ public final class MotionInfoOuterClass {
}
/**
- * optional .Vector pos = 6;
+ * optional .Vector pos = 12;
* @return whether the pos field is set
*/
public boolean hasPos() {
@@ -104,7 +104,7 @@ public final class MotionInfoOuterClass {
}
/**
- * optional .Vector pos = 6;
+ * optional .Vector pos = 12;
* @return this
*/
public MotionInfo clearPos() {
@@ -114,7 +114,7 @@ public final class MotionInfoOuterClass {
}
/**
- * optional .Vector pos = 6;
+ * optional .Vector pos = 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.
@@ -128,7 +128,7 @@ public final class MotionInfoOuterClass {
}
/**
- * optional .Vector pos = 6;
+ * optional .Vector pos = 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
@@ -142,7 +142,7 @@ public final class MotionInfoOuterClass {
}
/**
- * optional .Vector pos = 6;
+ * optional .Vector pos = 12;
* @param value the pos to set
* @return this
*/
@@ -219,11 +219,11 @@ public final class MotionInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 18);
+ output.writeRawByte((byte) 34);
output.writeMessageNoTag(rot);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 50);
+ output.writeRawByte((byte) 98);
output.writeMessageNoTag(pos);
}
}
@@ -247,16 +247,16 @@ public final class MotionInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 18: {
+ case 34: {
// rot
input.readMessage(rot);
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 50) {
+ if (tag != 98) {
break;
}
}
- case 50: {
+ case 98: {
// pos
input.readMessage(pos);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/NewMailScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/NewMailScNotifyOuterClass.java
index 87c4577..7371113 100644
--- a/src/generated/main/emu/lunarcore/proto/NewMailScNotifyOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/NewMailScNotifyOuterClass.java
@@ -20,7 +20,7 @@ public final class NewMailScNotifyOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated uint32 mail_id_list = 5;
+ * repeated uint32 mail_id_list = 8;
*/
private final RepeatedInt mailIdList = RepeatedInt.newEmptyInstance();
@@ -35,7 +35,7 @@ public final class NewMailScNotifyOuterClass {
}
/**
- * repeated uint32 mail_id_list = 5;
+ * repeated uint32 mail_id_list = 8;
* @return whether the mailIdList field is set
*/
public boolean hasMailIdList() {
@@ -43,7 +43,7 @@ public final class NewMailScNotifyOuterClass {
}
/**
- * repeated uint32 mail_id_list = 5;
+ * repeated uint32 mail_id_list = 8;
* @return this
*/
public NewMailScNotify clearMailIdList() {
@@ -53,7 +53,7 @@ public final class NewMailScNotifyOuterClass {
}
/**
- * repeated uint32 mail_id_list = 5;
+ * repeated uint32 mail_id_list = 8;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class NewMailScNotifyOuterClass {
}
/**
- * repeated uint32 mail_id_list = 5;
+ * repeated uint32 mail_id_list = 8;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class NewMailScNotifyOuterClass {
}
/**
- * repeated uint32 mail_id_list = 5;
+ * repeated uint32 mail_id_list = 8;
* @param value the mailIdList to add
* @return this
*/
@@ -92,7 +92,7 @@ public final class NewMailScNotifyOuterClass {
}
/**
- * repeated uint32 mail_id_list = 5;
+ * repeated uint32 mail_id_list = 8;
* @param values the mailIdList to add
* @return this
*/
@@ -163,7 +163,7 @@ public final class NewMailScNotifyOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < mailIdList.length(); i++) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(mailIdList.array()[i]);
}
}
@@ -185,7 +185,7 @@ public final class NewMailScNotifyOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 42: {
+ case 66: {
// mailIdList [packed=true]
input.readPackedUInt32(mailIdList, tag);
bitField0_ |= 0x00000001;
@@ -204,7 +204,7 @@ public final class NewMailScNotifyOuterClass {
tag = input.readTag();
break;
}
- case 40: {
+ case 64: {
// mailIdList [packed=false]
tag = input.readRepeatedUInt32(mailIdList, tag);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/NpcExtraInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/NpcExtraInfoOuterClass.java
index f21dda3..afb3fe1 100644
--- a/src/generated/main/emu/lunarcore/proto/NpcExtraInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/NpcExtraInfoOuterClass.java
@@ -19,7 +19,7 @@ public final class NpcExtraInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .NpcRogueInfo rogue_info = 12;
+ * optional .NpcRogueInfo rogue_info = 6;
*/
private final NpcRogueInfoOuterClass.NpcRogueInfo rogueInfo = NpcRogueInfoOuterClass.NpcRogueInfo.newInstance();
@@ -34,7 +34,7 @@ public final class NpcExtraInfoOuterClass {
}
/**
- * optional .NpcRogueInfo rogue_info = 12;
+ * optional .NpcRogueInfo rogue_info = 6;
* @return whether the rogueInfo field is set
*/
public boolean hasRogueInfo() {
@@ -42,7 +42,7 @@ public final class NpcExtraInfoOuterClass {
}
/**
- * optional .NpcRogueInfo rogue_info = 12;
+ * optional .NpcRogueInfo rogue_info = 6;
* @return this
*/
public NpcExtraInfo clearRogueInfo() {
@@ -52,7 +52,7 @@ public final class NpcExtraInfoOuterClass {
}
/**
- * optional .NpcRogueInfo rogue_info = 12;
+ * optional .NpcRogueInfo rogue_info = 6;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -66,7 +66,7 @@ public final class NpcExtraInfoOuterClass {
}
/**
- * optional .NpcRogueInfo rogue_info = 12;
+ * optional .NpcRogueInfo rogue_info = 6;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -80,7 +80,7 @@ public final class NpcExtraInfoOuterClass {
}
/**
- * optional .NpcRogueInfo rogue_info = 12;
+ * optional .NpcRogueInfo rogue_info = 6;
* @param value the rogueInfo to set
* @return this
*/
@@ -150,7 +150,7 @@ public final class NpcExtraInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 98);
+ output.writeRawByte((byte) 50);
output.writeMessageNoTag(rogueInfo);
}
}
@@ -171,7 +171,7 @@ public final class NpcExtraInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 98: {
+ case 50: {
// rogueInfo
input.readMessage(rogueInfo);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/NpcRogueInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/NpcRogueInfoOuterClass.java
index 8fbacd7..253bc17 100644
--- a/src/generated/main/emu/lunarcore/proto/NpcRogueInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/NpcRogueInfoOuterClass.java
@@ -19,39 +19,38 @@ public final class NpcRogueInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 KKCPLMGIADL = 3;
- */
- private int kKCPLMGIADL;
-
- /**
- * optional uint32 dialogue_group_id = 4;
+ * + * uint32 KKCPLMGIADL = 3; // useless?? + *+ * + *
optional uint32 dialogue_group_id = 2;
*/
private int dialogueGroupId;
/**
- * optional uint32 rogue_npc_id = 8;
+ * optional uint32 rogue_npc_id = 15;
*/
private int rogueNpcId;
+ /**
+ * optional bool AAHKFINCBIL = 1;
+ */
+ private boolean aAHKFINCBIL;
+
+ /**
+ * optional bool LCKILOCIFJH = 10;
+ */
+ private boolean lCKILOCIFJH;
+
/**
*
* unk
*
*
- * optional bool finish_dialogue = 1;
+ * optional bool finish_dialogue = 12;
*/
private boolean finishDialogue;
- /**
- * optional bool LCKILOCIFJH = 6;
- */
- private boolean lCKILOCIFJH;
-
- /**
- * optional bool AAHKFINCBIL = 13;
- */
- private boolean aAHKFINCBIL;
-
private NpcRogueInfo() {
}
@@ -63,62 +62,37 @@ public final class NpcRogueInfoOuterClass {
}
/**
- * optional uint32 KKCPLMGIADL = 3;
- * @return whether the kKCPLMGIADL field is set
+ * + * uint32 KKCPLMGIADL = 3; // useless?? + *+ * + *
optional uint32 dialogue_group_id = 2;
+ * @return whether the dialogueGroupId field is set
*/
- public boolean hasKKCPLMGIADL() {
+ public boolean hasDialogueGroupId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 KKCPLMGIADL = 3;
- * @return this
- */
- public NpcRogueInfo clearKKCPLMGIADL() {
- bitField0_ &= ~0x00000001;
- kKCPLMGIADL = 0;
- return this;
- }
-
- /**
- * optional uint32 KKCPLMGIADL = 3;
- * @return the kKCPLMGIADL
- */
- public int getKKCPLMGIADL() {
- return kKCPLMGIADL;
- }
-
- /**
- * optional uint32 KKCPLMGIADL = 3;
- * @param value the kKCPLMGIADL to set
- * @return this
- */
- public NpcRogueInfo setKKCPLMGIADL(final int value) {
- bitField0_ |= 0x00000001;
- kKCPLMGIADL = value;
- return this;
- }
-
- /**
- * optional uint32 dialogue_group_id = 4;
- * @return whether the dialogueGroupId field is set
- */
- public boolean hasDialogueGroupId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 dialogue_group_id = 4;
+ * + * uint32 KKCPLMGIADL = 3; // useless?? + *+ * + *
optional uint32 dialogue_group_id = 2;
* @return this
*/
public NpcRogueInfo clearDialogueGroupId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
dialogueGroupId = 0;
return this;
}
/**
- * optional uint32 dialogue_group_id = 4;
+ * + * uint32 KKCPLMGIADL = 3; // useless?? + *+ * + *
optional uint32 dialogue_group_id = 2;
* @return the dialogueGroupId
*/
public int getDialogueGroupId() {
@@ -126,36 +100,40 @@ public final class NpcRogueInfoOuterClass {
}
/**
- * optional uint32 dialogue_group_id = 4;
+ * + * uint32 KKCPLMGIADL = 3; // useless?? + *+ * + *
optional uint32 dialogue_group_id = 2;
* @param value the dialogueGroupId to set
* @return this
*/
public NpcRogueInfo setDialogueGroupId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
dialogueGroupId = value;
return this;
}
/**
- * optional uint32 rogue_npc_id = 8;
+ * optional uint32 rogue_npc_id = 15;
* @return whether the rogueNpcId field is set
*/
public boolean hasRogueNpcId() {
- return (bitField0_ & 0x00000004) != 0;
+ return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 rogue_npc_id = 8;
+ * optional uint32 rogue_npc_id = 15;
* @return this
*/
public NpcRogueInfo clearRogueNpcId() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
rogueNpcId = 0;
return this;
}
/**
- * optional uint32 rogue_npc_id = 8;
+ * optional uint32 rogue_npc_id = 15;
* @return the rogueNpcId
*/
public int getRogueNpcId() {
@@ -163,26 +141,100 @@ public final class NpcRogueInfoOuterClass {
}
/**
- * optional uint32 rogue_npc_id = 8;
+ * optional uint32 rogue_npc_id = 15;
* @param value the rogueNpcId to set
* @return this
*/
public NpcRogueInfo setRogueNpcId(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
rogueNpcId = value;
return this;
}
+ /**
+ * optional bool AAHKFINCBIL = 1;
+ * @return whether the aAHKFINCBIL field is set
+ */
+ public boolean hasAAHKFINCBIL() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional bool AAHKFINCBIL = 1;
+ * @return this
+ */
+ public NpcRogueInfo clearAAHKFINCBIL() {
+ bitField0_ &= ~0x00000004;
+ aAHKFINCBIL = false;
+ return this;
+ }
+
+ /**
+ * optional bool AAHKFINCBIL = 1;
+ * @return the aAHKFINCBIL
+ */
+ public boolean getAAHKFINCBIL() {
+ return aAHKFINCBIL;
+ }
+
+ /**
+ * optional bool AAHKFINCBIL = 1;
+ * @param value the aAHKFINCBIL to set
+ * @return this
+ */
+ public NpcRogueInfo setAAHKFINCBIL(final boolean value) {
+ bitField0_ |= 0x00000004;
+ aAHKFINCBIL = value;
+ return this;
+ }
+
+ /**
+ * optional bool LCKILOCIFJH = 10;
+ * @return whether the lCKILOCIFJH field is set
+ */
+ public boolean hasLCKILOCIFJH() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional bool LCKILOCIFJH = 10;
+ * @return this
+ */
+ public NpcRogueInfo clearLCKILOCIFJH() {
+ bitField0_ &= ~0x00000008;
+ lCKILOCIFJH = false;
+ return this;
+ }
+
+ /**
+ * optional bool LCKILOCIFJH = 10;
+ * @return the lCKILOCIFJH
+ */
+ public boolean getLCKILOCIFJH() {
+ return lCKILOCIFJH;
+ }
+
+ /**
+ * optional bool LCKILOCIFJH = 10;
+ * @param value the lCKILOCIFJH to set
+ * @return this
+ */
+ public NpcRogueInfo setLCKILOCIFJH(final boolean value) {
+ bitField0_ |= 0x00000008;
+ lCKILOCIFJH = value;
+ return this;
+ }
+
/**
*
* unk
*
*
- * optional bool finish_dialogue = 1;
+ * optional bool finish_dialogue = 12;
* @return whether the finishDialogue field is set
*/
public boolean hasFinishDialogue() {
- return (bitField0_ & 0x00000008) != 0;
+ return (bitField0_ & 0x00000010) != 0;
}
/**
@@ -190,11 +242,11 @@ public final class NpcRogueInfoOuterClass {
* unk
*
*
- * optional bool finish_dialogue = 1;
+ * optional bool finish_dialogue = 12;
* @return this
*/
public NpcRogueInfo clearFinishDialogue() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000010;
finishDialogue = false;
return this;
}
@@ -204,7 +256,7 @@ public final class NpcRogueInfoOuterClass {
* unk
*
*
- * optional bool finish_dialogue = 1;
+ * optional bool finish_dialogue = 12;
* @return the finishDialogue
*/
public boolean getFinishDialogue() {
@@ -216,87 +268,13 @@ public final class NpcRogueInfoOuterClass {
* unk
*
*
- * optional bool finish_dialogue = 1;
+ * optional bool finish_dialogue = 12;
* @param value the finishDialogue to set
* @return this
*/
public NpcRogueInfo setFinishDialogue(final boolean value) {
- bitField0_ |= 0x00000008;
- finishDialogue = value;
- return this;
- }
-
- /**
- * optional bool LCKILOCIFJH = 6;
- * @return whether the lCKILOCIFJH field is set
- */
- public boolean hasLCKILOCIFJH() {
- return (bitField0_ & 0x00000010) != 0;
- }
-
- /**
- * optional bool LCKILOCIFJH = 6;
- * @return this
- */
- public NpcRogueInfo clearLCKILOCIFJH() {
- bitField0_ &= ~0x00000010;
- lCKILOCIFJH = false;
- return this;
- }
-
- /**
- * optional bool LCKILOCIFJH = 6;
- * @return the lCKILOCIFJH
- */
- public boolean getLCKILOCIFJH() {
- return lCKILOCIFJH;
- }
-
- /**
- * optional bool LCKILOCIFJH = 6;
- * @param value the lCKILOCIFJH to set
- * @return this
- */
- public NpcRogueInfo setLCKILOCIFJH(final boolean value) {
bitField0_ |= 0x00000010;
- lCKILOCIFJH = value;
- return this;
- }
-
- /**
- * optional bool AAHKFINCBIL = 13;
- * @return whether the aAHKFINCBIL field is set
- */
- public boolean hasAAHKFINCBIL() {
- return (bitField0_ & 0x00000020) != 0;
- }
-
- /**
- * optional bool AAHKFINCBIL = 13;
- * @return this
- */
- public NpcRogueInfo clearAAHKFINCBIL() {
- bitField0_ &= ~0x00000020;
- aAHKFINCBIL = false;
- return this;
- }
-
- /**
- * optional bool AAHKFINCBIL = 13;
- * @return the aAHKFINCBIL
- */
- public boolean getAAHKFINCBIL() {
- return aAHKFINCBIL;
- }
-
- /**
- * optional bool AAHKFINCBIL = 13;
- * @param value the aAHKFINCBIL to set
- * @return this
- */
- public NpcRogueInfo setAAHKFINCBIL(final boolean value) {
- bitField0_ |= 0x00000020;
- aAHKFINCBIL = value;
+ finishDialogue = value;
return this;
}
@@ -305,12 +283,11 @@ public final class NpcRogueInfoOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- kKCPLMGIADL = other.kKCPLMGIADL;
dialogueGroupId = other.dialogueGroupId;
rogueNpcId = other.rogueNpcId;
- finishDialogue = other.finishDialogue;
- lCKILOCIFJH = other.lCKILOCIFJH;
aAHKFINCBIL = other.aAHKFINCBIL;
+ lCKILOCIFJH = other.lCKILOCIFJH;
+ finishDialogue = other.finishDialogue;
}
return this;
}
@@ -321,23 +298,20 @@ public final class NpcRogueInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasKKCPLMGIADL()) {
- setKKCPLMGIADL(other.kKCPLMGIADL);
- }
if (other.hasDialogueGroupId()) {
setDialogueGroupId(other.dialogueGroupId);
}
if (other.hasRogueNpcId()) {
setRogueNpcId(other.rogueNpcId);
}
- if (other.hasFinishDialogue()) {
- setFinishDialogue(other.finishDialogue);
+ if (other.hasAAHKFINCBIL()) {
+ setAAHKFINCBIL(other.aAHKFINCBIL);
}
if (other.hasLCKILOCIFJH()) {
setLCKILOCIFJH(other.lCKILOCIFJH);
}
- if (other.hasAAHKFINCBIL()) {
- setAAHKFINCBIL(other.aAHKFINCBIL);
+ if (other.hasFinishDialogue()) {
+ setFinishDialogue(other.finishDialogue);
}
return this;
}
@@ -349,12 +323,11 @@ public final class NpcRogueInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- kKCPLMGIADL = 0;
dialogueGroupId = 0;
rogueNpcId = 0;
- finishDialogue = false;
- lCKILOCIFJH = false;
aAHKFINCBIL = false;
+ lCKILOCIFJH = false;
+ finishDialogue = false;
return this;
}
@@ -378,39 +351,34 @@ public final class NpcRogueInfoOuterClass {
}
NpcRogueInfo other = (NpcRogueInfo) o;
return bitField0_ == other.bitField0_
- && (!hasKKCPLMGIADL() || kKCPLMGIADL == other.kKCPLMGIADL)
&& (!hasDialogueGroupId() || dialogueGroupId == other.dialogueGroupId)
&& (!hasRogueNpcId() || rogueNpcId == other.rogueNpcId)
- && (!hasFinishDialogue() || finishDialogue == other.finishDialogue)
+ && (!hasAAHKFINCBIL() || aAHKFINCBIL == other.aAHKFINCBIL)
&& (!hasLCKILOCIFJH() || lCKILOCIFJH == other.lCKILOCIFJH)
- && (!hasAAHKFINCBIL() || aAHKFINCBIL == other.aAHKFINCBIL);
+ && (!hasFinishDialogue() || finishDialogue == other.finishDialogue);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(kKCPLMGIADL);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(dialogueGroupId);
}
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 64);
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(rogueNpcId);
}
- if ((bitField0_ & 0x00000008) != 0) {
+ if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 8);
- output.writeBoolNoTag(finishDialogue);
+ output.writeBoolNoTag(aAHKFINCBIL);
}
- if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 48);
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeRawByte((byte) 80);
output.writeBoolNoTag(lCKILOCIFJH);
}
- if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 104);
- output.writeBoolNoTag(aAHKFINCBIL);
+ if ((bitField0_ & 0x00000010) != 0) {
+ output.writeRawByte((byte) 96);
+ output.writeBoolNoTag(finishDialogue);
}
}
@@ -418,23 +386,20 @@ public final class NpcRogueInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(kKCPLMGIADL);
- }
- if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueGroupId);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueNpcId);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += 2;
+ }
if ((bitField0_ & 0x00000008) != 0) {
size += 2;
}
if ((bitField0_ & 0x00000010) != 0) {
size += 2;
}
- if ((bitField0_ & 0x00000020) != 0) {
- size += 2;
- }
return size;
}
@@ -445,55 +410,46 @@ public final class NpcRogueInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
- // kKCPLMGIADL
- kKCPLMGIADL = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 32) {
- break;
- }
- }
- case 32: {
+ case 16: {
// dialogueGroupId
dialogueGroupId = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 64) {
+ if (tag != 120) {
break;
}
}
- case 64: {
+ case 120: {
// rogueNpcId
rogueNpcId = input.readUInt32();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 8) {
break;
}
}
case 8: {
- // finishDialogue
- finishDialogue = input.readBool();
- bitField0_ |= 0x00000008;
- tag = input.readTag();
- if (tag != 48) {
- break;
- }
- }
- case 48: {
- // lCKILOCIFJH
- lCKILOCIFJH = input.readBool();
- bitField0_ |= 0x00000010;
- tag = input.readTag();
- if (tag != 104) {
- break;
- }
- }
- case 104: {
// aAHKFINCBIL
aAHKFINCBIL = input.readBool();
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 80) {
+ break;
+ }
+ }
+ case 80: {
+ // lCKILOCIFJH
+ lCKILOCIFJH = input.readBool();
+ bitField0_ |= 0x00000008;
+ tag = input.readTag();
+ if (tag != 96) {
+ break;
+ }
+ }
+ case 96: {
+ // finishDialogue
+ finishDialogue = input.readBool();
+ bitField0_ |= 0x00000010;
tag = input.readTag();
if (tag != 0) {
break;
@@ -517,22 +473,19 @@ public final class NpcRogueInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.kKCPLMGIADL, kKCPLMGIADL);
- }
- if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.dialogueGroupId, dialogueGroupId);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.rogueNpcId, rogueNpcId);
}
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeBool(FieldNames.finishDialogue, finishDialogue);
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeBool(FieldNames.aAHKFINCBIL, aAHKFINCBIL);
}
- if ((bitField0_ & 0x00000010) != 0) {
+ if ((bitField0_ & 0x00000008) != 0) {
output.writeBool(FieldNames.lCKILOCIFJH, lCKILOCIFJH);
}
- if ((bitField0_ & 0x00000020) != 0) {
- output.writeBool(FieldNames.aAHKFINCBIL, aAHKFINCBIL);
+ if ((bitField0_ & 0x00000010) != 0) {
+ output.writeBool(FieldNames.finishDialogue, finishDialogue);
}
output.endObject();
}
@@ -544,23 +497,12 @@ public final class NpcRogueInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1332411111: {
- if (input.isAtField(FieldNames.kKCPLMGIADL)) {
- if (!input.trySkipNullValue()) {
- kKCPLMGIADL = input.readUInt32();
- bitField0_ |= 0x00000001;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 1758320386:
case 1899979106: {
if (input.isAtField(FieldNames.dialogueGroupId)) {
if (!input.trySkipNullValue()) {
dialogueGroupId = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
}
} else {
input.skipUnknownField();
@@ -572,6 +514,17 @@ public final class NpcRogueInfoOuterClass {
if (input.isAtField(FieldNames.rogueNpcId)) {
if (!input.trySkipNullValue()) {
rogueNpcId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -287370838: {
+ if (input.isAtField(FieldNames.aAHKFINCBIL)) {
+ if (!input.trySkipNullValue()) {
+ aAHKFINCBIL = input.readBool();
bitField0_ |= 0x00000004;
}
} else {
@@ -579,22 +532,22 @@ public final class NpcRogueInfoOuterClass {
}
break;
}
+ case 1901777798: {
+ if (input.isAtField(FieldNames.lCKILOCIFJH)) {
+ if (!input.trySkipNullValue()) {
+ lCKILOCIFJH = input.readBool();
+ bitField0_ |= 0x00000008;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case 552830859:
case 764736516: {
if (input.isAtField(FieldNames.finishDialogue)) {
if (!input.trySkipNullValue()) {
finishDialogue = input.readBool();
- bitField0_ |= 0x00000008;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 1901777798: {
- if (input.isAtField(FieldNames.lCKILOCIFJH)) {
- if (!input.trySkipNullValue()) {
- lCKILOCIFJH = input.readBool();
bitField0_ |= 0x00000010;
}
} else {
@@ -602,17 +555,6 @@ public final class NpcRogueInfoOuterClass {
}
break;
}
- case -287370838: {
- if (input.isAtField(FieldNames.aAHKFINCBIL)) {
- if (!input.trySkipNullValue()) {
- aAHKFINCBIL = input.readBool();
- bitField0_ |= 0x00000020;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
default: {
input.skipUnknownField();
break;
@@ -665,17 +607,15 @@ public final class NpcRogueInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName kKCPLMGIADL = FieldName.forField("KKCPLMGIADL");
-
static final FieldName dialogueGroupId = FieldName.forField("dialogueGroupId", "dialogue_group_id");
static final FieldName rogueNpcId = FieldName.forField("rogueNpcId", "rogue_npc_id");
- static final FieldName finishDialogue = FieldName.forField("finishDialogue", "finish_dialogue");
+ static final FieldName aAHKFINCBIL = FieldName.forField("AAHKFINCBIL");
static final FieldName lCKILOCIFJH = FieldName.forField("LCKILOCIFJH");
- static final FieldName aAHKFINCBIL = FieldName.forField("AAHKFINCBIL");
+ static final FieldName finishDialogue = FieldName.forField("finishDialogue", "finish_dialogue");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/NpcTalkInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/NpcTalkInfoOuterClass.java
index 2268d27..56d0a9c 100644
--- a/src/generated/main/emu/lunarcore/proto/NpcTalkInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/NpcTalkInfoOuterClass.java
@@ -19,7 +19,7 @@ public final class NpcTalkInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 npc_talk_id = 15;
+ * optional uint32 npc_talk_id = 6;
*/
private int npcTalkId;
@@ -34,7 +34,7 @@ public final class NpcTalkInfoOuterClass {
}
/**
- * optional uint32 npc_talk_id = 15;
+ * optional uint32 npc_talk_id = 6;
* @return whether the npcTalkId field is set
*/
public boolean hasNpcTalkId() {
@@ -42,7 +42,7 @@ public final class NpcTalkInfoOuterClass {
}
/**
- * optional uint32 npc_talk_id = 15;
+ * optional uint32 npc_talk_id = 6;
* @return this
*/
public NpcTalkInfo clearNpcTalkId() {
@@ -52,7 +52,7 @@ public final class NpcTalkInfoOuterClass {
}
/**
- * optional uint32 npc_talk_id = 15;
+ * optional uint32 npc_talk_id = 6;
* @return the npcTalkId
*/
public int getNpcTalkId() {
@@ -60,7 +60,7 @@ public final class NpcTalkInfoOuterClass {
}
/**
- * optional uint32 npc_talk_id = 15;
+ * optional uint32 npc_talk_id = 6;
* @param value the npcTalkId to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class NpcTalkInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(npcTalkId);
}
}
@@ -150,7 +150,7 @@ public final class NpcTalkInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 120: {
+ case 48: {
// npcTalkId
npcTalkId = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/PVEBattleResultCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PVEBattleResultCsReqOuterClass.java
index 7316022..6d116f8 100644
--- a/src/generated/main/emu/lunarcore/proto/PVEBattleResultCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PVEBattleResultCsReqOuterClass.java
@@ -21,47 +21,47 @@ public final class PVEBattleResultCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 cost_time = 8;
- */
- private int costTime;
-
- /**
- * optional uint32 battle_id = 11;
- */
- private int battleId;
-
- /**
- * optional uint32 client_res_version = 12;
- */
- private int clientResVersion;
-
- /**
- * optional uint32 stage_id = 14;
+ * optional uint32 stage_id = 2;
*/
private int stageId;
/**
- * optional .BattleEndStatus end_status = 6;
+ * optional uint32 cost_time = 5;
+ */
+ private int costTime;
+
+ /**
+ * optional uint32 battle_id = 8;
+ */
+ private int battleId;
+
+ /**
+ * optional uint32 client_res_version = 10;
+ */
+ private int clientResVersion;
+
+ /**
+ * optional .BattleEndStatus end_status = 7;
*/
private int endStatus;
/**
- * optional bool is_ai_consider_ultra_skill = 10;
+ * optional bool is_ai_consider_ultra_skill = 11;
*/
private boolean isAiConsiderUltraSkill;
/**
- * optional .BattleStatistics stt = 3;
+ * optional .BattleStatistics stt = 13;
*/
private final BattleStatisticsOuterClass.BattleStatistics stt = BattleStatisticsOuterClass.BattleStatistics.newInstance();
/**
- * optional bytes turn_snapshot_hash = 1;
+ * optional bytes turn_snapshot_hash = 14;
*/
private final RepeatedByte turnSnapshotHash = RepeatedByte.newEmptyInstance();
/**
- * repeated .BattleOp op_list = 5;
+ * repeated .BattleOp op_list = 6;
*/
private final RepeatedMessageoptional uint32 cost_time = 8;
- * @return whether the costTime field is set
+ * optional uint32 stage_id = 2;
+ * @return whether the stageId field is set
*/
- public boolean hasCostTime() {
+ public boolean hasStageId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 cost_time = 8;
- * @return this
- */
- public PVEBattleResultCsReq clearCostTime() {
- bitField0_ &= ~0x00000001;
- costTime = 0;
- return this;
- }
-
- /**
- * optional uint32 cost_time = 8;
- * @return the costTime
- */
- public int getCostTime() {
- return costTime;
- }
-
- /**
- * optional uint32 cost_time = 8;
- * @param value the costTime to set
- * @return this
- */
- public PVEBattleResultCsReq setCostTime(final int value) {
- bitField0_ |= 0x00000001;
- costTime = value;
- return this;
- }
-
- /**
- * optional uint32 battle_id = 11;
- * @return whether the battleId field is set
- */
- public boolean hasBattleId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 battle_id = 11;
- * @return this
- */
- public PVEBattleResultCsReq clearBattleId() {
- bitField0_ &= ~0x00000002;
- battleId = 0;
- return this;
- }
-
- /**
- * optional uint32 battle_id = 11;
- * @return the battleId
- */
- public int getBattleId() {
- return battleId;
- }
-
- /**
- * optional uint32 battle_id = 11;
- * @param value the battleId to set
- * @return this
- */
- public PVEBattleResultCsReq setBattleId(final int value) {
- bitField0_ |= 0x00000002;
- battleId = value;
- return this;
- }
-
- /**
- * optional uint32 client_res_version = 12;
- * @return whether the clientResVersion field is set
- */
- public boolean hasClientResVersion() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 client_res_version = 12;
- * @return this
- */
- public PVEBattleResultCsReq clearClientResVersion() {
- bitField0_ &= ~0x00000004;
- clientResVersion = 0;
- return this;
- }
-
- /**
- * optional uint32 client_res_version = 12;
- * @return the clientResVersion
- */
- public int getClientResVersion() {
- return clientResVersion;
- }
-
- /**
- * optional uint32 client_res_version = 12;
- * @param value the clientResVersion to set
- * @return this
- */
- public PVEBattleResultCsReq setClientResVersion(final int value) {
- bitField0_ |= 0x00000004;
- clientResVersion = value;
- return this;
- }
-
- /**
- * optional uint32 stage_id = 14;
- * @return whether the stageId field is set
- */
- public boolean hasStageId() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional uint32 stage_id = 14;
+ * optional uint32 stage_id = 2;
* @return this
*/
public PVEBattleResultCsReq clearStageId() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000001;
stageId = 0;
return this;
}
/**
- * optional uint32 stage_id = 14;
+ * optional uint32 stage_id = 2;
* @return the stageId
*/
public int getStageId() {
@@ -213,18 +102,129 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * optional uint32 stage_id = 14;
+ * optional uint32 stage_id = 2;
* @param value the stageId to set
* @return this
*/
public PVEBattleResultCsReq setStageId(final int value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000001;
stageId = value;
return this;
}
/**
- * optional .BattleEndStatus end_status = 6;
+ * optional uint32 cost_time = 5;
+ * @return whether the costTime field is set
+ */
+ public boolean hasCostTime() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 cost_time = 5;
+ * @return this
+ */
+ public PVEBattleResultCsReq clearCostTime() {
+ bitField0_ &= ~0x00000002;
+ costTime = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 cost_time = 5;
+ * @return the costTime
+ */
+ public int getCostTime() {
+ return costTime;
+ }
+
+ /**
+ * optional uint32 cost_time = 5;
+ * @param value the costTime to set
+ * @return this
+ */
+ public PVEBattleResultCsReq setCostTime(final int value) {
+ bitField0_ |= 0x00000002;
+ costTime = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 battle_id = 8;
+ * @return whether the battleId field is set
+ */
+ public boolean hasBattleId() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 battle_id = 8;
+ * @return this
+ */
+ public PVEBattleResultCsReq clearBattleId() {
+ bitField0_ &= ~0x00000004;
+ battleId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 battle_id = 8;
+ * @return the battleId
+ */
+ public int getBattleId() {
+ return battleId;
+ }
+
+ /**
+ * optional uint32 battle_id = 8;
+ * @param value the battleId to set
+ * @return this
+ */
+ public PVEBattleResultCsReq setBattleId(final int value) {
+ bitField0_ |= 0x00000004;
+ battleId = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 client_res_version = 10;
+ * @return whether the clientResVersion field is set
+ */
+ public boolean hasClientResVersion() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional uint32 client_res_version = 10;
+ * @return this
+ */
+ public PVEBattleResultCsReq clearClientResVersion() {
+ bitField0_ &= ~0x00000008;
+ clientResVersion = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 client_res_version = 10;
+ * @return the clientResVersion
+ */
+ public int getClientResVersion() {
+ return clientResVersion;
+ }
+
+ /**
+ * optional uint32 client_res_version = 10;
+ * @param value the clientResVersion to set
+ * @return this
+ */
+ public PVEBattleResultCsReq setClientResVersion(final int value) {
+ bitField0_ |= 0x00000008;
+ clientResVersion = value;
+ return this;
+ }
+
+ /**
+ * optional .BattleEndStatus end_status = 7;
* @return whether the endStatus field is set
*/
public boolean hasEndStatus() {
@@ -232,7 +232,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * optional .BattleEndStatus end_status = 6;
+ * optional .BattleEndStatus end_status = 7;
* @return this
*/
public PVEBattleResultCsReq clearEndStatus() {
@@ -242,7 +242,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * optional .BattleEndStatus end_status = 6;
+ * optional .BattleEndStatus end_status = 7;
* @return the endStatus
*/
public BattleEndStatusOuterClass.BattleEndStatus getEndStatus() {
@@ -275,7 +275,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * optional .BattleEndStatus end_status = 6;
+ * optional .BattleEndStatus end_status = 7;
* @param value the endStatus to set
* @return this
*/
@@ -287,7 +287,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * optional bool is_ai_consider_ultra_skill = 10;
+ * optional bool is_ai_consider_ultra_skill = 11;
* @return whether the isAiConsiderUltraSkill field is set
*/
public boolean hasIsAiConsiderUltraSkill() {
@@ -295,7 +295,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * optional bool is_ai_consider_ultra_skill = 10;
+ * optional bool is_ai_consider_ultra_skill = 11;
* @return this
*/
public PVEBattleResultCsReq clearIsAiConsiderUltraSkill() {
@@ -305,7 +305,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * optional bool is_ai_consider_ultra_skill = 10;
+ * optional bool is_ai_consider_ultra_skill = 11;
* @return the isAiConsiderUltraSkill
*/
public boolean getIsAiConsiderUltraSkill() {
@@ -313,7 +313,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * optional bool is_ai_consider_ultra_skill = 10;
+ * optional bool is_ai_consider_ultra_skill = 11;
* @param value the isAiConsiderUltraSkill to set
* @return this
*/
@@ -324,7 +324,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * optional .BattleStatistics stt = 3;
+ * optional .BattleStatistics stt = 13;
* @return whether the stt field is set
*/
public boolean hasStt() {
@@ -332,7 +332,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * optional .BattleStatistics stt = 3;
+ * optional .BattleStatistics stt = 13;
* @return this
*/
public PVEBattleResultCsReq clearStt() {
@@ -342,7 +342,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * optional .BattleStatistics stt = 3;
+ * optional .BattleStatistics stt = 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.
@@ -356,7 +356,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * optional .BattleStatistics stt = 3;
+ * optional .BattleStatistics stt = 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
@@ -370,7 +370,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * optional .BattleStatistics stt = 3;
+ * optional .BattleStatistics stt = 13;
* @param value the stt to set
* @return this
*/
@@ -381,7 +381,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * optional bytes turn_snapshot_hash = 1;
+ * optional bytes turn_snapshot_hash = 14;
* @return whether the turnSnapshotHash field is set
*/
public boolean hasTurnSnapshotHash() {
@@ -389,7 +389,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * optional bytes turn_snapshot_hash = 1;
+ * optional bytes turn_snapshot_hash = 14;
* @return this
*/
public PVEBattleResultCsReq clearTurnSnapshotHash() {
@@ -399,7 +399,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * optional bytes turn_snapshot_hash = 1;
+ * optional bytes turn_snapshot_hash = 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.
@@ -413,7 +413,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * optional bytes turn_snapshot_hash = 1;
+ * optional bytes turn_snapshot_hash = 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
@@ -427,7 +427,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * optional bytes turn_snapshot_hash = 1;
+ * optional bytes turn_snapshot_hash = 14;
* @param value the turnSnapshotHash to add
* @return this
*/
@@ -438,7 +438,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * optional bytes turn_snapshot_hash = 1;
+ * optional bytes turn_snapshot_hash = 14;
* @param values the turnSnapshotHash to add
* @return this
*/
@@ -449,7 +449,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * optional bytes turn_snapshot_hash = 1;
+ * optional bytes turn_snapshot_hash = 14;
* @param values the turnSnapshotHash to set
* @return this
*/
@@ -460,7 +460,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * repeated .BattleOp op_list = 5;
+ * repeated .BattleOp op_list = 6;
* @return whether the opList field is set
*/
public boolean hasOpList() {
@@ -468,7 +468,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * repeated .BattleOp op_list = 5;
+ * repeated .BattleOp op_list = 6;
* @return this
*/
public PVEBattleResultCsReq clearOpList() {
@@ -478,7 +478,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * repeated .BattleOp op_list = 5;
+ * repeated .BattleOp op_list = 6;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -492,7 +492,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * repeated .BattleOp op_list = 5;
+ * repeated .BattleOp op_list = 6;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -506,7 +506,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * repeated .BattleOp op_list = 5;
+ * repeated .BattleOp op_list = 6;
* @param value the opList to add
* @return this
*/
@@ -517,7 +517,7 @@ public final class PVEBattleResultCsReqOuterClass {
}
/**
- * repeated .BattleOp op_list = 5;
+ * repeated .BattleOp op_list = 6;
* @param values the opList to add
* @return this
*/
@@ -532,10 +532,10 @@ public final class PVEBattleResultCsReqOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
+ stageId = other.stageId;
costTime = other.costTime;
battleId = other.battleId;
clientResVersion = other.clientResVersion;
- stageId = other.stageId;
endStatus = other.endStatus;
isAiConsiderUltraSkill = other.isAiConsiderUltraSkill;
stt.copyFrom(other.stt);
@@ -551,6 +551,9 @@ public final class PVEBattleResultCsReqOuterClass {
return this;
}
cachedSize = -1;
+ if (other.hasStageId()) {
+ setStageId(other.stageId);
+ }
if (other.hasCostTime()) {
setCostTime(other.costTime);
}
@@ -560,9 +563,6 @@ public final class PVEBattleResultCsReqOuterClass {
if (other.hasClientResVersion()) {
setClientResVersion(other.clientResVersion);
}
- if (other.hasStageId()) {
- setStageId(other.stageId);
- }
if (other.hasEndStatus()) {
setEndStatusValue(other.endStatus);
}
@@ -588,10 +588,10 @@ public final class PVEBattleResultCsReqOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
+ stageId = 0;
costTime = 0;
battleId = 0;
clientResVersion = 0;
- stageId = 0;
endStatus = 0;
isAiConsiderUltraSkill = false;
stt.clear();
@@ -623,10 +623,10 @@ public final class PVEBattleResultCsReqOuterClass {
}
PVEBattleResultCsReq other = (PVEBattleResultCsReq) o;
return bitField0_ == other.bitField0_
+ && (!hasStageId() || stageId == other.stageId)
&& (!hasCostTime() || costTime == other.costTime)
&& (!hasBattleId() || battleId == other.battleId)
&& (!hasClientResVersion() || clientResVersion == other.clientResVersion)
- && (!hasStageId() || stageId == other.stageId)
&& (!hasEndStatus() || endStatus == other.endStatus)
&& (!hasIsAiConsiderUltraSkill() || isAiConsiderUltraSkill == other.isAiConsiderUltraSkill)
&& (!hasStt() || stt.equals(other.stt))
@@ -637,40 +637,40 @@ public final class PVEBattleResultCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 64);
- output.writeUInt32NoTag(costTime);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 88);
- output.writeUInt32NoTag(battleId);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 96);
- output.writeUInt32NoTag(clientResVersion);
- }
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(stageId);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 40);
+ output.writeUInt32NoTag(costTime);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 64);
+ output.writeUInt32NoTag(battleId);
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeRawByte((byte) 80);
+ output.writeUInt32NoTag(clientResVersion);
+ }
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 56);
output.writeEnumNoTag(endStatus);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 88);
output.writeBoolNoTag(isAiConsiderUltraSkill);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawByte((byte) 26);
+ output.writeRawByte((byte) 106);
output.writeMessageNoTag(stt);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRawByte((byte) 10);
+ output.writeRawByte((byte) 114);
output.writeBytesNoTag(turnSnapshotHash);
}
if ((bitField0_ & 0x00000100) != 0) {
for (int i = 0; i < opList.length(); i++) {
- output.writeRawByte((byte) 42);
+ output.writeRawByte((byte) 50);
output.writeMessageNoTag(opList.get(i));
}
}
@@ -680,16 +680,16 @@ public final class PVEBattleResultCsReqOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(costTime);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(costTime);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(clientResVersion);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(clientResVersion);
}
if ((bitField0_ & 0x00000010) != 0) {
size += 1 + ProtoSink.computeEnumSizeNoTag(endStatus);
@@ -716,43 +716,43 @@ public final class PVEBattleResultCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 64: {
- // costTime
- costTime = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 88) {
- break;
- }
- }
- case 88: {
- // battleId
- battleId = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 96) {
- break;
- }
- }
- case 96: {
- // clientResVersion
- clientResVersion = input.readUInt32();
- bitField0_ |= 0x00000004;
- tag = input.readTag();
- if (tag != 112) {
- break;
- }
- }
- case 112: {
+ case 16: {
// stageId
stageId = input.readUInt32();
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 48) {
+ if (tag != 40) {
break;
}
}
- case 48: {
+ case 40: {
+ // costTime
+ costTime = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 64) {
+ break;
+ }
+ }
+ case 64: {
+ // battleId
+ battleId = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 80) {
+ break;
+ }
+ }
+ case 80: {
+ // clientResVersion
+ clientResVersion = input.readUInt32();
+ bitField0_ |= 0x00000008;
+ tag = input.readTag();
+ if (tag != 56) {
+ break;
+ }
+ }
+ case 56: {
// endStatus
final int value = input.readInt32();
if (BattleEndStatusOuterClass.BattleEndStatus.forNumber(value) != null) {
@@ -760,38 +760,38 @@ public final class PVEBattleResultCsReqOuterClass {
bitField0_ |= 0x00000010;
}
tag = input.readTag();
- if (tag != 80) {
+ if (tag != 88) {
break;
}
}
- case 80: {
+ case 88: {
// isAiConsiderUltraSkill
isAiConsiderUltraSkill = input.readBool();
bitField0_ |= 0x00000020;
tag = input.readTag();
- if (tag != 26) {
+ if (tag != 106) {
break;
}
}
- case 26: {
+ case 106: {
// stt
input.readMessage(stt);
bitField0_ |= 0x00000040;
tag = input.readTag();
- if (tag != 10) {
+ if (tag != 114) {
break;
}
}
- case 10: {
+ case 114: {
// turnSnapshotHash
input.readBytes(turnSnapshotHash);
bitField0_ |= 0x00000080;
tag = input.readTag();
- if (tag != 42) {
+ if (tag != 50) {
break;
}
}
- case 42: {
+ case 50: {
// opList
tag = input.readRepeatedMessage(opList, tag);
bitField0_ |= 0x00000100;
@@ -817,16 +817,16 @@ public final class PVEBattleResultCsReqOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.costTime, costTime);
+ output.writeUInt32(FieldNames.stageId, stageId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.battleId, battleId);
+ output.writeUInt32(FieldNames.costTime, costTime);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.clientResVersion, clientResVersion);
+ output.writeUInt32(FieldNames.battleId, battleId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.stageId, stageId);
+ output.writeUInt32(FieldNames.clientResVersion, clientResVersion);
}
if ((bitField0_ & 0x00000010) != 0) {
output.writeEnum(FieldNames.endStatus, endStatus, BattleEndStatusOuterClass.BattleEndStatus.converter());
@@ -853,12 +853,24 @@ public final class PVEBattleResultCsReqOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
+ case -1897528135:
+ case 1306191356: {
+ if (input.isAtField(FieldNames.stageId)) {
+ if (!input.trySkipNullValue()) {
+ stageId = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case -424687558:
case -269929473: {
if (input.isAtField(FieldNames.costTime)) {
if (!input.trySkipNullValue()) {
costTime = input.readUInt32();
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
}
} else {
input.skipUnknownField();
@@ -870,7 +882,7 @@ public final class PVEBattleResultCsReqOuterClass {
if (input.isAtField(FieldNames.battleId)) {
if (!input.trySkipNullValue()) {
battleId = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
}
} else {
input.skipUnknownField();
@@ -882,18 +894,6 @@ public final class PVEBattleResultCsReqOuterClass {
if (input.isAtField(FieldNames.clientResVersion)) {
if (!input.trySkipNullValue()) {
clientResVersion = input.readUInt32();
- bitField0_ |= 0x00000004;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case -1897528135:
- case 1306191356: {
- if (input.isAtField(FieldNames.stageId)) {
- if (!input.trySkipNullValue()) {
- stageId = input.readUInt32();
bitField0_ |= 0x00000008;
}
} else {
@@ -1018,14 +1018,14 @@ public final class PVEBattleResultCsReqOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
+ static final FieldName stageId = FieldName.forField("stageId", "stage_id");
+
static final FieldName costTime = FieldName.forField("costTime", "cost_time");
static final FieldName battleId = FieldName.forField("battleId", "battle_id");
static final FieldName clientResVersion = FieldName.forField("clientResVersion", "client_res_version");
- static final FieldName stageId = FieldName.forField("stageId", "stage_id");
-
static final FieldName endStatus = FieldName.forField("endStatus", "end_status");
static final FieldName isAiConsiderUltraSkill = FieldName.forField("isAiConsiderUltraSkill", "is_ai_consider_ultra_skill");
diff --git a/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java
index d7b78a5..c77cbc4 100644
--- a/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java
@@ -21,14 +21,14 @@ public final class PVEBattleResultScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 stage_id = 5;
+ * optional uint32 battle_id = 6;
*/
- private int stageId;
+ private int battleId;
/**
- * optional uint32 event_id = 6;
+ * optional uint32 stage_id = 9;
*/
- private int eventId;
+ private int stageId;
/**
* optional uint32 retcode = 10;
@@ -36,61 +36,57 @@ public final class PVEBattleResultScRspOuterClass {
private int retcode;
/**
- * optional uint32 battle_id = 11;
+ * optional uint32 event_id = 12;
*/
- private int battleId;
+ private int eventId;
/**
- * optional uint32 mismatch_turn_count = 13;
+ * optional uint32 mismatch_turn_count = 15;
*/
private int mismatchTurnCount;
/**
- * optional .BattleEndStatus end_status = 8;
+ * optional .BattleEndStatus end_status = 13;
*/
private int endStatus;
/**
- * optional bool check_identical = 14;
+ * optional bool check_identical = 1;
*/
private boolean checkIdentical;
/**
- * optional .ItemList drop_data = 1;
+ * optional .ItemList drop_data = 2;
*/
private final ItemListOuterClass.ItemList dropData = ItemListOuterClass.ItemList.newInstance();
/**
- * optional .ItemList unk1 = 7;
+ * optional .ItemList unk1 = 4;
*/
private final ItemListOuterClass.ItemList unk1 = ItemListOuterClass.ItemList.newInstance();
/**
- * - * extra_drop_data - *- * - *
optional .ItemList unk2 = 12;
+ * optional .ItemList unk2 = 14;
*/
private final ItemListOuterClass.ItemList unk2 = ItemListOuterClass.ItemList.newInstance();
/**
- * optional .ItemList unk3 = 1634;
+ * optional .ItemList unk3 = 588;
*/
private final ItemListOuterClass.ItemList unk3 = ItemListOuterClass.ItemList.newInstance();
/**
- * optional string bin_version = 2;
+ * optional string bin_version = 3;
*/
private final Utf8String binVersion = Utf8String.newEmptyInstance();
/**
- * optional string res_version = 4;
+ * optional string res_version = 8;
*/
private final Utf8String resVersion = Utf8String.newEmptyInstance();
/**
- * repeated .BattleAvatar battle_avatar_list = 15;
+ * repeated .BattleAvatar battle_avatar_list = 7;
*/
private final RepeatedMessageoptional uint32 stage_id = 5;
- * @return whether the stageId field is set
+ * optional uint32 battle_id = 6;
+ * @return whether the battleId field is set
*/
- public boolean hasStageId() {
+ public boolean hasBattleId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 stage_id = 5;
+ * optional uint32 battle_id = 6;
+ * @return this
+ */
+ public PVEBattleResultScRsp clearBattleId() {
+ bitField0_ &= ~0x00000001;
+ battleId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 battle_id = 6;
+ * @return the battleId
+ */
+ public int getBattleId() {
+ return battleId;
+ }
+
+ /**
+ * optional uint32 battle_id = 6;
+ * @param value the battleId to set
+ * @return this
+ */
+ public PVEBattleResultScRsp setBattleId(final int value) {
+ bitField0_ |= 0x00000001;
+ battleId = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 stage_id = 9;
+ * @return whether the stageId field is set
+ */
+ public boolean hasStageId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 stage_id = 9;
* @return this
*/
public PVEBattleResultScRsp clearStageId() {
- bitField0_ &= ~0x00000001;
+ bitField0_ &= ~0x00000002;
stageId = 0;
return this;
}
/**
- * optional uint32 stage_id = 5;
+ * optional uint32 stage_id = 9;
* @return the stageId
*/
public int getStageId() {
@@ -131,50 +164,13 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional uint32 stage_id = 5;
+ * optional uint32 stage_id = 9;
* @param value the stageId to set
* @return this
*/
public PVEBattleResultScRsp setStageId(final int value) {
- bitField0_ |= 0x00000001;
- stageId = value;
- return this;
- }
-
- /**
- * optional uint32 event_id = 6;
- * @return whether the eventId field is set
- */
- public boolean hasEventId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 event_id = 6;
- * @return this
- */
- public PVEBattleResultScRsp clearEventId() {
- bitField0_ &= ~0x00000002;
- eventId = 0;
- return this;
- }
-
- /**
- * optional uint32 event_id = 6;
- * @return the eventId
- */
- public int getEventId() {
- return eventId;
- }
-
- /**
- * optional uint32 event_id = 6;
- * @param value the eventId to set
- * @return this
- */
- public PVEBattleResultScRsp setEventId(final int value) {
bitField0_ |= 0x00000002;
- eventId = value;
+ stageId = value;
return this;
}
@@ -216,44 +212,44 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional uint32 battle_id = 11;
- * @return whether the battleId field is set
+ * optional uint32 event_id = 12;
+ * @return whether the eventId field is set
*/
- public boolean hasBattleId() {
+ public boolean hasEventId() {
return (bitField0_ & 0x00000008) != 0;
}
/**
- * optional uint32 battle_id = 11;
+ * optional uint32 event_id = 12;
* @return this
*/
- public PVEBattleResultScRsp clearBattleId() {
+ public PVEBattleResultScRsp clearEventId() {
bitField0_ &= ~0x00000008;
- battleId = 0;
+ eventId = 0;
return this;
}
/**
- * optional uint32 battle_id = 11;
- * @return the battleId
+ * optional uint32 event_id = 12;
+ * @return the eventId
*/
- public int getBattleId() {
- return battleId;
+ public int getEventId() {
+ return eventId;
}
/**
- * optional uint32 battle_id = 11;
- * @param value the battleId to set
+ * optional uint32 event_id = 12;
+ * @param value the eventId to set
* @return this
*/
- public PVEBattleResultScRsp setBattleId(final int value) {
+ public PVEBattleResultScRsp setEventId(final int value) {
bitField0_ |= 0x00000008;
- battleId = value;
+ eventId = value;
return this;
}
/**
- * optional uint32 mismatch_turn_count = 13;
+ * optional uint32 mismatch_turn_count = 15;
* @return whether the mismatchTurnCount field is set
*/
public boolean hasMismatchTurnCount() {
@@ -261,7 +257,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional uint32 mismatch_turn_count = 13;
+ * optional uint32 mismatch_turn_count = 15;
* @return this
*/
public PVEBattleResultScRsp clearMismatchTurnCount() {
@@ -271,7 +267,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional uint32 mismatch_turn_count = 13;
+ * optional uint32 mismatch_turn_count = 15;
* @return the mismatchTurnCount
*/
public int getMismatchTurnCount() {
@@ -279,7 +275,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional uint32 mismatch_turn_count = 13;
+ * optional uint32 mismatch_turn_count = 15;
* @param value the mismatchTurnCount to set
* @return this
*/
@@ -290,7 +286,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional .BattleEndStatus end_status = 8;
+ * optional .BattleEndStatus end_status = 13;
* @return whether the endStatus field is set
*/
public boolean hasEndStatus() {
@@ -298,7 +294,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional .BattleEndStatus end_status = 8;
+ * optional .BattleEndStatus end_status = 13;
* @return this
*/
public PVEBattleResultScRsp clearEndStatus() {
@@ -308,7 +304,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional .BattleEndStatus end_status = 8;
+ * optional .BattleEndStatus end_status = 13;
* @return the endStatus
*/
public BattleEndStatusOuterClass.BattleEndStatus getEndStatus() {
@@ -341,7 +337,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional .BattleEndStatus end_status = 8;
+ * optional .BattleEndStatus end_status = 13;
* @param value the endStatus to set
* @return this
*/
@@ -353,7 +349,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional bool check_identical = 14;
+ * optional bool check_identical = 1;
* @return whether the checkIdentical field is set
*/
public boolean hasCheckIdentical() {
@@ -361,7 +357,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional bool check_identical = 14;
+ * optional bool check_identical = 1;
* @return this
*/
public PVEBattleResultScRsp clearCheckIdentical() {
@@ -371,7 +367,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional bool check_identical = 14;
+ * optional bool check_identical = 1;
* @return the checkIdentical
*/
public boolean getCheckIdentical() {
@@ -379,7 +375,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional bool check_identical = 14;
+ * optional bool check_identical = 1;
* @param value the checkIdentical to set
* @return this
*/
@@ -390,7 +386,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional .ItemList drop_data = 1;
+ * optional .ItemList drop_data = 2;
* @return whether the dropData field is set
*/
public boolean hasDropData() {
@@ -398,7 +394,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional .ItemList drop_data = 1;
+ * optional .ItemList drop_data = 2;
* @return this
*/
public PVEBattleResultScRsp clearDropData() {
@@ -408,7 +404,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional .ItemList drop_data = 1;
+ * optional .ItemList drop_data = 2;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -422,7 +418,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional .ItemList drop_data = 1;
+ * optional .ItemList drop_data = 2;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -436,7 +432,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional .ItemList drop_data = 1;
+ * optional .ItemList drop_data = 2;
* @param value the dropData to set
* @return this
*/
@@ -447,7 +443,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional .ItemList unk1 = 7;
+ * optional .ItemList unk1 = 4;
* @return whether the unk1 field is set
*/
public boolean hasUnk1() {
@@ -455,7 +451,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional .ItemList unk1 = 7;
+ * optional .ItemList unk1 = 4;
* @return this
*/
public PVEBattleResultScRsp clearUnk1() {
@@ -465,7 +461,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional .ItemList unk1 = 7;
+ * optional .ItemList unk1 = 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.
@@ -479,7 +475,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional .ItemList unk1 = 7;
+ * optional .ItemList unk1 = 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
@@ -493,7 +489,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional .ItemList unk1 = 7;
+ * optional .ItemList unk1 = 4;
* @param value the unk1 to set
* @return this
*/
@@ -504,11 +500,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * - * extra_drop_data - *- * - *
optional .ItemList unk2 = 12;
+ * optional .ItemList unk2 = 14;
* @return whether the unk2 field is set
*/
public boolean hasUnk2() {
@@ -516,11 +508,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * - * extra_drop_data - *- * - *
optional .ItemList unk2 = 12;
+ * optional .ItemList unk2 = 14;
* @return this
*/
public PVEBattleResultScRsp clearUnk2() {
@@ -530,11 +518,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * - * extra_drop_data - *- * - *
optional .ItemList unk2 = 12;
+ * optional .ItemList unk2 = 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.
@@ -548,11 +532,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * - * extra_drop_data - *- * - *
optional .ItemList unk2 = 12;
+ * optional .ItemList unk2 = 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
@@ -566,11 +546,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * - * extra_drop_data - *- * - *
optional .ItemList unk2 = 12;
+ * optional .ItemList unk2 = 14;
* @param value the unk2 to set
* @return this
*/
@@ -581,7 +557,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional .ItemList unk3 = 1634;
+ * optional .ItemList unk3 = 588;
* @return whether the unk3 field is set
*/
public boolean hasUnk3() {
@@ -589,7 +565,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional .ItemList unk3 = 1634;
+ * optional .ItemList unk3 = 588;
* @return this
*/
public PVEBattleResultScRsp clearUnk3() {
@@ -599,7 +575,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional .ItemList unk3 = 1634;
+ * optional .ItemList unk3 = 588;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -613,7 +589,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional .ItemList unk3 = 1634;
+ * optional .ItemList unk3 = 588;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -627,7 +603,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional .ItemList unk3 = 1634;
+ * optional .ItemList unk3 = 588;
* @param value the unk3 to set
* @return this
*/
@@ -638,7 +614,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional string bin_version = 2;
+ * optional string bin_version = 3;
* @return whether the binVersion field is set
*/
public boolean hasBinVersion() {
@@ -646,7 +622,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional string bin_version = 2;
+ * optional string bin_version = 3;
* @return this
*/
public PVEBattleResultScRsp clearBinVersion() {
@@ -656,7 +632,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional string bin_version = 2;
+ * optional string bin_version = 3;
* @return the binVersion
*/
public String getBinVersion() {
@@ -664,7 +640,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional string bin_version = 2;
+ * optional string bin_version = 3;
* @return internal {@code Utf8String} representation of binVersion for reading
*/
public Utf8String getBinVersionBytes() {
@@ -672,7 +648,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional string bin_version = 2;
+ * optional string bin_version = 3;
* @return internal {@code Utf8String} representation of binVersion for modifications
*/
public Utf8String getMutableBinVersionBytes() {
@@ -681,7 +657,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional string bin_version = 2;
+ * optional string bin_version = 3;
* @param value the binVersion to set
* @return this
*/
@@ -692,7 +668,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional string bin_version = 2;
+ * optional string bin_version = 3;
* @param value the binVersion to set
* @return this
*/
@@ -703,7 +679,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional string res_version = 4;
+ * optional string res_version = 8;
* @return whether the resVersion field is set
*/
public boolean hasResVersion() {
@@ -711,7 +687,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional string res_version = 4;
+ * optional string res_version = 8;
* @return this
*/
public PVEBattleResultScRsp clearResVersion() {
@@ -721,7 +697,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional string res_version = 4;
+ * optional string res_version = 8;
* @return the resVersion
*/
public String getResVersion() {
@@ -729,7 +705,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional string res_version = 4;
+ * optional string res_version = 8;
* @return internal {@code Utf8String} representation of resVersion for reading
*/
public Utf8String getResVersionBytes() {
@@ -737,7 +713,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional string res_version = 4;
+ * optional string res_version = 8;
* @return internal {@code Utf8String} representation of resVersion for modifications
*/
public Utf8String getMutableResVersionBytes() {
@@ -746,7 +722,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional string res_version = 4;
+ * optional string res_version = 8;
* @param value the resVersion to set
* @return this
*/
@@ -757,7 +733,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * optional string res_version = 4;
+ * optional string res_version = 8;
* @param value the resVersion to set
* @return this
*/
@@ -768,7 +744,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * repeated .BattleAvatar battle_avatar_list = 15;
+ * repeated .BattleAvatar battle_avatar_list = 7;
* @return whether the battleAvatarList field is set
*/
public boolean hasBattleAvatarList() {
@@ -776,7 +752,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * repeated .BattleAvatar battle_avatar_list = 15;
+ * repeated .BattleAvatar battle_avatar_list = 7;
* @return this
*/
public PVEBattleResultScRsp clearBattleAvatarList() {
@@ -786,7 +762,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * repeated .BattleAvatar battle_avatar_list = 15;
+ * repeated .BattleAvatar battle_avatar_list = 7;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -800,7 +776,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * repeated .BattleAvatar battle_avatar_list = 15;
+ * repeated .BattleAvatar battle_avatar_list = 7;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -814,7 +790,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * repeated .BattleAvatar battle_avatar_list = 15;
+ * repeated .BattleAvatar battle_avatar_list = 7;
* @param value the battleAvatarList to add
* @return this
*/
@@ -826,7 +802,7 @@ public final class PVEBattleResultScRspOuterClass {
}
/**
- * repeated .BattleAvatar battle_avatar_list = 15;
+ * repeated .BattleAvatar battle_avatar_list = 7;
* @param values the battleAvatarList to add
* @return this
*/
@@ -842,10 +818,10 @@ public final class PVEBattleResultScRspOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- stageId = other.stageId;
- eventId = other.eventId;
- retcode = other.retcode;
battleId = other.battleId;
+ stageId = other.stageId;
+ retcode = other.retcode;
+ eventId = other.eventId;
mismatchTurnCount = other.mismatchTurnCount;
endStatus = other.endStatus;
checkIdentical = other.checkIdentical;
@@ -866,17 +842,17 @@ public final class PVEBattleResultScRspOuterClass {
return this;
}
cachedSize = -1;
+ if (other.hasBattleId()) {
+ setBattleId(other.battleId);
+ }
if (other.hasStageId()) {
setStageId(other.stageId);
}
- if (other.hasEventId()) {
- setEventId(other.eventId);
- }
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
- if (other.hasBattleId()) {
- setBattleId(other.battleId);
+ if (other.hasEventId()) {
+ setEventId(other.eventId);
}
if (other.hasMismatchTurnCount()) {
setMismatchTurnCount(other.mismatchTurnCount);
@@ -918,10 +894,10 @@ public final class PVEBattleResultScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- stageId = 0;
- eventId = 0;
- retcode = 0;
battleId = 0;
+ stageId = 0;
+ retcode = 0;
+ eventId = 0;
mismatchTurnCount = 0;
endStatus = 0;
checkIdentical = false;
@@ -962,10 +938,10 @@ public final class PVEBattleResultScRspOuterClass {
}
PVEBattleResultScRsp other = (PVEBattleResultScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasStageId() || stageId == other.stageId)
- && (!hasEventId() || eventId == other.eventId)
- && (!hasRetcode() || retcode == other.retcode)
&& (!hasBattleId() || battleId == other.battleId)
+ && (!hasStageId() || stageId == other.stageId)
+ && (!hasRetcode() || retcode == other.retcode)
+ && (!hasEventId() || eventId == other.eventId)
&& (!hasMismatchTurnCount() || mismatchTurnCount == other.mismatchTurnCount)
&& (!hasEndStatus() || endStatus == other.endStatus)
&& (!hasCheckIdentical() || checkIdentical == other.checkIdentical)
@@ -981,60 +957,60 @@ public final class PVEBattleResultScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
- output.writeUInt32NoTag(stageId);
+ output.writeRawByte((byte) 48);
+ output.writeUInt32NoTag(battleId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 48);
- output.writeUInt32NoTag(eventId);
+ output.writeRawByte((byte) 72);
+ output.writeUInt32NoTag(stageId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 80);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 88);
- output.writeUInt32NoTag(battleId);
+ output.writeRawByte((byte) 96);
+ output.writeUInt32NoTag(eventId);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(mismatchTurnCount);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 104);
output.writeEnumNoTag(endStatus);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 8);
output.writeBoolNoTag(checkIdentical);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRawByte((byte) 10);
+ output.writeRawByte((byte) 18);
output.writeMessageNoTag(dropData);
}
if ((bitField0_ & 0x00000100) != 0) {
- output.writeRawByte((byte) 58);
+ output.writeRawByte((byte) 34);
output.writeMessageNoTag(unk1);
}
if ((bitField0_ & 0x00000200) != 0) {
- output.writeRawByte((byte) 98);
+ output.writeRawByte((byte) 114);
output.writeMessageNoTag(unk2);
}
if ((bitField0_ & 0x00000400) != 0) {
- output.writeRawLittleEndian16((short) 26258);
+ output.writeRawLittleEndian16((short) 9442);
output.writeMessageNoTag(unk3);
}
if ((bitField0_ & 0x00000800) != 0) {
- output.writeRawByte((byte) 18);
+ output.writeRawByte((byte) 26);
output.writeStringNoTag(binVersion);
}
if ((bitField0_ & 0x00001000) != 0) {
- output.writeRawByte((byte) 34);
+ output.writeRawByte((byte) 66);
output.writeStringNoTag(resVersion);
}
if ((bitField0_ & 0x00002000) != 0) {
for (int i = 0; i < battleAvatarList.length(); i++) {
- output.writeRawByte((byte) 122);
+ output.writeRawByte((byte) 58);
output.writeMessageNoTag(battleAvatarList.get(i));
}
}
@@ -1044,16 +1020,16 @@ public final class PVEBattleResultScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId);
}
if ((bitField0_ & 0x00000010) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(mismatchTurnCount);
@@ -1095,18 +1071,18 @@ public final class PVEBattleResultScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
- // stageId
- stageId = input.readUInt32();
+ case 48: {
+ // battleId
+ battleId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 48) {
+ if (tag != 72) {
break;
}
}
- case 48: {
- // eventId
- eventId = input.readUInt32();
+ case 72: {
+ // stageId
+ stageId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 80) {
@@ -1118,29 +1094,29 @@ public final class PVEBattleResultScRspOuterClass {
retcode = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 88) {
+ if (tag != 96) {
break;
}
}
- case 88: {
- // battleId
- battleId = input.readUInt32();
+ case 96: {
+ // eventId
+ eventId = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
+ if (tag != 120) {
+ break;
+ }
+ }
+ case 120: {
+ // mismatchTurnCount
+ mismatchTurnCount = input.readUInt32();
+ bitField0_ |= 0x00000010;
+ tag = input.readTag();
if (tag != 104) {
break;
}
}
case 104: {
- // mismatchTurnCount
- mismatchTurnCount = input.readUInt32();
- bitField0_ |= 0x00000010;
- tag = input.readTag();
- if (tag != 64) {
- break;
- }
- }
- case 64: {
// endStatus
final int value = input.readInt32();
if (BattleEndStatusOuterClass.BattleEndStatus.forNumber(value) != null) {
@@ -1148,74 +1124,74 @@ public final class PVEBattleResultScRspOuterClass {
bitField0_ |= 0x00000020;
}
tag = input.readTag();
- if (tag != 112) {
+ if (tag != 8) {
break;
}
}
- case 112: {
+ case 8: {
// checkIdentical
checkIdentical = input.readBool();
bitField0_ |= 0x00000040;
tag = input.readTag();
- if (tag != 10) {
- break;
- }
- }
- case 10: {
- // dropData
- input.readMessage(dropData);
- bitField0_ |= 0x00000080;
- tag = input.readTag();
- if (tag != 58) {
- break;
- }
- }
- case 58: {
- // unk1
- input.readMessage(unk1);
- bitField0_ |= 0x00000100;
- tag = input.readTag();
- if (tag != 98) {
- break;
- }
- }
- case 98: {
- // unk2
- input.readMessage(unk2);
- bitField0_ |= 0x00000200;
- tag = input.readTag();
- if (tag != 13074) {
- break;
- }
- }
- case 13074: {
- // unk3
- input.readMessage(unk3);
- bitField0_ |= 0x00000400;
- tag = input.readTag();
if (tag != 18) {
break;
}
}
case 18: {
- // binVersion
- input.readString(binVersion);
- bitField0_ |= 0x00000800;
+ // dropData
+ input.readMessage(dropData);
+ bitField0_ |= 0x00000080;
tag = input.readTag();
if (tag != 34) {
break;
}
}
case 34: {
+ // unk1
+ input.readMessage(unk1);
+ bitField0_ |= 0x00000100;
+ tag = input.readTag();
+ if (tag != 114) {
+ break;
+ }
+ }
+ case 114: {
+ // unk2
+ input.readMessage(unk2);
+ bitField0_ |= 0x00000200;
+ tag = input.readTag();
+ if (tag != 4706) {
+ break;
+ }
+ }
+ case 4706: {
+ // unk3
+ input.readMessage(unk3);
+ bitField0_ |= 0x00000400;
+ tag = input.readTag();
+ if (tag != 26) {
+ break;
+ }
+ }
+ case 26: {
+ // binVersion
+ input.readString(binVersion);
+ bitField0_ |= 0x00000800;
+ tag = input.readTag();
+ if (tag != 66) {
+ break;
+ }
+ }
+ case 66: {
// resVersion
input.readString(resVersion);
bitField0_ |= 0x00001000;
tag = input.readTag();
- if (tag != 122) {
+ if (tag != 58) {
break;
}
}
- case 122: {
+ case 58: {
// battleAvatarList
tag = input.readRepeatedMessage(battleAvatarList, tag);
bitField0_ |= 0x00002000;
@@ -1241,16 +1217,16 @@ public final class PVEBattleResultScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.stageId, stageId);
+ output.writeUInt32(FieldNames.battleId, battleId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.eventId, eventId);
+ output.writeUInt32(FieldNames.stageId, stageId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.battleId, battleId);
+ output.writeUInt32(FieldNames.eventId, eventId);
}
if ((bitField0_ & 0x00000010) != 0) {
output.writeUInt32(FieldNames.mismatchTurnCount, mismatchTurnCount);
@@ -1292,11 +1268,11 @@ public final class PVEBattleResultScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1897528135:
- case 1306191356: {
- if (input.isAtField(FieldNames.stageId)) {
+ case -1678308365:
+ case -487930366: {
+ if (input.isAtField(FieldNames.battleId)) {
if (!input.trySkipNullValue()) {
- stageId = input.readUInt32();
+ battleId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -1304,11 +1280,11 @@ public final class PVEBattleResultScRspOuterClass {
}
break;
}
- case -1376502443:
- case 278118624: {
- if (input.isAtField(FieldNames.eventId)) {
+ case -1897528135:
+ case 1306191356: {
+ if (input.isAtField(FieldNames.stageId)) {
if (!input.trySkipNullValue()) {
- eventId = input.readUInt32();
+ stageId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -1327,11 +1303,11 @@ public final class PVEBattleResultScRspOuterClass {
}
break;
}
- case -1678308365:
- case -487930366: {
- if (input.isAtField(FieldNames.battleId)) {
+ case -1376502443:
+ case 278118624: {
+ if (input.isAtField(FieldNames.eventId)) {
if (!input.trySkipNullValue()) {
- battleId = input.readUInt32();
+ eventId = input.readUInt32();
bitField0_ |= 0x00000008;
}
} else {
@@ -1514,13 +1490,13 @@ public final class PVEBattleResultScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName stageId = FieldName.forField("stageId", "stage_id");
+ static final FieldName battleId = FieldName.forField("battleId", "battle_id");
- static final FieldName eventId = FieldName.forField("eventId", "event_id");
+ static final FieldName stageId = FieldName.forField("stageId", "stage_id");
static final FieldName retcode = FieldName.forField("retcode");
- static final FieldName battleId = FieldName.forField("battleId", "battle_id");
+ static final FieldName eventId = FieldName.forField("eventId", "event_id");
static final FieldName mismatchTurnCount = FieldName.forField("mismatchTurnCount", "mismatch_turn_count");
diff --git a/src/generated/main/emu/lunarcore/proto/PickRogueAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PickRogueAvatarCsReqOuterClass.java
index 52a8b42..faeb018 100644
--- a/src/generated/main/emu/lunarcore/proto/PickRogueAvatarCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PickRogueAvatarCsReqOuterClass.java
@@ -20,7 +20,7 @@ public final class PickRogueAvatarCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated uint32 base_avatar_list = 9;
+ * repeated uint32 base_avatar_list = 12;
*/
private final RepeatedInt baseAvatarList = RepeatedInt.newEmptyInstance();
@@ -35,7 +35,7 @@ public final class PickRogueAvatarCsReqOuterClass {
}
/**
- * repeated uint32 base_avatar_list = 9;
+ * repeated uint32 base_avatar_list = 12;
* @return whether the baseAvatarList field is set
*/
public boolean hasBaseAvatarList() {
@@ -43,7 +43,7 @@ public final class PickRogueAvatarCsReqOuterClass {
}
/**
- * repeated uint32 base_avatar_list = 9;
+ * repeated uint32 base_avatar_list = 12;
* @return this
*/
public PickRogueAvatarCsReq clearBaseAvatarList() {
@@ -53,7 +53,7 @@ public final class PickRogueAvatarCsReqOuterClass {
}
/**
- * repeated uint32 base_avatar_list = 9;
+ * repeated uint32 base_avatar_list = 12;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class PickRogueAvatarCsReqOuterClass {
}
/**
- * repeated uint32 base_avatar_list = 9;
+ * repeated uint32 base_avatar_list = 12;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class PickRogueAvatarCsReqOuterClass {
}
/**
- * repeated uint32 base_avatar_list = 9;
+ * repeated uint32 base_avatar_list = 12;
* @param value the baseAvatarList to add
* @return this
*/
@@ -92,7 +92,7 @@ public final class PickRogueAvatarCsReqOuterClass {
}
/**
- * repeated uint32 base_avatar_list = 9;
+ * repeated uint32 base_avatar_list = 12;
* @param values the baseAvatarList to add
* @return this
*/
@@ -163,7 +163,7 @@ public final class PickRogueAvatarCsReqOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < baseAvatarList.length(); i++) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(baseAvatarList.array()[i]);
}
}
@@ -185,7 +185,7 @@ public final class PickRogueAvatarCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 74: {
+ case 98: {
// baseAvatarList [packed=true]
input.readPackedUInt32(baseAvatarList, tag);
bitField0_ |= 0x00000001;
@@ -204,7 +204,7 @@ public final class PickRogueAvatarCsReqOuterClass {
tag = input.readTag();
break;
}
- case 72: {
+ case 96: {
// baseAvatarList [packed=false]
tag = input.readRepeatedUInt32(baseAvatarList, tag);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/PickRogueAvatarScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PickRogueAvatarScRspOuterClass.java
index a5c1c4c..5b6abf0 100644
--- a/src/generated/main/emu/lunarcore/proto/PickRogueAvatarScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PickRogueAvatarScRspOuterClass.java
@@ -20,7 +20,7 @@ public final class PickRogueAvatarScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated uint32 base_avatar_list = 14;
+ * repeated uint32 base_avatar_list = 7;
*/
private final RepeatedInt baseAvatarList = RepeatedInt.newEmptyInstance();
@@ -35,7 +35,7 @@ public final class PickRogueAvatarScRspOuterClass {
}
/**
- * repeated uint32 base_avatar_list = 14;
+ * repeated uint32 base_avatar_list = 7;
* @return whether the baseAvatarList field is set
*/
public boolean hasBaseAvatarList() {
@@ -43,7 +43,7 @@ public final class PickRogueAvatarScRspOuterClass {
}
/**
- * repeated uint32 base_avatar_list = 14;
+ * repeated uint32 base_avatar_list = 7;
* @return this
*/
public PickRogueAvatarScRsp clearBaseAvatarList() {
@@ -53,7 +53,7 @@ public final class PickRogueAvatarScRspOuterClass {
}
/**
- * repeated uint32 base_avatar_list = 14;
+ * repeated uint32 base_avatar_list = 7;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class PickRogueAvatarScRspOuterClass {
}
/**
- * repeated uint32 base_avatar_list = 14;
+ * repeated uint32 base_avatar_list = 7;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class PickRogueAvatarScRspOuterClass {
}
/**
- * repeated uint32 base_avatar_list = 14;
+ * repeated uint32 base_avatar_list = 7;
* @param value the baseAvatarList to add
* @return this
*/
@@ -92,7 +92,7 @@ public final class PickRogueAvatarScRspOuterClass {
}
/**
- * repeated uint32 base_avatar_list = 14;
+ * repeated uint32 base_avatar_list = 7;
* @param values the baseAvatarList to add
* @return this
*/
@@ -163,7 +163,7 @@ public final class PickRogueAvatarScRspOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < baseAvatarList.length(); i++) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(baseAvatarList.array()[i]);
}
}
@@ -185,7 +185,7 @@ public final class PickRogueAvatarScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 114: {
+ case 58: {
// baseAvatarList [packed=true]
input.readPackedUInt32(baseAvatarList, tag);
bitField0_ |= 0x00000001;
@@ -204,7 +204,7 @@ public final class PickRogueAvatarScRspOuterClass {
tag = input.readTag();
break;
}
- case 112: {
+ case 56: {
// baseAvatarList [packed=false]
tag = input.readRepeatedUInt32(baseAvatarList, tag);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java b/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java
index fc5d6e8..93fdd3a 100644
--- a/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java
@@ -19,15 +19,15 @@ public final class PileItemOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 item_id = 4;
- */
- private int itemId;
-
- /**
- * optional uint32 item_num = 12;
+ * optional uint32 item_num = 8;
*/
private int itemNum;
+ /**
+ * optional uint32 item_id = 11;
+ */
+ private int itemId;
+
private PileItem() {
}
@@ -39,62 +39,25 @@ public final class PileItemOuterClass {
}
/**
- * optional uint32 item_id = 4;
- * @return whether the itemId field is set
+ * optional uint32 item_num = 8;
+ * @return whether the itemNum field is set
*/
- public boolean hasItemId() {
+ public boolean hasItemNum() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 item_id = 4;
- * @return this
- */
- public PileItem clearItemId() {
- bitField0_ &= ~0x00000001;
- itemId = 0;
- return this;
- }
-
- /**
- * optional uint32 item_id = 4;
- * @return the itemId
- */
- public int getItemId() {
- return itemId;
- }
-
- /**
- * optional uint32 item_id = 4;
- * @param value the itemId to set
- * @return this
- */
- public PileItem setItemId(final int value) {
- bitField0_ |= 0x00000001;
- itemId = value;
- return this;
- }
-
- /**
- * optional uint32 item_num = 12;
- * @return whether the itemNum field is set
- */
- public boolean hasItemNum() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 item_num = 12;
+ * optional uint32 item_num = 8;
* @return this
*/
public PileItem clearItemNum() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
itemNum = 0;
return this;
}
/**
- * optional uint32 item_num = 12;
+ * optional uint32 item_num = 8;
* @return the itemNum
*/
public int getItemNum() {
@@ -102,23 +65,60 @@ public final class PileItemOuterClass {
}
/**
- * optional uint32 item_num = 12;
+ * optional uint32 item_num = 8;
* @param value the itemNum to set
* @return this
*/
public PileItem setItemNum(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
itemNum = value;
return this;
}
+ /**
+ * optional uint32 item_id = 11;
+ * @return whether the itemId field is set
+ */
+ public boolean hasItemId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 item_id = 11;
+ * @return this
+ */
+ public PileItem clearItemId() {
+ bitField0_ &= ~0x00000002;
+ itemId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 item_id = 11;
+ * @return the itemId
+ */
+ public int getItemId() {
+ return itemId;
+ }
+
+ /**
+ * optional uint32 item_id = 11;
+ * @param value the itemId to set
+ * @return this
+ */
+ public PileItem setItemId(final int value) {
+ bitField0_ |= 0x00000002;
+ itemId = value;
+ return this;
+ }
+
@Override
public PileItem copyFrom(final PileItem other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- itemId = other.itemId;
itemNum = other.itemNum;
+ itemId = other.itemId;
}
return this;
}
@@ -129,12 +129,12 @@ public final class PileItemOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasItemId()) {
- setItemId(other.itemId);
- }
if (other.hasItemNum()) {
setItemNum(other.itemNum);
}
+ if (other.hasItemId()) {
+ setItemId(other.itemId);
+ }
return this;
}
@@ -145,8 +145,8 @@ public final class PileItemOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- itemId = 0;
itemNum = 0;
+ itemId = 0;
return this;
}
@@ -170,19 +170,19 @@ public final class PileItemOuterClass {
}
PileItem other = (PileItem) o;
return bitField0_ == other.bitField0_
- && (!hasItemId() || itemId == other.itemId)
- && (!hasItemNum() || itemNum == other.itemNum);
+ && (!hasItemNum() || itemNum == other.itemNum)
+ && (!hasItemId() || itemId == other.itemId);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(itemId);
+ output.writeRawByte((byte) 64);
+ output.writeUInt32NoTag(itemNum);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 96);
- output.writeUInt32NoTag(itemNum);
+ output.writeRawByte((byte) 88);
+ output.writeUInt32NoTag(itemId);
}
}
@@ -190,10 +190,10 @@ public final class PileItemOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(itemNum);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(itemNum);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId);
}
return size;
}
@@ -205,18 +205,18 @@ public final class PileItemOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
- // itemId
- itemId = input.readUInt32();
+ case 64: {
+ // itemNum
+ itemNum = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 88) {
break;
}
}
- case 96: {
- // itemNum
- itemNum = input.readUInt32();
+ case 88: {
+ // itemId
+ itemId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
@@ -241,10 +241,10 @@ public final class PileItemOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.itemId, itemId);
+ output.writeUInt32(FieldNames.itemNum, itemNum);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.itemNum, itemNum);
+ output.writeUInt32(FieldNames.itemId, itemId);
}
output.endObject();
}
@@ -256,11 +256,11 @@ public final class PileItemOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1178662002:
- case 2116204999: {
- if (input.isAtField(FieldNames.itemId)) {
+ case 2116189043:
+ case 1177850970: {
+ if (input.isAtField(FieldNames.itemNum)) {
if (!input.trySkipNullValue()) {
- itemId = input.readUInt32();
+ itemNum = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -268,11 +268,11 @@ public final class PileItemOuterClass {
}
break;
}
- case 2116189043:
- case 1177850970: {
- if (input.isAtField(FieldNames.itemNum)) {
+ case -1178662002:
+ case 2116204999: {
+ if (input.isAtField(FieldNames.itemId)) {
if (!input.trySkipNullValue()) {
- itemNum = input.readUInt32();
+ itemId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -332,9 +332,9 @@ public final class PileItemOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName itemId = FieldName.forField("itemId", "item_id");
-
static final FieldName itemNum = FieldName.forField("itemNum", "item_num");
+
+ static final FieldName itemId = FieldName.forField("itemId", "item_id");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicCsReqOuterClass.java
index 36d2483..b1c2884 100644
--- a/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class PlayBackGroundMusicCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 play_music_id = 14;
+ * optional uint32 play_music_id = 8;
*/
private int playMusicId;
@@ -34,7 +34,7 @@ public final class PlayBackGroundMusicCsReqOuterClass {
}
/**
- * optional uint32 play_music_id = 14;
+ * optional uint32 play_music_id = 8;
* @return whether the playMusicId field is set
*/
public boolean hasPlayMusicId() {
@@ -42,7 +42,7 @@ public final class PlayBackGroundMusicCsReqOuterClass {
}
/**
- * optional uint32 play_music_id = 14;
+ * optional uint32 play_music_id = 8;
* @return this
*/
public PlayBackGroundMusicCsReq clearPlayMusicId() {
@@ -52,7 +52,7 @@ public final class PlayBackGroundMusicCsReqOuterClass {
}
/**
- * optional uint32 play_music_id = 14;
+ * optional uint32 play_music_id = 8;
* @return the playMusicId
*/
public int getPlayMusicId() {
@@ -60,7 +60,7 @@ public final class PlayBackGroundMusicCsReqOuterClass {
}
/**
- * optional uint32 play_music_id = 14;
+ * optional uint32 play_music_id = 8;
* @param value the playMusicId to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class PlayBackGroundMusicCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(playMusicId);
}
}
@@ -150,7 +150,7 @@ public final class PlayBackGroundMusicCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 112: {
+ case 64: {
// playMusicId
playMusicId = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicScRspOuterClass.java
index 4f2eba7..ac19d49 100644
--- a/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicScRspOuterClass.java
@@ -19,20 +19,20 @@ public final class PlayBackGroundMusicScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 playing_id = 7;
+ * optional uint32 playing_id = 2;
*/
private int playingId;
/**
- * optional uint32 retcode = 8;
- */
- private int retcode;
-
- /**
- * optional uint32 play_music_id = 10;
+ * optional uint32 play_music_id = 7;
*/
private int playMusicId;
+ /**
+ * optional uint32 retcode = 15;
+ */
+ private int retcode;
+
private PlayBackGroundMusicScRsp() {
}
@@ -44,7 +44,7 @@ public final class PlayBackGroundMusicScRspOuterClass {
}
/**
- * optional uint32 playing_id = 7;
+ * optional uint32 playing_id = 2;
* @return whether the playingId field is set
*/
public boolean hasPlayingId() {
@@ -52,7 +52,7 @@ public final class PlayBackGroundMusicScRspOuterClass {
}
/**
- * optional uint32 playing_id = 7;
+ * optional uint32 playing_id = 2;
* @return this
*/
public PlayBackGroundMusicScRsp clearPlayingId() {
@@ -62,7 +62,7 @@ public final class PlayBackGroundMusicScRspOuterClass {
}
/**
- * optional uint32 playing_id = 7;
+ * optional uint32 playing_id = 2;
* @return the playingId
*/
public int getPlayingId() {
@@ -70,7 +70,7 @@ public final class PlayBackGroundMusicScRspOuterClass {
}
/**
- * optional uint32 playing_id = 7;
+ * optional uint32 playing_id = 2;
* @param value the playingId to set
* @return this
*/
@@ -81,62 +81,25 @@ public final class PlayBackGroundMusicScRspOuterClass {
}
/**
- * optional uint32 retcode = 8;
- * @return whether the retcode field is set
+ * optional uint32 play_music_id = 7;
+ * @return whether the playMusicId field is set
*/
- public boolean hasRetcode() {
+ public boolean hasPlayMusicId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 retcode = 8;
- * @return this
- */
- public PlayBackGroundMusicScRsp clearRetcode() {
- bitField0_ &= ~0x00000002;
- retcode = 0;
- return this;
- }
-
- /**
- * optional uint32 retcode = 8;
- * @return the retcode
- */
- public int getRetcode() {
- return retcode;
- }
-
- /**
- * optional uint32 retcode = 8;
- * @param value the retcode to set
- * @return this
- */
- public PlayBackGroundMusicScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000002;
- retcode = value;
- return this;
- }
-
- /**
- * optional uint32 play_music_id = 10;
- * @return whether the playMusicId field is set
- */
- public boolean hasPlayMusicId() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 play_music_id = 10;
+ * optional uint32 play_music_id = 7;
* @return this
*/
public PlayBackGroundMusicScRsp clearPlayMusicId() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
playMusicId = 0;
return this;
}
/**
- * optional uint32 play_music_id = 10;
+ * optional uint32 play_music_id = 7;
* @return the playMusicId
*/
public int getPlayMusicId() {
@@ -144,24 +107,61 @@ public final class PlayBackGroundMusicScRspOuterClass {
}
/**
- * optional uint32 play_music_id = 10;
+ * optional uint32 play_music_id = 7;
* @param value the playMusicId to set
* @return this
*/
public PlayBackGroundMusicScRsp setPlayMusicId(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
playMusicId = value;
return this;
}
+ /**
+ * optional uint32 retcode = 15;
+ * @return whether the retcode field is set
+ */
+ public boolean hasRetcode() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 retcode = 15;
+ * @return this
+ */
+ public PlayBackGroundMusicScRsp clearRetcode() {
+ bitField0_ &= ~0x00000004;
+ retcode = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 retcode = 15;
+ * @return the retcode
+ */
+ public int getRetcode() {
+ return retcode;
+ }
+
+ /**
+ * optional uint32 retcode = 15;
+ * @param value the retcode to set
+ * @return this
+ */
+ public PlayBackGroundMusicScRsp setRetcode(final int value) {
+ bitField0_ |= 0x00000004;
+ retcode = value;
+ return this;
+ }
+
@Override
public PlayBackGroundMusicScRsp copyFrom(final PlayBackGroundMusicScRsp other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
playingId = other.playingId;
- retcode = other.retcode;
playMusicId = other.playMusicId;
+ retcode = other.retcode;
}
return this;
}
@@ -175,12 +175,12 @@ public final class PlayBackGroundMusicScRspOuterClass {
if (other.hasPlayingId()) {
setPlayingId(other.playingId);
}
- if (other.hasRetcode()) {
- setRetcode(other.retcode);
- }
if (other.hasPlayMusicId()) {
setPlayMusicId(other.playMusicId);
}
+ if (other.hasRetcode()) {
+ setRetcode(other.retcode);
+ }
return this;
}
@@ -192,8 +192,8 @@ public final class PlayBackGroundMusicScRspOuterClass {
cachedSize = -1;
bitField0_ = 0;
playingId = 0;
- retcode = 0;
playMusicId = 0;
+ retcode = 0;
return this;
}
@@ -218,23 +218,23 @@ public final class PlayBackGroundMusicScRspOuterClass {
PlayBackGroundMusicScRsp other = (PlayBackGroundMusicScRsp) o;
return bitField0_ == other.bitField0_
&& (!hasPlayingId() || playingId == other.playingId)
- && (!hasRetcode() || retcode == other.retcode)
- && (!hasPlayMusicId() || playMusicId == other.playMusicId);
+ && (!hasPlayMusicId() || playMusicId == other.playMusicId)
+ && (!hasRetcode() || retcode == other.retcode);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(playingId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 64);
- output.writeUInt32NoTag(retcode);
+ output.writeRawByte((byte) 56);
+ output.writeUInt32NoTag(playMusicId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(playMusicId);
+ output.writeRawByte((byte) 120);
+ output.writeUInt32NoTag(retcode);
}
}
@@ -245,10 +245,10 @@ public final class PlayBackGroundMusicScRspOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(playingId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(playMusicId);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(playMusicId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
return size;
}
@@ -260,27 +260,27 @@ public final class PlayBackGroundMusicScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
+ case 16: {
// playingId
playingId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 64) {
+ if (tag != 56) {
break;
}
}
- case 64: {
- // retcode
- retcode = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 80) {
- break;
- }
- }
- case 80: {
+ case 56: {
// playMusicId
playMusicId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 120) {
+ break;
+ }
+ }
+ case 120: {
+ // retcode
+ retcode = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 0) {
@@ -308,10 +308,10 @@ public final class PlayBackGroundMusicScRspOuterClass {
output.writeUInt32(FieldNames.playingId, playingId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.playMusicId, playMusicId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.playMusicId, playMusicId);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
output.endObject();
}
@@ -335,10 +335,11 @@ public final class PlayBackGroundMusicScRspOuterClass {
}
break;
}
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case 835898444:
+ case -1319856608: {
+ if (input.isAtField(FieldNames.playMusicId)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ playMusicId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -346,11 +347,10 @@ public final class PlayBackGroundMusicScRspOuterClass {
}
break;
}
- case 835898444:
- case -1319856608: {
- if (input.isAtField(FieldNames.playMusicId)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- playMusicId = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -413,9 +413,9 @@ public final class PlayBackGroundMusicScRspOuterClass {
static class FieldNames {
static final FieldName playingId = FieldName.forField("playingId", "playing_id");
- static final FieldName retcode = FieldName.forField("retcode");
-
static final FieldName playMusicId = FieldName.forField("playMusicId", "play_music_id");
+
+ static final FieldName retcode = FieldName.forField("retcode");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/PlayerDetailInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerDetailInfoOuterClass.java
index c4decee..cf1658f 100644
--- a/src/generated/main/emu/lunarcore/proto/PlayerDetailInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PlayerDetailInfoOuterClass.java
@@ -20,51 +20,57 @@ public final class PlayerDetailInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 head_icon = 7;
+ * optional int32 int1 = 1;
*/
- private int headIcon;
+ private int int1;
/**
- * optional uint32 level = 9;
- */
- private int level;
-
- /**
- * optional uint32 world_level = 10;
- */
- private int worldLevel;
-
- /**
- * optional uint32 uid = 13;
+ * optional uint32 uid = 5;
*/
private int uid;
/**
- * optional .PlatformType platform_type = 4;
+ * optional uint32 head_icon = 6;
+ */
+ private int headIcon;
+
+ /**
+ * optional uint32 world_level = 9;
+ */
+ private int worldLevel;
+
+ /**
+ * optional uint32 level = 10;
+ */
+ private int level;
+
+ /**
+ * optional .PlatformType platform_type = 15;
*/
private int platformType;
/**
- * optional string signature = 2;
+ * optional bool b1 = 14;
+ */
+ private boolean b1;
+
+ /**
+ * optional string signature = 3;
*/
private final Utf8String signature = Utf8String.newEmptyInstance();
/**
- * optional string nickname = 6;
+ * optional string nickname = 4;
*/
private final Utf8String nickname = Utf8String.newEmptyInstance();
/**
- * optional string display_avatar_info = 14;
+ * optional string display_avatar_info = 13;
*/
private final Utf8String displayAvatarInfo = Utf8String.newEmptyInstance();
/**
- * - * DisplayAvatarDetailInfo display_avatar_info = 14; - *- * - *
optional string record_info = 15;
+ * optional string record_info = 425;
*/
private final Utf8String recordInfo = Utf8String.newEmptyInstance();
@@ -79,136 +85,62 @@ public final class PlayerDetailInfoOuterClass {
}
/**
- * optional uint32 head_icon = 7;
- * @return whether the headIcon field is set
+ * optional int32 int1 = 1;
+ * @return whether the int1 field is set
*/
- public boolean hasHeadIcon() {
+ public boolean hasInt1() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 head_icon = 7;
+ * optional int32 int1 = 1;
* @return this
*/
- public PlayerDetailInfo clearHeadIcon() {
+ public PlayerDetailInfo clearInt1() {
bitField0_ &= ~0x00000001;
- headIcon = 0;
+ int1 = 0;
return this;
}
/**
- * optional uint32 head_icon = 7;
- * @return the headIcon
+ * optional int32 int1 = 1;
+ * @return the int1
*/
- public int getHeadIcon() {
- return headIcon;
+ public int getInt1() {
+ return int1;
}
/**
- * optional uint32 head_icon = 7;
- * @param value the headIcon to set
+ * optional int32 int1 = 1;
+ * @param value the int1 to set
* @return this
*/
- public PlayerDetailInfo setHeadIcon(final int value) {
+ public PlayerDetailInfo setInt1(final int value) {
bitField0_ |= 0x00000001;
- headIcon = value;
+ int1 = value;
return this;
}
/**
- * optional uint32 level = 9;
- * @return whether the level field is set
+ * optional uint32 uid = 5;
+ * @return whether the uid field is set
*/
- public boolean hasLevel() {
+ public boolean hasUid() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 level = 9;
- * @return this
- */
- public PlayerDetailInfo clearLevel() {
- bitField0_ &= ~0x00000002;
- level = 0;
- return this;
- }
-
- /**
- * optional uint32 level = 9;
- * @return the level
- */
- public int getLevel() {
- return level;
- }
-
- /**
- * optional uint32 level = 9;
- * @param value the level to set
- * @return this
- */
- public PlayerDetailInfo setLevel(final int value) {
- bitField0_ |= 0x00000002;
- level = value;
- return this;
- }
-
- /**
- * optional uint32 world_level = 10;
- * @return whether the worldLevel field is set
- */
- public boolean hasWorldLevel() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 world_level = 10;
- * @return this
- */
- public PlayerDetailInfo clearWorldLevel() {
- bitField0_ &= ~0x00000004;
- worldLevel = 0;
- return this;
- }
-
- /**
- * optional uint32 world_level = 10;
- * @return the worldLevel
- */
- public int getWorldLevel() {
- return worldLevel;
- }
-
- /**
- * optional uint32 world_level = 10;
- * @param value the worldLevel to set
- * @return this
- */
- public PlayerDetailInfo setWorldLevel(final int value) {
- bitField0_ |= 0x00000004;
- worldLevel = value;
- return this;
- }
-
- /**
- * optional uint32 uid = 13;
- * @return whether the uid field is set
- */
- public boolean hasUid() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional uint32 uid = 13;
+ * optional uint32 uid = 5;
* @return this
*/
public PlayerDetailInfo clearUid() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000002;
uid = 0;
return this;
}
/**
- * optional uint32 uid = 13;
+ * optional uint32 uid = 5;
* @return the uid
*/
public int getUid() {
@@ -216,36 +148,147 @@ public final class PlayerDetailInfoOuterClass {
}
/**
- * optional uint32 uid = 13;
+ * optional uint32 uid = 5;
* @param value the uid to set
* @return this
*/
public PlayerDetailInfo setUid(final int value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000002;
uid = value;
return this;
}
/**
- * optional .PlatformType platform_type = 4;
- * @return whether the platformType field is set
+ * optional uint32 head_icon = 6;
+ * @return whether the headIcon field is set
*/
- public boolean hasPlatformType() {
+ public boolean hasHeadIcon() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 head_icon = 6;
+ * @return this
+ */
+ public PlayerDetailInfo clearHeadIcon() {
+ bitField0_ &= ~0x00000004;
+ headIcon = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 head_icon = 6;
+ * @return the headIcon
+ */
+ public int getHeadIcon() {
+ return headIcon;
+ }
+
+ /**
+ * optional uint32 head_icon = 6;
+ * @param value the headIcon to set
+ * @return this
+ */
+ public PlayerDetailInfo setHeadIcon(final int value) {
+ bitField0_ |= 0x00000004;
+ headIcon = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 world_level = 9;
+ * @return whether the worldLevel field is set
+ */
+ public boolean hasWorldLevel() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional uint32 world_level = 9;
+ * @return this
+ */
+ public PlayerDetailInfo clearWorldLevel() {
+ bitField0_ &= ~0x00000008;
+ worldLevel = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 world_level = 9;
+ * @return the worldLevel
+ */
+ public int getWorldLevel() {
+ return worldLevel;
+ }
+
+ /**
+ * optional uint32 world_level = 9;
+ * @param value the worldLevel to set
+ * @return this
+ */
+ public PlayerDetailInfo setWorldLevel(final int value) {
+ bitField0_ |= 0x00000008;
+ worldLevel = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 level = 10;
+ * @return whether the level field is set
+ */
+ public boolean hasLevel() {
return (bitField0_ & 0x00000010) != 0;
}
/**
- * optional .PlatformType platform_type = 4;
+ * optional uint32 level = 10;
+ * @return this
+ */
+ public PlayerDetailInfo clearLevel() {
+ bitField0_ &= ~0x00000010;
+ level = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 level = 10;
+ * @return the level
+ */
+ public int getLevel() {
+ return level;
+ }
+
+ /**
+ * optional uint32 level = 10;
+ * @param value the level to set
+ * @return this
+ */
+ public PlayerDetailInfo setLevel(final int value) {
+ bitField0_ |= 0x00000010;
+ level = value;
+ return this;
+ }
+
+ /**
+ * optional .PlatformType platform_type = 15;
+ * @return whether the platformType field is set
+ */
+ public boolean hasPlatformType() {
+ return (bitField0_ & 0x00000020) != 0;
+ }
+
+ /**
+ * optional .PlatformType platform_type = 15;
* @return this
*/
public PlayerDetailInfo clearPlatformType() {
- bitField0_ &= ~0x00000010;
+ bitField0_ &= ~0x00000020;
platformType = 0;
return this;
}
/**
- * optional .PlatformType platform_type = 4;
+ * optional .PlatformType platform_type = 15;
* @return the platformType
*/
public PlatformTypeOuterClass.PlatformType getPlatformType() {
@@ -272,42 +315,79 @@ public final class PlayerDetailInfoOuterClass {
* @return this
*/
public PlayerDetailInfo setPlatformTypeValue(final int value) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000020;
platformType = value;
return this;
}
/**
- * optional .PlatformType platform_type = 4;
+ * optional .PlatformType platform_type = 15;
* @param value the platformType to set
* @return this
*/
public PlayerDetailInfo setPlatformType(final PlatformTypeOuterClass.PlatformType value) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000020;
platformType = value.getNumber();
return this;
}
/**
- * optional string signature = 2;
- * @return whether the signature field is set
+ * optional bool b1 = 14;
+ * @return whether the b1 field is set
*/
- public boolean hasSignature() {
- return (bitField0_ & 0x00000020) != 0;
+ public boolean hasB1() {
+ return (bitField0_ & 0x00000040) != 0;
}
/**
- * optional string signature = 2;
+ * optional bool b1 = 14;
+ * @return this
+ */
+ public PlayerDetailInfo clearB1() {
+ bitField0_ &= ~0x00000040;
+ b1 = false;
+ return this;
+ }
+
+ /**
+ * optional bool b1 = 14;
+ * @return the b1
+ */
+ public boolean getB1() {
+ return b1;
+ }
+
+ /**
+ * optional bool b1 = 14;
+ * @param value the b1 to set
+ * @return this
+ */
+ public PlayerDetailInfo setB1(final boolean value) {
+ bitField0_ |= 0x00000040;
+ b1 = value;
+ return this;
+ }
+
+ /**
+ * optional string signature = 3;
+ * @return whether the signature field is set
+ */
+ public boolean hasSignature() {
+ return (bitField0_ & 0x00000080) != 0;
+ }
+
+ /**
+ * optional string signature = 3;
* @return this
*/
public PlayerDetailInfo clearSignature() {
- bitField0_ &= ~0x00000020;
+ bitField0_ &= ~0x00000080;
signature.clear();
return this;
}
/**
- * optional string signature = 2;
+ * optional string signature = 3;
* @return the signature
*/
public String getSignature() {
@@ -315,7 +395,7 @@ public final class PlayerDetailInfoOuterClass {
}
/**
- * optional string signature = 2;
+ * optional string signature = 3;
* @return internal {@code Utf8String} representation of signature for reading
*/
public Utf8String getSignatureBytes() {
@@ -323,56 +403,56 @@ public final class PlayerDetailInfoOuterClass {
}
/**
- * optional string signature = 2;
+ * optional string signature = 3;
* @return internal {@code Utf8String} representation of signature for modifications
*/
public Utf8String getMutableSignatureBytes() {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000080;
return this.signature;
}
/**
- * optional string signature = 2;
+ * optional string signature = 3;
* @param value the signature to set
* @return this
*/
public PlayerDetailInfo setSignature(final CharSequence value) {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000080;
signature.copyFrom(value);
return this;
}
/**
- * optional string signature = 2;
+ * optional string signature = 3;
* @param value the signature to set
* @return this
*/
public PlayerDetailInfo setSignature(final Utf8String value) {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000080;
signature.copyFrom(value);
return this;
}
/**
- * optional string nickname = 6;
+ * optional string nickname = 4;
* @return whether the nickname field is set
*/
public boolean hasNickname() {
- return (bitField0_ & 0x00000040) != 0;
+ return (bitField0_ & 0x00000100) != 0;
}
/**
- * optional string nickname = 6;
+ * optional string nickname = 4;
* @return this
*/
public PlayerDetailInfo clearNickname() {
- bitField0_ &= ~0x00000040;
+ bitField0_ &= ~0x00000100;
nickname.clear();
return this;
}
/**
- * optional string nickname = 6;
+ * optional string nickname = 4;
* @return the nickname
*/
public String getNickname() {
@@ -380,7 +460,7 @@ public final class PlayerDetailInfoOuterClass {
}
/**
- * optional string nickname = 6;
+ * optional string nickname = 4;
* @return internal {@code Utf8String} representation of nickname for reading
*/
public Utf8String getNicknameBytes() {
@@ -388,56 +468,56 @@ public final class PlayerDetailInfoOuterClass {
}
/**
- * optional string nickname = 6;
+ * optional string nickname = 4;
* @return internal {@code Utf8String} representation of nickname for modifications
*/
public Utf8String getMutableNicknameBytes() {
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000100;
return this.nickname;
}
/**
- * optional string nickname = 6;
+ * optional string nickname = 4;
* @param value the nickname to set
* @return this
*/
public PlayerDetailInfo setNickname(final CharSequence value) {
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000100;
nickname.copyFrom(value);
return this;
}
/**
- * optional string nickname = 6;
+ * optional string nickname = 4;
* @param value the nickname to set
* @return this
*/
public PlayerDetailInfo setNickname(final Utf8String value) {
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000100;
nickname.copyFrom(value);
return this;
}
/**
- * optional string display_avatar_info = 14;
+ * optional string display_avatar_info = 13;
* @return whether the displayAvatarInfo field is set
*/
public boolean hasDisplayAvatarInfo() {
- return (bitField0_ & 0x00000080) != 0;
+ return (bitField0_ & 0x00000200) != 0;
}
/**
- * optional string display_avatar_info = 14;
+ * optional string display_avatar_info = 13;
* @return this
*/
public PlayerDetailInfo clearDisplayAvatarInfo() {
- bitField0_ &= ~0x00000080;
+ bitField0_ &= ~0x00000200;
displayAvatarInfo.clear();
return this;
}
/**
- * optional string display_avatar_info = 14;
+ * optional string display_avatar_info = 13;
* @return the displayAvatarInfo
*/
public String getDisplayAvatarInfo() {
@@ -445,7 +525,7 @@ public final class PlayerDetailInfoOuterClass {
}
/**
- * optional string display_avatar_info = 14;
+ * optional string display_avatar_info = 13;
* @return internal {@code Utf8String} representation of displayAvatarInfo for reading
*/
public Utf8String getDisplayAvatarInfoBytes() {
@@ -453,68 +533,56 @@ public final class PlayerDetailInfoOuterClass {
}
/**
- * optional string display_avatar_info = 14;
+ * optional string display_avatar_info = 13;
* @return internal {@code Utf8String} representation of displayAvatarInfo for modifications
*/
public Utf8String getMutableDisplayAvatarInfoBytes() {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000200;
return this.displayAvatarInfo;
}
/**
- * optional string display_avatar_info = 14;
+ * optional string display_avatar_info = 13;
* @param value the displayAvatarInfo to set
* @return this
*/
public PlayerDetailInfo setDisplayAvatarInfo(final CharSequence value) {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000200;
displayAvatarInfo.copyFrom(value);
return this;
}
/**
- * optional string display_avatar_info = 14;
+ * optional string display_avatar_info = 13;
* @param value the displayAvatarInfo to set
* @return this
*/
public PlayerDetailInfo setDisplayAvatarInfo(final Utf8String value) {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000200;
displayAvatarInfo.copyFrom(value);
return this;
}
/**
- * - * DisplayAvatarDetailInfo display_avatar_info = 14; - *- * - *
optional string record_info = 15;
+ * optional string record_info = 425;
* @return whether the recordInfo field is set
*/
public boolean hasRecordInfo() {
- return (bitField0_ & 0x00000100) != 0;
+ return (bitField0_ & 0x00000400) != 0;
}
/**
- * - * DisplayAvatarDetailInfo display_avatar_info = 14; - *- * - *
optional string record_info = 15;
+ * optional string record_info = 425;
* @return this
*/
public PlayerDetailInfo clearRecordInfo() {
- bitField0_ &= ~0x00000100;
+ bitField0_ &= ~0x00000400;
recordInfo.clear();
return this;
}
/**
- * - * DisplayAvatarDetailInfo display_avatar_info = 14; - *- * - *
optional string record_info = 15;
+ * optional string record_info = 425;
* @return the recordInfo
*/
public String getRecordInfo() {
@@ -522,11 +590,7 @@ public final class PlayerDetailInfoOuterClass {
}
/**
- * - * DisplayAvatarDetailInfo display_avatar_info = 14; - *- * - *
optional string record_info = 15;
+ * optional string record_info = 425;
* @return internal {@code Utf8String} representation of recordInfo for reading
*/
public Utf8String getRecordInfoBytes() {
@@ -534,44 +598,32 @@ public final class PlayerDetailInfoOuterClass {
}
/**
- * - * DisplayAvatarDetailInfo display_avatar_info = 14; - *- * - *
optional string record_info = 15;
+ * optional string record_info = 425;
* @return internal {@code Utf8String} representation of recordInfo for modifications
*/
public Utf8String getMutableRecordInfoBytes() {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000400;
return this.recordInfo;
}
/**
- * - * DisplayAvatarDetailInfo display_avatar_info = 14; - *- * - *
optional string record_info = 15;
+ * optional string record_info = 425;
* @param value the recordInfo to set
* @return this
*/
public PlayerDetailInfo setRecordInfo(final CharSequence value) {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000400;
recordInfo.copyFrom(value);
return this;
}
/**
- * - * DisplayAvatarDetailInfo display_avatar_info = 14; - *- * - *
optional string record_info = 15;
+ * optional string record_info = 425;
* @param value the recordInfo to set
* @return this
*/
public PlayerDetailInfo setRecordInfo(final Utf8String value) {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000400;
recordInfo.copyFrom(value);
return this;
}
@@ -581,11 +633,13 @@ public final class PlayerDetailInfoOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- headIcon = other.headIcon;
- level = other.level;
- worldLevel = other.worldLevel;
+ int1 = other.int1;
uid = other.uid;
+ headIcon = other.headIcon;
+ worldLevel = other.worldLevel;
+ level = other.level;
platformType = other.platformType;
+ b1 = other.b1;
signature.copyFrom(other.signature);
nickname.copyFrom(other.nickname);
displayAvatarInfo.copyFrom(other.displayAvatarInfo);
@@ -600,21 +654,27 @@ public final class PlayerDetailInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasHeadIcon()) {
- setHeadIcon(other.headIcon);
- }
- if (other.hasLevel()) {
- setLevel(other.level);
- }
- if (other.hasWorldLevel()) {
- setWorldLevel(other.worldLevel);
+ if (other.hasInt1()) {
+ setInt1(other.int1);
}
if (other.hasUid()) {
setUid(other.uid);
}
+ if (other.hasHeadIcon()) {
+ setHeadIcon(other.headIcon);
+ }
+ if (other.hasWorldLevel()) {
+ setWorldLevel(other.worldLevel);
+ }
+ if (other.hasLevel()) {
+ setLevel(other.level);
+ }
if (other.hasPlatformType()) {
setPlatformTypeValue(other.platformType);
}
+ if (other.hasB1()) {
+ setB1(other.b1);
+ }
if (other.hasSignature()) {
getMutableSignatureBytes().copyFrom(other.signature);
}
@@ -637,11 +697,13 @@ public final class PlayerDetailInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- headIcon = 0;
- level = 0;
- worldLevel = 0;
+ int1 = 0;
uid = 0;
+ headIcon = 0;
+ worldLevel = 0;
+ level = 0;
platformType = 0;
+ b1 = false;
signature.clear();
nickname.clear();
displayAvatarInfo.clear();
@@ -673,11 +735,13 @@ public final class PlayerDetailInfoOuterClass {
}
PlayerDetailInfo other = (PlayerDetailInfo) o;
return bitField0_ == other.bitField0_
- && (!hasHeadIcon() || headIcon == other.headIcon)
- && (!hasLevel() || level == other.level)
- && (!hasWorldLevel() || worldLevel == other.worldLevel)
+ && (!hasInt1() || int1 == other.int1)
&& (!hasUid() || uid == other.uid)
+ && (!hasHeadIcon() || headIcon == other.headIcon)
+ && (!hasWorldLevel() || worldLevel == other.worldLevel)
+ && (!hasLevel() || level == other.level)
&& (!hasPlatformType() || platformType == other.platformType)
+ && (!hasB1() || b1 == other.b1)
&& (!hasSignature() || signature.equals(other.signature))
&& (!hasNickname() || nickname.equals(other.nickname))
&& (!hasDisplayAvatarInfo() || displayAvatarInfo.equals(other.displayAvatarInfo))
@@ -687,39 +751,47 @@ public final class PlayerDetailInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
- output.writeUInt32NoTag(headIcon);
+ output.writeRawByte((byte) 8);
+ output.writeInt32NoTag(int1);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 72);
- output.writeUInt32NoTag(level);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(worldLevel);
- }
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(uid);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 48);
+ output.writeUInt32NoTag(headIcon);
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeRawByte((byte) 72);
+ output.writeUInt32NoTag(worldLevel);
+ }
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 32);
- output.writeEnumNoTag(platformType);
+ output.writeRawByte((byte) 80);
+ output.writeUInt32NoTag(level);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 18);
- output.writeStringNoTag(signature);
+ output.writeRawByte((byte) 120);
+ output.writeEnumNoTag(platformType);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawByte((byte) 50);
- output.writeStringNoTag(nickname);
+ output.writeRawByte((byte) 112);
+ output.writeBoolNoTag(b1);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRawByte((byte) 114);
- output.writeStringNoTag(displayAvatarInfo);
+ output.writeRawByte((byte) 26);
+ output.writeStringNoTag(signature);
}
if ((bitField0_ & 0x00000100) != 0) {
- output.writeRawByte((byte) 122);
+ output.writeRawByte((byte) 34);
+ output.writeStringNoTag(nickname);
+ }
+ if ((bitField0_ & 0x00000200) != 0) {
+ output.writeRawByte((byte) 106);
+ output.writeStringNoTag(displayAvatarInfo);
+ }
+ if ((bitField0_ & 0x00000400) != 0) {
+ output.writeRawLittleEndian16((short) 6858);
output.writeStringNoTag(recordInfo);
}
}
@@ -728,31 +800,37 @@ public final class PlayerDetailInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(headIcon);
+ size += 1 + ProtoSink.computeInt32SizeNoTag(int1);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel);
- }
- if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(uid);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(headIcon);
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel);
+ }
if ((bitField0_ & 0x00000010) != 0) {
- size += 1 + ProtoSink.computeEnumSizeNoTag(platformType);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
}
if ((bitField0_ & 0x00000020) != 0) {
- size += 1 + ProtoSink.computeStringSizeNoTag(signature);
+ size += 1 + ProtoSink.computeEnumSizeNoTag(platformType);
}
if ((bitField0_ & 0x00000040) != 0) {
- size += 1 + ProtoSink.computeStringSizeNoTag(nickname);
+ size += 2;
}
if ((bitField0_ & 0x00000080) != 0) {
- size += 1 + ProtoSink.computeStringSizeNoTag(displayAvatarInfo);
+ size += 1 + ProtoSink.computeStringSizeNoTag(signature);
}
if ((bitField0_ & 0x00000100) != 0) {
- size += 1 + ProtoSink.computeStringSizeNoTag(recordInfo);
+ size += 1 + ProtoSink.computeStringSizeNoTag(nickname);
+ }
+ if ((bitField0_ & 0x00000200) != 0) {
+ size += 1 + ProtoSink.computeStringSizeNoTag(displayAvatarInfo);
+ }
+ if ((bitField0_ & 0x00000400) != 0) {
+ size += 2 + ProtoSink.computeStringSizeNoTag(recordInfo);
}
return size;
}
@@ -764,85 +842,103 @@ public final class PlayerDetailInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
+ case 8: {
+ // int1
+ int1 = input.readInt32();
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 40) {
+ break;
+ }
+ }
+ case 40: {
+ // uid
+ uid = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 48) {
+ break;
+ }
+ }
+ case 48: {
// headIcon
headIcon = input.readUInt32();
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 72) {
break;
}
}
case 72: {
- // level
- level = input.readUInt32();
- bitField0_ |= 0x00000002;
+ // worldLevel
+ worldLevel = input.readUInt32();
+ bitField0_ |= 0x00000008;
tag = input.readTag();
if (tag != 80) {
break;
}
}
case 80: {
- // worldLevel
- worldLevel = input.readUInt32();
- bitField0_ |= 0x00000004;
+ // level
+ level = input.readUInt32();
+ bitField0_ |= 0x00000010;
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 120) {
break;
}
}
- case 104: {
- // uid
- uid = input.readUInt32();
- bitField0_ |= 0x00000008;
- tag = input.readTag();
- if (tag != 32) {
- break;
- }
- }
- case 32: {
+ case 120: {
// platformType
final int value = input.readInt32();
if (PlatformTypeOuterClass.PlatformType.forNumber(value) != null) {
platformType = value;
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000020;
}
tag = input.readTag();
- if (tag != 18) {
+ if (tag != 112) {
break;
}
}
- case 18: {
- // signature
- input.readString(signature);
- bitField0_ |= 0x00000020;
- tag = input.readTag();
- if (tag != 50) {
- break;
- }
- }
- case 50: {
- // nickname
- input.readString(nickname);
+ case 112: {
+ // b1
+ b1 = input.readBool();
bitField0_ |= 0x00000040;
tag = input.readTag();
- if (tag != 114) {
+ if (tag != 26) {
break;
}
}
- case 114: {
- // displayAvatarInfo
- input.readString(displayAvatarInfo);
+ case 26: {
+ // signature
+ input.readString(signature);
bitField0_ |= 0x00000080;
tag = input.readTag();
- if (tag != 122) {
+ if (tag != 34) {
break;
}
}
- case 122: {
+ case 34: {
+ // nickname
+ input.readString(nickname);
+ bitField0_ |= 0x00000100;
+ tag = input.readTag();
+ if (tag != 106) {
+ break;
+ }
+ }
+ case 106: {
+ // displayAvatarInfo
+ input.readString(displayAvatarInfo);
+ bitField0_ |= 0x00000200;
+ tag = input.readTag();
+ if (tag != 3402) {
+ break;
+ }
+ }
+ case 3402: {
// recordInfo
input.readString(recordInfo);
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000400;
tag = input.readTag();
if (tag != 0) {
break;
@@ -866,30 +962,36 @@ public final class PlayerDetailInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.headIcon, headIcon);
+ output.writeInt32(FieldNames.int1, int1);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.level, level);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.worldLevel, worldLevel);
- }
- if ((bitField0_ & 0x00000008) != 0) {
output.writeUInt32(FieldNames.uid, uid);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeUInt32(FieldNames.headIcon, headIcon);
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeUInt32(FieldNames.worldLevel, worldLevel);
+ }
if ((bitField0_ & 0x00000010) != 0) {
- output.writeEnum(FieldNames.platformType, platformType, PlatformTypeOuterClass.PlatformType.converter());
+ output.writeUInt32(FieldNames.level, level);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeString(FieldNames.signature, signature);
+ output.writeEnum(FieldNames.platformType, platformType, PlatformTypeOuterClass.PlatformType.converter());
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeString(FieldNames.nickname, nickname);
+ output.writeBool(FieldNames.b1, b1);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeString(FieldNames.displayAvatarInfo, displayAvatarInfo);
+ output.writeString(FieldNames.signature, signature);
}
if ((bitField0_ & 0x00000100) != 0) {
+ output.writeString(FieldNames.nickname, nickname);
+ }
+ if ((bitField0_ & 0x00000200) != 0) {
+ output.writeString(FieldNames.displayAvatarInfo, displayAvatarInfo);
+ }
+ if ((bitField0_ & 0x00000400) != 0) {
output.writeString(FieldNames.recordInfo, recordInfo);
}
output.endObject();
@@ -902,11 +1004,10 @@ public final class PlayerDetailInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1116107143:
- case -219098248: {
- if (input.isAtField(FieldNames.headIcon)) {
+ case 3237410: {
+ if (input.isAtField(FieldNames.int1)) {
if (!input.trySkipNullValue()) {
- headIcon = input.readUInt32();
+ int1 = input.readInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -914,10 +1015,10 @@ public final class PlayerDetailInfoOuterClass {
}
break;
}
- case 102865796: {
- if (input.isAtField(FieldNames.level)) {
+ case 115792: {
+ if (input.isAtField(FieldNames.uid)) {
if (!input.trySkipNullValue()) {
- level = input.readUInt32();
+ uid = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -925,23 +1026,35 @@ public final class PlayerDetailInfoOuterClass {
}
break;
}
+ case -1116107143:
+ case -219098248: {
+ if (input.isAtField(FieldNames.headIcon)) {
+ if (!input.trySkipNullValue()) {
+ headIcon = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case 440007442:
case 1305257111: {
if (input.isAtField(FieldNames.worldLevel)) {
if (!input.trySkipNullValue()) {
worldLevel = input.readUInt32();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000008;
}
} else {
input.skipUnknownField();
}
break;
}
- case 115792: {
- if (input.isAtField(FieldNames.uid)) {
+ case 102865796: {
+ if (input.isAtField(FieldNames.level)) {
if (!input.trySkipNullValue()) {
- uid = input.readUInt32();
- bitField0_ |= 0x00000008;
+ level = input.readUInt32();
+ bitField0_ |= 0x00000010;
}
} else {
input.skipUnknownField();
@@ -955,7 +1068,7 @@ public final class PlayerDetailInfoOuterClass {
final PlatformTypeOuterClass.PlatformType value = input.readEnum(PlatformTypeOuterClass.PlatformType.converter());
if (value != null) {
platformType = value.getNumber();
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000020;
} else {
input.skipUnknownEnumValue();
}
@@ -965,11 +1078,22 @@ public final class PlayerDetailInfoOuterClass {
}
break;
}
+ case 3087: {
+ if (input.isAtField(FieldNames.b1)) {
+ if (!input.trySkipNullValue()) {
+ b1 = input.readBool();
+ bitField0_ |= 0x00000040;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case 1073584312: {
if (input.isAtField(FieldNames.signature)) {
if (!input.trySkipNullValue()) {
input.readString(signature);
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000080;
}
} else {
input.skipUnknownField();
@@ -980,7 +1104,7 @@ public final class PlayerDetailInfoOuterClass {
if (input.isAtField(FieldNames.nickname)) {
if (!input.trySkipNullValue()) {
input.readString(nickname);
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000100;
}
} else {
input.skipUnknownField();
@@ -992,7 +1116,7 @@ public final class PlayerDetailInfoOuterClass {
if (input.isAtField(FieldNames.displayAvatarInfo)) {
if (!input.trySkipNullValue()) {
input.readString(displayAvatarInfo);
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000200;
}
} else {
input.skipUnknownField();
@@ -1004,7 +1128,7 @@ public final class PlayerDetailInfoOuterClass {
if (input.isAtField(FieldNames.recordInfo)) {
if (!input.trySkipNullValue()) {
input.readString(recordInfo);
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000400;
}
} else {
input.skipUnknownField();
@@ -1064,16 +1188,20 @@ public final class PlayerDetailInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName headIcon = FieldName.forField("headIcon", "head_icon");
-
- static final FieldName level = FieldName.forField("level");
-
- static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level");
+ static final FieldName int1 = FieldName.forField("int1");
static final FieldName uid = FieldName.forField("uid");
+ static final FieldName headIcon = FieldName.forField("headIcon", "head_icon");
+
+ static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level");
+
+ static final FieldName level = FieldName.forField("level");
+
static final FieldName platformType = FieldName.forField("platformType", "platform_type");
+ static final FieldName b1 = FieldName.forField("b1");
+
static final FieldName signature = FieldName.forField("signature");
static final FieldName nickname = FieldName.forField("nickname");
diff --git a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java
index 01d0978..9bfc17f 100644
--- a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java
@@ -20,20 +20,20 @@ public final class PlayerGetTokenCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 platform_type = 12;
+ * optional uint32 platform_type = 15;
*/
private int platformType;
/**
- * optional string token = 8;
- */
- private final Utf8String token = Utf8String.newEmptyInstance();
-
- /**
- * optional string account_uid = 11;
+ * optional string account_uid = 6;
*/
private final Utf8String accountUid = Utf8String.newEmptyInstance();
+ /**
+ * optional string token = 9;
+ */
+ private final Utf8String token = Utf8String.newEmptyInstance();
+
private PlayerGetTokenCsReq() {
}
@@ -45,7 +45,7 @@ public final class PlayerGetTokenCsReqOuterClass {
}
/**
- * optional uint32 platform_type = 12;
+ * optional uint32 platform_type = 15;
* @return whether the platformType field is set
*/
public boolean hasPlatformType() {
@@ -53,7 +53,7 @@ public final class PlayerGetTokenCsReqOuterClass {
}
/**
- * optional uint32 platform_type = 12;
+ * optional uint32 platform_type = 15;
* @return this
*/
public PlayerGetTokenCsReq clearPlatformType() {
@@ -63,7 +63,7 @@ public final class PlayerGetTokenCsReqOuterClass {
}
/**
- * optional uint32 platform_type = 12;
+ * optional uint32 platform_type = 15;
* @return the platformType
*/
public int getPlatformType() {
@@ -71,7 +71,7 @@ public final class PlayerGetTokenCsReqOuterClass {
}
/**
- * optional uint32 platform_type = 12;
+ * optional uint32 platform_type = 15;
* @param value the platformType to set
* @return this
*/
@@ -82,90 +82,25 @@ public final class PlayerGetTokenCsReqOuterClass {
}
/**
- * optional string token = 8;
- * @return whether the token field is set
+ * optional string account_uid = 6;
+ * @return whether the accountUid field is set
*/
- public boolean hasToken() {
+ public boolean hasAccountUid() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional string token = 8;
- * @return this
- */
- public PlayerGetTokenCsReq clearToken() {
- bitField0_ &= ~0x00000002;
- token.clear();
- return this;
- }
-
- /**
- * optional string token = 8;
- * @return the token
- */
- public String getToken() {
- return token.getString();
- }
-
- /**
- * optional string token = 8;
- * @return internal {@code Utf8String} representation of token for reading
- */
- public Utf8String getTokenBytes() {
- return this.token;
- }
-
- /**
- * optional string token = 8;
- * @return internal {@code Utf8String} representation of token for modifications
- */
- public Utf8String getMutableTokenBytes() {
- bitField0_ |= 0x00000002;
- return this.token;
- }
-
- /**
- * optional string token = 8;
- * @param value the token to set
- * @return this
- */
- public PlayerGetTokenCsReq setToken(final CharSequence value) {
- bitField0_ |= 0x00000002;
- token.copyFrom(value);
- return this;
- }
-
- /**
- * optional string token = 8;
- * @param value the token to set
- * @return this
- */
- public PlayerGetTokenCsReq setToken(final Utf8String value) {
- bitField0_ |= 0x00000002;
- token.copyFrom(value);
- return this;
- }
-
- /**
- * optional string account_uid = 11;
- * @return whether the accountUid field is set
- */
- public boolean hasAccountUid() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional string account_uid = 11;
+ * optional string account_uid = 6;
* @return this
*/
public PlayerGetTokenCsReq clearAccountUid() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
accountUid.clear();
return this;
}
/**
- * optional string account_uid = 11;
+ * optional string account_uid = 6;
* @return the accountUid
*/
public String getAccountUid() {
@@ -173,7 +108,7 @@ public final class PlayerGetTokenCsReqOuterClass {
}
/**
- * optional string account_uid = 11;
+ * optional string account_uid = 6;
* @return internal {@code Utf8String} representation of accountUid for reading
*/
public Utf8String getAccountUidBytes() {
@@ -181,44 +116,109 @@ public final class PlayerGetTokenCsReqOuterClass {
}
/**
- * optional string account_uid = 11;
+ * optional string account_uid = 6;
* @return internal {@code Utf8String} representation of accountUid for modifications
*/
public Utf8String getMutableAccountUidBytes() {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
return this.accountUid;
}
/**
- * optional string account_uid = 11;
+ * optional string account_uid = 6;
* @param value the accountUid to set
* @return this
*/
public PlayerGetTokenCsReq setAccountUid(final CharSequence value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
accountUid.copyFrom(value);
return this;
}
/**
- * optional string account_uid = 11;
+ * optional string account_uid = 6;
* @param value the accountUid to set
* @return this
*/
public PlayerGetTokenCsReq setAccountUid(final Utf8String value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
accountUid.copyFrom(value);
return this;
}
+ /**
+ * optional string token = 9;
+ * @return whether the token field is set
+ */
+ public boolean hasToken() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional string token = 9;
+ * @return this
+ */
+ public PlayerGetTokenCsReq clearToken() {
+ bitField0_ &= ~0x00000004;
+ token.clear();
+ return this;
+ }
+
+ /**
+ * optional string token = 9;
+ * @return the token
+ */
+ public String getToken() {
+ return token.getString();
+ }
+
+ /**
+ * optional string token = 9;
+ * @return internal {@code Utf8String} representation of token for reading
+ */
+ public Utf8String getTokenBytes() {
+ return this.token;
+ }
+
+ /**
+ * optional string token = 9;
+ * @return internal {@code Utf8String} representation of token for modifications
+ */
+ public Utf8String getMutableTokenBytes() {
+ bitField0_ |= 0x00000004;
+ return this.token;
+ }
+
+ /**
+ * optional string token = 9;
+ * @param value the token to set
+ * @return this
+ */
+ public PlayerGetTokenCsReq setToken(final CharSequence value) {
+ bitField0_ |= 0x00000004;
+ token.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional string token = 9;
+ * @param value the token to set
+ * @return this
+ */
+ public PlayerGetTokenCsReq setToken(final Utf8String value) {
+ bitField0_ |= 0x00000004;
+ token.copyFrom(value);
+ return this;
+ }
+
@Override
public PlayerGetTokenCsReq copyFrom(final PlayerGetTokenCsReq other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
platformType = other.platformType;
- token.copyFrom(other.token);
accountUid.copyFrom(other.accountUid);
+ token.copyFrom(other.token);
}
return this;
}
@@ -232,12 +232,12 @@ public final class PlayerGetTokenCsReqOuterClass {
if (other.hasPlatformType()) {
setPlatformType(other.platformType);
}
- if (other.hasToken()) {
- getMutableTokenBytes().copyFrom(other.token);
- }
if (other.hasAccountUid()) {
getMutableAccountUidBytes().copyFrom(other.accountUid);
}
+ if (other.hasToken()) {
+ getMutableTokenBytes().copyFrom(other.token);
+ }
return this;
}
@@ -249,8 +249,8 @@ public final class PlayerGetTokenCsReqOuterClass {
cachedSize = -1;
bitField0_ = 0;
platformType = 0;
- token.clear();
accountUid.clear();
+ token.clear();
return this;
}
@@ -261,8 +261,8 @@ public final class PlayerGetTokenCsReqOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- token.clear();
accountUid.clear();
+ token.clear();
return this;
}
@@ -277,23 +277,23 @@ public final class PlayerGetTokenCsReqOuterClass {
PlayerGetTokenCsReq other = (PlayerGetTokenCsReq) o;
return bitField0_ == other.bitField0_
&& (!hasPlatformType() || platformType == other.platformType)
- && (!hasToken() || token.equals(other.token))
- && (!hasAccountUid() || accountUid.equals(other.accountUid));
+ && (!hasAccountUid() || accountUid.equals(other.accountUid))
+ && (!hasToken() || token.equals(other.token));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(platformType);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 66);
- output.writeStringNoTag(token);
+ output.writeRawByte((byte) 50);
+ output.writeStringNoTag(accountUid);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 90);
- output.writeStringNoTag(accountUid);
+ output.writeRawByte((byte) 74);
+ output.writeStringNoTag(token);
}
}
@@ -304,10 +304,10 @@ public final class PlayerGetTokenCsReqOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(platformType);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeStringSizeNoTag(token);
+ size += 1 + ProtoSink.computeStringSizeNoTag(accountUid);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeStringSizeNoTag(accountUid);
+ size += 1 + ProtoSink.computeStringSizeNoTag(token);
}
return size;
}
@@ -319,27 +319,27 @@ public final class PlayerGetTokenCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 96: {
+ case 120: {
// platformType
platformType = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 66) {
+ if (tag != 50) {
break;
}
}
- case 66: {
- // token
- input.readString(token);
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 90) {
- break;
- }
- }
- case 90: {
+ case 50: {
// accountUid
input.readString(accountUid);
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 74) {
+ break;
+ }
+ }
+ case 74: {
+ // token
+ input.readString(token);
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 0) {
@@ -367,10 +367,10 @@ public final class PlayerGetTokenCsReqOuterClass {
output.writeUInt32(FieldNames.platformType, platformType);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeString(FieldNames.token, token);
+ output.writeString(FieldNames.accountUid, accountUid);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeString(FieldNames.accountUid, accountUid);
+ output.writeString(FieldNames.token, token);
}
output.endObject();
}
@@ -394,10 +394,11 @@ public final class PlayerGetTokenCsReqOuterClass {
}
break;
}
- case 110541305: {
- if (input.isAtField(FieldNames.token)) {
+ case -803342621:
+ case 866492222: {
+ if (input.isAtField(FieldNames.accountUid)) {
if (!input.trySkipNullValue()) {
- input.readString(token);
+ input.readString(accountUid);
bitField0_ |= 0x00000002;
}
} else {
@@ -405,11 +406,10 @@ public final class PlayerGetTokenCsReqOuterClass {
}
break;
}
- case -803342621:
- case 866492222: {
- if (input.isAtField(FieldNames.accountUid)) {
+ case 110541305: {
+ if (input.isAtField(FieldNames.token)) {
if (!input.trySkipNullValue()) {
- input.readString(accountUid);
+ input.readString(token);
bitField0_ |= 0x00000004;
}
} else {
@@ -472,9 +472,9 @@ public final class PlayerGetTokenCsReqOuterClass {
static class FieldNames {
static final FieldName platformType = FieldName.forField("platformType", "platform_type");
- static final FieldName token = FieldName.forField("token");
-
static final FieldName accountUid = FieldName.forField("accountUid", "account_uid");
+
+ static final FieldName token = FieldName.forField("token");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenScRspOuterClass.java
index 9f6373b..28329e5 100644
--- a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenScRspOuterClass.java
@@ -20,27 +20,27 @@ public final class PlayerGetTokenScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint64 secret_key_seed = 11;
+ * optional uint64 secret_key_seed = 7;
*/
private long secretKeySeed;
/**
- * optional uint32 uid = 1;
- */
- private int uid;
-
- /**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 3;
*/
private int retcode;
/**
- * optional .BlackInfo black_info = 15;
+ * optional uint32 uid = 6;
+ */
+ private int uid;
+
+ /**
+ * optional .BlackInfo black_info = 13;
*/
private final BlackInfoOuterClass.BlackInfo blackInfo = BlackInfoOuterClass.BlackInfo.newInstance();
/**
- * optional string msg = 5;
+ * optional string msg = 11;
*/
private final Utf8String msg = Utf8String.newEmptyInstance();
@@ -55,7 +55,7 @@ public final class PlayerGetTokenScRspOuterClass {
}
/**
- * optional uint64 secret_key_seed = 11;
+ * optional uint64 secret_key_seed = 7;
* @return whether the secretKeySeed field is set
*/
public boolean hasSecretKeySeed() {
@@ -63,7 +63,7 @@ public final class PlayerGetTokenScRspOuterClass {
}
/**
- * optional uint64 secret_key_seed = 11;
+ * optional uint64 secret_key_seed = 7;
* @return this
*/
public PlayerGetTokenScRsp clearSecretKeySeed() {
@@ -73,7 +73,7 @@ public final class PlayerGetTokenScRspOuterClass {
}
/**
- * optional uint64 secret_key_seed = 11;
+ * optional uint64 secret_key_seed = 7;
* @return the secretKeySeed
*/
public long getSecretKeySeed() {
@@ -81,7 +81,7 @@ public final class PlayerGetTokenScRspOuterClass {
}
/**
- * optional uint64 secret_key_seed = 11;
+ * optional uint64 secret_key_seed = 7;
* @param value the secretKeySeed to set
* @return this
*/
@@ -92,62 +92,25 @@ public final class PlayerGetTokenScRspOuterClass {
}
/**
- * optional uint32 uid = 1;
- * @return whether the uid field is set
+ * optional uint32 retcode = 3;
+ * @return whether the retcode field is set
*/
- public boolean hasUid() {
+ public boolean hasRetcode() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 uid = 1;
- * @return this
- */
- public PlayerGetTokenScRsp clearUid() {
- bitField0_ &= ~0x00000002;
- uid = 0;
- return this;
- }
-
- /**
- * optional uint32 uid = 1;
- * @return the uid
- */
- public int getUid() {
- return uid;
- }
-
- /**
- * optional uint32 uid = 1;
- * @param value the uid to set
- * @return this
- */
- public PlayerGetTokenScRsp setUid(final int value) {
- bitField0_ |= 0x00000002;
- uid = value;
- return this;
- }
-
- /**
- * optional uint32 retcode = 7;
- * @return whether the retcode field is set
- */
- public boolean hasRetcode() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 3;
* @return this
*/
public PlayerGetTokenScRsp clearRetcode() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
retcode = 0;
return this;
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 3;
* @return the retcode
*/
public int getRetcode() {
@@ -155,18 +118,55 @@ public final class PlayerGetTokenScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 3;
* @param value the retcode to set
* @return this
*/
public PlayerGetTokenScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
retcode = value;
return this;
}
/**
- * optional .BlackInfo black_info = 15;
+ * optional uint32 uid = 6;
+ * @return whether the uid field is set
+ */
+ public boolean hasUid() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 uid = 6;
+ * @return this
+ */
+ public PlayerGetTokenScRsp clearUid() {
+ bitField0_ &= ~0x00000004;
+ uid = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 uid = 6;
+ * @return the uid
+ */
+ public int getUid() {
+ return uid;
+ }
+
+ /**
+ * optional uint32 uid = 6;
+ * @param value the uid to set
+ * @return this
+ */
+ public PlayerGetTokenScRsp setUid(final int value) {
+ bitField0_ |= 0x00000004;
+ uid = value;
+ return this;
+ }
+
+ /**
+ * optional .BlackInfo black_info = 13;
* @return whether the blackInfo field is set
*/
public boolean hasBlackInfo() {
@@ -174,7 +174,7 @@ public final class PlayerGetTokenScRspOuterClass {
}
/**
- * optional .BlackInfo black_info = 15;
+ * optional .BlackInfo black_info = 13;
* @return this
*/
public PlayerGetTokenScRsp clearBlackInfo() {
@@ -184,7 +184,7 @@ public final class PlayerGetTokenScRspOuterClass {
}
/**
- * optional .BlackInfo black_info = 15;
+ * optional .BlackInfo black_info = 13;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -198,7 +198,7 @@ public final class PlayerGetTokenScRspOuterClass {
}
/**
- * optional .BlackInfo black_info = 15;
+ * optional .BlackInfo black_info = 13;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -212,7 +212,7 @@ public final class PlayerGetTokenScRspOuterClass {
}
/**
- * optional .BlackInfo black_info = 15;
+ * optional .BlackInfo black_info = 13;
* @param value the blackInfo to set
* @return this
*/
@@ -223,7 +223,7 @@ public final class PlayerGetTokenScRspOuterClass {
}
/**
- * optional string msg = 5;
+ * optional string msg = 11;
* @return whether the msg field is set
*/
public boolean hasMsg() {
@@ -231,7 +231,7 @@ public final class PlayerGetTokenScRspOuterClass {
}
/**
- * optional string msg = 5;
+ * optional string msg = 11;
* @return this
*/
public PlayerGetTokenScRsp clearMsg() {
@@ -241,7 +241,7 @@ public final class PlayerGetTokenScRspOuterClass {
}
/**
- * optional string msg = 5;
+ * optional string msg = 11;
* @return the msg
*/
public String getMsg() {
@@ -249,7 +249,7 @@ public final class PlayerGetTokenScRspOuterClass {
}
/**
- * optional string msg = 5;
+ * optional string msg = 11;
* @return internal {@code Utf8String} representation of msg for reading
*/
public Utf8String getMsgBytes() {
@@ -257,7 +257,7 @@ public final class PlayerGetTokenScRspOuterClass {
}
/**
- * optional string msg = 5;
+ * optional string msg = 11;
* @return internal {@code Utf8String} representation of msg for modifications
*/
public Utf8String getMutableMsgBytes() {
@@ -266,7 +266,7 @@ public final class PlayerGetTokenScRspOuterClass {
}
/**
- * optional string msg = 5;
+ * optional string msg = 11;
* @param value the msg to set
* @return this
*/
@@ -277,7 +277,7 @@ public final class PlayerGetTokenScRspOuterClass {
}
/**
- * optional string msg = 5;
+ * optional string msg = 11;
* @param value the msg to set
* @return this
*/
@@ -293,8 +293,8 @@ public final class PlayerGetTokenScRspOuterClass {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
secretKeySeed = other.secretKeySeed;
- uid = other.uid;
retcode = other.retcode;
+ uid = other.uid;
blackInfo.copyFrom(other.blackInfo);
msg.copyFrom(other.msg);
}
@@ -310,12 +310,12 @@ public final class PlayerGetTokenScRspOuterClass {
if (other.hasSecretKeySeed()) {
setSecretKeySeed(other.secretKeySeed);
}
- if (other.hasUid()) {
- setUid(other.uid);
- }
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
+ if (other.hasUid()) {
+ setUid(other.uid);
+ }
if (other.hasBlackInfo()) {
getMutableBlackInfo().mergeFrom(other.blackInfo);
}
@@ -333,8 +333,8 @@ public final class PlayerGetTokenScRspOuterClass {
cachedSize = -1;
bitField0_ = 0;
secretKeySeed = 0L;
- uid = 0;
retcode = 0;
+ uid = 0;
blackInfo.clear();
msg.clear();
return this;
@@ -363,8 +363,8 @@ public final class PlayerGetTokenScRspOuterClass {
PlayerGetTokenScRsp other = (PlayerGetTokenScRsp) o;
return bitField0_ == other.bitField0_
&& (!hasSecretKeySeed() || secretKeySeed == other.secretKeySeed)
- && (!hasUid() || uid == other.uid)
&& (!hasRetcode() || retcode == other.retcode)
+ && (!hasUid() || uid == other.uid)
&& (!hasBlackInfo() || blackInfo.equals(other.blackInfo))
&& (!hasMsg() || msg.equals(other.msg));
}
@@ -372,23 +372,23 @@ public final class PlayerGetTokenScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 56);
output.writeUInt64NoTag(secretKeySeed);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(uid);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(retcode);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 48);
+ output.writeUInt32NoTag(uid);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 122);
+ output.writeRawByte((byte) 106);
output.writeMessageNoTag(blackInfo);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 42);
+ output.writeRawByte((byte) 90);
output.writeStringNoTag(msg);
}
}
@@ -400,10 +400,10 @@ public final class PlayerGetTokenScRspOuterClass {
size += 1 + ProtoSink.computeUInt64SizeNoTag(secretKeySeed);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(uid);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(uid);
}
if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(blackInfo);
@@ -421,43 +421,43 @@ public final class PlayerGetTokenScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 88: {
+ case 56: {
// secretKeySeed
secretKeySeed = input.readUInt64();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 8) {
+ if (tag != 24) {
break;
}
}
- case 8: {
- // uid
- uid = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 56) {
- break;
- }
- }
- case 56: {
+ case 24: {
// retcode
retcode = input.readUInt32();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 122) {
+ if (tag != 48) {
break;
}
}
- case 122: {
+ case 48: {
+ // uid
+ uid = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 106) {
+ break;
+ }
+ }
+ case 106: {
// blackInfo
input.readMessage(blackInfo);
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 42) {
+ if (tag != 90) {
break;
}
}
- case 42: {
+ case 90: {
// msg
input.readString(msg);
bitField0_ |= 0x00000010;
@@ -487,10 +487,10 @@ public final class PlayerGetTokenScRspOuterClass {
output.writeUInt64(FieldNames.secretKeySeed, secretKeySeed);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.uid, uid);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.uid, uid);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeMessage(FieldNames.blackInfo, blackInfo);
@@ -520,10 +520,10 @@ public final class PlayerGetTokenScRspOuterClass {
}
break;
}
- case 115792: {
- if (input.isAtField(FieldNames.uid)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- uid = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -531,10 +531,10 @@ public final class PlayerGetTokenScRspOuterClass {
}
break;
}
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case 115792: {
+ if (input.isAtField(FieldNames.uid)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ uid = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -620,10 +620,10 @@ public final class PlayerGetTokenScRspOuterClass {
static class FieldNames {
static final FieldName secretKeySeed = FieldName.forField("secretKeySeed", "secret_key_seed");
- static final FieldName uid = FieldName.forField("uid");
-
static final FieldName retcode = FieldName.forField("retcode");
+ static final FieldName uid = FieldName.forField("uid");
+
static final FieldName blackInfo = FieldName.forField("blackInfo", "black_info");
static final FieldName msg = FieldName.forField("msg");
diff --git a/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatCsReqOuterClass.java
index 1eead84..538aec4 100644
--- a/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class PlayerHeartbeatCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint64 client_time_ms = 9;
+ * optional uint64 client_time_ms = 8;
*/
private long clientTimeMs;
@@ -34,7 +34,7 @@ public final class PlayerHeartbeatCsReqOuterClass {
}
/**
- * optional uint64 client_time_ms = 9;
+ * optional uint64 client_time_ms = 8;
* @return whether the clientTimeMs field is set
*/
public boolean hasClientTimeMs() {
@@ -42,7 +42,7 @@ public final class PlayerHeartbeatCsReqOuterClass {
}
/**
- * optional uint64 client_time_ms = 9;
+ * optional uint64 client_time_ms = 8;
* @return this
*/
public PlayerHeartbeatCsReq clearClientTimeMs() {
@@ -52,7 +52,7 @@ public final class PlayerHeartbeatCsReqOuterClass {
}
/**
- * optional uint64 client_time_ms = 9;
+ * optional uint64 client_time_ms = 8;
* @return the clientTimeMs
*/
public long getClientTimeMs() {
@@ -60,7 +60,7 @@ public final class PlayerHeartbeatCsReqOuterClass {
}
/**
- * optional uint64 client_time_ms = 9;
+ * optional uint64 client_time_ms = 8;
* @param value the clientTimeMs to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class PlayerHeartbeatCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 64);
output.writeUInt64NoTag(clientTimeMs);
}
}
@@ -150,7 +150,7 @@ public final class PlayerHeartbeatCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 72: {
+ case 64: {
// clientTimeMs
clientTimeMs = input.readUInt64();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatScRspOuterClass.java
index bfa1c03..a8343cc 100644
--- a/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatScRspOuterClass.java
@@ -19,17 +19,17 @@ public final class PlayerHeartbeatScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint64 server_time_ms = 5;
- */
- private long serverTimeMs;
-
- /**
- * optional uint64 client_time_ms = 12;
+ * optional uint64 client_time_ms = 6;
*/
private long clientTimeMs;
/**
- * optional uint32 retcode = 1;
+ * optional uint64 server_time_ms = 15;
+ */
+ private long serverTimeMs;
+
+ /**
+ * optional uint32 retcode = 10;
*/
private int retcode;
@@ -44,62 +44,25 @@ public final class PlayerHeartbeatScRspOuterClass {
}
/**
- * optional uint64 server_time_ms = 5;
- * @return whether the serverTimeMs field is set
+ * optional uint64 client_time_ms = 6;
+ * @return whether the clientTimeMs field is set
*/
- public boolean hasServerTimeMs() {
+ public boolean hasClientTimeMs() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint64 server_time_ms = 5;
- * @return this
- */
- public PlayerHeartbeatScRsp clearServerTimeMs() {
- bitField0_ &= ~0x00000001;
- serverTimeMs = 0L;
- return this;
- }
-
- /**
- * optional uint64 server_time_ms = 5;
- * @return the serverTimeMs
- */
- public long getServerTimeMs() {
- return serverTimeMs;
- }
-
- /**
- * optional uint64 server_time_ms = 5;
- * @param value the serverTimeMs to set
- * @return this
- */
- public PlayerHeartbeatScRsp setServerTimeMs(final long value) {
- bitField0_ |= 0x00000001;
- serverTimeMs = value;
- return this;
- }
-
- /**
- * optional uint64 client_time_ms = 12;
- * @return whether the clientTimeMs field is set
- */
- public boolean hasClientTimeMs() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint64 client_time_ms = 12;
+ * optional uint64 client_time_ms = 6;
* @return this
*/
public PlayerHeartbeatScRsp clearClientTimeMs() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
clientTimeMs = 0L;
return this;
}
/**
- * optional uint64 client_time_ms = 12;
+ * optional uint64 client_time_ms = 6;
* @return the clientTimeMs
*/
public long getClientTimeMs() {
@@ -107,18 +70,55 @@ public final class PlayerHeartbeatScRspOuterClass {
}
/**
- * optional uint64 client_time_ms = 12;
+ * optional uint64 client_time_ms = 6;
* @param value the clientTimeMs to set
* @return this
*/
public PlayerHeartbeatScRsp setClientTimeMs(final long value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
clientTimeMs = value;
return this;
}
/**
- * optional uint32 retcode = 1;
+ * optional uint64 server_time_ms = 15;
+ * @return whether the serverTimeMs field is set
+ */
+ public boolean hasServerTimeMs() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint64 server_time_ms = 15;
+ * @return this
+ */
+ public PlayerHeartbeatScRsp clearServerTimeMs() {
+ bitField0_ &= ~0x00000002;
+ serverTimeMs = 0L;
+ return this;
+ }
+
+ /**
+ * optional uint64 server_time_ms = 15;
+ * @return the serverTimeMs
+ */
+ public long getServerTimeMs() {
+ return serverTimeMs;
+ }
+
+ /**
+ * optional uint64 server_time_ms = 15;
+ * @param value the serverTimeMs to set
+ * @return this
+ */
+ public PlayerHeartbeatScRsp setServerTimeMs(final long value) {
+ bitField0_ |= 0x00000002;
+ serverTimeMs = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 retcode = 10;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -126,7 +126,7 @@ public final class PlayerHeartbeatScRspOuterClass {
}
/**
- * optional uint32 retcode = 1;
+ * optional uint32 retcode = 10;
* @return this
*/
public PlayerHeartbeatScRsp clearRetcode() {
@@ -136,7 +136,7 @@ public final class PlayerHeartbeatScRspOuterClass {
}
/**
- * optional uint32 retcode = 1;
+ * optional uint32 retcode = 10;
* @return the retcode
*/
public int getRetcode() {
@@ -144,7 +144,7 @@ public final class PlayerHeartbeatScRspOuterClass {
}
/**
- * optional uint32 retcode = 1;
+ * optional uint32 retcode = 10;
* @param value the retcode to set
* @return this
*/
@@ -159,8 +159,8 @@ public final class PlayerHeartbeatScRspOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- serverTimeMs = other.serverTimeMs;
clientTimeMs = other.clientTimeMs;
+ serverTimeMs = other.serverTimeMs;
retcode = other.retcode;
}
return this;
@@ -172,12 +172,12 @@ public final class PlayerHeartbeatScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasServerTimeMs()) {
- setServerTimeMs(other.serverTimeMs);
- }
if (other.hasClientTimeMs()) {
setClientTimeMs(other.clientTimeMs);
}
+ if (other.hasServerTimeMs()) {
+ setServerTimeMs(other.serverTimeMs);
+ }
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
@@ -191,8 +191,8 @@ public final class PlayerHeartbeatScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- serverTimeMs = 0L;
clientTimeMs = 0L;
+ serverTimeMs = 0L;
retcode = 0;
return this;
}
@@ -217,23 +217,23 @@ public final class PlayerHeartbeatScRspOuterClass {
}
PlayerHeartbeatScRsp other = (PlayerHeartbeatScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasServerTimeMs() || serverTimeMs == other.serverTimeMs)
&& (!hasClientTimeMs() || clientTimeMs == other.clientTimeMs)
+ && (!hasServerTimeMs() || serverTimeMs == other.serverTimeMs)
&& (!hasRetcode() || retcode == other.retcode);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
- output.writeUInt64NoTag(serverTimeMs);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 48);
output.writeUInt64NoTag(clientTimeMs);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 120);
+ output.writeUInt64NoTag(serverTimeMs);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(retcode);
}
}
@@ -242,10 +242,10 @@ public final class PlayerHeartbeatScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt64SizeNoTag(serverTimeMs);
+ size += 1 + ProtoSink.computeUInt64SizeNoTag(clientTimeMs);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt64SizeNoTag(clientTimeMs);
+ size += 1 + ProtoSink.computeUInt64SizeNoTag(serverTimeMs);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
@@ -260,25 +260,25 @@ public final class PlayerHeartbeatScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
- // serverTimeMs
- serverTimeMs = input.readUInt64();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 96) {
- break;
- }
- }
- case 96: {
+ case 48: {
// clientTimeMs
clientTimeMs = input.readUInt64();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 8) {
+ if (tag != 120) {
break;
}
}
- case 8: {
+ case 120: {
+ // serverTimeMs
+ serverTimeMs = input.readUInt64();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 80) {
+ break;
+ }
+ }
+ case 80: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000004;
@@ -305,10 +305,10 @@ public final class PlayerHeartbeatScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt64(FieldNames.serverTimeMs, serverTimeMs);
+ output.writeUInt64(FieldNames.clientTimeMs, clientTimeMs);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt64(FieldNames.clientTimeMs, clientTimeMs);
+ output.writeUInt64(FieldNames.serverTimeMs, serverTimeMs);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.retcode, retcode);
@@ -323,11 +323,11 @@ public final class PlayerHeartbeatScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 1928739446:
- case 1149956956: {
- if (input.isAtField(FieldNames.serverTimeMs)) {
+ case -1414301442:
+ case 1123200996: {
+ if (input.isAtField(FieldNames.clientTimeMs)) {
if (!input.trySkipNullValue()) {
- serverTimeMs = input.readUInt64();
+ clientTimeMs = input.readUInt64();
bitField0_ |= 0x00000001;
}
} else {
@@ -335,11 +335,11 @@ public final class PlayerHeartbeatScRspOuterClass {
}
break;
}
- case -1414301442:
- case 1123200996: {
- if (input.isAtField(FieldNames.clientTimeMs)) {
+ case 1928739446:
+ case 1149956956: {
+ if (input.isAtField(FieldNames.serverTimeMs)) {
if (!input.trySkipNullValue()) {
- clientTimeMs = input.readUInt64();
+ serverTimeMs = input.readUInt64();
bitField0_ |= 0x00000002;
}
} else {
@@ -411,10 +411,10 @@ public final class PlayerHeartbeatScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName serverTimeMs = FieldName.forField("serverTimeMs", "server_time_ms");
-
static final FieldName clientTimeMs = FieldName.forField("clientTimeMs", "client_time_ms");
+ static final FieldName serverTimeMs = FieldName.forField("serverTimeMs", "server_time_ms");
+
static final FieldName retcode = FieldName.forField("retcode");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java
index 5e34946..2d5ffc0 100644
--- a/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java
@@ -19,7 +19,7 @@ public final class PlayerLoginScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint64 server_timestamp_ms = 1;
+ * optional uint64 server_timestamp_ms = 8;
*/
private long serverTimestampMs;
@@ -29,22 +29,22 @@ public final class PlayerLoginScRspOuterClass {
private long loginRandom;
/**
- * optional uint32 stamina = 6;
+ * optional uint32 stamina = 2;
*/
private int stamina;
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 5;
*/
private int retcode;
/**
- * optional sint32 cur_timezone = 5;
+ * optional sint32 cur_timezone = 13;
*/
private int curTimezone;
/**
- * optional .PlayerBasicInfo basic_info = 10;
+ * optional .PlayerBasicInfo basic_info = 7;
*/
private final PlayerBasicInfoOuterClass.PlayerBasicInfo basicInfo = PlayerBasicInfoOuterClass.PlayerBasicInfo.newInstance();
@@ -59,7 +59,7 @@ public final class PlayerLoginScRspOuterClass {
}
/**
- * optional uint64 server_timestamp_ms = 1;
+ * optional uint64 server_timestamp_ms = 8;
* @return whether the serverTimestampMs field is set
*/
public boolean hasServerTimestampMs() {
@@ -67,7 +67,7 @@ public final class PlayerLoginScRspOuterClass {
}
/**
- * optional uint64 server_timestamp_ms = 1;
+ * optional uint64 server_timestamp_ms = 8;
* @return this
*/
public PlayerLoginScRsp clearServerTimestampMs() {
@@ -77,7 +77,7 @@ public final class PlayerLoginScRspOuterClass {
}
/**
- * optional uint64 server_timestamp_ms = 1;
+ * optional uint64 server_timestamp_ms = 8;
* @return the serverTimestampMs
*/
public long getServerTimestampMs() {
@@ -85,7 +85,7 @@ public final class PlayerLoginScRspOuterClass {
}
/**
- * optional uint64 server_timestamp_ms = 1;
+ * optional uint64 server_timestamp_ms = 8;
* @param value the serverTimestampMs to set
* @return this
*/
@@ -133,7 +133,7 @@ public final class PlayerLoginScRspOuterClass {
}
/**
- * optional uint32 stamina = 6;
+ * optional uint32 stamina = 2;
* @return whether the stamina field is set
*/
public boolean hasStamina() {
@@ -141,7 +141,7 @@ public final class PlayerLoginScRspOuterClass {
}
/**
- * optional uint32 stamina = 6;
+ * optional uint32 stamina = 2;
* @return this
*/
public PlayerLoginScRsp clearStamina() {
@@ -151,7 +151,7 @@ public final class PlayerLoginScRspOuterClass {
}
/**
- * optional uint32 stamina = 6;
+ * optional uint32 stamina = 2;
* @return the stamina
*/
public int getStamina() {
@@ -159,7 +159,7 @@ public final class PlayerLoginScRspOuterClass {
}
/**
- * optional uint32 stamina = 6;
+ * optional uint32 stamina = 2;
* @param value the stamina to set
* @return this
*/
@@ -170,7 +170,7 @@ public final class PlayerLoginScRspOuterClass {
}
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 5;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -178,7 +178,7 @@ public final class PlayerLoginScRspOuterClass {
}
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 5;
* @return this
*/
public PlayerLoginScRsp clearRetcode() {
@@ -188,7 +188,7 @@ public final class PlayerLoginScRspOuterClass {
}
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 5;
* @return the retcode
*/
public int getRetcode() {
@@ -196,7 +196,7 @@ public final class PlayerLoginScRspOuterClass {
}
/**
- * optional uint32 retcode = 13;
+ * optional uint32 retcode = 5;
* @param value the retcode to set
* @return this
*/
@@ -207,7 +207,7 @@ public final class PlayerLoginScRspOuterClass {
}
/**
- * optional sint32 cur_timezone = 5;
+ * optional sint32 cur_timezone = 13;
* @return whether the curTimezone field is set
*/
public boolean hasCurTimezone() {
@@ -215,7 +215,7 @@ public final class PlayerLoginScRspOuterClass {
}
/**
- * optional sint32 cur_timezone = 5;
+ * optional sint32 cur_timezone = 13;
* @return this
*/
public PlayerLoginScRsp clearCurTimezone() {
@@ -225,7 +225,7 @@ public final class PlayerLoginScRspOuterClass {
}
/**
- * optional sint32 cur_timezone = 5;
+ * optional sint32 cur_timezone = 13;
* @return the curTimezone
*/
public int getCurTimezone() {
@@ -233,7 +233,7 @@ public final class PlayerLoginScRspOuterClass {
}
/**
- * optional sint32 cur_timezone = 5;
+ * optional sint32 cur_timezone = 13;
* @param value the curTimezone to set
* @return this
*/
@@ -244,7 +244,7 @@ public final class PlayerLoginScRspOuterClass {
}
/**
- * optional .PlayerBasicInfo basic_info = 10;
+ * optional .PlayerBasicInfo basic_info = 7;
* @return whether the basicInfo field is set
*/
public boolean hasBasicInfo() {
@@ -252,7 +252,7 @@ public final class PlayerLoginScRspOuterClass {
}
/**
- * optional .PlayerBasicInfo basic_info = 10;
+ * optional .PlayerBasicInfo basic_info = 7;
* @return this
*/
public PlayerLoginScRsp clearBasicInfo() {
@@ -262,7 +262,7 @@ public final class PlayerLoginScRspOuterClass {
}
/**
- * optional .PlayerBasicInfo basic_info = 10;
+ * optional .PlayerBasicInfo basic_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.
@@ -276,7 +276,7 @@ public final class PlayerLoginScRspOuterClass {
}
/**
- * optional .PlayerBasicInfo basic_info = 10;
+ * optional .PlayerBasicInfo basic_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
@@ -290,7 +290,7 @@ public final class PlayerLoginScRspOuterClass {
}
/**
- * optional .PlayerBasicInfo basic_info = 10;
+ * optional .PlayerBasicInfo basic_info = 7;
* @param value the basicInfo to set
* @return this
*/
@@ -390,7 +390,7 @@ public final class PlayerLoginScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 64);
output.writeUInt64NoTag(serverTimestampMs);
}
if ((bitField0_ & 0x00000002) != 0) {
@@ -398,19 +398,19 @@ public final class PlayerLoginScRspOuterClass {
output.writeUInt64NoTag(loginRandom);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(stamina);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 104);
output.writeSInt32NoTag(curTimezone);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 82);
+ output.writeRawByte((byte) 58);
output.writeMessageNoTag(basicInfo);
}
}
@@ -446,7 +446,7 @@ public final class PlayerLoginScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 64: {
// serverTimestampMs
serverTimestampMs = input.readUInt64();
bitField0_ |= 0x00000001;
@@ -460,38 +460,38 @@ public final class PlayerLoginScRspOuterClass {
loginRandom = input.readUInt64();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 48) {
+ if (tag != 16) {
break;
}
}
- case 48: {
+ case 16: {
// stamina
stamina = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 104) {
- break;
- }
- }
- case 104: {
- // retcode
- retcode = input.readUInt32();
- bitField0_ |= 0x00000008;
- tag = input.readTag();
if (tag != 40) {
break;
}
}
case 40: {
+ // retcode
+ retcode = input.readUInt32();
+ bitField0_ |= 0x00000008;
+ tag = input.readTag();
+ if (tag != 104) {
+ break;
+ }
+ }
+ case 104: {
// curTimezone
curTimezone = input.readSInt32();
bitField0_ |= 0x00000010;
tag = input.readTag();
- if (tag != 82) {
+ if (tag != 58) {
break;
}
}
- case 82: {
+ case 58: {
// basicInfo
input.readMessage(basicInfo);
bitField0_ |= 0x00000020;
diff --git a/src/generated/main/emu/lunarcore/proto/PlayerSettingInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerSettingInfoOuterClass.java
index 9ff62cd..128bd1d 100644
--- a/src/generated/main/emu/lunarcore/proto/PlayerSettingInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PlayerSettingInfoOuterClass.java
@@ -19,19 +19,39 @@ public final class PlayerSettingInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional bool PMBBEIEHBML = 7;
+ * optional .DisplayRecordType display_record_type = 12;
*/
- private boolean pMBBEIEHBML;
+ private int displayRecordType;
/**
- * optional bool NODHLKCFLPA = 8;
+ * optional bool b1 = 2;
*/
- private boolean nODHLKCFLPA;
+ private boolean b1;
/**
- * optional bool HMAMGFJANGO = 14;
+ * optional bool b4 = 3;
*/
- private boolean hMAMGFJANGO;
+ private boolean b4;
+
+ /**
+ * optional bool b3 = 4;
+ */
+ private boolean b3;
+
+ /**
+ * optional bool b6 = 5;
+ */
+ private boolean b6;
+
+ /**
+ * optional bool b2 = 8;
+ */
+ private boolean b2;
+
+ /**
+ * optional bool b5 = 13;
+ */
+ private boolean b5;
private PlayerSettingInfo() {
}
@@ -44,113 +64,287 @@ public final class PlayerSettingInfoOuterClass {
}
/**
- * optional bool PMBBEIEHBML = 7;
- * @return whether the pMBBEIEHBML field is set
+ * optional .DisplayRecordType display_record_type = 12;
+ * @return whether the displayRecordType field is set
*/
- public boolean hasPMBBEIEHBML() {
+ public boolean hasDisplayRecordType() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional bool PMBBEIEHBML = 7;
+ * optional .DisplayRecordType display_record_type = 12;
* @return this
*/
- public PlayerSettingInfo clearPMBBEIEHBML() {
+ public PlayerSettingInfo clearDisplayRecordType() {
bitField0_ &= ~0x00000001;
- pMBBEIEHBML = false;
+ displayRecordType = 0;
return this;
}
/**
- * optional bool PMBBEIEHBML = 7;
- * @return the pMBBEIEHBML
+ * optional .DisplayRecordType display_record_type = 12;
+ * @return the displayRecordType
*/
- public boolean getPMBBEIEHBML() {
- return pMBBEIEHBML;
+ public DisplayRecordTypeOuterClass.DisplayRecordType getDisplayRecordType() {
+ return DisplayRecordTypeOuterClass.DisplayRecordType.forNumber(displayRecordType);
}
/**
- * optional bool PMBBEIEHBML = 7;
- * @param value the pMBBEIEHBML to set
+ * Gets the value of the internal enum store. The result is
+ * equivalent to {@link PlayerSettingInfo#getDisplayRecordType()}.getNumber().
+ *
+ * @return numeric wire representation
+ */
+ public int getDisplayRecordTypeValue() {
+ return displayRecordType;
+ }
+
+ /**
+ * Sets the value of the internal enum store. This does not
+ * do any validity checks, so be sure to use appropriate value
+ * constants from {@link DisplayRecordTypeOuterClass.DisplayRecordType}. Setting an invalid value
+ * can cause {@link PlayerSettingInfo#getDisplayRecordType()} to return null
+ *
+ * @param value the numeric wire value to set
* @return this
*/
- public PlayerSettingInfo setPMBBEIEHBML(final boolean value) {
+ public PlayerSettingInfo setDisplayRecordTypeValue(final int value) {
bitField0_ |= 0x00000001;
- pMBBEIEHBML = value;
+ displayRecordType = value;
return this;
}
/**
- * optional bool NODHLKCFLPA = 8;
- * @return whether the nODHLKCFLPA field is set
+ * optional .DisplayRecordType display_record_type = 12;
+ * @param value the displayRecordType to set
+ * @return this
*/
- public boolean hasNODHLKCFLPA() {
+ public PlayerSettingInfo setDisplayRecordType(
+ final DisplayRecordTypeOuterClass.DisplayRecordType value) {
+ bitField0_ |= 0x00000001;
+ displayRecordType = value.getNumber();
+ return this;
+ }
+
+ /**
+ * optional bool b1 = 2;
+ * @return whether the b1 field is set
+ */
+ public boolean hasB1() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional bool NODHLKCFLPA = 8;
+ * optional bool b1 = 2;
* @return this
*/
- public PlayerSettingInfo clearNODHLKCFLPA() {
+ public PlayerSettingInfo clearB1() {
bitField0_ &= ~0x00000002;
- nODHLKCFLPA = false;
+ b1 = false;
return this;
}
/**
- * optional bool NODHLKCFLPA = 8;
- * @return the nODHLKCFLPA
+ * optional bool b1 = 2;
+ * @return the b1
*/
- public boolean getNODHLKCFLPA() {
- return nODHLKCFLPA;
+ public boolean getB1() {
+ return b1;
}
/**
- * optional bool NODHLKCFLPA = 8;
- * @param value the nODHLKCFLPA to set
+ * optional bool b1 = 2;
+ * @param value the b1 to set
* @return this
*/
- public PlayerSettingInfo setNODHLKCFLPA(final boolean value) {
+ public PlayerSettingInfo setB1(final boolean value) {
bitField0_ |= 0x00000002;
- nODHLKCFLPA = value;
+ b1 = value;
return this;
}
/**
- * optional bool HMAMGFJANGO = 14;
- * @return whether the hMAMGFJANGO field is set
+ * optional bool b4 = 3;
+ * @return whether the b4 field is set
*/
- public boolean hasHMAMGFJANGO() {
+ public boolean hasB4() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional bool HMAMGFJANGO = 14;
+ * optional bool b4 = 3;
* @return this
*/
- public PlayerSettingInfo clearHMAMGFJANGO() {
+ public PlayerSettingInfo clearB4() {
bitField0_ &= ~0x00000004;
- hMAMGFJANGO = false;
+ b4 = false;
return this;
}
/**
- * optional bool HMAMGFJANGO = 14;
- * @return the hMAMGFJANGO
+ * optional bool b4 = 3;
+ * @return the b4
*/
- public boolean getHMAMGFJANGO() {
- return hMAMGFJANGO;
+ public boolean getB4() {
+ return b4;
}
/**
- * optional bool HMAMGFJANGO = 14;
- * @param value the hMAMGFJANGO to set
+ * optional bool b4 = 3;
+ * @param value the b4 to set
* @return this
*/
- public PlayerSettingInfo setHMAMGFJANGO(final boolean value) {
+ public PlayerSettingInfo setB4(final boolean value) {
bitField0_ |= 0x00000004;
- hMAMGFJANGO = value;
+ b4 = value;
+ return this;
+ }
+
+ /**
+ * optional bool b3 = 4;
+ * @return whether the b3 field is set
+ */
+ public boolean hasB3() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional bool b3 = 4;
+ * @return this
+ */
+ public PlayerSettingInfo clearB3() {
+ bitField0_ &= ~0x00000008;
+ b3 = false;
+ return this;
+ }
+
+ /**
+ * optional bool b3 = 4;
+ * @return the b3
+ */
+ public boolean getB3() {
+ return b3;
+ }
+
+ /**
+ * optional bool b3 = 4;
+ * @param value the b3 to set
+ * @return this
+ */
+ public PlayerSettingInfo setB3(final boolean value) {
+ bitField0_ |= 0x00000008;
+ b3 = value;
+ return this;
+ }
+
+ /**
+ * optional bool b6 = 5;
+ * @return whether the b6 field is set
+ */
+ public boolean hasB6() {
+ return (bitField0_ & 0x00000010) != 0;
+ }
+
+ /**
+ * optional bool b6 = 5;
+ * @return this
+ */
+ public PlayerSettingInfo clearB6() {
+ bitField0_ &= ~0x00000010;
+ b6 = false;
+ return this;
+ }
+
+ /**
+ * optional bool b6 = 5;
+ * @return the b6
+ */
+ public boolean getB6() {
+ return b6;
+ }
+
+ /**
+ * optional bool b6 = 5;
+ * @param value the b6 to set
+ * @return this
+ */
+ public PlayerSettingInfo setB6(final boolean value) {
+ bitField0_ |= 0x00000010;
+ b6 = value;
+ return this;
+ }
+
+ /**
+ * optional bool b2 = 8;
+ * @return whether the b2 field is set
+ */
+ public boolean hasB2() {
+ return (bitField0_ & 0x00000020) != 0;
+ }
+
+ /**
+ * optional bool b2 = 8;
+ * @return this
+ */
+ public PlayerSettingInfo clearB2() {
+ bitField0_ &= ~0x00000020;
+ b2 = false;
+ return this;
+ }
+
+ /**
+ * optional bool b2 = 8;
+ * @return the b2
+ */
+ public boolean getB2() {
+ return b2;
+ }
+
+ /**
+ * optional bool b2 = 8;
+ * @param value the b2 to set
+ * @return this
+ */
+ public PlayerSettingInfo setB2(final boolean value) {
+ bitField0_ |= 0x00000020;
+ b2 = value;
+ return this;
+ }
+
+ /**
+ * optional bool b5 = 13;
+ * @return whether the b5 field is set
+ */
+ public boolean hasB5() {
+ return (bitField0_ & 0x00000040) != 0;
+ }
+
+ /**
+ * optional bool b5 = 13;
+ * @return this
+ */
+ public PlayerSettingInfo clearB5() {
+ bitField0_ &= ~0x00000040;
+ b5 = false;
+ return this;
+ }
+
+ /**
+ * optional bool b5 = 13;
+ * @return the b5
+ */
+ public boolean getB5() {
+ return b5;
+ }
+
+ /**
+ * optional bool b5 = 13;
+ * @param value the b5 to set
+ * @return this
+ */
+ public PlayerSettingInfo setB5(final boolean value) {
+ bitField0_ |= 0x00000040;
+ b5 = value;
return this;
}
@@ -159,9 +353,13 @@ public final class PlayerSettingInfoOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- pMBBEIEHBML = other.pMBBEIEHBML;
- nODHLKCFLPA = other.nODHLKCFLPA;
- hMAMGFJANGO = other.hMAMGFJANGO;
+ displayRecordType = other.displayRecordType;
+ b1 = other.b1;
+ b4 = other.b4;
+ b3 = other.b3;
+ b6 = other.b6;
+ b2 = other.b2;
+ b5 = other.b5;
}
return this;
}
@@ -172,14 +370,26 @@ public final class PlayerSettingInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasPMBBEIEHBML()) {
- setPMBBEIEHBML(other.pMBBEIEHBML);
+ if (other.hasDisplayRecordType()) {
+ setDisplayRecordTypeValue(other.displayRecordType);
}
- if (other.hasNODHLKCFLPA()) {
- setNODHLKCFLPA(other.nODHLKCFLPA);
+ if (other.hasB1()) {
+ setB1(other.b1);
}
- if (other.hasHMAMGFJANGO()) {
- setHMAMGFJANGO(other.hMAMGFJANGO);
+ if (other.hasB4()) {
+ setB4(other.b4);
+ }
+ if (other.hasB3()) {
+ setB3(other.b3);
+ }
+ if (other.hasB6()) {
+ setB6(other.b6);
+ }
+ if (other.hasB2()) {
+ setB2(other.b2);
+ }
+ if (other.hasB5()) {
+ setB5(other.b5);
}
return this;
}
@@ -191,9 +401,13 @@ public final class PlayerSettingInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- pMBBEIEHBML = false;
- nODHLKCFLPA = false;
- hMAMGFJANGO = false;
+ displayRecordType = 0;
+ b1 = false;
+ b4 = false;
+ b3 = false;
+ b6 = false;
+ b2 = false;
+ b5 = false;
return this;
}
@@ -217,24 +431,44 @@ public final class PlayerSettingInfoOuterClass {
}
PlayerSettingInfo other = (PlayerSettingInfo) o;
return bitField0_ == other.bitField0_
- && (!hasPMBBEIEHBML() || pMBBEIEHBML == other.pMBBEIEHBML)
- && (!hasNODHLKCFLPA() || nODHLKCFLPA == other.nODHLKCFLPA)
- && (!hasHMAMGFJANGO() || hMAMGFJANGO == other.hMAMGFJANGO);
+ && (!hasDisplayRecordType() || displayRecordType == other.displayRecordType)
+ && (!hasB1() || b1 == other.b1)
+ && (!hasB4() || b4 == other.b4)
+ && (!hasB3() || b3 == other.b3)
+ && (!hasB6() || b6 == other.b6)
+ && (!hasB2() || b2 == other.b2)
+ && (!hasB5() || b5 == other.b5);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
- output.writeBoolNoTag(pMBBEIEHBML);
+ output.writeRawByte((byte) 96);
+ output.writeEnumNoTag(displayRecordType);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 64);
- output.writeBoolNoTag(nODHLKCFLPA);
+ output.writeRawByte((byte) 16);
+ output.writeBoolNoTag(b1);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 112);
- output.writeBoolNoTag(hMAMGFJANGO);
+ output.writeRawByte((byte) 24);
+ output.writeBoolNoTag(b4);
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeRawByte((byte) 32);
+ output.writeBoolNoTag(b3);
+ }
+ if ((bitField0_ & 0x00000010) != 0) {
+ output.writeRawByte((byte) 40);
+ output.writeBoolNoTag(b6);
+ }
+ if ((bitField0_ & 0x00000020) != 0) {
+ output.writeRawByte((byte) 64);
+ output.writeBoolNoTag(b2);
+ }
+ if ((bitField0_ & 0x00000040) != 0) {
+ output.writeRawByte((byte) 104);
+ output.writeBoolNoTag(b5);
}
}
@@ -242,7 +476,7 @@ public final class PlayerSettingInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 2;
+ size += 1 + ProtoSink.computeEnumSizeNoTag(displayRecordType);
}
if ((bitField0_ & 0x00000002) != 0) {
size += 2;
@@ -250,6 +484,18 @@ public final class PlayerSettingInfoOuterClass {
if ((bitField0_ & 0x00000004) != 0) {
size += 2;
}
+ if ((bitField0_ & 0x00000008) != 0) {
+ size += 2;
+ }
+ if ((bitField0_ & 0x00000010) != 0) {
+ size += 2;
+ }
+ if ((bitField0_ & 0x00000020) != 0) {
+ size += 2;
+ }
+ if ((bitField0_ & 0x00000040) != 0) {
+ size += 2;
+ }
return size;
}
@@ -260,28 +506,67 @@ public final class PlayerSettingInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
- // pMBBEIEHBML
- pMBBEIEHBML = input.readBool();
- bitField0_ |= 0x00000001;
+ case 96: {
+ // displayRecordType
+ final int value = input.readInt32();
+ if (DisplayRecordTypeOuterClass.DisplayRecordType.forNumber(value) != null) {
+ displayRecordType = value;
+ bitField0_ |= 0x00000001;
+ }
+ tag = input.readTag();
+ if (tag != 16) {
+ break;
+ }
+ }
+ case 16: {
+ // b1
+ b1 = input.readBool();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 24) {
+ break;
+ }
+ }
+ case 24: {
+ // b4
+ b4 = input.readBool();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 32) {
+ break;
+ }
+ }
+ case 32: {
+ // b3
+ b3 = input.readBool();
+ bitField0_ |= 0x00000008;
+ tag = input.readTag();
+ if (tag != 40) {
+ break;
+ }
+ }
+ case 40: {
+ // b6
+ b6 = input.readBool();
+ bitField0_ |= 0x00000010;
tag = input.readTag();
if (tag != 64) {
break;
}
}
case 64: {
- // nODHLKCFLPA
- nODHLKCFLPA = input.readBool();
- bitField0_ |= 0x00000002;
+ // b2
+ b2 = input.readBool();
+ bitField0_ |= 0x00000020;
tag = input.readTag();
- if (tag != 112) {
+ if (tag != 104) {
break;
}
}
- case 112: {
- // hMAMGFJANGO
- hMAMGFJANGO = input.readBool();
- bitField0_ |= 0x00000004;
+ case 104: {
+ // b5
+ b5 = input.readBool();
+ bitField0_ |= 0x00000040;
tag = input.readTag();
if (tag != 0) {
break;
@@ -305,13 +590,25 @@ public final class PlayerSettingInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeBool(FieldNames.pMBBEIEHBML, pMBBEIEHBML);
+ output.writeEnum(FieldNames.displayRecordType, displayRecordType, DisplayRecordTypeOuterClass.DisplayRecordType.converter());
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeBool(FieldNames.nODHLKCFLPA, nODHLKCFLPA);
+ output.writeBool(FieldNames.b1, b1);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeBool(FieldNames.hMAMGFJANGO, hMAMGFJANGO);
+ output.writeBool(FieldNames.b4, b4);
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeBool(FieldNames.b3, b3);
+ }
+ if ((bitField0_ & 0x00000010) != 0) {
+ output.writeBool(FieldNames.b6, b6);
+ }
+ if ((bitField0_ & 0x00000020) != 0) {
+ output.writeBool(FieldNames.b2, b2);
+ }
+ if ((bitField0_ & 0x00000040) != 0) {
+ output.writeBool(FieldNames.b5, b5);
}
output.endObject();
}
@@ -323,21 +620,27 @@ public final class PlayerSettingInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -976297443: {
- if (input.isAtField(FieldNames.pMBBEIEHBML)) {
+ case -1038726771:
+ case 1165970027: {
+ if (input.isAtField(FieldNames.displayRecordType)) {
if (!input.trySkipNullValue()) {
- pMBBEIEHBML = input.readBool();
- bitField0_ |= 0x00000001;
+ final DisplayRecordTypeOuterClass.DisplayRecordType value = input.readEnum(DisplayRecordTypeOuterClass.DisplayRecordType.converter());
+ if (value != null) {
+ displayRecordType = value.getNumber();
+ bitField0_ |= 0x00000001;
+ } else {
+ input.skipUnknownEnumValue();
+ }
}
} else {
input.skipUnknownField();
}
break;
}
- case -1845450698: {
- if (input.isAtField(FieldNames.nODHLKCFLPA)) {
+ case 3087: {
+ if (input.isAtField(FieldNames.b1)) {
if (!input.trySkipNullValue()) {
- nODHLKCFLPA = input.readBool();
+ b1 = input.readBool();
bitField0_ |= 0x00000002;
}
} else {
@@ -345,10 +648,10 @@ public final class PlayerSettingInfoOuterClass {
}
break;
}
- case 1711483535: {
- if (input.isAtField(FieldNames.hMAMGFJANGO)) {
+ case 3090: {
+ if (input.isAtField(FieldNames.b4)) {
if (!input.trySkipNullValue()) {
- hMAMGFJANGO = input.readBool();
+ b4 = input.readBool();
bitField0_ |= 0x00000004;
}
} else {
@@ -356,6 +659,50 @@ public final class PlayerSettingInfoOuterClass {
}
break;
}
+ case 3089: {
+ if (input.isAtField(FieldNames.b3)) {
+ if (!input.trySkipNullValue()) {
+ b3 = input.readBool();
+ bitField0_ |= 0x00000008;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 3092: {
+ if (input.isAtField(FieldNames.b6)) {
+ if (!input.trySkipNullValue()) {
+ b6 = input.readBool();
+ bitField0_ |= 0x00000010;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 3088: {
+ if (input.isAtField(FieldNames.b2)) {
+ if (!input.trySkipNullValue()) {
+ b2 = input.readBool();
+ bitField0_ |= 0x00000020;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 3091: {
+ if (input.isAtField(FieldNames.b5)) {
+ if (!input.trySkipNullValue()) {
+ b5 = input.readBool();
+ bitField0_ |= 0x00000040;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
default: {
input.skipUnknownField();
break;
@@ -409,11 +756,19 @@ public final class PlayerSettingInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName pMBBEIEHBML = FieldName.forField("PMBBEIEHBML");
+ static final FieldName displayRecordType = FieldName.forField("displayRecordType", "display_record_type");
- static final FieldName nODHLKCFLPA = FieldName.forField("NODHLKCFLPA");
+ static final FieldName b1 = FieldName.forField("b1");
- static final FieldName hMAMGFJANGO = FieldName.forField("HMAMGFJANGO");
+ static final FieldName b4 = FieldName.forField("b4");
+
+ static final FieldName b3 = FieldName.forField("b3");
+
+ static final FieldName b6 = FieldName.forField("b6");
+
+ static final FieldName b2 = FieldName.forField("b2");
+
+ static final FieldName b5 = FieldName.forField("b5");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/PlayerSyncScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerSyncScNotifyOuterClass.java
index e09d11e..f1dde93 100644
--- a/src/generated/main/emu/lunarcore/proto/PlayerSyncScNotifyOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PlayerSyncScNotifyOuterClass.java
@@ -21,39 +21,39 @@ public final class PlayerSyncScNotifyOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 total_achievement_exp = 1822;
+ * optional uint32 total_achievement_exp = 1571;
*/
private int totalAchievementExp;
/**
- * optional .AvatarSync avatar_sync = 11;
+ * optional .AvatarSync avatar_sync = 3;
*/
private final AvatarSyncOuterClass.AvatarSync avatarSync = AvatarSyncOuterClass.AvatarSync.newInstance();
/**
- * optional .PlayerBasicInfo basic_info = 15;
+ * optional .PlayerBasicInfo basic_info = 6;
*/
private final PlayerBasicInfoOuterClass.PlayerBasicInfo basicInfo = PlayerBasicInfoOuterClass.PlayerBasicInfo.newInstance();
/**
- * optional .BoardDataSync board_data_sync = 480;
+ * optional .MissionSync mission_sync = 8;
+ */
+ private final MissionSyncOuterClass.MissionSync missionSync = MissionSyncOuterClass.MissionSync.newInstance();
+
+ /**
+ * optional .BoardDataSync board_data_sync = 1050;
*/
private final BoardDataSyncOuterClass.BoardDataSync boardDataSync = BoardDataSyncOuterClass.BoardDataSync.newInstance();
/**
- * repeated uint32 del_equipment_list = 7;
- */
- private final RepeatedInt delEquipmentList = RepeatedInt.newEmptyInstance();
-
- /**
- * repeated uint32 del_relic_list = 13;
+ * repeated uint32 del_relic_list = 2;
*/
private final RepeatedInt delRelicList = RepeatedInt.newEmptyInstance();
/**
- * repeated .HeroBasicTypeInfo basic_type_info_list = 1;
+ * repeated uint32 del_equipment_list = 13;
*/
- private final RepeatedMessagerepeated .Equipment equipment_list = 4;
@@ -61,10 +61,15 @@ public final class PlayerSyncScNotifyOuterClass {
private final RepeatedMessagerepeated .Material material_list = 12;
+ * repeated .Material material_list = 7;
*/
private final RepeatedMessagerepeated .HeroBasicTypeInfo basic_type_info_list = 11;
+ */
+ private final RepeatedMessagerepeated .Relic relic_list = 14;
*/
@@ -81,7 +86,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * optional uint32 total_achievement_exp = 1822;
+ * optional uint32 total_achievement_exp = 1571;
* @return whether the totalAchievementExp field is set
*/
public boolean hasTotalAchievementExp() {
@@ -89,7 +94,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * optional uint32 total_achievement_exp = 1822;
+ * optional uint32 total_achievement_exp = 1571;
* @return this
*/
public PlayerSyncScNotify clearTotalAchievementExp() {
@@ -99,7 +104,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * optional uint32 total_achievement_exp = 1822;
+ * optional uint32 total_achievement_exp = 1571;
* @return the totalAchievementExp
*/
public int getTotalAchievementExp() {
@@ -107,7 +112,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * optional uint32 total_achievement_exp = 1822;
+ * optional uint32 total_achievement_exp = 1571;
* @param value the totalAchievementExp to set
* @return this
*/
@@ -118,7 +123,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * optional .AvatarSync avatar_sync = 11;
+ * optional .AvatarSync avatar_sync = 3;
* @return whether the avatarSync field is set
*/
public boolean hasAvatarSync() {
@@ -126,7 +131,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * optional .AvatarSync avatar_sync = 11;
+ * optional .AvatarSync avatar_sync = 3;
* @return this
*/
public PlayerSyncScNotify clearAvatarSync() {
@@ -136,7 +141,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * optional .AvatarSync avatar_sync = 11;
+ * optional .AvatarSync avatar_sync = 3;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -150,7 +155,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * optional .AvatarSync avatar_sync = 11;
+ * optional .AvatarSync avatar_sync = 3;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -164,7 +169,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * optional .AvatarSync avatar_sync = 11;
+ * optional .AvatarSync avatar_sync = 3;
* @param value the avatarSync to set
* @return this
*/
@@ -175,7 +180,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * optional .PlayerBasicInfo basic_info = 15;
+ * optional .PlayerBasicInfo basic_info = 6;
* @return whether the basicInfo field is set
*/
public boolean hasBasicInfo() {
@@ -183,7 +188,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * optional .PlayerBasicInfo basic_info = 15;
+ * optional .PlayerBasicInfo basic_info = 6;
* @return this
*/
public PlayerSyncScNotify clearBasicInfo() {
@@ -193,7 +198,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * optional .PlayerBasicInfo basic_info = 15;
+ * optional .PlayerBasicInfo basic_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.
@@ -207,7 +212,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * optional .PlayerBasicInfo basic_info = 15;
+ * optional .PlayerBasicInfo basic_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
@@ -221,7 +226,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * optional .PlayerBasicInfo basic_info = 15;
+ * optional .PlayerBasicInfo basic_info = 6;
* @param value the basicInfo to set
* @return this
*/
@@ -232,25 +237,82 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * optional .BoardDataSync board_data_sync = 480;
- * @return whether the boardDataSync field is set
+ * optional .MissionSync mission_sync = 8;
+ * @return whether the missionSync field is set
*/
- public boolean hasBoardDataSync() {
+ public boolean hasMissionSync() {
return (bitField0_ & 0x00000008) != 0;
}
/**
- * optional .BoardDataSync board_data_sync = 480;
+ * optional .MissionSync mission_sync = 8;
+ * @return this
+ */
+ public PlayerSyncScNotify clearMissionSync() {
+ bitField0_ &= ~0x00000008;
+ missionSync.clear();
+ return this;
+ }
+
+ /**
+ * optional .MissionSync mission_sync = 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 #getMutableMissionSync()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public MissionSyncOuterClass.MissionSync getMissionSync() {
+ return missionSync;
+ }
+
+ /**
+ * optional .MissionSync mission_sync = 8;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public MissionSyncOuterClass.MissionSync getMutableMissionSync() {
+ bitField0_ |= 0x00000008;
+ return missionSync;
+ }
+
+ /**
+ * optional .MissionSync mission_sync = 8;
+ * @param value the missionSync to set
+ * @return this
+ */
+ public PlayerSyncScNotify setMissionSync(final MissionSyncOuterClass.MissionSync value) {
+ bitField0_ |= 0x00000008;
+ missionSync.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional .BoardDataSync board_data_sync = 1050;
+ * @return whether the boardDataSync field is set
+ */
+ public boolean hasBoardDataSync() {
+ return (bitField0_ & 0x00000010) != 0;
+ }
+
+ /**
+ * optional .BoardDataSync board_data_sync = 1050;
* @return this
*/
public PlayerSyncScNotify clearBoardDataSync() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000010;
boardDataSync.clear();
return this;
}
/**
- * optional .BoardDataSync board_data_sync = 480;
+ * optional .BoardDataSync board_data_sync = 1050;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -264,7 +326,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * optional .BoardDataSync board_data_sync = 480;
+ * optional .BoardDataSync board_data_sync = 1050;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -273,91 +335,23 @@ public final class PlayerSyncScNotifyOuterClass {
* @return internal storage object for modifications
*/
public BoardDataSyncOuterClass.BoardDataSync getMutableBoardDataSync() {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000010;
return boardDataSync;
}
/**
- * optional .BoardDataSync board_data_sync = 480;
+ * optional .BoardDataSync board_data_sync = 1050;
* @param value the boardDataSync to set
* @return this
*/
public PlayerSyncScNotify setBoardDataSync(final BoardDataSyncOuterClass.BoardDataSync value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000010;
boardDataSync.copyFrom(value);
return this;
}
/**
- * repeated uint32 del_equipment_list = 7;
- * @return whether the delEquipmentList field is set
- */
- public boolean hasDelEquipmentList() {
- return (bitField0_ & 0x00000010) != 0;
- }
-
- /**
- * repeated uint32 del_equipment_list = 7;
- * @return this
- */
- public PlayerSyncScNotify clearDelEquipmentList() {
- bitField0_ &= ~0x00000010;
- delEquipmentList.clear();
- return this;
- }
-
- /**
- * repeated uint32 del_equipment_list = 7;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableDelEquipmentList()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedInt getDelEquipmentList() {
- return delEquipmentList;
- }
-
- /**
- * repeated uint32 del_equipment_list = 7;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedInt getMutableDelEquipmentList() {
- bitField0_ |= 0x00000010;
- return delEquipmentList;
- }
-
- /**
- * repeated uint32 del_equipment_list = 7;
- * @param value the delEquipmentList to add
- * @return this
- */
- public PlayerSyncScNotify addDelEquipmentList(final int value) {
- bitField0_ |= 0x00000010;
- delEquipmentList.add(value);
- return this;
- }
-
- /**
- * repeated uint32 del_equipment_list = 7;
- * @param values the delEquipmentList to add
- * @return this
- */
- public PlayerSyncScNotify addAllDelEquipmentList(final int... values) {
- bitField0_ |= 0x00000010;
- delEquipmentList.addAll(values);
- return this;
- }
-
- /**
- * repeated uint32 del_relic_list = 13;
+ * repeated uint32 del_relic_list = 2;
* @return whether the delRelicList field is set
*/
public boolean hasDelRelicList() {
@@ -365,7 +359,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * repeated uint32 del_relic_list = 13;
+ * repeated uint32 del_relic_list = 2;
* @return this
*/
public PlayerSyncScNotify clearDelRelicList() {
@@ -375,7 +369,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * repeated uint32 del_relic_list = 13;
+ * repeated uint32 del_relic_list = 2;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -389,7 +383,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * repeated uint32 del_relic_list = 13;
+ * repeated uint32 del_relic_list = 2;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -403,7 +397,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * repeated uint32 del_relic_list = 13;
+ * repeated uint32 del_relic_list = 2;
* @param value the delRelicList to add
* @return this
*/
@@ -414,7 +408,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * repeated uint32 del_relic_list = 13;
+ * repeated uint32 del_relic_list = 2;
* @param values the delRelicList to add
* @return this
*/
@@ -425,39 +419,39 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * repeated .HeroBasicTypeInfo basic_type_info_list = 1;
- * @return whether the basicTypeInfoList field is set
+ * repeated uint32 del_equipment_list = 13;
+ * @return whether the delEquipmentList field is set
*/
- public boolean hasBasicTypeInfoList() {
+ public boolean hasDelEquipmentList() {
return (bitField0_ & 0x00000040) != 0;
}
/**
- * repeated .HeroBasicTypeInfo basic_type_info_list = 1;
+ * repeated uint32 del_equipment_list = 13;
* @return this
*/
- public PlayerSyncScNotify clearBasicTypeInfoList() {
+ public PlayerSyncScNotify clearDelEquipmentList() {
bitField0_ &= ~0x00000040;
- basicTypeInfoList.clear();
+ delEquipmentList.clear();
return this;
}
/**
- * repeated .HeroBasicTypeInfo basic_type_info_list = 1;
+ * repeated uint32 del_equipment_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 #getMutableBasicTypeInfoList()} if you want to modify it.
+ * Use {@link #getMutableDelEquipmentList()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public RepeatedMessagerepeated .HeroBasicTypeInfo basic_type_info_list = 1;
+ * repeated uint32 del_equipment_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
@@ -465,33 +459,30 @@ public final class PlayerSyncScNotifyOuterClass {
*
* @return internal storage object for modifications
*/
- public RepeatedMessagerepeated .HeroBasicTypeInfo basic_type_info_list = 1;
- * @param value the basicTypeInfoList to add
+ * repeated uint32 del_equipment_list = 13;
+ * @param value the delEquipmentList to add
* @return this
*/
- public PlayerSyncScNotify addBasicTypeInfoList(
- final HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo value) {
+ public PlayerSyncScNotify addDelEquipmentList(final int value) {
bitField0_ |= 0x00000040;
- basicTypeInfoList.add(value);
+ delEquipmentList.add(value);
return this;
}
/**
- * repeated .HeroBasicTypeInfo basic_type_info_list = 1;
- * @param values the basicTypeInfoList to add
+ * repeated uint32 del_equipment_list = 13;
+ * @param values the delEquipmentList to add
* @return this
*/
- public PlayerSyncScNotify addAllBasicTypeInfoList(
- final HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo... values) {
+ public PlayerSyncScNotify addAllDelEquipmentList(final int... values) {
bitField0_ |= 0x00000040;
- basicTypeInfoList.addAll(values);
+ delEquipmentList.addAll(values);
return this;
}
@@ -564,7 +555,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * repeated .Material material_list = 12;
+ * repeated .Material material_list = 7;
* @return whether the materialList field is set
*/
public boolean hasMaterialList() {
@@ -572,7 +563,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * repeated .Material material_list = 12;
+ * repeated .Material material_list = 7;
* @return this
*/
public PlayerSyncScNotify clearMaterialList() {
@@ -582,7 +573,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * repeated .Material material_list = 12;
+ * repeated .Material material_list = 7;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -596,7 +587,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * repeated .Material material_list = 12;
+ * repeated .Material material_list = 7;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -610,7 +601,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * repeated .Material material_list = 12;
+ * repeated .Material material_list = 7;
* @param value the materialList to add
* @return this
*/
@@ -621,7 +612,7 @@ public final class PlayerSyncScNotifyOuterClass {
}
/**
- * repeated .Material material_list = 12;
+ * repeated .Material material_list = 7;
* @param values the materialList to add
* @return this
*/
@@ -631,12 +622,83 @@ public final class PlayerSyncScNotifyOuterClass {
return this;
}
+ /**
+ * repeated .HeroBasicTypeInfo basic_type_info_list = 11;
+ * @return whether the basicTypeInfoList field is set
+ */
+ public boolean hasBasicTypeInfoList() {
+ return (bitField0_ & 0x00000200) != 0;
+ }
+
+ /**
+ * repeated .HeroBasicTypeInfo basic_type_info_list = 11;
+ * @return this
+ */
+ public PlayerSyncScNotify clearBasicTypeInfoList() {
+ bitField0_ &= ~0x00000200;
+ basicTypeInfoList.clear();
+ return this;
+ }
+
+ /**
+ * repeated .HeroBasicTypeInfo basic_type_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.
+ *
+ * Use {@link #getMutableBasicTypeInfoList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedMessagerepeated .HeroBasicTypeInfo basic_type_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
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedMessagerepeated .HeroBasicTypeInfo basic_type_info_list = 11;
+ * @param value the basicTypeInfoList to add
+ * @return this
+ */
+ public PlayerSyncScNotify addBasicTypeInfoList(
+ final HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo value) {
+ bitField0_ |= 0x00000200;
+ basicTypeInfoList.add(value);
+ return this;
+ }
+
+ /**
+ * repeated .HeroBasicTypeInfo basic_type_info_list = 11;
+ * @param values the basicTypeInfoList to add
+ * @return this
+ */
+ public PlayerSyncScNotify addAllBasicTypeInfoList(
+ final HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo... values) {
+ bitField0_ |= 0x00000200;
+ basicTypeInfoList.addAll(values);
+ return this;
+ }
+
/**
* repeated .Relic relic_list = 14;
* @return whether the relicList field is set
*/
public boolean hasRelicList() {
- return (bitField0_ & 0x00000200) != 0;
+ return (bitField0_ & 0x00000400) != 0;
}
/**
@@ -644,7 +706,7 @@ public final class PlayerSyncScNotifyOuterClass {
* @return this
*/
public PlayerSyncScNotify clearRelicList() {
- bitField0_ &= ~0x00000200;
+ bitField0_ &= ~0x00000400;
relicList.clear();
return this;
}
@@ -673,7 +735,7 @@ public final class PlayerSyncScNotifyOuterClass {
* @return internal storage object for modifications
*/
public RepeatedMessagePLAYING_STATE_NONE = 0;
+ */
+ PLAYING_STATE_NONE("PLAYING_STATE_NONE", 0),
+
+ /**
+ * PLAYING_ROGUE_COSMOS = 1;
+ */
+ PLAYING_ROGUE_COSMOS("PLAYING_ROGUE_COSMOS", 1),
+
+ /**
+ * PLAYING_ROGUE_CHESS = 2;
+ */
+ PLAYING_ROGUE_CHESS("PLAYING_ROGUE_CHESS", 2),
+
+ /**
+ * PLAYING_ROGUE_CHESS_NOUS = 3;
+ */
+ PLAYING_ROGUE_CHESS_NOUS("PLAYING_ROGUE_CHESS_NOUS", 3),
+
+ /**
+ * PLAYING_CHALLENGE_MEMORY = 4;
+ */
+ PLAYING_CHALLENGE_MEMORY("PLAYING_CHALLENGE_MEMORY", 4),
+
+ /**
+ * PLAYING_CHALLENGE_STORY = 5;
+ */
+ PLAYING_CHALLENGE_STORY("PLAYING_CHALLENGE_STORY", 5);
+
+ /**
+ * PLAYING_STATE_NONE = 0;
+ */
+ public static final int PLAYING_STATE_NONE_VALUE = 0;
+
+ /**
+ * PLAYING_ROGUE_COSMOS = 1;
+ */
+ public static final int PLAYING_ROGUE_COSMOS_VALUE = 1;
+
+ /**
+ * PLAYING_ROGUE_CHESS = 2;
+ */
+ public static final int PLAYING_ROGUE_CHESS_VALUE = 2;
+
+ /**
+ * PLAYING_ROGUE_CHESS_NOUS = 3;
+ */
+ public static final int PLAYING_ROGUE_CHESS_NOUS_VALUE = 3;
+
+ /**
+ * PLAYING_CHALLENGE_MEMORY = 4;
+ */
+ public static final int PLAYING_CHALLENGE_MEMORY_VALUE = 4;
+
+ /**
+ * PLAYING_CHALLENGE_STORY = 5;
+ */
+ public static final int PLAYING_CHALLENGE_STORY_VALUE = 5;
+
+ private final String name;
+
+ private final int number;
+
+ private PlayingState(String name, int number) {
+ this.name = name;
+ this.number = number;
+ }
+
+ /**
+ * @return the string representation of enum entry
+ */
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @return the numeric wire value of this enum entry
+ */
+ @Override
+ public int getNumber() {
+ return number;
+ }
+
+ /**
+ * @return a converter that maps between this enum's numeric and text representations
+ */
+ public static ProtoEnum.EnumConverteroptional uint32 base_avatar_id = 4;
+ * optional uint32 base_avatar_id = 7;
*/
private int baseAvatarId;
/**
- * repeated .ItemCost item_list = 7;
+ * repeated .ItemCost item_list = 13;
*/
private final RepeatedMessageoptional uint32 base_avatar_id = 4;
+ * optional uint32 base_avatar_id = 7;
* @return whether the baseAvatarId field is set
*/
public boolean hasBaseAvatarId() {
@@ -48,7 +48,7 @@ public final class PromoteAvatarCsReqOuterClass {
}
/**
- * optional uint32 base_avatar_id = 4;
+ * optional uint32 base_avatar_id = 7;
* @return this
*/
public PromoteAvatarCsReq clearBaseAvatarId() {
@@ -58,7 +58,7 @@ public final class PromoteAvatarCsReqOuterClass {
}
/**
- * optional uint32 base_avatar_id = 4;
+ * optional uint32 base_avatar_id = 7;
* @return the baseAvatarId
*/
public int getBaseAvatarId() {
@@ -66,7 +66,7 @@ public final class PromoteAvatarCsReqOuterClass {
}
/**
- * optional uint32 base_avatar_id = 4;
+ * optional uint32 base_avatar_id = 7;
* @param value the baseAvatarId to set
* @return this
*/
@@ -77,7 +77,7 @@ public final class PromoteAvatarCsReqOuterClass {
}
/**
- * repeated .ItemCost item_list = 7;
+ * repeated .ItemCost item_list = 13;
* @return whether the itemList field is set
*/
public boolean hasItemList() {
@@ -85,7 +85,7 @@ public final class PromoteAvatarCsReqOuterClass {
}
/**
- * repeated .ItemCost item_list = 7;
+ * repeated .ItemCost item_list = 13;
* @return this
*/
public PromoteAvatarCsReq clearItemList() {
@@ -95,7 +95,7 @@ public final class PromoteAvatarCsReqOuterClass {
}
/**
- * repeated .ItemCost item_list = 7;
+ * repeated .ItemCost item_list = 13;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class PromoteAvatarCsReqOuterClass {
}
/**
- * repeated .ItemCost item_list = 7;
+ * repeated .ItemCost item_list = 13;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public final class PromoteAvatarCsReqOuterClass {
}
/**
- * repeated .ItemCost item_list = 7;
+ * repeated .ItemCost item_list = 13;
* @param value the itemList to add
* @return this
*/
@@ -134,7 +134,7 @@ public final class PromoteAvatarCsReqOuterClass {
}
/**
- * repeated .ItemCost item_list = 7;
+ * repeated .ItemCost item_list = 13;
* @param values the itemList to add
* @return this
*/
@@ -210,12 +210,12 @@ public final class PromoteAvatarCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(baseAvatarId);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < itemList.length(); i++) {
- output.writeRawByte((byte) 58);
+ output.writeRawByte((byte) 106);
output.writeMessageNoTag(itemList.get(i));
}
}
@@ -240,16 +240,16 @@ public final class PromoteAvatarCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
+ case 56: {
// baseAvatarId
baseAvatarId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 58) {
+ if (tag != 106) {
break;
}
}
- case 58: {
+ case 106: {
// itemList
tag = input.readRepeatedMessage(itemList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/PromoteEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PromoteEquipmentCsReqOuterClass.java
index 46d24c3..1d4cbb8 100644
--- a/src/generated/main/emu/lunarcore/proto/PromoteEquipmentCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PromoteEquipmentCsReqOuterClass.java
@@ -19,12 +19,12 @@ public final class PromoteEquipmentCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 equipment_unique_id = 15;
+ * optional uint32 equipment_unique_id = 6;
*/
private int equipmentUniqueId;
/**
- * optional .ItemCostList item_cost_list = 5;
+ * optional .ItemCostList item_cost_list = 13;
*/
private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance();
@@ -39,7 +39,7 @@ public final class PromoteEquipmentCsReqOuterClass {
}
/**
- * optional uint32 equipment_unique_id = 15;
+ * optional uint32 equipment_unique_id = 6;
* @return whether the equipmentUniqueId field is set
*/
public boolean hasEquipmentUniqueId() {
@@ -47,7 +47,7 @@ public final class PromoteEquipmentCsReqOuterClass {
}
/**
- * optional uint32 equipment_unique_id = 15;
+ * optional uint32 equipment_unique_id = 6;
* @return this
*/
public PromoteEquipmentCsReq clearEquipmentUniqueId() {
@@ -57,7 +57,7 @@ public final class PromoteEquipmentCsReqOuterClass {
}
/**
- * optional uint32 equipment_unique_id = 15;
+ * optional uint32 equipment_unique_id = 6;
* @return the equipmentUniqueId
*/
public int getEquipmentUniqueId() {
@@ -65,7 +65,7 @@ public final class PromoteEquipmentCsReqOuterClass {
}
/**
- * optional uint32 equipment_unique_id = 15;
+ * optional uint32 equipment_unique_id = 6;
* @param value the equipmentUniqueId to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class PromoteEquipmentCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 5;
+ * optional .ItemCostList item_cost_list = 13;
* @return whether the itemCostList field is set
*/
public boolean hasItemCostList() {
@@ -84,7 +84,7 @@ public final class PromoteEquipmentCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 5;
+ * optional .ItemCostList item_cost_list = 13;
* @return this
*/
public PromoteEquipmentCsReq clearItemCostList() {
@@ -94,7 +94,7 @@ public final class PromoteEquipmentCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 5;
+ * 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 final class PromoteEquipmentCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 5;
+ * 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 final class PromoteEquipmentCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 5;
+ * optional .ItemCostList item_cost_list = 13;
* @param value the itemCostList to set
* @return this
*/
@@ -198,11 +198,11 @@ public final class PromoteEquipmentCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(equipmentUniqueId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 42);
+ output.writeRawByte((byte) 106);
output.writeMessageNoTag(itemCostList);
}
}
@@ -226,16 +226,16 @@ public final class PromoteEquipmentCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 120: {
+ case 48: {
// equipmentUniqueId
equipmentUniqueId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 42) {
+ if (tag != 106) {
break;
}
}
- case 42: {
+ case 106: {
// itemCostList
input.readMessage(itemCostList);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/PropAeonInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/PropAeonInfoOuterClass.java
index 7ac15c8..e2729da 100644
--- a/src/generated/main/emu/lunarcore/proto/PropAeonInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PropAeonInfoOuterClass.java
@@ -18,21 +18,21 @@ public final class PropAeonInfoOuterClass {
public static final class PropAeonInfo extends ProtoMessageoptional uint32 aeon_id = 4;
- */
- private int aeonId;
-
/**
* optional uint32 dialogue_group_id = 9;
*/
private int dialogueGroupId;
/**
- * optional uint32 add_exp = 15;
+ * optional uint32 add_exp = 10;
*/
private int addExp;
+ /**
+ * optional uint32 aeon_id = 12;
+ */
+ private int aeonId;
+
private PropAeonInfo() {
}
@@ -43,49 +43,12 @@ public final class PropAeonInfoOuterClass {
return new PropAeonInfo();
}
- /**
- * optional uint32 aeon_id = 4;
- * @return whether the aeonId field is set
- */
- public boolean hasAeonId() {
- return (bitField0_ & 0x00000001) != 0;
- }
-
- /**
- * optional uint32 aeon_id = 4;
- * @return this
- */
- public PropAeonInfo clearAeonId() {
- bitField0_ &= ~0x00000001;
- aeonId = 0;
- return this;
- }
-
- /**
- * optional uint32 aeon_id = 4;
- * @return the aeonId
- */
- public int getAeonId() {
- return aeonId;
- }
-
- /**
- * optional uint32 aeon_id = 4;
- * @param value the aeonId to set
- * @return this
- */
- public PropAeonInfo setAeonId(final int value) {
- bitField0_ |= 0x00000001;
- aeonId = value;
- return this;
- }
-
/**
* optional uint32 dialogue_group_id = 9;
* @return whether the dialogueGroupId field is set
*/
public boolean hasDialogueGroupId() {
- return (bitField0_ & 0x00000002) != 0;
+ return (bitField0_ & 0x00000001) != 0;
}
/**
@@ -93,7 +56,7 @@ public final class PropAeonInfoOuterClass {
* @return this
*/
public PropAeonInfo clearDialogueGroupId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
dialogueGroupId = 0;
return this;
}
@@ -112,31 +75,31 @@ public final class PropAeonInfoOuterClass {
* @return this
*/
public PropAeonInfo setDialogueGroupId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
dialogueGroupId = value;
return this;
}
/**
- * optional uint32 add_exp = 15;
+ * optional uint32 add_exp = 10;
* @return whether the addExp field is set
*/
public boolean hasAddExp() {
- return (bitField0_ & 0x00000004) != 0;
+ return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 add_exp = 15;
+ * optional uint32 add_exp = 10;
* @return this
*/
public PropAeonInfo clearAddExp() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
addExp = 0;
return this;
}
/**
- * optional uint32 add_exp = 15;
+ * optional uint32 add_exp = 10;
* @return the addExp
*/
public int getAddExp() {
@@ -144,24 +107,61 @@ public final class PropAeonInfoOuterClass {
}
/**
- * optional uint32 add_exp = 15;
+ * optional uint32 add_exp = 10;
* @param value the addExp to set
* @return this
*/
public PropAeonInfo setAddExp(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
addExp = value;
return this;
}
+ /**
+ * optional uint32 aeon_id = 12;
+ * @return whether the aeonId field is set
+ */
+ public boolean hasAeonId() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 aeon_id = 12;
+ * @return this
+ */
+ public PropAeonInfo clearAeonId() {
+ bitField0_ &= ~0x00000004;
+ aeonId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 aeon_id = 12;
+ * @return the aeonId
+ */
+ public int getAeonId() {
+ return aeonId;
+ }
+
+ /**
+ * optional uint32 aeon_id = 12;
+ * @param value the aeonId to set
+ * @return this
+ */
+ public PropAeonInfo setAeonId(final int value) {
+ bitField0_ |= 0x00000004;
+ aeonId = value;
+ return this;
+ }
+
@Override
public PropAeonInfo copyFrom(final PropAeonInfo other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- aeonId = other.aeonId;
dialogueGroupId = other.dialogueGroupId;
addExp = other.addExp;
+ aeonId = other.aeonId;
}
return this;
}
@@ -172,15 +172,15 @@ public final class PropAeonInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasAeonId()) {
- setAeonId(other.aeonId);
- }
if (other.hasDialogueGroupId()) {
setDialogueGroupId(other.dialogueGroupId);
}
if (other.hasAddExp()) {
setAddExp(other.addExp);
}
+ if (other.hasAeonId()) {
+ setAeonId(other.aeonId);
+ }
return this;
}
@@ -191,9 +191,9 @@ public final class PropAeonInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- aeonId = 0;
dialogueGroupId = 0;
addExp = 0;
+ aeonId = 0;
return this;
}
@@ -217,39 +217,39 @@ public final class PropAeonInfoOuterClass {
}
PropAeonInfo other = (PropAeonInfo) o;
return bitField0_ == other.bitField0_
- && (!hasAeonId() || aeonId == other.aeonId)
&& (!hasDialogueGroupId() || dialogueGroupId == other.dialogueGroupId)
- && (!hasAddExp() || addExp == other.addExp);
+ && (!hasAddExp() || addExp == other.addExp)
+ && (!hasAeonId() || aeonId == other.aeonId);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(aeonId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 72);
output.writeUInt32NoTag(dialogueGroupId);
}
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 120);
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(addExp);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 96);
+ output.writeUInt32NoTag(aeonId);
+ }
}
@Override
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueGroupId);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(addExp);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonId);
+ }
return size;
}
@@ -260,27 +260,27 @@ public final class PropAeonInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
- // aeonId
- aeonId = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 72) {
- break;
- }
- }
case 72: {
// dialogueGroupId
dialogueGroupId = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 80) {
break;
}
}
- case 120: {
+ case 80: {
// addExp
addExp = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 96) {
+ break;
+ }
+ }
+ case 96: {
+ // aeonId
+ aeonId = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 0) {
@@ -305,14 +305,14 @@ public final class PropAeonInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.aeonId, aeonId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.dialogueGroupId, dialogueGroupId);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.addExp, addExp);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeUInt32(FieldNames.aeonId, aeonId);
+ }
output.endObject();
}
@@ -323,24 +323,12 @@ public final class PropAeonInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1421249154:
- case -1109029417: {
- if (input.isAtField(FieldNames.aeonId)) {
- if (!input.trySkipNullValue()) {
- aeonId = input.readUInt32();
- bitField0_ |= 0x00000001;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 1758320386:
case 1899979106: {
if (input.isAtField(FieldNames.dialogueGroupId)) {
if (!input.trySkipNullValue()) {
dialogueGroupId = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
}
} else {
input.skipUnknownField();
@@ -352,6 +340,18 @@ public final class PropAeonInfoOuterClass {
if (input.isAtField(FieldNames.addExp)) {
if (!input.trySkipNullValue()) {
addExp = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -1421249154:
+ case -1109029417: {
+ if (input.isAtField(FieldNames.aeonId)) {
+ if (!input.trySkipNullValue()) {
+ aeonId = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -411,11 +411,11 @@ public final class PropAeonInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName aeonId = FieldName.forField("aeonId", "aeon_id");
-
static final FieldName dialogueGroupId = FieldName.forField("dialogueGroupId", "dialogue_group_id");
static final FieldName addExp = FieldName.forField("addExp", "add_exp");
+
+ static final FieldName aeonId = FieldName.forField("aeonId", "aeon_id");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/PropExtraInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/PropExtraInfoOuterClass.java
index 05d439f..cccd7c9 100644
--- a/src/generated/main/emu/lunarcore/proto/PropExtraInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PropExtraInfoOuterClass.java
@@ -19,7 +19,12 @@ public final class PropExtraInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .PropRogueInfo rogue_info = 12;
+ * + * PropAeonInfo aeon_info = 5; + * PropChessInfo chess_rogue_info = 4; + *+ * + *
optional .PropRogueInfo rogue_info = 11;
*/
private final PropRogueInfoOuterClass.PropRogueInfo rogueInfo = PropRogueInfoOuterClass.PropRogueInfo.newInstance();
@@ -33,8 +38,24 @@ public final class PropExtraInfoOuterClass {
return new PropExtraInfo();
}
+ public boolean hasInfo() {
+ return (((bitField0_ & 0x00000001)) != 0);
+ }
+
+ public PropExtraInfo clearInfo() {
+ if (hasInfo()) {
+ clearRogueInfo();
+ }
+ return this;
+ }
+
/**
- * optional .PropRogueInfo rogue_info = 12;
+ * + * PropAeonInfo aeon_info = 5; + * PropChessInfo chess_rogue_info = 4; + *+ * + *
optional .PropRogueInfo rogue_info = 11;
* @return whether the rogueInfo field is set
*/
public boolean hasRogueInfo() {
@@ -42,7 +63,12 @@ public final class PropExtraInfoOuterClass {
}
/**
- * optional .PropRogueInfo rogue_info = 12;
+ * + * PropAeonInfo aeon_info = 5; + * PropChessInfo chess_rogue_info = 4; + *+ * + *
optional .PropRogueInfo rogue_info = 11;
* @return this
*/
public PropExtraInfo clearRogueInfo() {
@@ -52,7 +78,12 @@ public final class PropExtraInfoOuterClass {
}
/**
- * optional .PropRogueInfo rogue_info = 12;
+ * + * PropAeonInfo aeon_info = 5; + * PropChessInfo chess_rogue_info = 4; + *+ * + *
optional .PropRogueInfo rogue_info = 11;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -66,7 +97,12 @@ public final class PropExtraInfoOuterClass {
}
/**
- * optional .PropRogueInfo rogue_info = 12;
+ * + * PropAeonInfo aeon_info = 5; + * PropChessInfo chess_rogue_info = 4; + *+ * + *
optional .PropRogueInfo rogue_info = 11;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -80,7 +116,12 @@ public final class PropExtraInfoOuterClass {
}
/**
- * optional .PropRogueInfo rogue_info = 12;
+ * + * PropAeonInfo aeon_info = 5; + * PropChessInfo chess_rogue_info = 4; + *+ * + *
optional .PropRogueInfo rogue_info = 11;
* @param value the rogueInfo to set
* @return this
*/
@@ -150,7 +191,7 @@ public final class PropExtraInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 98);
+ output.writeRawByte((byte) 90);
output.writeMessageNoTag(rogueInfo);
}
}
@@ -171,7 +212,7 @@ public final class PropExtraInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 98: {
+ case 90: {
// rogueInfo
input.readMessage(rogueInfo);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/PropRogueInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/PropRogueInfoOuterClass.java
index bec1e1c..bc8e23f 100644
--- a/src/generated/main/emu/lunarcore/proto/PropRogueInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/PropRogueInfoOuterClass.java
@@ -19,15 +19,15 @@ public final class PropRogueInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 room_id = 10;
- */
- private int roomId;
-
- /**
- * optional uint32 site_id = 13;
+ * optional uint32 site_id = 6;
*/
private int siteId;
+ /**
+ * optional uint32 room_id = 11;
+ */
+ private int roomId;
+
private PropRogueInfo() {
}
@@ -39,62 +39,25 @@ public final class PropRogueInfoOuterClass {
}
/**
- * optional uint32 room_id = 10;
- * @return whether the roomId field is set
+ * optional uint32 site_id = 6;
+ * @return whether the siteId field is set
*/
- public boolean hasRoomId() {
+ public boolean hasSiteId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 room_id = 10;
- * @return this
- */
- public PropRogueInfo clearRoomId() {
- bitField0_ &= ~0x00000001;
- roomId = 0;
- return this;
- }
-
- /**
- * optional uint32 room_id = 10;
- * @return the roomId
- */
- public int getRoomId() {
- return roomId;
- }
-
- /**
- * optional uint32 room_id = 10;
- * @param value the roomId to set
- * @return this
- */
- public PropRogueInfo setRoomId(final int value) {
- bitField0_ |= 0x00000001;
- roomId = value;
- return this;
- }
-
- /**
- * optional uint32 site_id = 13;
- * @return whether the siteId field is set
- */
- public boolean hasSiteId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 site_id = 13;
+ * optional uint32 site_id = 6;
* @return this
*/
public PropRogueInfo clearSiteId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
siteId = 0;
return this;
}
/**
- * optional uint32 site_id = 13;
+ * optional uint32 site_id = 6;
* @return the siteId
*/
public int getSiteId() {
@@ -102,23 +65,60 @@ public final class PropRogueInfoOuterClass {
}
/**
- * optional uint32 site_id = 13;
+ * optional uint32 site_id = 6;
* @param value the siteId to set
* @return this
*/
public PropRogueInfo setSiteId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
siteId = value;
return this;
}
+ /**
+ * optional uint32 room_id = 11;
+ * @return whether the roomId field is set
+ */
+ public boolean hasRoomId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 room_id = 11;
+ * @return this
+ */
+ public PropRogueInfo clearRoomId() {
+ bitField0_ &= ~0x00000002;
+ roomId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 room_id = 11;
+ * @return the roomId
+ */
+ public int getRoomId() {
+ return roomId;
+ }
+
+ /**
+ * optional uint32 room_id = 11;
+ * @param value the roomId to set
+ * @return this
+ */
+ public PropRogueInfo setRoomId(final int value) {
+ bitField0_ |= 0x00000002;
+ roomId = value;
+ return this;
+ }
+
@Override
public PropRogueInfo copyFrom(final PropRogueInfo other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- roomId = other.roomId;
siteId = other.siteId;
+ roomId = other.roomId;
}
return this;
}
@@ -129,12 +129,12 @@ public final class PropRogueInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasRoomId()) {
- setRoomId(other.roomId);
- }
if (other.hasSiteId()) {
setSiteId(other.siteId);
}
+ if (other.hasRoomId()) {
+ setRoomId(other.roomId);
+ }
return this;
}
@@ -145,8 +145,8 @@ public final class PropRogueInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- roomId = 0;
siteId = 0;
+ roomId = 0;
return this;
}
@@ -170,19 +170,19 @@ public final class PropRogueInfoOuterClass {
}
PropRogueInfo other = (PropRogueInfo) o;
return bitField0_ == other.bitField0_
- && (!hasRoomId() || roomId == other.roomId)
- && (!hasSiteId() || siteId == other.siteId);
+ && (!hasSiteId() || siteId == other.siteId)
+ && (!hasRoomId() || roomId == other.roomId);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(roomId);
+ output.writeRawByte((byte) 48);
+ output.writeUInt32NoTag(siteId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 104);
- output.writeUInt32NoTag(siteId);
+ output.writeRawByte((byte) 88);
+ output.writeUInt32NoTag(roomId);
}
}
@@ -190,10 +190,10 @@ public final class PropRogueInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(roomId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(siteId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(siteId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(roomId);
}
return size;
}
@@ -205,18 +205,18 @@ public final class PropRogueInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 80: {
- // roomId
- roomId = input.readUInt32();
+ case 48: {
+ // siteId
+ siteId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 88) {
break;
}
}
- case 104: {
- // siteId
- siteId = input.readUInt32();
+ case 88: {
+ // roomId
+ roomId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
@@ -241,10 +241,10 @@ public final class PropRogueInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.roomId, roomId);
+ output.writeUInt32(FieldNames.siteId, siteId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.siteId, siteId);
+ output.writeUInt32(FieldNames.roomId, roomId);
}
output.endObject();
}
@@ -256,11 +256,11 @@ public final class PropRogueInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -925319338:
- case 1379892991: {
- if (input.isAtField(FieldNames.roomId)) {
+ case -902090046:
+ case 2100001043: {
+ if (input.isAtField(FieldNames.siteId)) {
if (!input.trySkipNullValue()) {
- roomId = input.readUInt32();
+ siteId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -268,11 +268,11 @@ public final class PropRogueInfoOuterClass {
}
break;
}
- case -902090046:
- case 2100001043: {
- if (input.isAtField(FieldNames.siteId)) {
+ case -925319338:
+ case 1379892991: {
+ if (input.isAtField(FieldNames.roomId)) {
if (!input.trySkipNullValue()) {
- siteId = input.readUInt32();
+ roomId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -332,9 +332,9 @@ public final class PropRogueInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName roomId = FieldName.forField("roomId", "room_id");
-
static final FieldName siteId = FieldName.forField("siteId", "site_id");
+
+ static final FieldName roomId = FieldName.forField("roomId", "room_id");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/QuestOuterClass.java b/src/generated/main/emu/lunarcore/proto/QuestOuterClass.java
index e3f31b3..afd07fe 100644
--- a/src/generated/main/emu/lunarcore/proto/QuestOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/QuestOuterClass.java
@@ -19,22 +19,22 @@ public final class QuestOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional int64 finish_time = 3;
+ * optional int64 finish_time = 4;
*/
private long finishTime;
/**
- * optional uint32 id = 1;
- */
- private int id;
-
- /**
- * optional uint32 progress = 8;
+ * optional uint32 progress = 1;
*/
private int progress;
/**
- * optional .QuestStatus status = 14;
+ * optional uint32 id = 14;
+ */
+ private int id;
+
+ /**
+ * optional .QuestStatus status = 8;
*/
private int status;
@@ -49,7 +49,7 @@ public final class QuestOuterClass {
}
/**
- * optional int64 finish_time = 3;
+ * optional int64 finish_time = 4;
* @return whether the finishTime field is set
*/
public boolean hasFinishTime() {
@@ -57,7 +57,7 @@ public final class QuestOuterClass {
}
/**
- * optional int64 finish_time = 3;
+ * optional int64 finish_time = 4;
* @return this
*/
public Quest clearFinishTime() {
@@ -67,7 +67,7 @@ public final class QuestOuterClass {
}
/**
- * optional int64 finish_time = 3;
+ * optional int64 finish_time = 4;
* @return the finishTime
*/
public long getFinishTime() {
@@ -75,7 +75,7 @@ public final class QuestOuterClass {
}
/**
- * optional int64 finish_time = 3;
+ * optional int64 finish_time = 4;
* @param value the finishTime to set
* @return this
*/
@@ -86,62 +86,25 @@ public final class QuestOuterClass {
}
/**
- * optional uint32 id = 1;
- * @return whether the id field is set
+ * optional uint32 progress = 1;
+ * @return whether the progress field is set
*/
- public boolean hasId() {
+ public boolean hasProgress() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 id = 1;
- * @return this
- */
- public Quest clearId() {
- bitField0_ &= ~0x00000002;
- id = 0;
- return this;
- }
-
- /**
- * optional uint32 id = 1;
- * @return the id
- */
- public int getId() {
- return id;
- }
-
- /**
- * optional uint32 id = 1;
- * @param value the id to set
- * @return this
- */
- public Quest setId(final int value) {
- bitField0_ |= 0x00000002;
- id = value;
- return this;
- }
-
- /**
- * optional uint32 progress = 8;
- * @return whether the progress field is set
- */
- public boolean hasProgress() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 progress = 8;
+ * optional uint32 progress = 1;
* @return this
*/
public Quest clearProgress() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
progress = 0;
return this;
}
/**
- * optional uint32 progress = 8;
+ * optional uint32 progress = 1;
* @return the progress
*/
public int getProgress() {
@@ -149,18 +112,55 @@ public final class QuestOuterClass {
}
/**
- * optional uint32 progress = 8;
+ * optional uint32 progress = 1;
* @param value the progress to set
* @return this
*/
public Quest setProgress(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
progress = value;
return this;
}
/**
- * optional .QuestStatus status = 14;
+ * optional uint32 id = 14;
+ * @return whether the id field is set
+ */
+ public boolean hasId() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 id = 14;
+ * @return this
+ */
+ public Quest clearId() {
+ bitField0_ &= ~0x00000004;
+ id = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 id = 14;
+ * @return the id
+ */
+ public int getId() {
+ return id;
+ }
+
+ /**
+ * optional uint32 id = 14;
+ * @param value the id to set
+ * @return this
+ */
+ public Quest setId(final int value) {
+ bitField0_ |= 0x00000004;
+ id = value;
+ return this;
+ }
+
+ /**
+ * optional .QuestStatus status = 8;
* @return whether the status field is set
*/
public boolean hasStatus() {
@@ -168,7 +168,7 @@ public final class QuestOuterClass {
}
/**
- * optional .QuestStatus status = 14;
+ * optional .QuestStatus status = 8;
* @return this
*/
public Quest clearStatus() {
@@ -178,7 +178,7 @@ public final class QuestOuterClass {
}
/**
- * optional .QuestStatus status = 14;
+ * optional .QuestStatus status = 8;
* @return the status
*/
public QuestStatusOuterClass.QuestStatus getStatus() {
@@ -211,7 +211,7 @@ public final class QuestOuterClass {
}
/**
- * optional .QuestStatus status = 14;
+ * optional .QuestStatus status = 8;
* @param value the status to set
* @return this
*/
@@ -227,8 +227,8 @@ public final class QuestOuterClass {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
finishTime = other.finishTime;
- id = other.id;
progress = other.progress;
+ id = other.id;
status = other.status;
}
return this;
@@ -243,12 +243,12 @@ public final class QuestOuterClass {
if (other.hasFinishTime()) {
setFinishTime(other.finishTime);
}
- if (other.hasId()) {
- setId(other.id);
- }
if (other.hasProgress()) {
setProgress(other.progress);
}
+ if (other.hasId()) {
+ setId(other.id);
+ }
if (other.hasStatus()) {
setStatusValue(other.status);
}
@@ -263,8 +263,8 @@ public final class QuestOuterClass {
cachedSize = -1;
bitField0_ = 0;
finishTime = 0L;
- id = 0;
progress = 0;
+ id = 0;
status = 0;
return this;
}
@@ -290,27 +290,27 @@ public final class QuestOuterClass {
Quest other = (Quest) o;
return bitField0_ == other.bitField0_
&& (!hasFinishTime() || finishTime == other.finishTime)
- && (!hasId() || id == other.id)
&& (!hasProgress() || progress == other.progress)
+ && (!hasId() || id == other.id)
&& (!hasStatus() || status == other.status);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 32);
output.writeInt64NoTag(finishTime);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(id);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 64);
output.writeUInt32NoTag(progress);
}
- if ((bitField0_ & 0x00000008) != 0) {
+ if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 112);
+ output.writeUInt32NoTag(id);
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeRawByte((byte) 64);
output.writeEnumNoTag(status);
}
}
@@ -322,10 +322,10 @@ public final class QuestOuterClass {
size += 1 + ProtoSink.computeInt64SizeNoTag(finishTime);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(id);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(progress);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(progress);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(id);
}
if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeEnumSizeNoTag(status);
@@ -340,7 +340,7 @@ public final class QuestOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
+ case 32: {
// finishTime
finishTime = input.readInt64();
bitField0_ |= 0x00000001;
@@ -350,24 +350,24 @@ public final class QuestOuterClass {
}
}
case 8: {
- // id
- id = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 64) {
- break;
- }
- }
- case 64: {
// progress
progress = input.readUInt32();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 112) {
break;
}
}
case 112: {
+ // id
+ id = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 64) {
+ break;
+ }
+ }
+ case 64: {
// status
final int value = input.readInt32();
if (QuestStatusOuterClass.QuestStatus.forNumber(value) != null) {
@@ -400,10 +400,10 @@ public final class QuestOuterClass {
output.writeInt64(FieldNames.finishTime, finishTime);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.id, id);
+ output.writeUInt32(FieldNames.progress, progress);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.progress, progress);
+ output.writeUInt32(FieldNames.id, id);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeEnum(FieldNames.status, status, QuestStatusOuterClass.QuestStatus.converter());
@@ -430,10 +430,10 @@ public final class QuestOuterClass {
}
break;
}
- case 3355: {
- if (input.isAtField(FieldNames.id)) {
+ case -1001078227: {
+ if (input.isAtField(FieldNames.progress)) {
if (!input.trySkipNullValue()) {
- id = input.readUInt32();
+ progress = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -441,10 +441,10 @@ public final class QuestOuterClass {
}
break;
}
- case -1001078227: {
- if (input.isAtField(FieldNames.progress)) {
+ case 3355: {
+ if (input.isAtField(FieldNames.id)) {
if (!input.trySkipNullValue()) {
- progress = input.readUInt32();
+ id = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -522,10 +522,10 @@ public final class QuestOuterClass {
static class FieldNames {
static final FieldName finishTime = FieldName.forField("finishTime", "finish_time");
- static final FieldName id = FieldName.forField("id");
-
static final FieldName progress = FieldName.forField("progress");
+ static final FieldName id = FieldName.forField("id");
+
static final FieldName status = FieldName.forField("status");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/QuitLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/QuitLineupCsReqOuterClass.java
index d309e94..b88fd14 100644
--- a/src/generated/main/emu/lunarcore/proto/QuitLineupCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/QuitLineupCsReqOuterClass.java
@@ -19,24 +19,19 @@ public final class QuitLineupCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 index = 12;
- */
- private int index;
-
- /**
- * optional uint32 plane_id = 13;
+ * optional uint32 plane_id = 6;
*/
private int planeId;
/**
- * optional uint32 base_avatar_id = 15;
+ * optional uint32 base_avatar_id = 12;
*/
private int baseAvatarId;
/**
- * optional .AvatarType avatar_type = 5;
+ * optional uint32 index = 13;
*/
- private int avatarType;
+ private int index;
/**
* optional .ExtraLineupType extra_lineup_type = 8;
@@ -44,7 +39,12 @@ public final class QuitLineupCsReqOuterClass {
private int extraLineupType;
/**
- * optional bool is_virtual = 7;
+ * optional .AvatarType avatar_type = 9;
+ */
+ private int avatarType;
+
+ /**
+ * optional bool is_virtual = 1;
*/
private boolean isVirtual;
@@ -59,62 +59,25 @@ public final class QuitLineupCsReqOuterClass {
}
/**
- * optional uint32 index = 12;
- * @return whether the index field is set
+ * optional uint32 plane_id = 6;
+ * @return whether the planeId field is set
*/
- public boolean hasIndex() {
+ public boolean hasPlaneId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 index = 12;
- * @return this
- */
- public QuitLineupCsReq clearIndex() {
- bitField0_ &= ~0x00000001;
- index = 0;
- return this;
- }
-
- /**
- * optional uint32 index = 12;
- * @return the index
- */
- public int getIndex() {
- return index;
- }
-
- /**
- * optional uint32 index = 12;
- * @param value the index to set
- * @return this
- */
- public QuitLineupCsReq setIndex(final int value) {
- bitField0_ |= 0x00000001;
- index = value;
- return this;
- }
-
- /**
- * optional uint32 plane_id = 13;
- * @return whether the planeId field is set
- */
- public boolean hasPlaneId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 plane_id = 13;
+ * optional uint32 plane_id = 6;
* @return this
*/
public QuitLineupCsReq clearPlaneId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
planeId = 0;
return this;
}
/**
- * optional uint32 plane_id = 13;
+ * optional uint32 plane_id = 6;
* @return the planeId
*/
public int getPlaneId() {
@@ -122,36 +85,36 @@ public final class QuitLineupCsReqOuterClass {
}
/**
- * optional uint32 plane_id = 13;
+ * optional uint32 plane_id = 6;
* @param value the planeId to set
* @return this
*/
public QuitLineupCsReq setPlaneId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
planeId = value;
return this;
}
/**
- * optional uint32 base_avatar_id = 15;
+ * optional uint32 base_avatar_id = 12;
* @return whether the baseAvatarId field is set
*/
public boolean hasBaseAvatarId() {
- return (bitField0_ & 0x00000004) != 0;
+ return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 base_avatar_id = 15;
+ * optional uint32 base_avatar_id = 12;
* @return this
*/
public QuitLineupCsReq clearBaseAvatarId() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
baseAvatarId = 0;
return this;
}
/**
- * optional uint32 base_avatar_id = 15;
+ * optional uint32 base_avatar_id = 12;
* @return the baseAvatarId
*/
public int getBaseAvatarId() {
@@ -159,75 +122,50 @@ public final class QuitLineupCsReqOuterClass {
}
/**
- * optional uint32 base_avatar_id = 15;
+ * optional uint32 base_avatar_id = 12;
* @param value the baseAvatarId to set
* @return this
*/
public QuitLineupCsReq setBaseAvatarId(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
baseAvatarId = value;
return this;
}
/**
- * optional .AvatarType avatar_type = 5;
- * @return whether the avatarType field is set
+ * optional uint32 index = 13;
+ * @return whether the index field is set
*/
- public boolean hasAvatarType() {
- return (bitField0_ & 0x00000008) != 0;
+ public boolean hasIndex() {
+ return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional .AvatarType avatar_type = 5;
+ * optional uint32 index = 13;
* @return this
*/
- public QuitLineupCsReq clearAvatarType() {
- bitField0_ &= ~0x00000008;
- avatarType = 0;
+ public QuitLineupCsReq clearIndex() {
+ bitField0_ &= ~0x00000004;
+ index = 0;
return this;
}
/**
- * optional .AvatarType avatar_type = 5;
- * @return the avatarType
+ * optional uint32 index = 13;
+ * @return the index
*/
- public AvatarTypeOuterClass.AvatarType getAvatarType() {
- return AvatarTypeOuterClass.AvatarType.forNumber(avatarType);
+ public int getIndex() {
+ return index;
}
/**
- * Gets the value of the internal enum store. The result is
- * equivalent to {@link QuitLineupCsReq#getAvatarType()}.getNumber().
- *
- * @return numeric wire representation
- */
- public int getAvatarTypeValue() {
- return avatarType;
- }
-
- /**
- * Sets the value of the internal enum store. This does not
- * do any validity checks, so be sure to use appropriate value
- * constants from {@link AvatarTypeOuterClass.AvatarType}. Setting an invalid value
- * can cause {@link QuitLineupCsReq#getAvatarType()} to return null
- *
- * @param value the numeric wire value to set
+ * optional uint32 index = 13;
+ * @param value the index to set
* @return this
*/
- public QuitLineupCsReq setAvatarTypeValue(final int value) {
- bitField0_ |= 0x00000008;
- avatarType = value;
- return this;
- }
-
- /**
- * optional .AvatarType avatar_type = 5;
- * @param value the avatarType to set
- * @return this
- */
- public QuitLineupCsReq setAvatarType(final AvatarTypeOuterClass.AvatarType value) {
- bitField0_ |= 0x00000008;
- avatarType = value.getNumber();
+ public QuitLineupCsReq setIndex(final int value) {
+ bitField0_ |= 0x00000004;
+ index = value;
return this;
}
@@ -236,7 +174,7 @@ public final class QuitLineupCsReqOuterClass {
* @return whether the extraLineupType field is set
*/
public boolean hasExtraLineupType() {
- return (bitField0_ & 0x00000010) != 0;
+ return (bitField0_ & 0x00000008) != 0;
}
/**
@@ -244,7 +182,7 @@ public final class QuitLineupCsReqOuterClass {
* @return this
*/
public QuitLineupCsReq clearExtraLineupType() {
- bitField0_ &= ~0x00000010;
+ bitField0_ &= ~0x00000008;
extraLineupType = 0;
return this;
}
@@ -277,7 +215,7 @@ public final class QuitLineupCsReqOuterClass {
* @return this
*/
public QuitLineupCsReq setExtraLineupTypeValue(final int value) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
extraLineupType = value;
return this;
}
@@ -289,13 +227,75 @@ public final class QuitLineupCsReqOuterClass {
*/
public QuitLineupCsReq setExtraLineupType(
final ExtraLineupTypeOuterClass.ExtraLineupType value) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
extraLineupType = value.getNumber();
return this;
}
/**
- * optional bool is_virtual = 7;
+ * optional .AvatarType avatar_type = 9;
+ * @return whether the avatarType field is set
+ */
+ public boolean hasAvatarType() {
+ return (bitField0_ & 0x00000010) != 0;
+ }
+
+ /**
+ * optional .AvatarType avatar_type = 9;
+ * @return this
+ */
+ public QuitLineupCsReq clearAvatarType() {
+ bitField0_ &= ~0x00000010;
+ avatarType = 0;
+ return this;
+ }
+
+ /**
+ * optional .AvatarType avatar_type = 9;
+ * @return the avatarType
+ */
+ public AvatarTypeOuterClass.AvatarType getAvatarType() {
+ return AvatarTypeOuterClass.AvatarType.forNumber(avatarType);
+ }
+
+ /**
+ * Gets the value of the internal enum store. The result is
+ * equivalent to {@link QuitLineupCsReq#getAvatarType()}.getNumber().
+ *
+ * @return numeric wire representation
+ */
+ public int getAvatarTypeValue() {
+ return avatarType;
+ }
+
+ /**
+ * Sets the value of the internal enum store. This does not
+ * do any validity checks, so be sure to use appropriate value
+ * constants from {@link AvatarTypeOuterClass.AvatarType}. Setting an invalid value
+ * can cause {@link QuitLineupCsReq#getAvatarType()} to return null
+ *
+ * @param value the numeric wire value to set
+ * @return this
+ */
+ public QuitLineupCsReq setAvatarTypeValue(final int value) {
+ bitField0_ |= 0x00000010;
+ avatarType = value;
+ return this;
+ }
+
+ /**
+ * optional .AvatarType avatar_type = 9;
+ * @param value the avatarType to set
+ * @return this
+ */
+ public QuitLineupCsReq setAvatarType(final AvatarTypeOuterClass.AvatarType value) {
+ bitField0_ |= 0x00000010;
+ avatarType = value.getNumber();
+ return this;
+ }
+
+ /**
+ * optional bool is_virtual = 1;
* @return whether the isVirtual field is set
*/
public boolean hasIsVirtual() {
@@ -303,7 +303,7 @@ public final class QuitLineupCsReqOuterClass {
}
/**
- * optional bool is_virtual = 7;
+ * optional bool is_virtual = 1;
* @return this
*/
public QuitLineupCsReq clearIsVirtual() {
@@ -313,7 +313,7 @@ public final class QuitLineupCsReqOuterClass {
}
/**
- * optional bool is_virtual = 7;
+ * optional bool is_virtual = 1;
* @return the isVirtual
*/
public boolean getIsVirtual() {
@@ -321,7 +321,7 @@ public final class QuitLineupCsReqOuterClass {
}
/**
- * optional bool is_virtual = 7;
+ * optional bool is_virtual = 1;
* @param value the isVirtual to set
* @return this
*/
@@ -336,11 +336,11 @@ public final class QuitLineupCsReqOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- index = other.index;
planeId = other.planeId;
baseAvatarId = other.baseAvatarId;
- avatarType = other.avatarType;
+ index = other.index;
extraLineupType = other.extraLineupType;
+ avatarType = other.avatarType;
isVirtual = other.isVirtual;
}
return this;
@@ -352,21 +352,21 @@ public final class QuitLineupCsReqOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasIndex()) {
- setIndex(other.index);
- }
if (other.hasPlaneId()) {
setPlaneId(other.planeId);
}
if (other.hasBaseAvatarId()) {
setBaseAvatarId(other.baseAvatarId);
}
- if (other.hasAvatarType()) {
- setAvatarTypeValue(other.avatarType);
+ if (other.hasIndex()) {
+ setIndex(other.index);
}
if (other.hasExtraLineupType()) {
setExtraLineupTypeValue(other.extraLineupType);
}
+ if (other.hasAvatarType()) {
+ setAvatarTypeValue(other.avatarType);
+ }
if (other.hasIsVirtual()) {
setIsVirtual(other.isVirtual);
}
@@ -380,11 +380,11 @@ public final class QuitLineupCsReqOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- index = 0;
planeId = 0;
baseAvatarId = 0;
- avatarType = 0;
+ index = 0;
extraLineupType = 0;
+ avatarType = 0;
isVirtual = false;
return this;
}
@@ -409,38 +409,38 @@ public final class QuitLineupCsReqOuterClass {
}
QuitLineupCsReq other = (QuitLineupCsReq) o;
return bitField0_ == other.bitField0_
- && (!hasIndex() || index == other.index)
&& (!hasPlaneId() || planeId == other.planeId)
&& (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
- && (!hasAvatarType() || avatarType == other.avatarType)
+ && (!hasIndex() || index == other.index)
&& (!hasExtraLineupType() || extraLineupType == other.extraLineupType)
+ && (!hasAvatarType() || avatarType == other.avatarType)
&& (!hasIsVirtual() || isVirtual == other.isVirtual);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 96);
- output.writeUInt32NoTag(index);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(planeId);
}
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 120);
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(baseAvatarId);
}
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 40);
- output.writeEnumNoTag(avatarType);
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(index);
}
- if ((bitField0_ & 0x00000010) != 0) {
+ if ((bitField0_ & 0x00000008) != 0) {
output.writeRawByte((byte) 64);
output.writeEnumNoTag(extraLineupType);
}
+ if ((bitField0_ & 0x00000010) != 0) {
+ output.writeRawByte((byte) 72);
+ output.writeEnumNoTag(avatarType);
+ }
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 8);
output.writeBoolNoTag(isVirtual);
}
}
@@ -449,19 +449,19 @@ public final class QuitLineupCsReqOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(index);
- }
- if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(index);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType);
+ size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType);
+ size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType);
}
if ((bitField0_ & 0x00000020) != 0) {
size += 2;
@@ -476,41 +476,29 @@ public final class QuitLineupCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 96: {
- // index
- index = input.readUInt32();
+ case 48: {
+ // planeId
+ planeId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
+ if (tag != 96) {
+ break;
+ }
+ }
+ case 96: {
+ // baseAvatarId
+ baseAvatarId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
if (tag != 104) {
break;
}
}
case 104: {
- // planeId
- planeId = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 120) {
- break;
- }
- }
- case 120: {
- // baseAvatarId
- baseAvatarId = input.readUInt32();
+ // index
+ index = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 40) {
- break;
- }
- }
- case 40: {
- // avatarType
- final int value = input.readInt32();
- if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) {
- avatarType = value;
- bitField0_ |= 0x00000008;
- }
- tag = input.readTag();
if (tag != 64) {
break;
}
@@ -520,14 +508,26 @@ public final class QuitLineupCsReqOuterClass {
final int value = input.readInt32();
if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) {
extraLineupType = value;
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
}
tag = input.readTag();
- if (tag != 56) {
+ if (tag != 72) {
break;
}
}
- case 56: {
+ case 72: {
+ // avatarType
+ final int value = input.readInt32();
+ if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) {
+ avatarType = value;
+ bitField0_ |= 0x00000010;
+ }
+ tag = input.readTag();
+ if (tag != 8) {
+ break;
+ }
+ }
+ case 8: {
// isVirtual
isVirtual = input.readBool();
bitField0_ |= 0x00000020;
@@ -554,19 +554,19 @@ public final class QuitLineupCsReqOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.index, index);
- }
- if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.planeId, planeId);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeUInt32(FieldNames.index, index);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter());
+ output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter());
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter());
+ output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter());
}
if ((bitField0_ & 0x00000020) != 0) {
output.writeBool(FieldNames.isVirtual, isVirtual);
@@ -581,23 +581,12 @@ public final class QuitLineupCsReqOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 100346066: {
- if (input.isAtField(FieldNames.index)) {
- if (!input.trySkipNullValue()) {
- index = input.readUInt32();
- bitField0_ |= 0x00000001;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case -493896553:
case 1869097438: {
if (input.isAtField(FieldNames.planeId)) {
if (!input.trySkipNullValue()) {
planeId = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
}
} else {
input.skipUnknownField();
@@ -609,24 +598,18 @@ public final class QuitLineupCsReqOuterClass {
if (input.isAtField(FieldNames.baseAvatarId)) {
if (!input.trySkipNullValue()) {
baseAvatarId = input.readUInt32();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
}
} else {
input.skipUnknownField();
}
break;
}
- case -403148749:
- case 397309536: {
- if (input.isAtField(FieldNames.avatarType)) {
+ case 100346066: {
+ if (input.isAtField(FieldNames.index)) {
if (!input.trySkipNullValue()) {
- final AvatarTypeOuterClass.AvatarType value = input.readEnum(AvatarTypeOuterClass.AvatarType.converter());
- if (value != null) {
- avatarType = value.getNumber();
- bitField0_ |= 0x00000008;
- } else {
- input.skipUnknownEnumValue();
- }
+ index = input.readUInt32();
+ bitField0_ |= 0x00000004;
}
} else {
input.skipUnknownField();
@@ -640,6 +623,23 @@ public final class QuitLineupCsReqOuterClass {
final ExtraLineupTypeOuterClass.ExtraLineupType value = input.readEnum(ExtraLineupTypeOuterClass.ExtraLineupType.converter());
if (value != null) {
extraLineupType = value.getNumber();
+ bitField0_ |= 0x00000008;
+ } else {
+ input.skipUnknownEnumValue();
+ }
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -403148749:
+ case 397309536: {
+ if (input.isAtField(FieldNames.avatarType)) {
+ if (!input.trySkipNullValue()) {
+ final AvatarTypeOuterClass.AvatarType value = input.readEnum(AvatarTypeOuterClass.AvatarType.converter());
+ if (value != null) {
+ avatarType = value.getNumber();
bitField0_ |= 0x00000010;
} else {
input.skipUnknownEnumValue();
@@ -715,16 +715,16 @@ public final class QuitLineupCsReqOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName index = FieldName.forField("index");
-
static final FieldName planeId = FieldName.forField("planeId", "plane_id");
static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
- static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type");
+ static final FieldName index = FieldName.forField("index");
static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type");
+ static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type");
+
static final FieldName isVirtual = FieldName.forField("isVirtual", "is_virtual");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/RankUpAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RankUpAvatarCsReqOuterClass.java
index 98cabab..a432daf 100644
--- a/src/generated/main/emu/lunarcore/proto/RankUpAvatarCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RankUpAvatarCsReqOuterClass.java
@@ -18,18 +18,18 @@ public final class RankUpAvatarCsReqOuterClass {
public static final class RankUpAvatarCsReq extends ProtoMessageoptional uint32 rank = 2;
- */
- private int rank;
-
/**
* optional uint32 base_avatar_id = 9;
*/
private int baseAvatarId;
/**
- * optional .ItemCostList item_cost_list = 7;
+ * optional uint32 rank = 11;
+ */
+ private int rank;
+
+ /**
+ * optional .ItemCostList item_cost_list = 4;
*/
private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance();
@@ -43,49 +43,12 @@ public final class RankUpAvatarCsReqOuterClass {
return new RankUpAvatarCsReq();
}
- /**
- * optional uint32 rank = 2;
- * @return whether the rank field is set
- */
- public boolean hasRank() {
- return (bitField0_ & 0x00000001) != 0;
- }
-
- /**
- * optional uint32 rank = 2;
- * @return this
- */
- public RankUpAvatarCsReq clearRank() {
- bitField0_ &= ~0x00000001;
- rank = 0;
- return this;
- }
-
- /**
- * optional uint32 rank = 2;
- * @return the rank
- */
- public int getRank() {
- return rank;
- }
-
- /**
- * optional uint32 rank = 2;
- * @param value the rank to set
- * @return this
- */
- public RankUpAvatarCsReq setRank(final int value) {
- bitField0_ |= 0x00000001;
- rank = value;
- return this;
- }
-
/**
* optional uint32 base_avatar_id = 9;
* @return whether the baseAvatarId field is set
*/
public boolean hasBaseAvatarId() {
- return (bitField0_ & 0x00000002) != 0;
+ return (bitField0_ & 0x00000001) != 0;
}
/**
@@ -93,7 +56,7 @@ public final class RankUpAvatarCsReqOuterClass {
* @return this
*/
public RankUpAvatarCsReq clearBaseAvatarId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
baseAvatarId = 0;
return this;
}
@@ -112,13 +75,50 @@ public final class RankUpAvatarCsReqOuterClass {
* @return this
*/
public RankUpAvatarCsReq setBaseAvatarId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
baseAvatarId = value;
return this;
}
/**
- * optional .ItemCostList item_cost_list = 7;
+ * optional uint32 rank = 11;
+ * @return whether the rank field is set
+ */
+ public boolean hasRank() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 rank = 11;
+ * @return this
+ */
+ public RankUpAvatarCsReq clearRank() {
+ bitField0_ &= ~0x00000002;
+ rank = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 rank = 11;
+ * @return the rank
+ */
+ public int getRank() {
+ return rank;
+ }
+
+ /**
+ * optional uint32 rank = 11;
+ * @param value the rank to set
+ * @return this
+ */
+ public RankUpAvatarCsReq setRank(final int value) {
+ bitField0_ |= 0x00000002;
+ rank = value;
+ return this;
+ }
+
+ /**
+ * optional .ItemCostList item_cost_list = 4;
* @return whether the itemCostList field is set
*/
public boolean hasItemCostList() {
@@ -126,7 +126,7 @@ public final class RankUpAvatarCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 7;
+ * optional .ItemCostList item_cost_list = 4;
* @return this
*/
public RankUpAvatarCsReq clearItemCostList() {
@@ -136,7 +136,7 @@ public final class RankUpAvatarCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 7;
+ * optional .ItemCostList item_cost_list = 4;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -150,7 +150,7 @@ public final class RankUpAvatarCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 7;
+ * optional .ItemCostList item_cost_list = 4;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -164,7 +164,7 @@ public final class RankUpAvatarCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 7;
+ * optional .ItemCostList item_cost_list = 4;
* @param value the itemCostList to set
* @return this
*/
@@ -179,8 +179,8 @@ public final class RankUpAvatarCsReqOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- rank = other.rank;
baseAvatarId = other.baseAvatarId;
+ rank = other.rank;
itemCostList.copyFrom(other.itemCostList);
}
return this;
@@ -192,12 +192,12 @@ public final class RankUpAvatarCsReqOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasRank()) {
- setRank(other.rank);
- }
if (other.hasBaseAvatarId()) {
setBaseAvatarId(other.baseAvatarId);
}
+ if (other.hasRank()) {
+ setRank(other.rank);
+ }
if (other.hasItemCostList()) {
getMutableItemCostList().mergeFrom(other.itemCostList);
}
@@ -211,8 +211,8 @@ public final class RankUpAvatarCsReqOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- rank = 0;
baseAvatarId = 0;
+ rank = 0;
itemCostList.clear();
return this;
}
@@ -238,23 +238,23 @@ public final class RankUpAvatarCsReqOuterClass {
}
RankUpAvatarCsReq other = (RankUpAvatarCsReq) o;
return bitField0_ == other.bitField0_
- && (!hasRank() || rank == other.rank)
&& (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
+ && (!hasRank() || rank == other.rank)
&& (!hasItemCostList() || itemCostList.equals(other.itemCostList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(rank);
- }
- if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 72);
output.writeUInt32NoTag(baseAvatarId);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 88);
+ output.writeUInt32NoTag(rank);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 58);
+ output.writeRawByte((byte) 34);
output.writeMessageNoTag(itemCostList);
}
}
@@ -263,10 +263,10 @@ public final class RankUpAvatarCsReqOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(rank);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(rank);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(itemCostList);
@@ -281,25 +281,25 @@ public final class RankUpAvatarCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
- // rank
- rank = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 72) {
- break;
- }
- }
case 72: {
// baseAvatarId
baseAvatarId = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 58) {
+ if (tag != 88) {
break;
}
}
- case 58: {
+ case 88: {
+ // rank
+ rank = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 34) {
+ break;
+ }
+ }
+ case 34: {
// itemCostList
input.readMessage(itemCostList);
bitField0_ |= 0x00000004;
@@ -326,10 +326,10 @@ public final class RankUpAvatarCsReqOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.rank, rank);
+ output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
+ output.writeUInt32(FieldNames.rank, rank);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeMessage(FieldNames.itemCostList, itemCostList);
@@ -344,10 +344,11 @@ public final class RankUpAvatarCsReqOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 3492908: {
- if (input.isAtField(FieldNames.rank)) {
+ case 118022725:
+ case -1756826157: {
+ if (input.isAtField(FieldNames.baseAvatarId)) {
if (!input.trySkipNullValue()) {
- rank = input.readUInt32();
+ baseAvatarId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -355,11 +356,10 @@ public final class RankUpAvatarCsReqOuterClass {
}
break;
}
- case 118022725:
- case -1756826157: {
- if (input.isAtField(FieldNames.baseAvatarId)) {
+ case 3492908: {
+ if (input.isAtField(FieldNames.rank)) {
if (!input.trySkipNullValue()) {
- baseAvatarId = input.readUInt32();
+ rank = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -432,10 +432,10 @@ public final class RankUpAvatarCsReqOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName rank = FieldName.forField("rank");
-
static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
+ static final FieldName rank = FieldName.forField("rank");
+
static final FieldName itemCostList = FieldName.forField("itemCostList", "item_cost_list");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/RankUpEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RankUpEquipmentCsReqOuterClass.java
index 09f5d3d..721688b 100644
--- a/src/generated/main/emu/lunarcore/proto/RankUpEquipmentCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RankUpEquipmentCsReqOuterClass.java
@@ -19,12 +19,12 @@ public final class RankUpEquipmentCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 equipment_unique_id = 13;
+ * optional uint32 equipment_unique_id = 3;
*/
private int equipmentUniqueId;
/**
- * optional .ItemCostList item_cost_list = 9;
+ * optional .ItemCostList item_cost_list = 5;
*/
private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance();
@@ -39,7 +39,7 @@ public final class RankUpEquipmentCsReqOuterClass {
}
/**
- * optional uint32 equipment_unique_id = 13;
+ * optional uint32 equipment_unique_id = 3;
* @return whether the equipmentUniqueId field is set
*/
public boolean hasEquipmentUniqueId() {
@@ -47,7 +47,7 @@ public final class RankUpEquipmentCsReqOuterClass {
}
/**
- * optional uint32 equipment_unique_id = 13;
+ * optional uint32 equipment_unique_id = 3;
* @return this
*/
public RankUpEquipmentCsReq clearEquipmentUniqueId() {
@@ -57,7 +57,7 @@ public final class RankUpEquipmentCsReqOuterClass {
}
/**
- * optional uint32 equipment_unique_id = 13;
+ * optional uint32 equipment_unique_id = 3;
* @return the equipmentUniqueId
*/
public int getEquipmentUniqueId() {
@@ -65,7 +65,7 @@ public final class RankUpEquipmentCsReqOuterClass {
}
/**
- * optional uint32 equipment_unique_id = 13;
+ * optional uint32 equipment_unique_id = 3;
* @param value the equipmentUniqueId to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class RankUpEquipmentCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 9;
+ * optional .ItemCostList item_cost_list = 5;
* @return whether the itemCostList field is set
*/
public boolean hasItemCostList() {
@@ -84,7 +84,7 @@ public final class RankUpEquipmentCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 9;
+ * optional .ItemCostList item_cost_list = 5;
* @return this
*/
public RankUpEquipmentCsReq clearItemCostList() {
@@ -94,7 +94,7 @@ public final class RankUpEquipmentCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 9;
+ * optional .ItemCostList item_cost_list = 5;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class RankUpEquipmentCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 9;
+ * optional .ItemCostList item_cost_list = 5;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class RankUpEquipmentCsReqOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 9;
+ * optional .ItemCostList item_cost_list = 5;
* @param value the itemCostList to set
* @return this
*/
@@ -198,11 +198,11 @@ public final class RankUpEquipmentCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(equipmentUniqueId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 74);
+ output.writeRawByte((byte) 42);
output.writeMessageNoTag(itemCostList);
}
}
@@ -226,16 +226,16 @@ public final class RankUpEquipmentCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 104: {
+ case 24: {
// equipmentUniqueId
equipmentUniqueId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 74) {
+ if (tag != 42) {
break;
}
}
- case 74: {
+ case 42: {
// itemCostList
input.readMessage(itemCostList);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageCsReqOuterClass.java
index 8f70d90..48ba932 100644
--- a/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class ReEnterLastElementStageCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 stage_id = 6;
+ * optional uint32 stage_id = 12;
*/
private int stageId;
@@ -34,7 +34,7 @@ public final class ReEnterLastElementStageCsReqOuterClass {
}
/**
- * optional uint32 stage_id = 6;
+ * optional uint32 stage_id = 12;
* @return whether the stageId field is set
*/
public boolean hasStageId() {
@@ -42,7 +42,7 @@ public final class ReEnterLastElementStageCsReqOuterClass {
}
/**
- * optional uint32 stage_id = 6;
+ * optional uint32 stage_id = 12;
* @return this
*/
public ReEnterLastElementStageCsReq clearStageId() {
@@ -52,7 +52,7 @@ public final class ReEnterLastElementStageCsReqOuterClass {
}
/**
- * optional uint32 stage_id = 6;
+ * optional uint32 stage_id = 12;
* @return the stageId
*/
public int getStageId() {
@@ -60,7 +60,7 @@ public final class ReEnterLastElementStageCsReqOuterClass {
}
/**
- * optional uint32 stage_id = 6;
+ * optional uint32 stage_id = 12;
* @param value the stageId to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class ReEnterLastElementStageCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(stageId);
}
}
@@ -150,7 +150,7 @@ public final class ReEnterLastElementStageCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 48: {
+ case 96: {
// stageId
stageId = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageScRspOuterClass.java
index 302018d..788a9c9 100644
--- a/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageScRspOuterClass.java
@@ -19,17 +19,17 @@ public final class ReEnterLastElementStageScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 6;
- */
- private int retcode;
-
- /**
- * optional uint32 stage_id = 10;
+ * optional uint32 stage_id = 8;
*/
private int stageId;
/**
- * optional .SceneBattleInfo battle_info = 1;
+ * optional uint32 retcode = 12;
+ */
+ private int retcode;
+
+ /**
+ * optional .SceneBattleInfo battle_info = 10;
*/
private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance();
@@ -44,62 +44,25 @@ public final class ReEnterLastElementStageScRspOuterClass {
}
/**
- * optional uint32 retcode = 6;
- * @return whether the retcode field is set
+ * optional uint32 stage_id = 8;
+ * @return whether the stageId field is set
*/
- public boolean hasRetcode() {
+ public boolean hasStageId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 retcode = 6;
- * @return this
- */
- public ReEnterLastElementStageScRsp clearRetcode() {
- bitField0_ &= ~0x00000001;
- retcode = 0;
- return this;
- }
-
- /**
- * optional uint32 retcode = 6;
- * @return the retcode
- */
- public int getRetcode() {
- return retcode;
- }
-
- /**
- * optional uint32 retcode = 6;
- * @param value the retcode to set
- * @return this
- */
- public ReEnterLastElementStageScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000001;
- retcode = value;
- return this;
- }
-
- /**
- * optional uint32 stage_id = 10;
- * @return whether the stageId field is set
- */
- public boolean hasStageId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 stage_id = 10;
+ * optional uint32 stage_id = 8;
* @return this
*/
public ReEnterLastElementStageScRsp clearStageId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
stageId = 0;
return this;
}
/**
- * optional uint32 stage_id = 10;
+ * optional uint32 stage_id = 8;
* @return the stageId
*/
public int getStageId() {
@@ -107,18 +70,55 @@ public final class ReEnterLastElementStageScRspOuterClass {
}
/**
- * optional uint32 stage_id = 10;
+ * optional uint32 stage_id = 8;
* @param value the stageId to set
* @return this
*/
public ReEnterLastElementStageScRsp setStageId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
stageId = value;
return this;
}
/**
- * optional .SceneBattleInfo battle_info = 1;
+ * optional uint32 retcode = 12;
+ * @return whether the retcode field is set
+ */
+ public boolean hasRetcode() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 retcode = 12;
+ * @return this
+ */
+ public ReEnterLastElementStageScRsp clearRetcode() {
+ bitField0_ &= ~0x00000002;
+ retcode = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 retcode = 12;
+ * @return the retcode
+ */
+ public int getRetcode() {
+ return retcode;
+ }
+
+ /**
+ * optional uint32 retcode = 12;
+ * @param value the retcode to set
+ * @return this
+ */
+ public ReEnterLastElementStageScRsp setRetcode(final int value) {
+ bitField0_ |= 0x00000002;
+ retcode = value;
+ return this;
+ }
+
+ /**
+ * optional .SceneBattleInfo battle_info = 10;
* @return whether the battleInfo field is set
*/
public boolean hasBattleInfo() {
@@ -126,7 +126,7 @@ public final class ReEnterLastElementStageScRspOuterClass {
}
/**
- * optional .SceneBattleInfo battle_info = 1;
+ * optional .SceneBattleInfo battle_info = 10;
* @return this
*/
public ReEnterLastElementStageScRsp clearBattleInfo() {
@@ -136,7 +136,7 @@ public final class ReEnterLastElementStageScRspOuterClass {
}
/**
- * optional .SceneBattleInfo battle_info = 1;
+ * optional .SceneBattleInfo battle_info = 10;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -150,7 +150,7 @@ public final class ReEnterLastElementStageScRspOuterClass {
}
/**
- * optional .SceneBattleInfo battle_info = 1;
+ * optional .SceneBattleInfo battle_info = 10;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -164,7 +164,7 @@ public final class ReEnterLastElementStageScRspOuterClass {
}
/**
- * optional .SceneBattleInfo battle_info = 1;
+ * optional .SceneBattleInfo battle_info = 10;
* @param value the battleInfo to set
* @return this
*/
@@ -180,8 +180,8 @@ public final class ReEnterLastElementStageScRspOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- retcode = other.retcode;
stageId = other.stageId;
+ retcode = other.retcode;
battleInfo.copyFrom(other.battleInfo);
}
return this;
@@ -193,12 +193,12 @@ public final class ReEnterLastElementStageScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasRetcode()) {
- setRetcode(other.retcode);
- }
if (other.hasStageId()) {
setStageId(other.stageId);
}
+ if (other.hasRetcode()) {
+ setRetcode(other.retcode);
+ }
if (other.hasBattleInfo()) {
getMutableBattleInfo().mergeFrom(other.battleInfo);
}
@@ -212,8 +212,8 @@ public final class ReEnterLastElementStageScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- retcode = 0;
stageId = 0;
+ retcode = 0;
battleInfo.clear();
return this;
}
@@ -239,23 +239,23 @@ public final class ReEnterLastElementStageScRspOuterClass {
}
ReEnterLastElementStageScRsp other = (ReEnterLastElementStageScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasRetcode() || retcode == other.retcode)
&& (!hasStageId() || stageId == other.stageId)
+ && (!hasRetcode() || retcode == other.retcode)
&& (!hasBattleInfo() || battleInfo.equals(other.battleInfo));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 48);
- output.writeUInt32NoTag(retcode);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(stageId);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 96);
+ output.writeUInt32NoTag(retcode);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 10);
+ output.writeRawByte((byte) 82);
output.writeMessageNoTag(battleInfo);
}
}
@@ -264,10 +264,10 @@ public final class ReEnterLastElementStageScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(battleInfo);
@@ -282,25 +282,25 @@ public final class ReEnterLastElementStageScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 48: {
- // retcode
- retcode = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 80) {
- break;
- }
- }
- case 80: {
+ case 64: {
// stageId
stageId = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 10) {
+ if (tag != 96) {
break;
}
}
- case 10: {
+ case 96: {
+ // retcode
+ retcode = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 82) {
+ break;
+ }
+ }
+ case 82: {
// battleInfo
input.readMessage(battleInfo);
bitField0_ |= 0x00000004;
@@ -327,10 +327,10 @@ public final class ReEnterLastElementStageScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.stageId, stageId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.stageId, stageId);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeMessage(FieldNames.battleInfo, battleInfo);
@@ -345,10 +345,11 @@ public final class ReEnterLastElementStageScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case -1897528135:
+ case 1306191356: {
+ if (input.isAtField(FieldNames.stageId)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ stageId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -356,11 +357,10 @@ public final class ReEnterLastElementStageScRspOuterClass {
}
break;
}
- case -1897528135:
- case 1306191356: {
- if (input.isAtField(FieldNames.stageId)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- stageId = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -435,10 +435,10 @@ public final class ReEnterLastElementStageScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName retcode = FieldName.forField("retcode");
-
static final FieldName stageId = FieldName.forField("stageId", "stage_id");
+ static final FieldName retcode = FieldName.forField("retcode");
+
static final FieldName battleInfo = FieldName.forField("battleInfo", "battle_info");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientCsReqOuterClass.java
index 30e8462..3d807a2 100644
--- a/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientCsReqOuterClass.java
@@ -21,22 +21,22 @@ public final class RefreshTriggerByClientCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 trigger_entity_id = 4;
+ * optional uint32 trigger_entity_id = 11;
*/
private int triggerEntityId;
/**
- * optional .MotionInfo trigger_motion = 12;
+ * optional .MotionInfo trigger_motion = 15;
*/
private final MotionInfoOuterClass.MotionInfo triggerMotion = MotionInfoOuterClass.MotionInfo.newInstance();
/**
- * optional string trigger_name = 5;
+ * optional string trigger_name = 9;
*/
private final Utf8String triggerName = Utf8String.newEmptyInstance();
/**
- * repeated uint32 trigger_target_id_list = 10;
+ * repeated uint32 trigger_target_id_list = 4;
*/
private final RepeatedInt triggerTargetIdList = RepeatedInt.newEmptyInstance();
@@ -51,7 +51,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
}
/**
- * optional uint32 trigger_entity_id = 4;
+ * optional uint32 trigger_entity_id = 11;
* @return whether the triggerEntityId field is set
*/
public boolean hasTriggerEntityId() {
@@ -59,7 +59,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
}
/**
- * optional uint32 trigger_entity_id = 4;
+ * optional uint32 trigger_entity_id = 11;
* @return this
*/
public RefreshTriggerByClientCsReq clearTriggerEntityId() {
@@ -69,7 +69,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
}
/**
- * optional uint32 trigger_entity_id = 4;
+ * optional uint32 trigger_entity_id = 11;
* @return the triggerEntityId
*/
public int getTriggerEntityId() {
@@ -77,7 +77,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
}
/**
- * optional uint32 trigger_entity_id = 4;
+ * optional uint32 trigger_entity_id = 11;
* @param value the triggerEntityId to set
* @return this
*/
@@ -88,7 +88,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
}
/**
- * optional .MotionInfo trigger_motion = 12;
+ * optional .MotionInfo trigger_motion = 15;
* @return whether the triggerMotion field is set
*/
public boolean hasTriggerMotion() {
@@ -96,7 +96,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
}
/**
- * optional .MotionInfo trigger_motion = 12;
+ * optional .MotionInfo trigger_motion = 15;
* @return this
*/
public RefreshTriggerByClientCsReq clearTriggerMotion() {
@@ -106,7 +106,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
}
/**
- * optional .MotionInfo trigger_motion = 12;
+ * optional .MotionInfo trigger_motion = 15;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -120,7 +120,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
}
/**
- * optional .MotionInfo trigger_motion = 12;
+ * optional .MotionInfo trigger_motion = 15;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -134,7 +134,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
}
/**
- * optional .MotionInfo trigger_motion = 12;
+ * optional .MotionInfo trigger_motion = 15;
* @param value the triggerMotion to set
* @return this
*/
@@ -146,7 +146,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
}
/**
- * optional string trigger_name = 5;
+ * optional string trigger_name = 9;
* @return whether the triggerName field is set
*/
public boolean hasTriggerName() {
@@ -154,7 +154,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
}
/**
- * optional string trigger_name = 5;
+ * optional string trigger_name = 9;
* @return this
*/
public RefreshTriggerByClientCsReq clearTriggerName() {
@@ -164,7 +164,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
}
/**
- * optional string trigger_name = 5;
+ * optional string trigger_name = 9;
* @return the triggerName
*/
public String getTriggerName() {
@@ -172,7 +172,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
}
/**
- * optional string trigger_name = 5;
+ * optional string trigger_name = 9;
* @return internal {@code Utf8String} representation of triggerName for reading
*/
public Utf8String getTriggerNameBytes() {
@@ -180,7 +180,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
}
/**
- * optional string trigger_name = 5;
+ * optional string trigger_name = 9;
* @return internal {@code Utf8String} representation of triggerName for modifications
*/
public Utf8String getMutableTriggerNameBytes() {
@@ -189,7 +189,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
}
/**
- * optional string trigger_name = 5;
+ * optional string trigger_name = 9;
* @param value the triggerName to set
* @return this
*/
@@ -200,7 +200,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
}
/**
- * optional string trigger_name = 5;
+ * optional string trigger_name = 9;
* @param value the triggerName to set
* @return this
*/
@@ -211,7 +211,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
}
/**
- * repeated uint32 trigger_target_id_list = 10;
+ * repeated uint32 trigger_target_id_list = 4;
* @return whether the triggerTargetIdList field is set
*/
public boolean hasTriggerTargetIdList() {
@@ -219,7 +219,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
}
/**
- * repeated uint32 trigger_target_id_list = 10;
+ * repeated uint32 trigger_target_id_list = 4;
* @return this
*/
public RefreshTriggerByClientCsReq clearTriggerTargetIdList() {
@@ -229,7 +229,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
}
/**
- * repeated uint32 trigger_target_id_list = 10;
+ * repeated uint32 trigger_target_id_list = 4;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -243,7 +243,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
}
/**
- * repeated uint32 trigger_target_id_list = 10;
+ * repeated uint32 trigger_target_id_list = 4;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -257,7 +257,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
}
/**
- * repeated uint32 trigger_target_id_list = 10;
+ * repeated uint32 trigger_target_id_list = 4;
* @param value the triggerTargetIdList to add
* @return this
*/
@@ -268,7 +268,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
}
/**
- * repeated uint32 trigger_target_id_list = 10;
+ * repeated uint32 trigger_target_id_list = 4;
* @param values the triggerTargetIdList to add
* @return this
*/
@@ -358,20 +358,20 @@ public final class RefreshTriggerByClientCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(triggerEntityId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 98);
+ output.writeRawByte((byte) 122);
output.writeMessageNoTag(triggerMotion);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 42);
+ output.writeRawByte((byte) 74);
output.writeStringNoTag(triggerName);
}
if ((bitField0_ & 0x00000008) != 0) {
for (int i = 0; i < triggerTargetIdList.length(); i++) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(triggerTargetIdList.array()[i]);
}
}
@@ -402,34 +402,34 @@ public final class RefreshTriggerByClientCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
+ case 88: {
// triggerEntityId
triggerEntityId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 98) {
+ if (tag != 122) {
break;
}
}
- case 98: {
+ case 122: {
// triggerMotion
input.readMessage(triggerMotion);
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 42) {
+ if (tag != 74) {
break;
}
}
- case 42: {
+ case 74: {
// triggerName
input.readString(triggerName);
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 82) {
+ if (tag != 34) {
break;
}
}
- case 82: {
+ case 34: {
// triggerTargetIdList [packed=true]
input.readPackedUInt32(triggerTargetIdList, tag);
bitField0_ |= 0x00000008;
@@ -448,7 +448,7 @@ public final class RefreshTriggerByClientCsReqOuterClass {
tag = input.readTag();
break;
}
- case 80: {
+ case 32: {
// triggerTargetIdList [packed=false]
tag = input.readRepeatedUInt32(triggerTargetIdList, tag);
bitField0_ |= 0x00000008;
diff --git a/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScNotifyOuterClass.java
index 02b5de0..1289f7d 100644
--- a/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScNotifyOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScNotifyOuterClass.java
@@ -21,17 +21,17 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 trigger_entity_id = 4;
+ * optional uint32 trigger_entity_id = 2;
*/
private int triggerEntityId;
/**
- * optional string trigger_name = 2;
+ * optional string trigger_name = 4;
*/
private final Utf8String triggerName = Utf8String.newEmptyInstance();
/**
- * repeated uint32 trigger_target_id_list = 14;
+ * repeated uint32 trigger_target_id_list = 6;
*/
private final RepeatedInt triggerTargetIdList = RepeatedInt.newEmptyInstance();
@@ -46,7 +46,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
}
/**
- * optional uint32 trigger_entity_id = 4;
+ * optional uint32 trigger_entity_id = 2;
* @return whether the triggerEntityId field is set
*/
public boolean hasTriggerEntityId() {
@@ -54,7 +54,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
}
/**
- * optional uint32 trigger_entity_id = 4;
+ * optional uint32 trigger_entity_id = 2;
* @return this
*/
public RefreshTriggerByClientScNotify clearTriggerEntityId() {
@@ -64,7 +64,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
}
/**
- * optional uint32 trigger_entity_id = 4;
+ * optional uint32 trigger_entity_id = 2;
* @return the triggerEntityId
*/
public int getTriggerEntityId() {
@@ -72,7 +72,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
}
/**
- * optional uint32 trigger_entity_id = 4;
+ * optional uint32 trigger_entity_id = 2;
* @param value the triggerEntityId to set
* @return this
*/
@@ -83,7 +83,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
}
/**
- * optional string trigger_name = 2;
+ * optional string trigger_name = 4;
* @return whether the triggerName field is set
*/
public boolean hasTriggerName() {
@@ -91,7 +91,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
}
/**
- * optional string trigger_name = 2;
+ * optional string trigger_name = 4;
* @return this
*/
public RefreshTriggerByClientScNotify clearTriggerName() {
@@ -101,7 +101,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
}
/**
- * optional string trigger_name = 2;
+ * optional string trigger_name = 4;
* @return the triggerName
*/
public String getTriggerName() {
@@ -109,7 +109,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
}
/**
- * optional string trigger_name = 2;
+ * optional string trigger_name = 4;
* @return internal {@code Utf8String} representation of triggerName for reading
*/
public Utf8String getTriggerNameBytes() {
@@ -117,7 +117,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
}
/**
- * optional string trigger_name = 2;
+ * optional string trigger_name = 4;
* @return internal {@code Utf8String} representation of triggerName for modifications
*/
public Utf8String getMutableTriggerNameBytes() {
@@ -126,7 +126,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
}
/**
- * optional string trigger_name = 2;
+ * optional string trigger_name = 4;
* @param value the triggerName to set
* @return this
*/
@@ -137,7 +137,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
}
/**
- * optional string trigger_name = 2;
+ * optional string trigger_name = 4;
* @param value the triggerName to set
* @return this
*/
@@ -148,7 +148,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
}
/**
- * repeated uint32 trigger_target_id_list = 14;
+ * repeated uint32 trigger_target_id_list = 6;
* @return whether the triggerTargetIdList field is set
*/
public boolean hasTriggerTargetIdList() {
@@ -156,7 +156,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
}
/**
- * repeated uint32 trigger_target_id_list = 14;
+ * repeated uint32 trigger_target_id_list = 6;
* @return this
*/
public RefreshTriggerByClientScNotify clearTriggerTargetIdList() {
@@ -166,7 +166,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
}
/**
- * repeated uint32 trigger_target_id_list = 14;
+ * repeated uint32 trigger_target_id_list = 6;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -180,7 +180,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
}
/**
- * repeated uint32 trigger_target_id_list = 14;
+ * repeated uint32 trigger_target_id_list = 6;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -194,7 +194,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
}
/**
- * repeated uint32 trigger_target_id_list = 14;
+ * repeated uint32 trigger_target_id_list = 6;
* @param value the triggerTargetIdList to add
* @return this
*/
@@ -205,7 +205,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
}
/**
- * repeated uint32 trigger_target_id_list = 14;
+ * repeated uint32 trigger_target_id_list = 6;
* @param values the triggerTargetIdList to add
* @return this
*/
@@ -288,16 +288,16 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(triggerEntityId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 18);
+ output.writeRawByte((byte) 34);
output.writeStringNoTag(triggerName);
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < triggerTargetIdList.length(); i++) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(triggerTargetIdList.array()[i]);
}
}
@@ -325,25 +325,25 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
+ case 16: {
// triggerEntityId
triggerEntityId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 18) {
+ if (tag != 34) {
break;
}
}
- case 18: {
+ case 34: {
// triggerName
input.readString(triggerName);
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 114) {
+ if (tag != 50) {
break;
}
}
- case 114: {
+ case 50: {
// triggerTargetIdList [packed=true]
input.readPackedUInt32(triggerTargetIdList, tag);
bitField0_ |= 0x00000004;
@@ -362,7 +362,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass {
tag = input.readTag();
break;
}
- case 112: {
+ case 48: {
// triggerTargetIdList [packed=false]
tag = input.readRepeatedUInt32(triggerTargetIdList, tag);
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScRspOuterClass.java
index 82404b2..3448908 100644
--- a/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScRspOuterClass.java
@@ -20,22 +20,22 @@ public final class RefreshTriggerByClientScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 trigger_entity_id = 1;
- */
- private int triggerEntityId;
-
- /**
- * optional uint32 retcode = 10;
+ * optional uint32 retcode = 11;
*/
private int retcode;
/**
- * optional bool refresh_trigger = 12;
+ * optional uint32 trigger_entity_id = 13;
+ */
+ private int triggerEntityId;
+
+ /**
+ * optional bool refresh_trigger = 10;
*/
private boolean refreshTrigger;
/**
- * optional string trigger_name = 2;
+ * optional string trigger_name = 4;
*/
private final Utf8String triggerName = Utf8String.newEmptyInstance();
@@ -50,62 +50,25 @@ public final class RefreshTriggerByClientScRspOuterClass {
}
/**
- * optional uint32 trigger_entity_id = 1;
- * @return whether the triggerEntityId field is set
+ * optional uint32 retcode = 11;
+ * @return whether the retcode field is set
*/
- public boolean hasTriggerEntityId() {
+ public boolean hasRetcode() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 trigger_entity_id = 1;
- * @return this
- */
- public RefreshTriggerByClientScRsp clearTriggerEntityId() {
- bitField0_ &= ~0x00000001;
- triggerEntityId = 0;
- return this;
- }
-
- /**
- * optional uint32 trigger_entity_id = 1;
- * @return the triggerEntityId
- */
- public int getTriggerEntityId() {
- return triggerEntityId;
- }
-
- /**
- * optional uint32 trigger_entity_id = 1;
- * @param value the triggerEntityId to set
- * @return this
- */
- public RefreshTriggerByClientScRsp setTriggerEntityId(final int value) {
- bitField0_ |= 0x00000001;
- triggerEntityId = value;
- return this;
- }
-
- /**
- * optional uint32 retcode = 10;
- * @return whether the retcode field is set
- */
- public boolean hasRetcode() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 retcode = 10;
+ * optional uint32 retcode = 11;
* @return this
*/
public RefreshTriggerByClientScRsp clearRetcode() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
retcode = 0;
return this;
}
/**
- * optional uint32 retcode = 10;
+ * optional uint32 retcode = 11;
* @return the retcode
*/
public int getRetcode() {
@@ -113,18 +76,55 @@ public final class RefreshTriggerByClientScRspOuterClass {
}
/**
- * optional uint32 retcode = 10;
+ * optional uint32 retcode = 11;
* @param value the retcode to set
* @return this
*/
public RefreshTriggerByClientScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
retcode = value;
return this;
}
/**
- * optional bool refresh_trigger = 12;
+ * optional uint32 trigger_entity_id = 13;
+ * @return whether the triggerEntityId field is set
+ */
+ public boolean hasTriggerEntityId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 trigger_entity_id = 13;
+ * @return this
+ */
+ public RefreshTriggerByClientScRsp clearTriggerEntityId() {
+ bitField0_ &= ~0x00000002;
+ triggerEntityId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 trigger_entity_id = 13;
+ * @return the triggerEntityId
+ */
+ public int getTriggerEntityId() {
+ return triggerEntityId;
+ }
+
+ /**
+ * optional uint32 trigger_entity_id = 13;
+ * @param value the triggerEntityId to set
+ * @return this
+ */
+ public RefreshTriggerByClientScRsp setTriggerEntityId(final int value) {
+ bitField0_ |= 0x00000002;
+ triggerEntityId = value;
+ return this;
+ }
+
+ /**
+ * optional bool refresh_trigger = 10;
* @return whether the refreshTrigger field is set
*/
public boolean hasRefreshTrigger() {
@@ -132,7 +132,7 @@ public final class RefreshTriggerByClientScRspOuterClass {
}
/**
- * optional bool refresh_trigger = 12;
+ * optional bool refresh_trigger = 10;
* @return this
*/
public RefreshTriggerByClientScRsp clearRefreshTrigger() {
@@ -142,7 +142,7 @@ public final class RefreshTriggerByClientScRspOuterClass {
}
/**
- * optional bool refresh_trigger = 12;
+ * optional bool refresh_trigger = 10;
* @return the refreshTrigger
*/
public boolean getRefreshTrigger() {
@@ -150,7 +150,7 @@ public final class RefreshTriggerByClientScRspOuterClass {
}
/**
- * optional bool refresh_trigger = 12;
+ * optional bool refresh_trigger = 10;
* @param value the refreshTrigger to set
* @return this
*/
@@ -161,7 +161,7 @@ public final class RefreshTriggerByClientScRspOuterClass {
}
/**
- * optional string trigger_name = 2;
+ * optional string trigger_name = 4;
* @return whether the triggerName field is set
*/
public boolean hasTriggerName() {
@@ -169,7 +169,7 @@ public final class RefreshTriggerByClientScRspOuterClass {
}
/**
- * optional string trigger_name = 2;
+ * optional string trigger_name = 4;
* @return this
*/
public RefreshTriggerByClientScRsp clearTriggerName() {
@@ -179,7 +179,7 @@ public final class RefreshTriggerByClientScRspOuterClass {
}
/**
- * optional string trigger_name = 2;
+ * optional string trigger_name = 4;
* @return the triggerName
*/
public String getTriggerName() {
@@ -187,7 +187,7 @@ public final class RefreshTriggerByClientScRspOuterClass {
}
/**
- * optional string trigger_name = 2;
+ * optional string trigger_name = 4;
* @return internal {@code Utf8String} representation of triggerName for reading
*/
public Utf8String getTriggerNameBytes() {
@@ -195,7 +195,7 @@ public final class RefreshTriggerByClientScRspOuterClass {
}
/**
- * optional string trigger_name = 2;
+ * optional string trigger_name = 4;
* @return internal {@code Utf8String} representation of triggerName for modifications
*/
public Utf8String getMutableTriggerNameBytes() {
@@ -204,7 +204,7 @@ public final class RefreshTriggerByClientScRspOuterClass {
}
/**
- * optional string trigger_name = 2;
+ * optional string trigger_name = 4;
* @param value the triggerName to set
* @return this
*/
@@ -215,7 +215,7 @@ public final class RefreshTriggerByClientScRspOuterClass {
}
/**
- * optional string trigger_name = 2;
+ * optional string trigger_name = 4;
* @param value the triggerName to set
* @return this
*/
@@ -230,8 +230,8 @@ public final class RefreshTriggerByClientScRspOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- triggerEntityId = other.triggerEntityId;
retcode = other.retcode;
+ triggerEntityId = other.triggerEntityId;
refreshTrigger = other.refreshTrigger;
triggerName.copyFrom(other.triggerName);
}
@@ -244,12 +244,12 @@ public final class RefreshTriggerByClientScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasTriggerEntityId()) {
- setTriggerEntityId(other.triggerEntityId);
- }
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
+ if (other.hasTriggerEntityId()) {
+ setTriggerEntityId(other.triggerEntityId);
+ }
if (other.hasRefreshTrigger()) {
setRefreshTrigger(other.refreshTrigger);
}
@@ -266,8 +266,8 @@ public final class RefreshTriggerByClientScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- triggerEntityId = 0;
retcode = 0;
+ triggerEntityId = 0;
refreshTrigger = false;
triggerName.clear();
return this;
@@ -294,8 +294,8 @@ public final class RefreshTriggerByClientScRspOuterClass {
}
RefreshTriggerByClientScRsp other = (RefreshTriggerByClientScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasTriggerEntityId() || triggerEntityId == other.triggerEntityId)
&& (!hasRetcode() || retcode == other.retcode)
+ && (!hasTriggerEntityId() || triggerEntityId == other.triggerEntityId)
&& (!hasRefreshTrigger() || refreshTrigger == other.refreshTrigger)
&& (!hasTriggerName() || triggerName.equals(other.triggerName));
}
@@ -303,19 +303,19 @@ public final class RefreshTriggerByClientScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(triggerEntityId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(retcode);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(triggerEntityId);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 80);
output.writeBoolNoTag(refreshTrigger);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 18);
+ output.writeRawByte((byte) 34);
output.writeStringNoTag(triggerName);
}
}
@@ -324,10 +324,10 @@ public final class RefreshTriggerByClientScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(triggerEntityId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(triggerEntityId);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 2;
@@ -345,34 +345,34 @@ public final class RefreshTriggerByClientScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 88: {
+ // retcode
+ retcode = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 104) {
+ break;
+ }
+ }
+ case 104: {
// triggerEntityId
triggerEntityId = input.readUInt32();
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 80) {
break;
}
}
case 80: {
- // retcode
- retcode = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 96) {
- break;
- }
- }
- case 96: {
// refreshTrigger
refreshTrigger = input.readBool();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 18) {
+ if (tag != 34) {
break;
}
}
- case 18: {
+ case 34: {
// triggerName
input.readString(triggerName);
bitField0_ |= 0x00000008;
@@ -399,10 +399,10 @@ public final class RefreshTriggerByClientScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.triggerEntityId, triggerEntityId);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.triggerEntityId, triggerEntityId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeBool(FieldNames.refreshTrigger, refreshTrigger);
@@ -420,11 +420,10 @@ public final class RefreshTriggerByClientScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 242025014:
- case -2081789648: {
- if (input.isAtField(FieldNames.triggerEntityId)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- triggerEntityId = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -432,10 +431,11 @@ public final class RefreshTriggerByClientScRspOuterClass {
}
break;
}
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case 242025014:
+ case -2081789648: {
+ if (input.isAtField(FieldNames.triggerEntityId)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ triggerEntityId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -521,10 +521,10 @@ public final class RefreshTriggerByClientScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName triggerEntityId = FieldName.forField("triggerEntityId", "trigger_entity_id");
-
static final FieldName retcode = FieldName.forField("retcode");
+ static final FieldName triggerEntityId = FieldName.forField("triggerEntityId", "trigger_entity_id");
+
static final FieldName refreshTrigger = FieldName.forField("refreshTrigger", "refresh_trigger");
static final FieldName triggerName = FieldName.forField("triggerName", "trigger_name");
diff --git a/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java
index f9d32ee..fa12ffe 100644
--- a/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java
@@ -19,15 +19,15 @@ public final class RelicArchiveOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 slot = 1;
- */
- private int slot;
-
- /**
- * optional uint32 relic_id = 15;
+ * optional uint32 relic_id = 11;
*/
private int relicId;
+ /**
+ * optional uint32 slot = 12;
+ */
+ private int slot;
+
private RelicArchive() {
}
@@ -39,62 +39,25 @@ public final class RelicArchiveOuterClass {
}
/**
- * optional uint32 slot = 1;
- * @return whether the slot field is set
+ * optional uint32 relic_id = 11;
+ * @return whether the relicId field is set
*/
- public boolean hasSlot() {
+ public boolean hasRelicId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 slot = 1;
- * @return this
- */
- public RelicArchive clearSlot() {
- bitField0_ &= ~0x00000001;
- slot = 0;
- return this;
- }
-
- /**
- * optional uint32 slot = 1;
- * @return the slot
- */
- public int getSlot() {
- return slot;
- }
-
- /**
- * optional uint32 slot = 1;
- * @param value the slot to set
- * @return this
- */
- public RelicArchive setSlot(final int value) {
- bitField0_ |= 0x00000001;
- slot = value;
- return this;
- }
-
- /**
- * optional uint32 relic_id = 15;
- * @return whether the relicId field is set
- */
- public boolean hasRelicId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 relic_id = 15;
+ * optional uint32 relic_id = 11;
* @return this
*/
public RelicArchive clearRelicId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
relicId = 0;
return this;
}
/**
- * optional uint32 relic_id = 15;
+ * optional uint32 relic_id = 11;
* @return the relicId
*/
public int getRelicId() {
@@ -102,23 +65,60 @@ public final class RelicArchiveOuterClass {
}
/**
- * optional uint32 relic_id = 15;
+ * optional uint32 relic_id = 11;
* @param value the relicId to set
* @return this
*/
public RelicArchive setRelicId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
relicId = value;
return this;
}
+ /**
+ * optional uint32 slot = 12;
+ * @return whether the slot field is set
+ */
+ public boolean hasSlot() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 slot = 12;
+ * @return this
+ */
+ public RelicArchive clearSlot() {
+ bitField0_ &= ~0x00000002;
+ slot = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 slot = 12;
+ * @return the slot
+ */
+ public int getSlot() {
+ return slot;
+ }
+
+ /**
+ * optional uint32 slot = 12;
+ * @param value the slot to set
+ * @return this
+ */
+ public RelicArchive setSlot(final int value) {
+ bitField0_ |= 0x00000002;
+ slot = value;
+ return this;
+ }
+
@Override
public RelicArchive copyFrom(final RelicArchive other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- slot = other.slot;
relicId = other.relicId;
+ slot = other.slot;
}
return this;
}
@@ -129,12 +129,12 @@ public final class RelicArchiveOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasSlot()) {
- setSlot(other.slot);
- }
if (other.hasRelicId()) {
setRelicId(other.relicId);
}
+ if (other.hasSlot()) {
+ setSlot(other.slot);
+ }
return this;
}
@@ -145,8 +145,8 @@ public final class RelicArchiveOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- slot = 0;
relicId = 0;
+ slot = 0;
return this;
}
@@ -170,19 +170,19 @@ public final class RelicArchiveOuterClass {
}
RelicArchive other = (RelicArchive) o;
return bitField0_ == other.bitField0_
- && (!hasSlot() || slot == other.slot)
- && (!hasRelicId() || relicId == other.relicId);
+ && (!hasRelicId() || relicId == other.relicId)
+ && (!hasSlot() || slot == other.slot);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(slot);
+ output.writeRawByte((byte) 88);
+ output.writeUInt32NoTag(relicId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 120);
- output.writeUInt32NoTag(relicId);
+ output.writeRawByte((byte) 96);
+ output.writeUInt32NoTag(slot);
}
}
@@ -190,10 +190,10 @@ public final class RelicArchiveOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(slot);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(relicId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(relicId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(slot);
}
return size;
}
@@ -205,18 +205,18 @@ public final class RelicArchiveOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
- // slot
- slot = input.readUInt32();
+ case 88: {
+ // relicId
+ relicId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 96) {
break;
}
}
- case 120: {
- // relicId
- relicId = input.readUInt32();
+ case 96: {
+ // slot
+ slot = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
@@ -241,10 +241,10 @@ public final class RelicArchiveOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.slot, slot);
+ output.writeUInt32(FieldNames.relicId, relicId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.relicId, relicId);
+ output.writeUInt32(FieldNames.slot, slot);
}
output.endObject();
}
@@ -256,10 +256,11 @@ public final class RelicArchiveOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 3533310: {
- if (input.isAtField(FieldNames.slot)) {
+ case 1090714606:
+ case -547564185: {
+ if (input.isAtField(FieldNames.relicId)) {
if (!input.trySkipNullValue()) {
- slot = input.readUInt32();
+ relicId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -267,11 +268,10 @@ public final class RelicArchiveOuterClass {
}
break;
}
- case 1090714606:
- case -547564185: {
- if (input.isAtField(FieldNames.relicId)) {
+ case 3533310: {
+ if (input.isAtField(FieldNames.slot)) {
if (!input.trySkipNullValue()) {
- relicId = input.readUInt32();
+ slot = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -331,9 +331,9 @@ public final class RelicArchiveOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName slot = FieldName.forField("slot");
-
static final FieldName relicId = FieldName.forField("relicId", "relic_id");
+
+ static final FieldName slot = FieldName.forField("slot");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java
index e02f1a2..01b7281 100644
--- a/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java
@@ -20,14 +20,9 @@ public final class RelicOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 main_affix_id = 2;
+ * optional uint32 unique_id = 2;
*/
- private int mainAffixId;
-
- /**
- * optional uint32 base_avatar_id = 6;
- */
- private int baseAvatarId;
+ private int uniqueId;
/**
* optional uint32 level = 8;
@@ -35,32 +30,42 @@ public final class RelicOuterClass {
private int level;
/**
- * optional uint32 tid = 10;
- */
- private int tid;
-
- /**
- * optional uint32 unique_id = 13;
- */
- private int uniqueId;
-
- /**
- * optional uint32 exp = 15;
+ * optional uint32 exp = 9;
*/
private int exp;
/**
- * optional bool is_protected = 1;
+ * optional uint32 base_avatar_id = 10;
*/
- private boolean isProtected;
+ private int baseAvatarId;
/**
- * optional bool is_discarded = 7;
+ * optional uint32 tid = 13;
+ */
+ private int tid;
+
+ /**
+ * optional uint32 equip_avatar_id = 14;
+ */
+ private int equipAvatarId;
+
+ /**
+ * optional uint32 main_affix_id = 15;
+ */
+ private int mainAffixId;
+
+ /**
+ * optional bool is_discarded = 1;
*/
private boolean isDiscarded;
/**
- * repeated .RelicAffix sub_affix_list = 9;
+ * optional bool is_protected = 4;
+ */
+ private boolean isProtected;
+
+ /**
+ * repeated .RelicAffix sub_affix_list = 12;
*/
private final RepeatedMessageoptional uint32 main_affix_id = 2;
- * @return whether the mainAffixId field is set
+ * optional uint32 unique_id = 2;
+ * @return whether the uniqueId field is set
*/
- public boolean hasMainAffixId() {
+ public boolean hasUniqueId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 main_affix_id = 2;
+ * optional uint32 unique_id = 2;
* @return this
*/
- public Relic clearMainAffixId() {
+ public Relic clearUniqueId() {
bitField0_ &= ~0x00000001;
- mainAffixId = 0;
+ uniqueId = 0;
return this;
}
/**
- * optional uint32 main_affix_id = 2;
- * @return the mainAffixId
+ * optional uint32 unique_id = 2;
+ * @return the uniqueId
*/
- public int getMainAffixId() {
- return mainAffixId;
+ public int getUniqueId() {
+ return uniqueId;
}
/**
- * optional uint32 main_affix_id = 2;
- * @param value the mainAffixId to set
+ * optional uint32 unique_id = 2;
+ * @param value the uniqueId to set
* @return this
*/
- public Relic setMainAffixId(final int value) {
+ public Relic setUniqueId(final int value) {
bitField0_ |= 0x00000001;
- mainAffixId = value;
- return this;
- }
-
- /**
- * optional uint32 base_avatar_id = 6;
- * @return whether the baseAvatarId field is set
- */
- public boolean hasBaseAvatarId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 base_avatar_id = 6;
- * @return this
- */
- public Relic clearBaseAvatarId() {
- bitField0_ &= ~0x00000002;
- baseAvatarId = 0;
- return this;
- }
-
- /**
- * optional uint32 base_avatar_id = 6;
- * @return the baseAvatarId
- */
- public int getBaseAvatarId() {
- return baseAvatarId;
- }
-
- /**
- * optional uint32 base_avatar_id = 6;
- * @param value the baseAvatarId to set
- * @return this
- */
- public Relic setBaseAvatarId(final int value) {
- bitField0_ |= 0x00000002;
- baseAvatarId = value;
+ uniqueId = value;
return this;
}
@@ -153,7 +121,7 @@ public final class RelicOuterClass {
* @return whether the level field is set
*/
public boolean hasLevel() {
- return (bitField0_ & 0x00000004) != 0;
+ return (bitField0_ & 0x00000002) != 0;
}
/**
@@ -161,7 +129,7 @@ public final class RelicOuterClass {
* @return this
*/
public Relic clearLevel() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
level = 0;
return this;
}
@@ -180,105 +148,31 @@ public final class RelicOuterClass {
* @return this
*/
public Relic setLevel(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
level = value;
return this;
}
/**
- * optional uint32 tid = 10;
- * @return whether the tid field is set
- */
- public boolean hasTid() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional uint32 tid = 10;
- * @return this
- */
- public Relic clearTid() {
- bitField0_ &= ~0x00000008;
- tid = 0;
- return this;
- }
-
- /**
- * optional uint32 tid = 10;
- * @return the tid
- */
- public int getTid() {
- return tid;
- }
-
- /**
- * optional uint32 tid = 10;
- * @param value the tid to set
- * @return this
- */
- public Relic setTid(final int value) {
- bitField0_ |= 0x00000008;
- tid = value;
- return this;
- }
-
- /**
- * optional uint32 unique_id = 13;
- * @return whether the uniqueId field is set
- */
- public boolean hasUniqueId() {
- return (bitField0_ & 0x00000010) != 0;
- }
-
- /**
- * optional uint32 unique_id = 13;
- * @return this
- */
- public Relic clearUniqueId() {
- bitField0_ &= ~0x00000010;
- uniqueId = 0;
- return this;
- }
-
- /**
- * optional uint32 unique_id = 13;
- * @return the uniqueId
- */
- public int getUniqueId() {
- return uniqueId;
- }
-
- /**
- * optional uint32 unique_id = 13;
- * @param value the uniqueId to set
- * @return this
- */
- public Relic setUniqueId(final int value) {
- bitField0_ |= 0x00000010;
- uniqueId = value;
- return this;
- }
-
- /**
- * optional uint32 exp = 15;
+ * optional uint32 exp = 9;
* @return whether the exp field is set
*/
public boolean hasExp() {
- return (bitField0_ & 0x00000020) != 0;
+ return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 exp = 15;
+ * optional uint32 exp = 9;
* @return this
*/
public Relic clearExp() {
- bitField0_ &= ~0x00000020;
+ bitField0_ &= ~0x00000004;
exp = 0;
return this;
}
/**
- * optional uint32 exp = 15;
+ * optional uint32 exp = 9;
* @return the exp
*/
public int getExp() {
@@ -286,55 +180,166 @@ public final class RelicOuterClass {
}
/**
- * optional uint32 exp = 15;
+ * optional uint32 exp = 9;
* @param value the exp to set
* @return this
*/
public Relic setExp(final int value) {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000004;
exp = value;
return this;
}
/**
- * optional bool is_protected = 1;
- * @return whether the isProtected field is set
+ * optional uint32 base_avatar_id = 10;
+ * @return whether the baseAvatarId field is set
*/
- public boolean hasIsProtected() {
+ public boolean hasBaseAvatarId() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional uint32 base_avatar_id = 10;
+ * @return this
+ */
+ public Relic clearBaseAvatarId() {
+ bitField0_ &= ~0x00000008;
+ baseAvatarId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 base_avatar_id = 10;
+ * @return the baseAvatarId
+ */
+ public int getBaseAvatarId() {
+ return baseAvatarId;
+ }
+
+ /**
+ * optional uint32 base_avatar_id = 10;
+ * @param value the baseAvatarId to set
+ * @return this
+ */
+ public Relic setBaseAvatarId(final int value) {
+ bitField0_ |= 0x00000008;
+ baseAvatarId = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 tid = 13;
+ * @return whether the tid field is set
+ */
+ public boolean hasTid() {
+ return (bitField0_ & 0x00000010) != 0;
+ }
+
+ /**
+ * optional uint32 tid = 13;
+ * @return this
+ */
+ public Relic clearTid() {
+ bitField0_ &= ~0x00000010;
+ tid = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 tid = 13;
+ * @return the tid
+ */
+ public int getTid() {
+ return tid;
+ }
+
+ /**
+ * optional uint32 tid = 13;
+ * @param value the tid to set
+ * @return this
+ */
+ public Relic setTid(final int value) {
+ bitField0_ |= 0x00000010;
+ tid = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 equip_avatar_id = 14;
+ * @return whether the equipAvatarId field is set
+ */
+ public boolean hasEquipAvatarId() {
+ return (bitField0_ & 0x00000020) != 0;
+ }
+
+ /**
+ * optional uint32 equip_avatar_id = 14;
+ * @return this
+ */
+ public Relic clearEquipAvatarId() {
+ bitField0_ &= ~0x00000020;
+ equipAvatarId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 equip_avatar_id = 14;
+ * @return the equipAvatarId
+ */
+ public int getEquipAvatarId() {
+ return equipAvatarId;
+ }
+
+ /**
+ * optional uint32 equip_avatar_id = 14;
+ * @param value the equipAvatarId to set
+ * @return this
+ */
+ public Relic setEquipAvatarId(final int value) {
+ bitField0_ |= 0x00000020;
+ equipAvatarId = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 main_affix_id = 15;
+ * @return whether the mainAffixId field is set
+ */
+ public boolean hasMainAffixId() {
return (bitField0_ & 0x00000040) != 0;
}
/**
- * optional bool is_protected = 1;
+ * optional uint32 main_affix_id = 15;
* @return this
*/
- public Relic clearIsProtected() {
+ public Relic clearMainAffixId() {
bitField0_ &= ~0x00000040;
- isProtected = false;
+ mainAffixId = 0;
return this;
}
/**
- * optional bool is_protected = 1;
- * @return the isProtected
+ * optional uint32 main_affix_id = 15;
+ * @return the mainAffixId
*/
- public boolean getIsProtected() {
- return isProtected;
+ public int getMainAffixId() {
+ return mainAffixId;
}
/**
- * optional bool is_protected = 1;
- * @param value the isProtected to set
+ * optional uint32 main_affix_id = 15;
+ * @param value the mainAffixId to set
* @return this
*/
- public Relic setIsProtected(final boolean value) {
+ public Relic setMainAffixId(final int value) {
bitField0_ |= 0x00000040;
- isProtected = value;
+ mainAffixId = value;
return this;
}
/**
- * optional bool is_discarded = 7;
+ * optional bool is_discarded = 1;
* @return whether the isDiscarded field is set
*/
public boolean hasIsDiscarded() {
@@ -342,7 +347,7 @@ public final class RelicOuterClass {
}
/**
- * optional bool is_discarded = 7;
+ * optional bool is_discarded = 1;
* @return this
*/
public Relic clearIsDiscarded() {
@@ -352,7 +357,7 @@ public final class RelicOuterClass {
}
/**
- * optional bool is_discarded = 7;
+ * optional bool is_discarded = 1;
* @return the isDiscarded
*/
public boolean getIsDiscarded() {
@@ -360,7 +365,7 @@ public final class RelicOuterClass {
}
/**
- * optional bool is_discarded = 7;
+ * optional bool is_discarded = 1;
* @param value the isDiscarded to set
* @return this
*/
@@ -371,25 +376,62 @@ public final class RelicOuterClass {
}
/**
- * repeated .RelicAffix sub_affix_list = 9;
- * @return whether the subAffixList field is set
+ * optional bool is_protected = 4;
+ * @return whether the isProtected field is set
*/
- public boolean hasSubAffixList() {
+ public boolean hasIsProtected() {
return (bitField0_ & 0x00000100) != 0;
}
/**
- * repeated .RelicAffix sub_affix_list = 9;
+ * optional bool is_protected = 4;
+ * @return this
+ */
+ public Relic clearIsProtected() {
+ bitField0_ &= ~0x00000100;
+ isProtected = false;
+ return this;
+ }
+
+ /**
+ * optional bool is_protected = 4;
+ * @return the isProtected
+ */
+ public boolean getIsProtected() {
+ return isProtected;
+ }
+
+ /**
+ * optional bool is_protected = 4;
+ * @param value the isProtected to set
+ * @return this
+ */
+ public Relic setIsProtected(final boolean value) {
+ bitField0_ |= 0x00000100;
+ isProtected = value;
+ return this;
+ }
+
+ /**
+ * repeated .RelicAffix sub_affix_list = 12;
+ * @return whether the subAffixList field is set
+ */
+ public boolean hasSubAffixList() {
+ return (bitField0_ & 0x00000200) != 0;
+ }
+
+ /**
+ * repeated .RelicAffix sub_affix_list = 12;
* @return this
*/
public Relic clearSubAffixList() {
- bitField0_ &= ~0x00000100;
+ bitField0_ &= ~0x00000200;
subAffixList.clear();
return this;
}
/**
- * repeated .RelicAffix sub_affix_list = 9;
+ * repeated .RelicAffix sub_affix_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.
@@ -403,7 +445,7 @@ public final class RelicOuterClass {
}
/**
- * repeated .RelicAffix sub_affix_list = 9;
+ * repeated .RelicAffix sub_affix_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
@@ -412,28 +454,28 @@ public final class RelicOuterClass {
* @return internal storage object for modifications
*/
public RepeatedMessagerepeated .RelicAffix sub_affix_list = 9;
+ * repeated .RelicAffix sub_affix_list = 12;
* @param value the subAffixList to add
* @return this
*/
public Relic addSubAffixList(final RelicAffixOuterClass.RelicAffix value) {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000200;
subAffixList.add(value);
return this;
}
/**
- * repeated .RelicAffix sub_affix_list = 9;
+ * repeated .RelicAffix sub_affix_list = 12;
* @param values the subAffixList to add
* @return this
*/
public Relic addAllSubAffixList(final RelicAffixOuterClass.RelicAffix... values) {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000200;
subAffixList.addAll(values);
return this;
}
@@ -443,14 +485,15 @@ public final class RelicOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- mainAffixId = other.mainAffixId;
- baseAvatarId = other.baseAvatarId;
- level = other.level;
- tid = other.tid;
uniqueId = other.uniqueId;
+ level = other.level;
exp = other.exp;
- isProtected = other.isProtected;
+ baseAvatarId = other.baseAvatarId;
+ tid = other.tid;
+ equipAvatarId = other.equipAvatarId;
+ mainAffixId = other.mainAffixId;
isDiscarded = other.isDiscarded;
+ isProtected = other.isProtected;
subAffixList.copyFrom(other.subAffixList);
}
return this;
@@ -462,30 +505,33 @@ public final class RelicOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasMainAffixId()) {
- setMainAffixId(other.mainAffixId);
- }
- if (other.hasBaseAvatarId()) {
- setBaseAvatarId(other.baseAvatarId);
+ if (other.hasUniqueId()) {
+ setUniqueId(other.uniqueId);
}
if (other.hasLevel()) {
setLevel(other.level);
}
- if (other.hasTid()) {
- setTid(other.tid);
- }
- if (other.hasUniqueId()) {
- setUniqueId(other.uniqueId);
- }
if (other.hasExp()) {
setExp(other.exp);
}
- if (other.hasIsProtected()) {
- setIsProtected(other.isProtected);
+ if (other.hasBaseAvatarId()) {
+ setBaseAvatarId(other.baseAvatarId);
+ }
+ if (other.hasTid()) {
+ setTid(other.tid);
+ }
+ if (other.hasEquipAvatarId()) {
+ setEquipAvatarId(other.equipAvatarId);
+ }
+ if (other.hasMainAffixId()) {
+ setMainAffixId(other.mainAffixId);
}
if (other.hasIsDiscarded()) {
setIsDiscarded(other.isDiscarded);
}
+ if (other.hasIsProtected()) {
+ setIsProtected(other.isProtected);
+ }
if (other.hasSubAffixList()) {
getMutableSubAffixList().addAll(other.subAffixList);
}
@@ -499,14 +545,15 @@ public final class RelicOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- mainAffixId = 0;
- baseAvatarId = 0;
- level = 0;
- tid = 0;
uniqueId = 0;
+ level = 0;
exp = 0;
- isProtected = false;
+ baseAvatarId = 0;
+ tid = 0;
+ equipAvatarId = 0;
+ mainAffixId = 0;
isDiscarded = false;
+ isProtected = false;
subAffixList.clear();
return this;
}
@@ -532,14 +579,15 @@ public final class RelicOuterClass {
}
Relic other = (Relic) o;
return bitField0_ == other.bitField0_
- && (!hasMainAffixId() || mainAffixId == other.mainAffixId)
- && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
- && (!hasLevel() || level == other.level)
- && (!hasTid() || tid == other.tid)
&& (!hasUniqueId() || uniqueId == other.uniqueId)
+ && (!hasLevel() || level == other.level)
&& (!hasExp() || exp == other.exp)
- && (!hasIsProtected() || isProtected == other.isProtected)
+ && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
+ && (!hasTid() || tid == other.tid)
+ && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId)
+ && (!hasMainAffixId() || mainAffixId == other.mainAffixId)
&& (!hasIsDiscarded() || isDiscarded == other.isDiscarded)
+ && (!hasIsProtected() || isProtected == other.isProtected)
&& (!hasSubAffixList() || subAffixList.equals(other.subAffixList));
}
@@ -547,39 +595,43 @@ public final class RelicOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(mainAffixId);
+ output.writeUInt32NoTag(uniqueId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 48);
- output.writeUInt32NoTag(baseAvatarId);
- }
- if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 64);
output.writeUInt32NoTag(level);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 72);
+ output.writeUInt32NoTag(exp);
+ }
if ((bitField0_ & 0x00000008) != 0) {
output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(tid);
+ output.writeUInt32NoTag(baseAvatarId);
}
if ((bitField0_ & 0x00000010) != 0) {
output.writeRawByte((byte) 104);
- output.writeUInt32NoTag(uniqueId);
+ output.writeUInt32NoTag(tid);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 120);
- output.writeUInt32NoTag(exp);
+ output.writeRawByte((byte) 112);
+ output.writeUInt32NoTag(equipAvatarId);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawByte((byte) 8);
- output.writeBoolNoTag(isProtected);
+ output.writeRawByte((byte) 120);
+ output.writeUInt32NoTag(mainAffixId);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 8);
output.writeBoolNoTag(isDiscarded);
}
if ((bitField0_ & 0x00000100) != 0) {
+ output.writeRawByte((byte) 32);
+ output.writeBoolNoTag(isProtected);
+ }
+ if ((bitField0_ & 0x00000200) != 0) {
for (int i = 0; i < subAffixList.length(); i++) {
- output.writeRawByte((byte) 74);
+ output.writeRawByte((byte) 98);
output.writeMessageNoTag(subAffixList.get(i));
}
}
@@ -589,30 +641,33 @@ public final class RelicOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
- }
- if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(tid);
- }
- if ((bitField0_ & 0x00000010) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId);
}
- if ((bitField0_ & 0x00000020) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(exp);
}
+ if ((bitField0_ & 0x00000008) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
+ }
+ if ((bitField0_ & 0x00000010) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(tid);
+ }
+ if ((bitField0_ & 0x00000020) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId);
+ }
if ((bitField0_ & 0x00000040) != 0) {
- size += 2;
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId);
}
if ((bitField0_ & 0x00000080) != 0) {
size += 2;
}
if ((bitField0_ & 0x00000100) != 0) {
+ size += 2;
+ }
+ if ((bitField0_ & 0x00000200) != 0) {
size += (1 * subAffixList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(subAffixList);
}
return size;
@@ -626,19 +681,10 @@ public final class RelicOuterClass {
while (true) {
switch (tag) {
case 16: {
- // mainAffixId
- mainAffixId = input.readUInt32();
+ // uniqueId
+ uniqueId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 48) {
- break;
- }
- }
- case 48: {
- // baseAvatarId
- baseAvatarId = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
if (tag != 64) {
break;
}
@@ -646,6 +692,15 @@ public final class RelicOuterClass {
case 64: {
// level
level = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 72) {
+ break;
+ }
+ }
+ case 72: {
+ // exp
+ exp = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 80) {
@@ -653,8 +708,8 @@ public final class RelicOuterClass {
}
}
case 80: {
- // tid
- tid = input.readUInt32();
+ // baseAvatarId
+ baseAvatarId = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
if (tag != 104) {
@@ -662,45 +717,54 @@ public final class RelicOuterClass {
}
}
case 104: {
- // uniqueId
- uniqueId = input.readUInt32();
+ // tid
+ tid = input.readUInt32();
bitField0_ |= 0x00000010;
tag = input.readTag();
+ if (tag != 112) {
+ break;
+ }
+ }
+ case 112: {
+ // equipAvatarId
+ equipAvatarId = input.readUInt32();
+ bitField0_ |= 0x00000020;
+ tag = input.readTag();
if (tag != 120) {
break;
}
}
case 120: {
- // exp
- exp = input.readUInt32();
- bitField0_ |= 0x00000020;
+ // mainAffixId
+ mainAffixId = input.readUInt32();
+ bitField0_ |= 0x00000040;
tag = input.readTag();
if (tag != 8) {
break;
}
}
case 8: {
- // isProtected
- isProtected = input.readBool();
- bitField0_ |= 0x00000040;
- tag = input.readTag();
- if (tag != 56) {
- break;
- }
- }
- case 56: {
// isDiscarded
isDiscarded = input.readBool();
bitField0_ |= 0x00000080;
tag = input.readTag();
- if (tag != 74) {
+ if (tag != 32) {
break;
}
}
- case 74: {
+ case 32: {
+ // isProtected
+ isProtected = input.readBool();
+ bitField0_ |= 0x00000100;
+ tag = input.readTag();
+ if (tag != 98) {
+ break;
+ }
+ }
+ case 98: {
// subAffixList
tag = input.readRepeatedMessage(subAffixList, tag);
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000200;
if (tag != 0) {
break;
}
@@ -723,30 +787,33 @@ public final class RelicOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.mainAffixId, mainAffixId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.level, level);
- }
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.tid, tid);
- }
- if ((bitField0_ & 0x00000010) != 0) {
output.writeUInt32(FieldNames.uniqueId, uniqueId);
}
- if ((bitField0_ & 0x00000020) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeUInt32(FieldNames.level, level);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.exp, exp);
}
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
+ }
+ if ((bitField0_ & 0x00000010) != 0) {
+ output.writeUInt32(FieldNames.tid, tid);
+ }
+ if ((bitField0_ & 0x00000020) != 0) {
+ output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId);
+ }
if ((bitField0_ & 0x00000040) != 0) {
- output.writeBool(FieldNames.isProtected, isProtected);
+ output.writeUInt32(FieldNames.mainAffixId, mainAffixId);
}
if ((bitField0_ & 0x00000080) != 0) {
output.writeBool(FieldNames.isDiscarded, isDiscarded);
}
if ((bitField0_ & 0x00000100) != 0) {
+ output.writeBool(FieldNames.isProtected, isProtected);
+ }
+ if ((bitField0_ & 0x00000200) != 0) {
output.writeRepeatedMessage(FieldNames.subAffixList, subAffixList);
}
output.endObject();
@@ -759,11 +826,11 @@ public final class RelicOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1973876974:
- case -1426712144: {
- if (input.isAtField(FieldNames.mainAffixId)) {
+ case -294460212:
+ case -538310583: {
+ if (input.isAtField(FieldNames.uniqueId)) {
if (!input.trySkipNullValue()) {
- mainAffixId = input.readUInt32();
+ uniqueId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -771,23 +838,34 @@ public final class RelicOuterClass {
}
break;
}
+ case 102865796: {
+ if (input.isAtField(FieldNames.level)) {
+ if (!input.trySkipNullValue()) {
+ level = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 100893: {
+ if (input.isAtField(FieldNames.exp)) {
+ if (!input.trySkipNullValue()) {
+ exp = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case 118022725:
case -1756826157: {
if (input.isAtField(FieldNames.baseAvatarId)) {
if (!input.trySkipNullValue()) {
baseAvatarId = input.readUInt32();
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 102865796: {
- if (input.isAtField(FieldNames.level)) {
- if (!input.trySkipNullValue()) {
- level = input.readUInt32();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000008;
}
} else {
input.skipUnknownField();
@@ -798,18 +876,6 @@ public final class RelicOuterClass {
if (input.isAtField(FieldNames.tid)) {
if (!input.trySkipNullValue()) {
tid = input.readUInt32();
- bitField0_ |= 0x00000008;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case -294460212:
- case -538310583: {
- if (input.isAtField(FieldNames.uniqueId)) {
- if (!input.trySkipNullValue()) {
- uniqueId = input.readUInt32();
bitField0_ |= 0x00000010;
}
} else {
@@ -817,10 +883,11 @@ public final class RelicOuterClass {
}
break;
}
- case 100893: {
- if (input.isAtField(FieldNames.exp)) {
+ case 169047204:
+ case 33057906: {
+ if (input.isAtField(FieldNames.equipAvatarId)) {
if (!input.trySkipNullValue()) {
- exp = input.readUInt32();
+ equipAvatarId = input.readUInt32();
bitField0_ |= 0x00000020;
}
} else {
@@ -828,11 +895,11 @@ public final class RelicOuterClass {
}
break;
}
- case 569879972:
- case -1919645991: {
- if (input.isAtField(FieldNames.isProtected)) {
+ case -1973876974:
+ case -1426712144: {
+ if (input.isAtField(FieldNames.mainAffixId)) {
if (!input.trySkipNullValue()) {
- isProtected = input.readBool();
+ mainAffixId = input.readUInt32();
bitField0_ |= 0x00000040;
}
} else {
@@ -852,12 +919,24 @@ public final class RelicOuterClass {
}
break;
}
+ case 569879972:
+ case -1919645991: {
+ if (input.isAtField(FieldNames.isProtected)) {
+ if (!input.trySkipNullValue()) {
+ isProtected = input.readBool();
+ bitField0_ |= 0x00000100;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case -600836050:
case 919890188: {
if (input.isAtField(FieldNames.subAffixList)) {
if (!input.trySkipNullValue()) {
input.readRepeatedMessage(subAffixList);
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000200;
}
} else {
input.skipUnknownField();
@@ -916,22 +995,24 @@ public final class RelicOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id");
-
- static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
+ static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id");
static final FieldName level = FieldName.forField("level");
- static final FieldName tid = FieldName.forField("tid");
-
- static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id");
-
static final FieldName exp = FieldName.forField("exp");
- static final FieldName isProtected = FieldName.forField("isProtected", "is_protected");
+ static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
+
+ static final FieldName tid = FieldName.forField("tid");
+
+ static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_avatar_id");
+
+ static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id");
static final FieldName isDiscarded = FieldName.forField("isDiscarded", "is_discarded");
+ static final FieldName isProtected = FieldName.forField("isProtected", "is_protected");
+
static final FieldName subAffixList = FieldName.forField("subAffixList", "sub_affix_list");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java
index bf1660f..a46d80c 100644
--- a/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java
@@ -19,15 +19,15 @@ public final class RelicParamOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 slot = 3;
- */
- private int slot;
-
- /**
- * optional uint32 relic_unique_id = 4;
+ * optional uint32 relic_unique_id = 5;
*/
private int relicUniqueId;
+ /**
+ * optional uint32 slot = 13;
+ */
+ private int slot;
+
private RelicParam() {
}
@@ -39,62 +39,25 @@ public final class RelicParamOuterClass {
}
/**
- * optional uint32 slot = 3;
- * @return whether the slot field is set
+ * optional uint32 relic_unique_id = 5;
+ * @return whether the relicUniqueId field is set
*/
- public boolean hasSlot() {
+ public boolean hasRelicUniqueId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 slot = 3;
- * @return this
- */
- public RelicParam clearSlot() {
- bitField0_ &= ~0x00000001;
- slot = 0;
- return this;
- }
-
- /**
- * optional uint32 slot = 3;
- * @return the slot
- */
- public int getSlot() {
- return slot;
- }
-
- /**
- * optional uint32 slot = 3;
- * @param value the slot to set
- * @return this
- */
- public RelicParam setSlot(final int value) {
- bitField0_ |= 0x00000001;
- slot = value;
- return this;
- }
-
- /**
- * optional uint32 relic_unique_id = 4;
- * @return whether the relicUniqueId field is set
- */
- public boolean hasRelicUniqueId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 relic_unique_id = 4;
+ * optional uint32 relic_unique_id = 5;
* @return this
*/
public RelicParam clearRelicUniqueId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
relicUniqueId = 0;
return this;
}
/**
- * optional uint32 relic_unique_id = 4;
+ * optional uint32 relic_unique_id = 5;
* @return the relicUniqueId
*/
public int getRelicUniqueId() {
@@ -102,23 +65,60 @@ public final class RelicParamOuterClass {
}
/**
- * optional uint32 relic_unique_id = 4;
+ * optional uint32 relic_unique_id = 5;
* @param value the relicUniqueId to set
* @return this
*/
public RelicParam setRelicUniqueId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
relicUniqueId = value;
return this;
}
+ /**
+ * optional uint32 slot = 13;
+ * @return whether the slot field is set
+ */
+ public boolean hasSlot() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 slot = 13;
+ * @return this
+ */
+ public RelicParam clearSlot() {
+ bitField0_ &= ~0x00000002;
+ slot = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 slot = 13;
+ * @return the slot
+ */
+ public int getSlot() {
+ return slot;
+ }
+
+ /**
+ * optional uint32 slot = 13;
+ * @param value the slot to set
+ * @return this
+ */
+ public RelicParam setSlot(final int value) {
+ bitField0_ |= 0x00000002;
+ slot = value;
+ return this;
+ }
+
@Override
public RelicParam copyFrom(final RelicParam other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- slot = other.slot;
relicUniqueId = other.relicUniqueId;
+ slot = other.slot;
}
return this;
}
@@ -129,12 +129,12 @@ public final class RelicParamOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasSlot()) {
- setSlot(other.slot);
- }
if (other.hasRelicUniqueId()) {
setRelicUniqueId(other.relicUniqueId);
}
+ if (other.hasSlot()) {
+ setSlot(other.slot);
+ }
return this;
}
@@ -145,8 +145,8 @@ public final class RelicParamOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- slot = 0;
relicUniqueId = 0;
+ slot = 0;
return this;
}
@@ -170,19 +170,19 @@ public final class RelicParamOuterClass {
}
RelicParam other = (RelicParam) o;
return bitField0_ == other.bitField0_
- && (!hasSlot() || slot == other.slot)
- && (!hasRelicUniqueId() || relicUniqueId == other.relicUniqueId);
+ && (!hasRelicUniqueId() || relicUniqueId == other.relicUniqueId)
+ && (!hasSlot() || slot == other.slot);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(slot);
+ output.writeRawByte((byte) 40);
+ output.writeUInt32NoTag(relicUniqueId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(relicUniqueId);
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(slot);
}
}
@@ -190,10 +190,10 @@ public final class RelicParamOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(slot);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(relicUniqueId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(relicUniqueId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(slot);
}
return size;
}
@@ -205,18 +205,18 @@ public final class RelicParamOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
- // slot
- slot = input.readUInt32();
+ case 40: {
+ // relicUniqueId
+ relicUniqueId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 32) {
+ if (tag != 104) {
break;
}
}
- case 32: {
- // relicUniqueId
- relicUniqueId = input.readUInt32();
+ case 104: {
+ // slot
+ slot = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
@@ -241,10 +241,10 @@ public final class RelicParamOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.slot, slot);
+ output.writeUInt32(FieldNames.relicUniqueId, relicUniqueId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.relicUniqueId, relicUniqueId);
+ output.writeUInt32(FieldNames.slot, slot);
}
output.endObject();
}
@@ -256,10 +256,11 @@ public final class RelicParamOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 3533310: {
- if (input.isAtField(FieldNames.slot)) {
+ case -1966200481:
+ case 49648253: {
+ if (input.isAtField(FieldNames.relicUniqueId)) {
if (!input.trySkipNullValue()) {
- slot = input.readUInt32();
+ relicUniqueId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -267,11 +268,10 @@ public final class RelicParamOuterClass {
}
break;
}
- case -1966200481:
- case 49648253: {
- if (input.isAtField(FieldNames.relicUniqueId)) {
+ case 3533310: {
+ if (input.isAtField(FieldNames.slot)) {
if (!input.trySkipNullValue()) {
- relicUniqueId = input.readUInt32();
+ slot = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -331,9 +331,9 @@ public final class RelicParamOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName slot = FieldName.forField("slot");
-
static final FieldName relicUniqueId = FieldName.forField("relicUniqueId", "relic_unique_id");
+
+ static final FieldName slot = FieldName.forField("slot");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java
index b4cbab5..bd58cf6 100644
--- a/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java
@@ -20,32 +20,32 @@ public final class ReplaceLineupCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 index = 5;
- */
- private int index;
-
- /**
- * optional uint32 plane_id = 8;
+ * optional uint32 plane_id = 2;
*/
private int planeId;
/**
- * optional uint32 leader_slot = 13;
+ * optional uint32 index = 3;
+ */
+ private int index;
+
+ /**
+ * optional uint32 leader_slot = 12;
*/
private int leaderSlot;
/**
- * optional .ExtraLineupType extra_lineup_type = 12;
+ * optional .ExtraLineupType extra_lineup_type = 9;
*/
private int extraLineupType;
/**
- * optional bool is_virtual = 7;
+ * optional bool is_virtual = 10;
*/
private boolean isVirtual;
/**
- * repeated .LineupSlotData slots = 3;
+ * repeated .LineupSlotData slots = 5;
*/
private final RepeatedMessageoptional uint32 index = 5;
- * @return whether the index field is set
+ * optional uint32 plane_id = 2;
+ * @return whether the planeId field is set
*/
- public boolean hasIndex() {
+ public boolean hasPlaneId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 index = 5;
- * @return this
- */
- public ReplaceLineupCsReq clearIndex() {
- bitField0_ &= ~0x00000001;
- index = 0;
- return this;
- }
-
- /**
- * optional uint32 index = 5;
- * @return the index
- */
- public int getIndex() {
- return index;
- }
-
- /**
- * optional uint32 index = 5;
- * @param value the index to set
- * @return this
- */
- public ReplaceLineupCsReq setIndex(final int value) {
- bitField0_ |= 0x00000001;
- index = value;
- return this;
- }
-
- /**
- * optional uint32 plane_id = 8;
- * @return whether the planeId field is set
- */
- public boolean hasPlaneId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 plane_id = 8;
+ * optional uint32 plane_id = 2;
* @return this
*/
public ReplaceLineupCsReq clearPlaneId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
planeId = 0;
return this;
}
/**
- * optional uint32 plane_id = 8;
+ * optional uint32 plane_id = 2;
* @return the planeId
*/
public int getPlaneId() {
@@ -123,18 +86,55 @@ public final class ReplaceLineupCsReqOuterClass {
}
/**
- * optional uint32 plane_id = 8;
+ * optional uint32 plane_id = 2;
* @param value the planeId to set
* @return this
*/
public ReplaceLineupCsReq setPlaneId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
planeId = value;
return this;
}
/**
- * optional uint32 leader_slot = 13;
+ * optional uint32 index = 3;
+ * @return whether the index field is set
+ */
+ public boolean hasIndex() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 index = 3;
+ * @return this
+ */
+ public ReplaceLineupCsReq clearIndex() {
+ bitField0_ &= ~0x00000002;
+ index = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 index = 3;
+ * @return the index
+ */
+ public int getIndex() {
+ return index;
+ }
+
+ /**
+ * optional uint32 index = 3;
+ * @param value the index to set
+ * @return this
+ */
+ public ReplaceLineupCsReq setIndex(final int value) {
+ bitField0_ |= 0x00000002;
+ index = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 leader_slot = 12;
* @return whether the leaderSlot field is set
*/
public boolean hasLeaderSlot() {
@@ -142,7 +142,7 @@ public final class ReplaceLineupCsReqOuterClass {
}
/**
- * optional uint32 leader_slot = 13;
+ * optional uint32 leader_slot = 12;
* @return this
*/
public ReplaceLineupCsReq clearLeaderSlot() {
@@ -152,7 +152,7 @@ public final class ReplaceLineupCsReqOuterClass {
}
/**
- * optional uint32 leader_slot = 13;
+ * optional uint32 leader_slot = 12;
* @return the leaderSlot
*/
public int getLeaderSlot() {
@@ -160,7 +160,7 @@ public final class ReplaceLineupCsReqOuterClass {
}
/**
- * optional uint32 leader_slot = 13;
+ * optional uint32 leader_slot = 12;
* @param value the leaderSlot to set
* @return this
*/
@@ -171,7 +171,7 @@ public final class ReplaceLineupCsReqOuterClass {
}
/**
- * optional .ExtraLineupType extra_lineup_type = 12;
+ * optional .ExtraLineupType extra_lineup_type = 9;
* @return whether the extraLineupType field is set
*/
public boolean hasExtraLineupType() {
@@ -179,7 +179,7 @@ public final class ReplaceLineupCsReqOuterClass {
}
/**
- * optional .ExtraLineupType extra_lineup_type = 12;
+ * optional .ExtraLineupType extra_lineup_type = 9;
* @return this
*/
public ReplaceLineupCsReq clearExtraLineupType() {
@@ -189,7 +189,7 @@ public final class ReplaceLineupCsReqOuterClass {
}
/**
- * optional .ExtraLineupType extra_lineup_type = 12;
+ * optional .ExtraLineupType extra_lineup_type = 9;
* @return the extraLineupType
*/
public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() {
@@ -222,7 +222,7 @@ public final class ReplaceLineupCsReqOuterClass {
}
/**
- * optional .ExtraLineupType extra_lineup_type = 12;
+ * optional .ExtraLineupType extra_lineup_type = 9;
* @param value the extraLineupType to set
* @return this
*/
@@ -234,7 +234,7 @@ public final class ReplaceLineupCsReqOuterClass {
}
/**
- * optional bool is_virtual = 7;
+ * optional bool is_virtual = 10;
* @return whether the isVirtual field is set
*/
public boolean hasIsVirtual() {
@@ -242,7 +242,7 @@ public final class ReplaceLineupCsReqOuterClass {
}
/**
- * optional bool is_virtual = 7;
+ * optional bool is_virtual = 10;
* @return this
*/
public ReplaceLineupCsReq clearIsVirtual() {
@@ -252,7 +252,7 @@ public final class ReplaceLineupCsReqOuterClass {
}
/**
- * optional bool is_virtual = 7;
+ * optional bool is_virtual = 10;
* @return the isVirtual
*/
public boolean getIsVirtual() {
@@ -260,7 +260,7 @@ public final class ReplaceLineupCsReqOuterClass {
}
/**
- * optional bool is_virtual = 7;
+ * optional bool is_virtual = 10;
* @param value the isVirtual to set
* @return this
*/
@@ -271,7 +271,7 @@ public final class ReplaceLineupCsReqOuterClass {
}
/**
- * repeated .LineupSlotData slots = 3;
+ * repeated .LineupSlotData slots = 5;
* @return whether the slots field is set
*/
public boolean hasSlots() {
@@ -279,7 +279,7 @@ public final class ReplaceLineupCsReqOuterClass {
}
/**
- * repeated .LineupSlotData slots = 3;
+ * repeated .LineupSlotData slots = 5;
* @return this
*/
public ReplaceLineupCsReq clearSlots() {
@@ -289,7 +289,7 @@ public final class ReplaceLineupCsReqOuterClass {
}
/**
- * repeated .LineupSlotData slots = 3;
+ * repeated .LineupSlotData slots = 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.
@@ -303,7 +303,7 @@ public final class ReplaceLineupCsReqOuterClass {
}
/**
- * repeated .LineupSlotData slots = 3;
+ * repeated .LineupSlotData slots = 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
@@ -317,7 +317,7 @@ public final class ReplaceLineupCsReqOuterClass {
}
/**
- * repeated .LineupSlotData slots = 3;
+ * repeated .LineupSlotData slots = 5;
* @param value the slots to add
* @return this
*/
@@ -328,7 +328,7 @@ public final class ReplaceLineupCsReqOuterClass {
}
/**
- * repeated .LineupSlotData slots = 3;
+ * repeated .LineupSlotData slots = 5;
* @param values the slots to add
* @return this
*/
@@ -343,8 +343,8 @@ public final class ReplaceLineupCsReqOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- index = other.index;
planeId = other.planeId;
+ index = other.index;
leaderSlot = other.leaderSlot;
extraLineupType = other.extraLineupType;
isVirtual = other.isVirtual;
@@ -359,12 +359,12 @@ public final class ReplaceLineupCsReqOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasIndex()) {
- setIndex(other.index);
- }
if (other.hasPlaneId()) {
setPlaneId(other.planeId);
}
+ if (other.hasIndex()) {
+ setIndex(other.index);
+ }
if (other.hasLeaderSlot()) {
setLeaderSlot(other.leaderSlot);
}
@@ -387,8 +387,8 @@ public final class ReplaceLineupCsReqOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- index = 0;
planeId = 0;
+ index = 0;
leaderSlot = 0;
extraLineupType = 0;
isVirtual = false;
@@ -417,8 +417,8 @@ public final class ReplaceLineupCsReqOuterClass {
}
ReplaceLineupCsReq other = (ReplaceLineupCsReq) o;
return bitField0_ == other.bitField0_
- && (!hasIndex() || index == other.index)
&& (!hasPlaneId() || planeId == other.planeId)
+ && (!hasIndex() || index == other.index)
&& (!hasLeaderSlot() || leaderSlot == other.leaderSlot)
&& (!hasExtraLineupType() || extraLineupType == other.extraLineupType)
&& (!hasIsVirtual() || isVirtual == other.isVirtual)
@@ -428,28 +428,28 @@ public final class ReplaceLineupCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
- output.writeUInt32NoTag(index);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(planeId);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 24);
+ output.writeUInt32NoTag(index);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(leaderSlot);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 72);
output.writeEnumNoTag(extraLineupType);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 80);
output.writeBoolNoTag(isVirtual);
}
if ((bitField0_ & 0x00000020) != 0) {
for (int i = 0; i < slots.length(); i++) {
- output.writeRawByte((byte) 26);
+ output.writeRawByte((byte) 42);
output.writeMessageNoTag(slots.get(i));
}
}
@@ -459,10 +459,10 @@ public final class ReplaceLineupCsReqOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(index);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(index);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot);
@@ -486,34 +486,34 @@ public final class ReplaceLineupCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
- // index
- index = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 64) {
- break;
- }
- }
- case 64: {
+ case 16: {
// planeId
planeId = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 24) {
break;
}
}
- case 104: {
- // leaderSlot
- leaderSlot = input.readUInt32();
- bitField0_ |= 0x00000004;
+ case 24: {
+ // index
+ index = input.readUInt32();
+ bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 96) {
break;
}
}
case 96: {
+ // leaderSlot
+ leaderSlot = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 72) {
+ break;
+ }
+ }
+ case 72: {
// extraLineupType
final int value = input.readInt32();
if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) {
@@ -521,20 +521,20 @@ public final class ReplaceLineupCsReqOuterClass {
bitField0_ |= 0x00000008;
}
tag = input.readTag();
- if (tag != 56) {
+ if (tag != 80) {
break;
}
}
- case 56: {
+ case 80: {
// isVirtual
isVirtual = input.readBool();
bitField0_ |= 0x00000010;
tag = input.readTag();
- if (tag != 26) {
+ if (tag != 42) {
break;
}
}
- case 26: {
+ case 42: {
// slots
tag = input.readRepeatedMessage(slots, tag);
bitField0_ |= 0x00000020;
@@ -560,10 +560,10 @@ public final class ReplaceLineupCsReqOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.index, index);
+ output.writeUInt32(FieldNames.planeId, planeId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.planeId, planeId);
+ output.writeUInt32(FieldNames.index, index);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.leaderSlot, leaderSlot);
@@ -587,10 +587,11 @@ public final class ReplaceLineupCsReqOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 100346066: {
- if (input.isAtField(FieldNames.index)) {
+ case -493896553:
+ case 1869097438: {
+ if (input.isAtField(FieldNames.planeId)) {
if (!input.trySkipNullValue()) {
- index = input.readUInt32();
+ planeId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -598,11 +599,10 @@ public final class ReplaceLineupCsReqOuterClass {
}
break;
}
- case -493896553:
- case 1869097438: {
- if (input.isAtField(FieldNames.planeId)) {
+ case 100346066: {
+ if (input.isAtField(FieldNames.index)) {
if (!input.trySkipNullValue()) {
- planeId = input.readUInt32();
+ index = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -715,10 +715,10 @@ public final class ReplaceLineupCsReqOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName index = FieldName.forField("index");
-
static final FieldName planeId = FieldName.forField("planeId", "plane_id");
+ static final FieldName index = FieldName.forField("index");
+
static final FieldName leaderSlot = FieldName.forField("leaderSlot", "leader_slot");
static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type");
diff --git a/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeCsReqOuterClass.java
index f028249..1c41223 100644
--- a/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 num = 11;
+ * optional uint32 num = 8;
*/
private int num;
@@ -34,7 +34,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass {
}
/**
- * optional uint32 num = 11;
+ * optional uint32 num = 8;
* @return whether the num field is set
*/
public boolean hasNum() {
@@ -42,7 +42,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass {
}
/**
- * optional uint32 num = 11;
+ * optional uint32 num = 8;
* @return this
*/
public ReserveStaminaExchangeCsReq clearNum() {
@@ -52,7 +52,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass {
}
/**
- * optional uint32 num = 11;
+ * optional uint32 num = 8;
* @return the num
*/
public int getNum() {
@@ -60,7 +60,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass {
}
/**
- * optional uint32 num = 11;
+ * optional uint32 num = 8;
* @param value the num to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(num);
}
}
@@ -150,7 +150,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 88: {
+ case 64: {
// num
num = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeScRspOuterClass.java
index f7b27b7..81e49ae 100644
--- a/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeScRspOuterClass.java
@@ -19,15 +19,15 @@ public final class ReserveStaminaExchangeScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 num = 8;
- */
- private int num;
-
- /**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 11;
*/
private int retcode;
+ /**
+ * optional uint32 num = 12;
+ */
+ private int num;
+
private ReserveStaminaExchangeScRsp() {
}
@@ -39,62 +39,25 @@ public final class ReserveStaminaExchangeScRspOuterClass {
}
/**
- * optional uint32 num = 8;
- * @return whether the num field is set
+ * optional uint32 retcode = 11;
+ * @return whether the retcode field is set
*/
- public boolean hasNum() {
+ public boolean hasRetcode() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 num = 8;
- * @return this
- */
- public ReserveStaminaExchangeScRsp clearNum() {
- bitField0_ &= ~0x00000001;
- num = 0;
- return this;
- }
-
- /**
- * optional uint32 num = 8;
- * @return the num
- */
- public int getNum() {
- return num;
- }
-
- /**
- * optional uint32 num = 8;
- * @param value the num to set
- * @return this
- */
- public ReserveStaminaExchangeScRsp setNum(final int value) {
- bitField0_ |= 0x00000001;
- num = value;
- return this;
- }
-
- /**
- * optional uint32 retcode = 12;
- * @return whether the retcode field is set
- */
- public boolean hasRetcode() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 11;
* @return this
*/
public ReserveStaminaExchangeScRsp clearRetcode() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
retcode = 0;
return this;
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 11;
* @return the retcode
*/
public int getRetcode() {
@@ -102,23 +65,60 @@ public final class ReserveStaminaExchangeScRspOuterClass {
}
/**
- * optional uint32 retcode = 12;
+ * optional uint32 retcode = 11;
* @param value the retcode to set
* @return this
*/
public ReserveStaminaExchangeScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
retcode = value;
return this;
}
+ /**
+ * optional uint32 num = 12;
+ * @return whether the num field is set
+ */
+ public boolean hasNum() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 num = 12;
+ * @return this
+ */
+ public ReserveStaminaExchangeScRsp clearNum() {
+ bitField0_ &= ~0x00000002;
+ num = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 num = 12;
+ * @return the num
+ */
+ public int getNum() {
+ return num;
+ }
+
+ /**
+ * optional uint32 num = 12;
+ * @param value the num to set
+ * @return this
+ */
+ public ReserveStaminaExchangeScRsp setNum(final int value) {
+ bitField0_ |= 0x00000002;
+ num = value;
+ return this;
+ }
+
@Override
public ReserveStaminaExchangeScRsp copyFrom(final ReserveStaminaExchangeScRsp other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- num = other.num;
retcode = other.retcode;
+ num = other.num;
}
return this;
}
@@ -129,12 +129,12 @@ public final class ReserveStaminaExchangeScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasNum()) {
- setNum(other.num);
- }
if (other.hasRetcode()) {
setRetcode(other.retcode);
}
+ if (other.hasNum()) {
+ setNum(other.num);
+ }
return this;
}
@@ -145,8 +145,8 @@ public final class ReserveStaminaExchangeScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- num = 0;
retcode = 0;
+ num = 0;
return this;
}
@@ -170,19 +170,19 @@ public final class ReserveStaminaExchangeScRspOuterClass {
}
ReserveStaminaExchangeScRsp other = (ReserveStaminaExchangeScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasNum() || num == other.num)
- && (!hasRetcode() || retcode == other.retcode);
+ && (!hasRetcode() || retcode == other.retcode)
+ && (!hasNum() || num == other.num);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 64);
- output.writeUInt32NoTag(num);
+ output.writeRawByte((byte) 88);
+ output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 96);
- output.writeUInt32NoTag(retcode);
+ output.writeUInt32NoTag(num);
}
}
@@ -190,10 +190,10 @@ public final class ReserveStaminaExchangeScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(num);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(num);
}
return size;
}
@@ -205,9 +205,9 @@ public final class ReserveStaminaExchangeScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 64: {
- // num
- num = input.readUInt32();
+ case 88: {
+ // retcode
+ retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
if (tag != 96) {
@@ -215,8 +215,8 @@ public final class ReserveStaminaExchangeScRspOuterClass {
}
}
case 96: {
- // retcode
- retcode = input.readUInt32();
+ // num
+ num = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
@@ -241,10 +241,10 @@ public final class ReserveStaminaExchangeScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.num, num);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.num, num);
}
output.endObject();
}
@@ -256,10 +256,10 @@ public final class ReserveStaminaExchangeScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 109446: {
- if (input.isAtField(FieldNames.num)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- num = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -267,10 +267,10 @@ public final class ReserveStaminaExchangeScRspOuterClass {
}
break;
}
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case 109446: {
+ if (input.isAtField(FieldNames.num)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ num = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -332,9 +332,9 @@ public final class ReserveStaminaExchangeScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName num = FieldName.forField("num");
-
static final FieldName retcode = FieldName.forField("retcode");
+
+ static final FieldName num = FieldName.forField("num");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/RevcMsgScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/RevcMsgScNotifyOuterClass.java
index 8ac0925..bf62587 100644
--- a/src/generated/main/emu/lunarcore/proto/RevcMsgScNotifyOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RevcMsgScNotifyOuterClass.java
@@ -20,32 +20,32 @@ public final class RevcMsgScNotifyOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 emote = 1;
+ * optional uint32 emote = 2;
*/
private int emote;
/**
- * optional uint32 to_uid = 4;
+ * optional uint32 to_uid = 3;
*/
private int toUid;
/**
- * optional uint32 from_uid = 7;
+ * optional uint32 from_uid = 11;
*/
private int fromUid;
/**
- * optional .ChatType chat_type = 5;
+ * optional .ChatType chat_type = 6;
*/
private int chatType;
/**
- * optional .MsgType msg_type = 9;
+ * optional .MsgType msg_type = 15;
*/
private int msgType;
/**
- * optional string text = 10;
+ * optional string text = 9;
*/
private final Utf8String text = Utf8String.newEmptyInstance();
@@ -60,7 +60,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional uint32 emote = 1;
+ * optional uint32 emote = 2;
* @return whether the emote field is set
*/
public boolean hasEmote() {
@@ -68,7 +68,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional uint32 emote = 1;
+ * optional uint32 emote = 2;
* @return this
*/
public RevcMsgScNotify clearEmote() {
@@ -78,7 +78,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional uint32 emote = 1;
+ * optional uint32 emote = 2;
* @return the emote
*/
public int getEmote() {
@@ -86,7 +86,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional uint32 emote = 1;
+ * optional uint32 emote = 2;
* @param value the emote to set
* @return this
*/
@@ -97,7 +97,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional uint32 to_uid = 4;
+ * optional uint32 to_uid = 3;
* @return whether the toUid field is set
*/
public boolean hasToUid() {
@@ -105,7 +105,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional uint32 to_uid = 4;
+ * optional uint32 to_uid = 3;
* @return this
*/
public RevcMsgScNotify clearToUid() {
@@ -115,7 +115,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional uint32 to_uid = 4;
+ * optional uint32 to_uid = 3;
* @return the toUid
*/
public int getToUid() {
@@ -123,7 +123,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional uint32 to_uid = 4;
+ * optional uint32 to_uid = 3;
* @param value the toUid to set
* @return this
*/
@@ -134,7 +134,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional uint32 from_uid = 7;
+ * optional uint32 from_uid = 11;
* @return whether the fromUid field is set
*/
public boolean hasFromUid() {
@@ -142,7 +142,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional uint32 from_uid = 7;
+ * optional uint32 from_uid = 11;
* @return this
*/
public RevcMsgScNotify clearFromUid() {
@@ -152,7 +152,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional uint32 from_uid = 7;
+ * optional uint32 from_uid = 11;
* @return the fromUid
*/
public int getFromUid() {
@@ -160,7 +160,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional uint32 from_uid = 7;
+ * optional uint32 from_uid = 11;
* @param value the fromUid to set
* @return this
*/
@@ -171,7 +171,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional .ChatType chat_type = 5;
+ * optional .ChatType chat_type = 6;
* @return whether the chatType field is set
*/
public boolean hasChatType() {
@@ -179,7 +179,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional .ChatType chat_type = 5;
+ * optional .ChatType chat_type = 6;
* @return this
*/
public RevcMsgScNotify clearChatType() {
@@ -189,7 +189,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional .ChatType chat_type = 5;
+ * optional .ChatType chat_type = 6;
* @return the chatType
*/
public ChatTypeOuterClass.ChatType getChatType() {
@@ -222,7 +222,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional .ChatType chat_type = 5;
+ * optional .ChatType chat_type = 6;
* @param value the chatType to set
* @return this
*/
@@ -233,7 +233,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional .MsgType msg_type = 9;
+ * optional .MsgType msg_type = 15;
* @return whether the msgType field is set
*/
public boolean hasMsgType() {
@@ -241,7 +241,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional .MsgType msg_type = 9;
+ * optional .MsgType msg_type = 15;
* @return this
*/
public RevcMsgScNotify clearMsgType() {
@@ -251,7 +251,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional .MsgType msg_type = 9;
+ * optional .MsgType msg_type = 15;
* @return the msgType
*/
public MsgTypeOuterClass.MsgType getMsgType() {
@@ -284,7 +284,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional .MsgType msg_type = 9;
+ * optional .MsgType msg_type = 15;
* @param value the msgType to set
* @return this
*/
@@ -295,7 +295,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional string text = 10;
+ * optional string text = 9;
* @return whether the text field is set
*/
public boolean hasText() {
@@ -303,7 +303,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional string text = 10;
+ * optional string text = 9;
* @return this
*/
public RevcMsgScNotify clearText() {
@@ -313,7 +313,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional string text = 10;
+ * optional string text = 9;
* @return the text
*/
public String getText() {
@@ -321,7 +321,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional string text = 10;
+ * optional string text = 9;
* @return internal {@code Utf8String} representation of text for reading
*/
public Utf8String getTextBytes() {
@@ -329,7 +329,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional string text = 10;
+ * optional string text = 9;
* @return internal {@code Utf8String} representation of text for modifications
*/
public Utf8String getMutableTextBytes() {
@@ -338,7 +338,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional string text = 10;
+ * optional string text = 9;
* @param value the text to set
* @return this
*/
@@ -349,7 +349,7 @@ public final class RevcMsgScNotifyOuterClass {
}
/**
- * optional string text = 10;
+ * optional string text = 9;
* @param value the text to set
* @return this
*/
@@ -449,27 +449,27 @@ public final class RevcMsgScNotifyOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(emote);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(toUid);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(fromUid);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 48);
output.writeEnumNoTag(chatType);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 120);
output.writeEnumNoTag(msgType);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 82);
+ output.writeRawByte((byte) 74);
output.writeStringNoTag(text);
}
}
@@ -505,34 +505,34 @@ public final class RevcMsgScNotifyOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 16: {
// emote
emote = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 32) {
+ if (tag != 24) {
break;
}
}
- case 32: {
+ case 24: {
// toUid
toUid = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 56) {
+ if (tag != 88) {
break;
}
}
- case 56: {
+ case 88: {
// fromUid
fromUid = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 40) {
+ if (tag != 48) {
break;
}
}
- case 40: {
+ case 48: {
// chatType
final int value = input.readInt32();
if (ChatTypeOuterClass.ChatType.forNumber(value) != null) {
@@ -540,11 +540,11 @@ public final class RevcMsgScNotifyOuterClass {
bitField0_ |= 0x00000008;
}
tag = input.readTag();
- if (tag != 72) {
+ if (tag != 120) {
break;
}
}
- case 72: {
+ case 120: {
// msgType
final int value = input.readInt32();
if (MsgTypeOuterClass.MsgType.forNumber(value) != null) {
@@ -552,11 +552,11 @@ public final class RevcMsgScNotifyOuterClass {
bitField0_ |= 0x00000010;
}
tag = input.readTag();
- if (tag != 82) {
+ if (tag != 74) {
break;
}
}
- case 82: {
+ case 74: {
// text
input.readString(text);
bitField0_ |= 0x00000020;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueActionOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueActionOuterClass.java
index bee9e23..90e6ff3 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueActionOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueActionOuterClass.java
@@ -27,7 +27,7 @@ public final class RogueActionOuterClass {
* RogueMiracleSelectDestroyedAction PKEFIKCMDOM = 1336;
*
*
- * optional .RogueBonusSelectInfo bonus_select_info = 1849;
+ * optional .RogueBonusSelectInfo bonus_select_info = 515;
*/
private final RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo bonusSelectInfo = RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo.newInstance();
@@ -37,7 +37,7 @@ public final class RogueActionOuterClass {
* RogueBuffEnhanceSelectInfo BDLINKPALNL = 1837;
*
*
- * optional .RogueMiracleSelectInfo miracle_select_info = 1899;
+ * optional .RogueMiracleSelectInfo miracle_select_info = 527;
*/
private final RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo miracleSelectInfo = RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo.newInstance();
@@ -46,7 +46,7 @@ public final class RogueActionOuterClass {
* done
*
*
- * optional .RogueCommonBuffSelectInfo buff_select_info = 1978;
+ * optional .RogueCommonBuffSelectInfo buff_select_info = 1454;
*/
private final RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo buffSelectInfo = RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo.newInstance();
@@ -103,7 +103,7 @@ public final class RogueActionOuterClass {
* RogueMiracleSelectDestroyedAction PKEFIKCMDOM = 1336;
*
*
- * optional .RogueBonusSelectInfo bonus_select_info = 1849;
+ * optional .RogueBonusSelectInfo bonus_select_info = 515;
* @return whether the bonusSelectInfo field is set
*/
public boolean hasBonusSelectInfo() {
@@ -119,7 +119,7 @@ public final class RogueActionOuterClass {
* RogueMiracleSelectDestroyedAction PKEFIKCMDOM = 1336;
*
*
- * optional .RogueBonusSelectInfo bonus_select_info = 1849;
+ * optional .RogueBonusSelectInfo bonus_select_info = 515;
* @return this
*/
public RogueAction clearBonusSelectInfo() {
@@ -137,7 +137,7 @@ public final class RogueActionOuterClass {
* RogueMiracleSelectDestroyedAction PKEFIKCMDOM = 1336;
*
*
- * optional .RogueBonusSelectInfo bonus_select_info = 1849;
+ * optional .RogueBonusSelectInfo bonus_select_info = 515;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -159,7 +159,7 @@ public final class RogueActionOuterClass {
* RogueMiracleSelectDestroyedAction PKEFIKCMDOM = 1336;
*
*
- * optional .RogueBonusSelectInfo bonus_select_info = 1849;
+ * optional .RogueBonusSelectInfo bonus_select_info = 515;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -182,7 +182,7 @@ public final class RogueActionOuterClass {
* RogueMiracleSelectDestroyedAction PKEFIKCMDOM = 1336;
*
*
- * optional .RogueBonusSelectInfo bonus_select_info = 1849;
+ * optional .RogueBonusSelectInfo bonus_select_info = 515;
* @param value the bonusSelectInfo to set
* @return this
*/
@@ -200,7 +200,7 @@ public final class RogueActionOuterClass {
* RogueBuffEnhanceSelectInfo BDLINKPALNL = 1837;
*
*
- * optional .RogueMiracleSelectInfo miracle_select_info = 1899;
+ * optional .RogueMiracleSelectInfo miracle_select_info = 527;
* @return whether the miracleSelectInfo field is set
*/
public boolean hasMiracleSelectInfo() {
@@ -213,7 +213,7 @@ public final class RogueActionOuterClass {
* RogueBuffEnhanceSelectInfo BDLINKPALNL = 1837;
*
*
- * optional .RogueMiracleSelectInfo miracle_select_info = 1899;
+ * optional .RogueMiracleSelectInfo miracle_select_info = 527;
* @return this
*/
public RogueAction clearMiracleSelectInfo() {
@@ -228,7 +228,7 @@ public final class RogueActionOuterClass {
* RogueBuffEnhanceSelectInfo BDLINKPALNL = 1837;
*
*
- * optional .RogueMiracleSelectInfo miracle_select_info = 1899;
+ * optional .RogueMiracleSelectInfo miracle_select_info = 527;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -247,7 +247,7 @@ public final class RogueActionOuterClass {
* RogueBuffEnhanceSelectInfo BDLINKPALNL = 1837;
*
*
- * optional .RogueMiracleSelectInfo miracle_select_info = 1899;
+ * optional .RogueMiracleSelectInfo miracle_select_info = 527;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -267,7 +267,7 @@ public final class RogueActionOuterClass {
* RogueBuffEnhanceSelectInfo BDLINKPALNL = 1837;
*
*
- * optional .RogueMiracleSelectInfo miracle_select_info = 1899;
+ * optional .RogueMiracleSelectInfo miracle_select_info = 527;
* @param value the miracleSelectInfo to set
* @return this
*/
@@ -284,7 +284,7 @@ public final class RogueActionOuterClass {
* done
*
*
- * optional .RogueCommonBuffSelectInfo buff_select_info = 1978;
+ * optional .RogueCommonBuffSelectInfo buff_select_info = 1454;
* @return whether the buffSelectInfo field is set
*/
public boolean hasBuffSelectInfo() {
@@ -296,7 +296,7 @@ public final class RogueActionOuterClass {
* done
*
*
- * optional .RogueCommonBuffSelectInfo buff_select_info = 1978;
+ * optional .RogueCommonBuffSelectInfo buff_select_info = 1454;
* @return this
*/
public RogueAction clearBuffSelectInfo() {
@@ -310,7 +310,7 @@ public final class RogueActionOuterClass {
* done
*
*
- * optional .RogueCommonBuffSelectInfo buff_select_info = 1978;
+ * optional .RogueCommonBuffSelectInfo buff_select_info = 1454;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -328,7 +328,7 @@ public final class RogueActionOuterClass {
* done
*
*
- * optional .RogueCommonBuffSelectInfo buff_select_info = 1978;
+ * optional .RogueCommonBuffSelectInfo buff_select_info = 1454;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -348,7 +348,7 @@ public final class RogueActionOuterClass {
* done
*
*
- * optional .RogueCommonBuffSelectInfo buff_select_info = 1978;
+ * optional .RogueCommonBuffSelectInfo buff_select_info = 1454;
* @param value the buffSelectInfo to set
* @return this
*/
@@ -434,15 +434,15 @@ public final class RogueActionOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawLittleEndian16((short) 29642);
+ output.writeRawLittleEndian16((short) 8346);
output.writeMessageNoTag(bonusSelectInfo);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawLittleEndian16((short) 30426);
+ output.writeRawLittleEndian16((short) 8442);
output.writeMessageNoTag(miracleSelectInfo);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawLittleEndian16((short) 31698);
+ output.writeRawLittleEndian16((short) 23282);
output.writeMessageNoTag(buffSelectInfo);
}
}
@@ -469,27 +469,27 @@ public final class RogueActionOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 14794: {
+ case 4122: {
// bonusSelectInfo
clearActionOtherBonusSelectInfo();
input.readMessage(bonusSelectInfo);
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 15194) {
+ if (tag != 4218) {
break;
}
}
- case 15194: {
+ case 4218: {
// miracleSelectInfo
clearActionOtherMiracleSelectInfo();
input.readMessage(miracleSelectInfo);
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 15826) {
+ if (tag != 11634) {
break;
}
}
- case 15826: {
+ case 11634: {
// buffSelectInfo
clearActionOtherBuffSelectInfo();
input.readMessage(buffSelectInfo);
diff --git a/src/generated/main/emu/lunarcore/proto/RogueActionResultDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueActionResultDataOuterClass.java
index 5b48dbe..b6e184d 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueActionResultDataOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueActionResultDataOuterClass.java
@@ -19,27 +19,27 @@ public final class RogueActionResultDataOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .RogueVirtualItemData remove_item_list = 12;
- */
- private final RogueVirtualItemDataOuterClass.RogueVirtualItemData removeItemList = RogueVirtualItemDataOuterClass.RogueVirtualItemData.newInstance();
-
- /**
- * optional .RogueVirtualItemData add_item_list = 13;
+ * optional .RogueVirtualItemData add_item_list = 11;
*/
private final RogueVirtualItemDataOuterClass.RogueVirtualItemData addItemList = RogueVirtualItemDataOuterClass.RogueVirtualItemData.newInstance();
/**
- * optional .RogueBuffData remove_buff_list = 818;
+ * optional .RogueVirtualItemData remove_item_list = 14;
*/
- private final RogueBuffDataOuterClass.RogueBuffData removeBuffList = RogueBuffDataOuterClass.RogueBuffData.newInstance();
+ private final RogueVirtualItemDataOuterClass.RogueVirtualItemData removeItemList = RogueVirtualItemDataOuterClass.RogueVirtualItemData.newInstance();
/**
- * optional .RogueMiracleData add_miracle_list = 1194;
+ * optional .RogueMiracleData add_miracle_list = 516;
*/
private final RogueMiracleDataOuterClass.RogueMiracleData addMiracleList = RogueMiracleDataOuterClass.RogueMiracleData.newInstance();
/**
- * optional .RogueBuffData add_buff_list = 1583;
+ * optional .RogueBuffData remove_buff_list = 1574;
+ */
+ private final RogueBuffDataOuterClass.RogueBuffData removeBuffList = RogueBuffDataOuterClass.RogueBuffData.newInstance();
+
+ /**
+ * optional .RogueBuffData add_buff_list = 1586;
*/
private final RogueBuffDataOuterClass.RogueBuffData addBuffList = RogueBuffDataOuterClass.RogueBuffData.newInstance();
@@ -53,84 +53,86 @@ public final class RogueActionResultDataOuterClass {
return new RogueActionResultData();
}
+ public boolean hasResultAction() {
+ return (((bitField0_ & 0x0000001f)) != 0);
+ }
+
+ public RogueActionResultData clearResultAction() {
+ if (hasResultAction()) {
+ clearAddItemList();
+ clearRemoveItemList();
+ clearAddMiracleList();
+ clearRemoveBuffList();
+ clearAddBuffList();
+ }
+ return this;
+ }
+
+ private void clearResultActionOtherAddItemList() {
+ if ((((bitField0_ & 0x0000001e)) != 0)) {
+ clearRemoveItemList();
+ clearAddMiracleList();
+ clearRemoveBuffList();
+ clearAddBuffList();
+ }
+ }
+
+ private void clearResultActionOtherRemoveItemList() {
+ if ((((bitField0_ & 0x0000001d)) != 0)) {
+ clearAddItemList();
+ clearAddMiracleList();
+ clearRemoveBuffList();
+ clearAddBuffList();
+ }
+ }
+
+ private void clearResultActionOtherAddMiracleList() {
+ if ((((bitField0_ & 0x0000001b)) != 0)) {
+ clearAddItemList();
+ clearRemoveItemList();
+ clearRemoveBuffList();
+ clearAddBuffList();
+ }
+ }
+
+ private void clearResultActionOtherRemoveBuffList() {
+ if ((((bitField0_ & 0x00000017)) != 0)) {
+ clearAddItemList();
+ clearRemoveItemList();
+ clearAddMiracleList();
+ clearAddBuffList();
+ }
+ }
+
+ private void clearResultActionOtherAddBuffList() {
+ if ((((bitField0_ & 0x0000000f)) != 0)) {
+ clearAddItemList();
+ clearRemoveItemList();
+ clearAddMiracleList();
+ clearRemoveBuffList();
+ }
+ }
+
/**
- * optional .RogueVirtualItemData remove_item_list = 12;
- * @return whether the removeItemList field is set
+ * optional .RogueVirtualItemData add_item_list = 11;
+ * @return whether the addItemList field is set
*/
- public boolean hasRemoveItemList() {
+ public boolean hasAddItemList() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional .RogueVirtualItemData remove_item_list = 12;
- * @return this
- */
- public RogueActionResultData clearRemoveItemList() {
- bitField0_ &= ~0x00000001;
- removeItemList.clear();
- return this;
- }
-
- /**
- * optional .RogueVirtualItemData remove_item_list = 12;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableRemoveItemList()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RogueVirtualItemDataOuterClass.RogueVirtualItemData getRemoveItemList() {
- return removeItemList;
- }
-
- /**
- * optional .RogueVirtualItemData remove_item_list = 12;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RogueVirtualItemDataOuterClass.RogueVirtualItemData getMutableRemoveItemList() {
- bitField0_ |= 0x00000001;
- return removeItemList;
- }
-
- /**
- * optional .RogueVirtualItemData remove_item_list = 12;
- * @param value the removeItemList to set
- * @return this
- */
- public RogueActionResultData setRemoveItemList(
- final RogueVirtualItemDataOuterClass.RogueVirtualItemData value) {
- bitField0_ |= 0x00000001;
- removeItemList.copyFrom(value);
- return this;
- }
-
- /**
- * optional .RogueVirtualItemData add_item_list = 13;
- * @return whether the addItemList field is set
- */
- public boolean hasAddItemList() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional .RogueVirtualItemData add_item_list = 13;
+ * optional .RogueVirtualItemData add_item_list = 11;
* @return this
*/
public RogueActionResultData clearAddItemList() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
addItemList.clear();
return this;
}
/**
- * optional .RogueVirtualItemData add_item_list = 13;
+ * optional .RogueVirtualItemData add_item_list = 11;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -144,7 +146,7 @@ public final class RogueActionResultDataOuterClass {
}
/**
- * optional .RogueVirtualItemData add_item_list = 13;
+ * optional .RogueVirtualItemData add_item_list = 11;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -153,56 +155,58 @@ public final class RogueActionResultDataOuterClass {
* @return internal storage object for modifications
*/
public RogueVirtualItemDataOuterClass.RogueVirtualItemData getMutableAddItemList() {
- bitField0_ |= 0x00000002;
+ clearResultActionOtherAddItemList();
+ bitField0_ |= 0x00000001;
return addItemList;
}
/**
- * optional .RogueVirtualItemData add_item_list = 13;
+ * optional .RogueVirtualItemData add_item_list = 11;
* @param value the addItemList to set
* @return this
*/
public RogueActionResultData setAddItemList(
final RogueVirtualItemDataOuterClass.RogueVirtualItemData value) {
- bitField0_ |= 0x00000002;
+ clearResultActionOtherAddItemList();
+ bitField0_ |= 0x00000001;
addItemList.copyFrom(value);
return this;
}
/**
- * optional .RogueBuffData remove_buff_list = 818;
- * @return whether the removeBuffList field is set
+ * optional .RogueVirtualItemData remove_item_list = 14;
+ * @return whether the removeItemList field is set
*/
- public boolean hasRemoveBuffList() {
- return (bitField0_ & 0x00000004) != 0;
+ public boolean hasRemoveItemList() {
+ return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional .RogueBuffData remove_buff_list = 818;
+ * optional .RogueVirtualItemData remove_item_list = 14;
* @return this
*/
- public RogueActionResultData clearRemoveBuffList() {
- bitField0_ &= ~0x00000004;
- removeBuffList.clear();
+ public RogueActionResultData clearRemoveItemList() {
+ bitField0_ &= ~0x00000002;
+ removeItemList.clear();
return this;
}
/**
- * optional .RogueBuffData remove_buff_list = 818;
+ * optional .RogueVirtualItemData remove_item_list = 14;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
*
- * Use {@link #getMutableRemoveBuffList()} if you want to modify it.
+ * Use {@link #getMutableRemoveItemList()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public RogueBuffDataOuterClass.RogueBuffData getRemoveBuffList() {
- return removeBuffList;
+ public RogueVirtualItemDataOuterClass.RogueVirtualItemData getRemoveItemList() {
+ return removeItemList;
}
/**
- * optional .RogueBuffData remove_buff_list = 818;
+ * optional .RogueVirtualItemData remove_item_list = 14;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -210,43 +214,45 @@ public final class RogueActionResultDataOuterClass {
*
* @return internal storage object for modifications
*/
- public RogueBuffDataOuterClass.RogueBuffData getMutableRemoveBuffList() {
- bitField0_ |= 0x00000004;
- return removeBuffList;
+ public RogueVirtualItemDataOuterClass.RogueVirtualItemData getMutableRemoveItemList() {
+ clearResultActionOtherRemoveItemList();
+ bitField0_ |= 0x00000002;
+ return removeItemList;
}
/**
- * optional .RogueBuffData remove_buff_list = 818;
- * @param value the removeBuffList to set
+ * optional .RogueVirtualItemData remove_item_list = 14;
+ * @param value the removeItemList to set
* @return this
*/
- public RogueActionResultData setRemoveBuffList(
- final RogueBuffDataOuterClass.RogueBuffData value) {
- bitField0_ |= 0x00000004;
- removeBuffList.copyFrom(value);
+ public RogueActionResultData setRemoveItemList(
+ final RogueVirtualItemDataOuterClass.RogueVirtualItemData value) {
+ clearResultActionOtherRemoveItemList();
+ bitField0_ |= 0x00000002;
+ removeItemList.copyFrom(value);
return this;
}
/**
- * optional .RogueMiracleData add_miracle_list = 1194;
+ * optional .RogueMiracleData add_miracle_list = 516;
* @return whether the addMiracleList field is set
*/
public boolean hasAddMiracleList() {
- return (bitField0_ & 0x00000008) != 0;
+ return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional .RogueMiracleData add_miracle_list = 1194;
+ * optional .RogueMiracleData add_miracle_list = 516;
* @return this
*/
public RogueActionResultData clearAddMiracleList() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000004;
addMiracleList.clear();
return this;
}
/**
- * optional .RogueMiracleData add_miracle_list = 1194;
+ * optional .RogueMiracleData add_miracle_list = 516;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -260,7 +266,7 @@ public final class RogueActionResultDataOuterClass {
}
/**
- * optional .RogueMiracleData add_miracle_list = 1194;
+ * optional .RogueMiracleData add_miracle_list = 516;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -269,24 +275,86 @@ public final class RogueActionResultDataOuterClass {
* @return internal storage object for modifications
*/
public RogueMiracleDataOuterClass.RogueMiracleData getMutableAddMiracleList() {
- bitField0_ |= 0x00000008;
+ clearResultActionOtherAddMiracleList();
+ bitField0_ |= 0x00000004;
return addMiracleList;
}
/**
- * optional .RogueMiracleData add_miracle_list = 1194;
+ * optional .RogueMiracleData add_miracle_list = 516;
* @param value the addMiracleList to set
* @return this
*/
public RogueActionResultData setAddMiracleList(
final RogueMiracleDataOuterClass.RogueMiracleData value) {
- bitField0_ |= 0x00000008;
+ clearResultActionOtherAddMiracleList();
+ bitField0_ |= 0x00000004;
addMiracleList.copyFrom(value);
return this;
}
/**
- * optional .RogueBuffData add_buff_list = 1583;
+ * optional .RogueBuffData remove_buff_list = 1574;
+ * @return whether the removeBuffList field is set
+ */
+ public boolean hasRemoveBuffList() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional .RogueBuffData remove_buff_list = 1574;
+ * @return this
+ */
+ public RogueActionResultData clearRemoveBuffList() {
+ bitField0_ &= ~0x00000008;
+ removeBuffList.clear();
+ return this;
+ }
+
+ /**
+ * optional .RogueBuffData remove_buff_list = 1574;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableRemoveBuffList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RogueBuffDataOuterClass.RogueBuffData getRemoveBuffList() {
+ return removeBuffList;
+ }
+
+ /**
+ * optional .RogueBuffData remove_buff_list = 1574;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RogueBuffDataOuterClass.RogueBuffData getMutableRemoveBuffList() {
+ clearResultActionOtherRemoveBuffList();
+ bitField0_ |= 0x00000008;
+ return removeBuffList;
+ }
+
+ /**
+ * optional .RogueBuffData remove_buff_list = 1574;
+ * @param value the removeBuffList to set
+ * @return this
+ */
+ public RogueActionResultData setRemoveBuffList(
+ final RogueBuffDataOuterClass.RogueBuffData value) {
+ clearResultActionOtherRemoveBuffList();
+ bitField0_ |= 0x00000008;
+ removeBuffList.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional .RogueBuffData add_buff_list = 1586;
* @return whether the addBuffList field is set
*/
public boolean hasAddBuffList() {
@@ -294,7 +362,7 @@ public final class RogueActionResultDataOuterClass {
}
/**
- * optional .RogueBuffData add_buff_list = 1583;
+ * optional .RogueBuffData add_buff_list = 1586;
* @return this
*/
public RogueActionResultData clearAddBuffList() {
@@ -304,7 +372,7 @@ public final class RogueActionResultDataOuterClass {
}
/**
- * optional .RogueBuffData add_buff_list = 1583;
+ * optional .RogueBuffData add_buff_list = 1586;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -318,7 +386,7 @@ public final class RogueActionResultDataOuterClass {
}
/**
- * optional .RogueBuffData add_buff_list = 1583;
+ * optional .RogueBuffData add_buff_list = 1586;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -327,16 +395,18 @@ public final class RogueActionResultDataOuterClass {
* @return internal storage object for modifications
*/
public RogueBuffDataOuterClass.RogueBuffData getMutableAddBuffList() {
+ clearResultActionOtherAddBuffList();
bitField0_ |= 0x00000010;
return addBuffList;
}
/**
- * optional .RogueBuffData add_buff_list = 1583;
+ * optional .RogueBuffData add_buff_list = 1586;
* @param value the addBuffList to set
* @return this
*/
public RogueActionResultData setAddBuffList(final RogueBuffDataOuterClass.RogueBuffData value) {
+ clearResultActionOtherAddBuffList();
bitField0_ |= 0x00000010;
addBuffList.copyFrom(value);
return this;
@@ -347,10 +417,10 @@ public final class RogueActionResultDataOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- removeItemList.copyFrom(other.removeItemList);
addItemList.copyFrom(other.addItemList);
- removeBuffList.copyFrom(other.removeBuffList);
+ removeItemList.copyFrom(other.removeItemList);
addMiracleList.copyFrom(other.addMiracleList);
+ removeBuffList.copyFrom(other.removeBuffList);
addBuffList.copyFrom(other.addBuffList);
}
return this;
@@ -362,18 +432,18 @@ public final class RogueActionResultDataOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasRemoveItemList()) {
- getMutableRemoveItemList().mergeFrom(other.removeItemList);
- }
if (other.hasAddItemList()) {
getMutableAddItemList().mergeFrom(other.addItemList);
}
- if (other.hasRemoveBuffList()) {
- getMutableRemoveBuffList().mergeFrom(other.removeBuffList);
+ if (other.hasRemoveItemList()) {
+ getMutableRemoveItemList().mergeFrom(other.removeItemList);
}
if (other.hasAddMiracleList()) {
getMutableAddMiracleList().mergeFrom(other.addMiracleList);
}
+ if (other.hasRemoveBuffList()) {
+ getMutableRemoveBuffList().mergeFrom(other.removeBuffList);
+ }
if (other.hasAddBuffList()) {
getMutableAddBuffList().mergeFrom(other.addBuffList);
}
@@ -387,10 +457,10 @@ public final class RogueActionResultDataOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- removeItemList.clear();
addItemList.clear();
- removeBuffList.clear();
+ removeItemList.clear();
addMiracleList.clear();
+ removeBuffList.clear();
addBuffList.clear();
return this;
}
@@ -402,10 +472,10 @@ public final class RogueActionResultDataOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- removeItemList.clearQuick();
addItemList.clearQuick();
- removeBuffList.clearQuick();
+ removeItemList.clearQuick();
addMiracleList.clearQuick();
+ removeBuffList.clearQuick();
addBuffList.clearQuick();
return this;
}
@@ -420,33 +490,33 @@ public final class RogueActionResultDataOuterClass {
}
RogueActionResultData other = (RogueActionResultData) o;
return bitField0_ == other.bitField0_
- && (!hasRemoveItemList() || removeItemList.equals(other.removeItemList))
&& (!hasAddItemList() || addItemList.equals(other.addItemList))
- && (!hasRemoveBuffList() || removeBuffList.equals(other.removeBuffList))
+ && (!hasRemoveItemList() || removeItemList.equals(other.removeItemList))
&& (!hasAddMiracleList() || addMiracleList.equals(other.addMiracleList))
+ && (!hasRemoveBuffList() || removeBuffList.equals(other.removeBuffList))
&& (!hasAddBuffList() || addBuffList.equals(other.addBuffList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 98);
- output.writeMessageNoTag(removeItemList);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 106);
+ output.writeRawByte((byte) 90);
output.writeMessageNoTag(addItemList);
}
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawLittleEndian16((short) 13202);
- output.writeMessageNoTag(removeBuffList);
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 114);
+ output.writeMessageNoTag(removeItemList);
}
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawLittleEndian16((short) 19154);
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawLittleEndian16((short) 8354);
output.writeMessageNoTag(addMiracleList);
}
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeRawLittleEndian16((short) 25266);
+ output.writeMessageNoTag(removeBuffList);
+ }
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawLittleEndian16((short) 25338);
+ output.writeRawLittleEndian16((short) 25490);
output.writeMessageNoTag(addBuffList);
}
}
@@ -455,16 +525,16 @@ public final class RogueActionResultDataOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(removeItemList);
- }
- if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(addItemList);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ size += 1 + ProtoSink.computeMessageSizeNoTag(removeItemList);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- size += 2 + ProtoSink.computeMessageSizeNoTag(removeBuffList);
+ size += 2 + ProtoSink.computeMessageSizeNoTag(addMiracleList);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 2 + ProtoSink.computeMessageSizeNoTag(addMiracleList);
+ size += 2 + ProtoSink.computeMessageSizeNoTag(removeBuffList);
}
if ((bitField0_ & 0x00000010) != 0) {
size += 2 + ProtoSink.computeMessageSizeNoTag(addBuffList);
@@ -479,44 +549,49 @@ public final class RogueActionResultDataOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 98: {
- // removeItemList
- input.readMessage(removeItemList);
+ case 90: {
+ // addItemList
+ clearResultActionOtherAddItemList();
+ input.readMessage(addItemList);
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 106) {
+ if (tag != 114) {
break;
}
}
- case 106: {
- // addItemList
- input.readMessage(addItemList);
+ case 114: {
+ // removeItemList
+ clearResultActionOtherRemoveItemList();
+ input.readMessage(removeItemList);
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 6546) {
+ if (tag != 4130) {
break;
}
}
- case 6546: {
- // removeBuffList
- input.readMessage(removeBuffList);
+ case 4130: {
+ // addMiracleList
+ clearResultActionOtherAddMiracleList();
+ input.readMessage(addMiracleList);
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 9554) {
+ if (tag != 12594) {
break;
}
}
- case 9554: {
- // addMiracleList
- input.readMessage(addMiracleList);
+ case 12594: {
+ // removeBuffList
+ clearResultActionOtherRemoveBuffList();
+ input.readMessage(removeBuffList);
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 12666) {
+ if (tag != 12690) {
break;
}
}
- case 12666: {
+ case 12690: {
// addBuffList
+ clearResultActionOtherAddBuffList();
input.readMessage(addBuffList);
bitField0_ |= 0x00000010;
tag = input.readTag();
@@ -542,16 +617,16 @@ public final class RogueActionResultDataOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeMessage(FieldNames.removeItemList, removeItemList);
- }
- if ((bitField0_ & 0x00000002) != 0) {
output.writeMessage(FieldNames.addItemList, addItemList);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeMessage(FieldNames.removeItemList, removeItemList);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeMessage(FieldNames.removeBuffList, removeBuffList);
+ output.writeMessage(FieldNames.addMiracleList, addMiracleList);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeMessage(FieldNames.addMiracleList, addMiracleList);
+ output.writeMessage(FieldNames.removeBuffList, removeBuffList);
}
if ((bitField0_ & 0x00000010) != 0) {
output.writeMessage(FieldNames.addBuffList, addBuffList);
@@ -566,11 +641,12 @@ public final class RogueActionResultDataOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -417171723:
- case -293666737: {
- if (input.isAtField(FieldNames.removeItemList)) {
+ case 203000338:
+ case -1308770260: {
+ if (input.isAtField(FieldNames.addItemList)) {
if (!input.trySkipNullValue()) {
- input.readMessage(removeItemList);
+ clearResultActionOtherAddItemList();
+ input.readMessage(addItemList);
bitField0_ |= 0x00000001;
}
} else {
@@ -578,11 +654,12 @@ public final class RogueActionResultDataOuterClass {
}
break;
}
- case 203000338:
- case -1308770260: {
- if (input.isAtField(FieldNames.addItemList)) {
+ case -417171723:
+ case -293666737: {
+ if (input.isAtField(FieldNames.removeItemList)) {
if (!input.trySkipNullValue()) {
- input.readMessage(addItemList);
+ clearResultActionOtherRemoveItemList();
+ input.readMessage(removeItemList);
bitField0_ |= 0x00000002;
}
} else {
@@ -590,23 +667,25 @@ public final class RogueActionResultDataOuterClass {
}
break;
}
- case 1177726005:
- case 1903522575: {
- if (input.isAtField(FieldNames.removeBuffList)) {
- if (!input.trySkipNullValue()) {
- input.readMessage(removeBuffList);
- bitField0_ |= 0x00000004;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 1381554510:
case -850648438: {
if (input.isAtField(FieldNames.addMiracleList)) {
if (!input.trySkipNullValue()) {
+ clearResultActionOtherAddMiracleList();
input.readMessage(addMiracleList);
+ bitField0_ |= 0x00000004;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 1177726005:
+ case 1903522575: {
+ if (input.isAtField(FieldNames.removeBuffList)) {
+ if (!input.trySkipNullValue()) {
+ clearResultActionOtherRemoveBuffList();
+ input.readMessage(removeBuffList);
bitField0_ |= 0x00000008;
}
} else {
@@ -618,6 +697,7 @@ public final class RogueActionResultDataOuterClass {
case 888419052: {
if (input.isAtField(FieldNames.addBuffList)) {
if (!input.trySkipNullValue()) {
+ clearResultActionOtherAddBuffList();
input.readMessage(addBuffList);
bitField0_ |= 0x00000010;
}
@@ -679,14 +759,14 @@ public final class RogueActionResultDataOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName removeItemList = FieldName.forField("removeItemList", "remove_item_list");
-
static final FieldName addItemList = FieldName.forField("addItemList", "add_item_list");
- static final FieldName removeBuffList = FieldName.forField("removeBuffList", "remove_buff_list");
+ static final FieldName removeItemList = FieldName.forField("removeItemList", "remove_item_list");
static final FieldName addMiracleList = FieldName.forField("addMiracleList", "add_miracle_list");
+ static final FieldName removeBuffList = FieldName.forField("removeBuffList", "remove_buff_list");
+
static final FieldName addBuffList = FieldName.forField("addBuffList", "add_buff_list");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/RogueActionResultOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueActionResultOuterClass.java
index 409655c..91709e6 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueActionResultOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueActionResultOuterClass.java
@@ -19,12 +19,12 @@ public final class RogueActionResultOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .RogueBuffSource source = 11;
+ * optional .RogueBuffSource source = 10;
*/
private int source;
/**
- * optional .RogueActionResultData rogue_action = 15;
+ * optional .RogueActionResultData rogue_action = 5;
*/
private final RogueActionResultDataOuterClass.RogueActionResultData rogueAction = RogueActionResultDataOuterClass.RogueActionResultData.newInstance();
@@ -39,7 +39,7 @@ public final class RogueActionResultOuterClass {
}
/**
- * optional .RogueBuffSource source = 11;
+ * optional .RogueBuffSource source = 10;
* @return whether the source field is set
*/
public boolean hasSource() {
@@ -47,7 +47,7 @@ public final class RogueActionResultOuterClass {
}
/**
- * optional .RogueBuffSource source = 11;
+ * optional .RogueBuffSource source = 10;
* @return this
*/
public RogueActionResult clearSource() {
@@ -57,7 +57,7 @@ public final class RogueActionResultOuterClass {
}
/**
- * optional .RogueBuffSource source = 11;
+ * optional .RogueBuffSource source = 10;
* @return the source
*/
public RogueBuffSourceOuterClass.RogueBuffSource getSource() {
@@ -90,7 +90,7 @@ public final class RogueActionResultOuterClass {
}
/**
- * optional .RogueBuffSource source = 11;
+ * optional .RogueBuffSource source = 10;
* @param value the source to set
* @return this
*/
@@ -101,7 +101,7 @@ public final class RogueActionResultOuterClass {
}
/**
- * optional .RogueActionResultData rogue_action = 15;
+ * optional .RogueActionResultData rogue_action = 5;
* @return whether the rogueAction field is set
*/
public boolean hasRogueAction() {
@@ -109,7 +109,7 @@ public final class RogueActionResultOuterClass {
}
/**
- * optional .RogueActionResultData rogue_action = 15;
+ * optional .RogueActionResultData rogue_action = 5;
* @return this
*/
public RogueActionResult clearRogueAction() {
@@ -119,7 +119,7 @@ public final class RogueActionResultOuterClass {
}
/**
- * optional .RogueActionResultData rogue_action = 15;
+ * optional .RogueActionResultData rogue_action = 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.
@@ -133,7 +133,7 @@ public final class RogueActionResultOuterClass {
}
/**
- * optional .RogueActionResultData rogue_action = 15;
+ * optional .RogueActionResultData rogue_action = 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
@@ -147,7 +147,7 @@ public final class RogueActionResultOuterClass {
}
/**
- * optional .RogueActionResultData rogue_action = 15;
+ * optional .RogueActionResultData rogue_action = 5;
* @param value the rogueAction to set
* @return this
*/
@@ -224,11 +224,11 @@ public final class RogueActionResultOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 80);
output.writeEnumNoTag(source);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 122);
+ output.writeRawByte((byte) 42);
output.writeMessageNoTag(rogueAction);
}
}
@@ -252,7 +252,7 @@ public final class RogueActionResultOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 88: {
+ case 80: {
// source
final int value = input.readInt32();
if (RogueBuffSourceOuterClass.RogueBuffSource.forNumber(value) != null) {
@@ -260,11 +260,11 @@ public final class RogueActionResultOuterClass {
bitField0_ |= 0x00000001;
}
tag = input.readTag();
- if (tag != 122) {
+ if (tag != 42) {
break;
}
}
- case 122: {
+ case 42: {
// rogueAction
input.readMessage(rogueAction);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java
index f1abdf0..b1b5ad3 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java
@@ -20,22 +20,22 @@ public final class RogueAeonInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 NFFJHLFKCPE = 11;
- */
- private int nFFJHLFKCPE;
-
- /**
- * optional uint32 unlock_aeon_num = 15;
+ * optional uint32 unlock_aeon_num = 7;
*/
private int unlockAeonNum;
/**
- * optional bool is_unlocked = 5;
+ * optional uint32 unlock_aeon_enhance_num = 11;
+ */
+ private int unlockAeonEnhanceNum;
+
+ /**
+ * optional bool is_unlocked = 15;
*/
private boolean isUnlocked;
/**
- * repeated uint32 aeon_id_list = 13;
+ * repeated uint32 aeon_id_list = 2;
*/
private final RepeatedInt aeonIdList = RepeatedInt.newEmptyInstance();
@@ -50,62 +50,25 @@ public final class RogueAeonInfoOuterClass {
}
/**
- * optional uint32 NFFJHLFKCPE = 11;
- * @return whether the nFFJHLFKCPE field is set
+ * optional uint32 unlock_aeon_num = 7;
+ * @return whether the unlockAeonNum field is set
*/
- public boolean hasNFFJHLFKCPE() {
+ public boolean hasUnlockAeonNum() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 NFFJHLFKCPE = 11;
- * @return this
- */
- public RogueAeonInfo clearNFFJHLFKCPE() {
- bitField0_ &= ~0x00000001;
- nFFJHLFKCPE = 0;
- return this;
- }
-
- /**
- * optional uint32 NFFJHLFKCPE = 11;
- * @return the nFFJHLFKCPE
- */
- public int getNFFJHLFKCPE() {
- return nFFJHLFKCPE;
- }
-
- /**
- * optional uint32 NFFJHLFKCPE = 11;
- * @param value the nFFJHLFKCPE to set
- * @return this
- */
- public RogueAeonInfo setNFFJHLFKCPE(final int value) {
- bitField0_ |= 0x00000001;
- nFFJHLFKCPE = value;
- return this;
- }
-
- /**
- * optional uint32 unlock_aeon_num = 15;
- * @return whether the unlockAeonNum field is set
- */
- public boolean hasUnlockAeonNum() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 unlock_aeon_num = 15;
+ * optional uint32 unlock_aeon_num = 7;
* @return this
*/
public RogueAeonInfo clearUnlockAeonNum() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
unlockAeonNum = 0;
return this;
}
/**
- * optional uint32 unlock_aeon_num = 15;
+ * optional uint32 unlock_aeon_num = 7;
* @return the unlockAeonNum
*/
public int getUnlockAeonNum() {
@@ -113,18 +76,55 @@ public final class RogueAeonInfoOuterClass {
}
/**
- * optional uint32 unlock_aeon_num = 15;
+ * optional uint32 unlock_aeon_num = 7;
* @param value the unlockAeonNum to set
* @return this
*/
public RogueAeonInfo setUnlockAeonNum(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
unlockAeonNum = value;
return this;
}
/**
- * optional bool is_unlocked = 5;
+ * optional uint32 unlock_aeon_enhance_num = 11;
+ * @return whether the unlockAeonEnhanceNum field is set
+ */
+ public boolean hasUnlockAeonEnhanceNum() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 unlock_aeon_enhance_num = 11;
+ * @return this
+ */
+ public RogueAeonInfo clearUnlockAeonEnhanceNum() {
+ bitField0_ &= ~0x00000002;
+ unlockAeonEnhanceNum = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 unlock_aeon_enhance_num = 11;
+ * @return the unlockAeonEnhanceNum
+ */
+ public int getUnlockAeonEnhanceNum() {
+ return unlockAeonEnhanceNum;
+ }
+
+ /**
+ * optional uint32 unlock_aeon_enhance_num = 11;
+ * @param value the unlockAeonEnhanceNum to set
+ * @return this
+ */
+ public RogueAeonInfo setUnlockAeonEnhanceNum(final int value) {
+ bitField0_ |= 0x00000002;
+ unlockAeonEnhanceNum = value;
+ return this;
+ }
+
+ /**
+ * optional bool is_unlocked = 15;
* @return whether the isUnlocked field is set
*/
public boolean hasIsUnlocked() {
@@ -132,7 +132,7 @@ public final class RogueAeonInfoOuterClass {
}
/**
- * optional bool is_unlocked = 5;
+ * optional bool is_unlocked = 15;
* @return this
*/
public RogueAeonInfo clearIsUnlocked() {
@@ -142,7 +142,7 @@ public final class RogueAeonInfoOuterClass {
}
/**
- * optional bool is_unlocked = 5;
+ * optional bool is_unlocked = 15;
* @return the isUnlocked
*/
public boolean getIsUnlocked() {
@@ -150,7 +150,7 @@ public final class RogueAeonInfoOuterClass {
}
/**
- * optional bool is_unlocked = 5;
+ * optional bool is_unlocked = 15;
* @param value the isUnlocked to set
* @return this
*/
@@ -161,7 +161,7 @@ public final class RogueAeonInfoOuterClass {
}
/**
- * repeated uint32 aeon_id_list = 13;
+ * repeated uint32 aeon_id_list = 2;
* @return whether the aeonIdList field is set
*/
public boolean hasAeonIdList() {
@@ -169,7 +169,7 @@ public final class RogueAeonInfoOuterClass {
}
/**
- * repeated uint32 aeon_id_list = 13;
+ * repeated uint32 aeon_id_list = 2;
* @return this
*/
public RogueAeonInfo clearAeonIdList() {
@@ -179,7 +179,7 @@ public final class RogueAeonInfoOuterClass {
}
/**
- * repeated uint32 aeon_id_list = 13;
+ * repeated uint32 aeon_id_list = 2;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -193,7 +193,7 @@ public final class RogueAeonInfoOuterClass {
}
/**
- * repeated uint32 aeon_id_list = 13;
+ * repeated uint32 aeon_id_list = 2;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -207,7 +207,7 @@ public final class RogueAeonInfoOuterClass {
}
/**
- * repeated uint32 aeon_id_list = 13;
+ * repeated uint32 aeon_id_list = 2;
* @param value the aeonIdList to add
* @return this
*/
@@ -218,7 +218,7 @@ public final class RogueAeonInfoOuterClass {
}
/**
- * repeated uint32 aeon_id_list = 13;
+ * repeated uint32 aeon_id_list = 2;
* @param values the aeonIdList to add
* @return this
*/
@@ -233,8 +233,8 @@ public final class RogueAeonInfoOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- nFFJHLFKCPE = other.nFFJHLFKCPE;
unlockAeonNum = other.unlockAeonNum;
+ unlockAeonEnhanceNum = other.unlockAeonEnhanceNum;
isUnlocked = other.isUnlocked;
aeonIdList.copyFrom(other.aeonIdList);
}
@@ -247,12 +247,12 @@ public final class RogueAeonInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasNFFJHLFKCPE()) {
- setNFFJHLFKCPE(other.nFFJHLFKCPE);
- }
if (other.hasUnlockAeonNum()) {
setUnlockAeonNum(other.unlockAeonNum);
}
+ if (other.hasUnlockAeonEnhanceNum()) {
+ setUnlockAeonEnhanceNum(other.unlockAeonEnhanceNum);
+ }
if (other.hasIsUnlocked()) {
setIsUnlocked(other.isUnlocked);
}
@@ -269,8 +269,8 @@ public final class RogueAeonInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- nFFJHLFKCPE = 0;
unlockAeonNum = 0;
+ unlockAeonEnhanceNum = 0;
isUnlocked = false;
aeonIdList.clear();
return this;
@@ -297,8 +297,8 @@ public final class RogueAeonInfoOuterClass {
}
RogueAeonInfo other = (RogueAeonInfo) o;
return bitField0_ == other.bitField0_
- && (!hasNFFJHLFKCPE() || nFFJHLFKCPE == other.nFFJHLFKCPE)
&& (!hasUnlockAeonNum() || unlockAeonNum == other.unlockAeonNum)
+ && (!hasUnlockAeonEnhanceNum() || unlockAeonEnhanceNum == other.unlockAeonEnhanceNum)
&& (!hasIsUnlocked() || isUnlocked == other.isUnlocked)
&& (!hasAeonIdList() || aeonIdList.equals(other.aeonIdList));
}
@@ -306,20 +306,20 @@ public final class RogueAeonInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 88);
- output.writeUInt32NoTag(nFFJHLFKCPE);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(unlockAeonNum);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 88);
+ output.writeUInt32NoTag(unlockAeonEnhanceNum);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 120);
output.writeBoolNoTag(isUnlocked);
}
if ((bitField0_ & 0x00000008) != 0) {
for (int i = 0; i < aeonIdList.length(); i++) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(aeonIdList.array()[i]);
}
}
@@ -329,10 +329,10 @@ public final class RogueAeonInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(nFFJHLFKCPE);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockAeonNum);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockAeonNum);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockAeonEnhanceNum);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 2;
@@ -350,34 +350,34 @@ public final class RogueAeonInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 88: {
- // nFFJHLFKCPE
- nFFJHLFKCPE = input.readUInt32();
+ case 56: {
+ // unlockAeonNum
+ unlockAeonNum = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
+ if (tag != 88) {
+ break;
+ }
+ }
+ case 88: {
+ // unlockAeonEnhanceNum
+ unlockAeonEnhanceNum = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
if (tag != 120) {
break;
}
}
case 120: {
- // unlockAeonNum
- unlockAeonNum = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 40) {
- break;
- }
- }
- case 40: {
// isUnlocked
isUnlocked = input.readBool();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 106) {
+ if (tag != 18) {
break;
}
}
- case 106: {
+ case 18: {
// aeonIdList [packed=true]
input.readPackedUInt32(aeonIdList, tag);
bitField0_ |= 0x00000008;
@@ -396,7 +396,7 @@ public final class RogueAeonInfoOuterClass {
tag = input.readTag();
break;
}
- case 104: {
+ case 16: {
// aeonIdList [packed=false]
tag = input.readRepeatedUInt32(aeonIdList, tag);
bitField0_ |= 0x00000008;
@@ -410,10 +410,10 @@ public final class RogueAeonInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.nFFJHLFKCPE, nFFJHLFKCPE);
+ output.writeUInt32(FieldNames.unlockAeonNum, unlockAeonNum);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.unlockAeonNum, unlockAeonNum);
+ output.writeUInt32(FieldNames.unlockAeonEnhanceNum, unlockAeonEnhanceNum);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeBool(FieldNames.isUnlocked, isUnlocked);
@@ -431,10 +431,11 @@ public final class RogueAeonInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 570375187: {
- if (input.isAtField(FieldNames.nFFJHLFKCPE)) {
+ case -281209953:
+ case -952729371: {
+ if (input.isAtField(FieldNames.unlockAeonNum)) {
if (!input.trySkipNullValue()) {
- nFFJHLFKCPE = input.readUInt32();
+ unlockAeonNum = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -442,11 +443,11 @@ public final class RogueAeonInfoOuterClass {
}
break;
}
- case -281209953:
- case -952729371: {
- if (input.isAtField(FieldNames.unlockAeonNum)) {
+ case 1040991167:
+ case 7773396: {
+ if (input.isAtField(FieldNames.unlockAeonEnhanceNum)) {
if (!input.trySkipNullValue()) {
- unlockAeonNum = input.readUInt32();
+ unlockAeonEnhanceNum = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -530,10 +531,10 @@ public final class RogueAeonInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName nFFJHLFKCPE = FieldName.forField("NFFJHLFKCPE");
-
static final FieldName unlockAeonNum = FieldName.forField("unlockAeonNum", "unlock_aeon_num");
+ static final FieldName unlockAeonEnhanceNum = FieldName.forField("unlockAeonEnhanceNum", "unlock_aeon_enhance_num");
+
static final FieldName isUnlocked = FieldName.forField("isUnlocked", "is_unlocked");
static final FieldName aeonIdList = FieldName.forField("aeonIdList", "aeon_id_list");
diff --git a/src/generated/main/emu/lunarcore/proto/RogueAreaInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAreaInfoOuterClass.java
index 8ee9e8f..0f50f93 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueAreaInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueAreaInfoOuterClass.java
@@ -20,7 +20,7 @@ public final class RogueAreaInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated .RogueArea rogue_area = 7;
+ * repeated .RogueArea rogue_area = 15;
*/
private final RepeatedMessagerepeated .RogueArea rogue_area = 7;
+ * repeated .RogueArea rogue_area = 15;
* @return whether the rogueArea field is set
*/
public boolean hasRogueArea() {
@@ -43,7 +43,7 @@ public final class RogueAreaInfoOuterClass {
}
/**
- * repeated .RogueArea rogue_area = 7;
+ * repeated .RogueArea rogue_area = 15;
* @return this
*/
public RogueAreaInfo clearRogueArea() {
@@ -53,7 +53,7 @@ public final class RogueAreaInfoOuterClass {
}
/**
- * repeated .RogueArea rogue_area = 7;
+ * repeated .RogueArea rogue_area = 15;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class RogueAreaInfoOuterClass {
}
/**
- * repeated .RogueArea rogue_area = 7;
+ * repeated .RogueArea rogue_area = 15;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class RogueAreaInfoOuterClass {
}
/**
- * repeated .RogueArea rogue_area = 7;
+ * repeated .RogueArea rogue_area = 15;
* @param value the rogueArea to add
* @return this
*/
@@ -92,7 +92,7 @@ public final class RogueAreaInfoOuterClass {
}
/**
- * repeated .RogueArea rogue_area = 7;
+ * repeated .RogueArea rogue_area = 15;
* @param values the rogueArea to add
* @return this
*/
@@ -163,7 +163,7 @@ public final class RogueAreaInfoOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < rogueArea.length(); i++) {
- output.writeRawByte((byte) 58);
+ output.writeRawByte((byte) 122);
output.writeMessageNoTag(rogueArea.get(i));
}
}
@@ -185,7 +185,7 @@ public final class RogueAreaInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 58: {
+ case 122: {
// rogueArea
tag = input.readRepeatedMessage(rogueArea, tag);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueAreaOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAreaOuterClass.java
index 7266818..8348672 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueAreaOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueAreaOuterClass.java
@@ -19,32 +19,32 @@ public final class RogueAreaOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 rogue_area_status = 1;
+ * optional uint32 rogue_area_status = 2;
*/
private int rogueAreaStatus;
/**
- * optional uint32 area_id = 2;
- */
- private int areaId;
-
- /**
- * optional uint32 rogue_status = 4;
- */
- private int rogueStatus;
-
- /**
- * optional uint32 cur_reach_room_num = 6;
- */
- private int curReachRoomNum;
-
- /**
- * optional uint32 map_id = 15;
+ * optional uint32 map_id = 3;
*/
private int mapId;
/**
- * optional bool has_taken_rewards = 11;
+ * optional uint32 rogue_status = 5;
+ */
+ private int rogueStatus;
+
+ /**
+ * optional uint32 area_id = 8;
+ */
+ private int areaId;
+
+ /**
+ * optional uint32 cur_reach_room_num = 14;
+ */
+ private int curReachRoomNum;
+
+ /**
+ * optional bool has_taken_rewards = 9;
*/
private boolean hasTakenRewards;
@@ -59,7 +59,7 @@ public final class RogueAreaOuterClass {
}
/**
- * optional uint32 rogue_area_status = 1;
+ * optional uint32 rogue_area_status = 2;
* @return whether the rogueAreaStatus field is set
*/
public boolean hasRogueAreaStatus() {
@@ -67,7 +67,7 @@ public final class RogueAreaOuterClass {
}
/**
- * optional uint32 rogue_area_status = 1;
+ * optional uint32 rogue_area_status = 2;
* @return this
*/
public RogueArea clearRogueAreaStatus() {
@@ -77,7 +77,7 @@ public final class RogueAreaOuterClass {
}
/**
- * optional uint32 rogue_area_status = 1;
+ * optional uint32 rogue_area_status = 2;
* @return the rogueAreaStatus
*/
public int getRogueAreaStatus() {
@@ -85,7 +85,7 @@ public final class RogueAreaOuterClass {
}
/**
- * optional uint32 rogue_area_status = 1;
+ * optional uint32 rogue_area_status = 2;
* @param value the rogueAreaStatus to set
* @return this
*/
@@ -96,44 +96,44 @@ public final class RogueAreaOuterClass {
}
/**
- * optional uint32 area_id = 2;
- * @return whether the areaId field is set
+ * optional uint32 map_id = 3;
+ * @return whether the mapId field is set
*/
- public boolean hasAreaId() {
+ public boolean hasMapId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 area_id = 2;
+ * optional uint32 map_id = 3;
* @return this
*/
- public RogueArea clearAreaId() {
+ public RogueArea clearMapId() {
bitField0_ &= ~0x00000002;
- areaId = 0;
+ mapId = 0;
return this;
}
/**
- * optional uint32 area_id = 2;
- * @return the areaId
+ * optional uint32 map_id = 3;
+ * @return the mapId
*/
- public int getAreaId() {
- return areaId;
+ public int getMapId() {
+ return mapId;
}
/**
- * optional uint32 area_id = 2;
- * @param value the areaId to set
+ * optional uint32 map_id = 3;
+ * @param value the mapId to set
* @return this
*/
- public RogueArea setAreaId(final int value) {
+ public RogueArea setMapId(final int value) {
bitField0_ |= 0x00000002;
- areaId = value;
+ mapId = value;
return this;
}
/**
- * optional uint32 rogue_status = 4;
+ * optional uint32 rogue_status = 5;
* @return whether the rogueStatus field is set
*/
public boolean hasRogueStatus() {
@@ -141,7 +141,7 @@ public final class RogueAreaOuterClass {
}
/**
- * optional uint32 rogue_status = 4;
+ * optional uint32 rogue_status = 5;
* @return this
*/
public RogueArea clearRogueStatus() {
@@ -151,7 +151,7 @@ public final class RogueAreaOuterClass {
}
/**
- * optional uint32 rogue_status = 4;
+ * optional uint32 rogue_status = 5;
* @return the rogueStatus
*/
public int getRogueStatus() {
@@ -159,7 +159,7 @@ public final class RogueAreaOuterClass {
}
/**
- * optional uint32 rogue_status = 4;
+ * optional uint32 rogue_status = 5;
* @param value the rogueStatus to set
* @return this
*/
@@ -170,25 +170,62 @@ public final class RogueAreaOuterClass {
}
/**
- * optional uint32 cur_reach_room_num = 6;
- * @return whether the curReachRoomNum field is set
+ * optional uint32 area_id = 8;
+ * @return whether the areaId field is set
*/
- public boolean hasCurReachRoomNum() {
+ public boolean hasAreaId() {
return (bitField0_ & 0x00000008) != 0;
}
/**
- * optional uint32 cur_reach_room_num = 6;
+ * optional uint32 area_id = 8;
+ * @return this
+ */
+ public RogueArea clearAreaId() {
+ bitField0_ &= ~0x00000008;
+ areaId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 area_id = 8;
+ * @return the areaId
+ */
+ public int getAreaId() {
+ return areaId;
+ }
+
+ /**
+ * optional uint32 area_id = 8;
+ * @param value the areaId to set
+ * @return this
+ */
+ public RogueArea setAreaId(final int value) {
+ bitField0_ |= 0x00000008;
+ areaId = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 cur_reach_room_num = 14;
+ * @return whether the curReachRoomNum field is set
+ */
+ public boolean hasCurReachRoomNum() {
+ return (bitField0_ & 0x00000010) != 0;
+ }
+
+ /**
+ * optional uint32 cur_reach_room_num = 14;
* @return this
*/
public RogueArea clearCurReachRoomNum() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000010;
curReachRoomNum = 0;
return this;
}
/**
- * optional uint32 cur_reach_room_num = 6;
+ * optional uint32 cur_reach_room_num = 14;
* @return the curReachRoomNum
*/
public int getCurReachRoomNum() {
@@ -196,55 +233,18 @@ public final class RogueAreaOuterClass {
}
/**
- * optional uint32 cur_reach_room_num = 6;
+ * optional uint32 cur_reach_room_num = 14;
* @param value the curReachRoomNum to set
* @return this
*/
public RogueArea setCurReachRoomNum(final int value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000010;
curReachRoomNum = value;
return this;
}
/**
- * optional uint32 map_id = 15;
- * @return whether the mapId field is set
- */
- public boolean hasMapId() {
- return (bitField0_ & 0x00000010) != 0;
- }
-
- /**
- * optional uint32 map_id = 15;
- * @return this
- */
- public RogueArea clearMapId() {
- bitField0_ &= ~0x00000010;
- mapId = 0;
- return this;
- }
-
- /**
- * optional uint32 map_id = 15;
- * @return the mapId
- */
- public int getMapId() {
- return mapId;
- }
-
- /**
- * optional uint32 map_id = 15;
- * @param value the mapId to set
- * @return this
- */
- public RogueArea setMapId(final int value) {
- bitField0_ |= 0x00000010;
- mapId = value;
- return this;
- }
-
- /**
- * optional bool has_taken_rewards = 11;
+ * optional bool has_taken_rewards = 9;
* @return whether the hasTakenRewards field is set
*/
public boolean hasHasTakenRewards() {
@@ -252,7 +252,7 @@ public final class RogueAreaOuterClass {
}
/**
- * optional bool has_taken_rewards = 11;
+ * optional bool has_taken_rewards = 9;
* @return this
*/
public RogueArea clearHasTakenRewards() {
@@ -262,7 +262,7 @@ public final class RogueAreaOuterClass {
}
/**
- * optional bool has_taken_rewards = 11;
+ * optional bool has_taken_rewards = 9;
* @return the hasTakenRewards
*/
public boolean getHasTakenRewards() {
@@ -270,7 +270,7 @@ public final class RogueAreaOuterClass {
}
/**
- * optional bool has_taken_rewards = 11;
+ * optional bool has_taken_rewards = 9;
* @param value the hasTakenRewards to set
* @return this
*/
@@ -286,10 +286,10 @@ public final class RogueAreaOuterClass {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
rogueAreaStatus = other.rogueAreaStatus;
- areaId = other.areaId;
- rogueStatus = other.rogueStatus;
- curReachRoomNum = other.curReachRoomNum;
mapId = other.mapId;
+ rogueStatus = other.rogueStatus;
+ areaId = other.areaId;
+ curReachRoomNum = other.curReachRoomNum;
hasTakenRewards = other.hasTakenRewards;
}
return this;
@@ -304,18 +304,18 @@ public final class RogueAreaOuterClass {
if (other.hasRogueAreaStatus()) {
setRogueAreaStatus(other.rogueAreaStatus);
}
- if (other.hasAreaId()) {
- setAreaId(other.areaId);
+ if (other.hasMapId()) {
+ setMapId(other.mapId);
}
if (other.hasRogueStatus()) {
setRogueStatus(other.rogueStatus);
}
+ if (other.hasAreaId()) {
+ setAreaId(other.areaId);
+ }
if (other.hasCurReachRoomNum()) {
setCurReachRoomNum(other.curReachRoomNum);
}
- if (other.hasMapId()) {
- setMapId(other.mapId);
- }
if (other.hasHasTakenRewards()) {
setHasTakenRewards(other.hasTakenRewards);
}
@@ -330,10 +330,10 @@ public final class RogueAreaOuterClass {
cachedSize = -1;
bitField0_ = 0;
rogueAreaStatus = 0;
- areaId = 0;
- rogueStatus = 0;
- curReachRoomNum = 0;
mapId = 0;
+ rogueStatus = 0;
+ areaId = 0;
+ curReachRoomNum = 0;
hasTakenRewards = false;
return this;
}
@@ -359,37 +359,37 @@ public final class RogueAreaOuterClass {
RogueArea other = (RogueArea) o;
return bitField0_ == other.bitField0_
&& (!hasRogueAreaStatus() || rogueAreaStatus == other.rogueAreaStatus)
- && (!hasAreaId() || areaId == other.areaId)
- && (!hasRogueStatus() || rogueStatus == other.rogueStatus)
- && (!hasCurReachRoomNum() || curReachRoomNum == other.curReachRoomNum)
&& (!hasMapId() || mapId == other.mapId)
+ && (!hasRogueStatus() || rogueStatus == other.rogueStatus)
+ && (!hasAreaId() || areaId == other.areaId)
+ && (!hasCurReachRoomNum() || curReachRoomNum == other.curReachRoomNum)
&& (!hasHasTakenRewards() || hasTakenRewards == other.hasTakenRewards);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(rogueAreaStatus);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(areaId);
+ output.writeRawByte((byte) 24);
+ output.writeUInt32NoTag(mapId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(rogueStatus);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 48);
- output.writeUInt32NoTag(curReachRoomNum);
+ output.writeRawByte((byte) 64);
+ output.writeUInt32NoTag(areaId);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 120);
- output.writeUInt32NoTag(mapId);
+ output.writeRawByte((byte) 112);
+ output.writeUInt32NoTag(curReachRoomNum);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 72);
output.writeBoolNoTag(hasTakenRewards);
}
}
@@ -401,16 +401,16 @@ public final class RogueAreaOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueAreaStatus);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(areaId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(mapId);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueStatus);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(curReachRoomNum);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(areaId);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(mapId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(curReachRoomNum);
}
if ((bitField0_ & 0x00000020) != 0) {
size += 2;
@@ -425,52 +425,52 @@ public final class RogueAreaOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 16: {
// rogueAreaStatus
rogueAreaStatus = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 16) {
+ if (tag != 24) {
break;
}
}
- case 16: {
- // areaId
- areaId = input.readUInt32();
+ case 24: {
+ // mapId
+ mapId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 32) {
+ if (tag != 40) {
break;
}
}
- case 32: {
+ case 40: {
// rogueStatus
rogueStatus = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 48) {
+ if (tag != 64) {
break;
}
}
- case 48: {
- // curReachRoomNum
- curReachRoomNum = input.readUInt32();
+ case 64: {
+ // areaId
+ areaId = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 112) {
break;
}
}
- case 120: {
- // mapId
- mapId = input.readUInt32();
+ case 112: {
+ // curReachRoomNum
+ curReachRoomNum = input.readUInt32();
bitField0_ |= 0x00000010;
tag = input.readTag();
- if (tag != 88) {
+ if (tag != 72) {
break;
}
}
- case 88: {
+ case 72: {
// hasTakenRewards
hasTakenRewards = input.readBool();
bitField0_ |= 0x00000020;
@@ -500,16 +500,16 @@ public final class RogueAreaOuterClass {
output.writeUInt32(FieldNames.rogueAreaStatus, rogueAreaStatus);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.areaId, areaId);
+ output.writeUInt32(FieldNames.mapId, mapId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.rogueStatus, rogueStatus);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.curReachRoomNum, curReachRoomNum);
+ output.writeUInt32(FieldNames.areaId, areaId);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeUInt32(FieldNames.mapId, mapId);
+ output.writeUInt32(FieldNames.curReachRoomNum, curReachRoomNum);
}
if ((bitField0_ & 0x00000020) != 0) {
output.writeBool(FieldNames.hasTakenRewards, hasTakenRewards);
@@ -536,11 +536,11 @@ public final class RogueAreaOuterClass {
}
break;
}
- case -1409553784:
- case -746472947: {
- if (input.isAtField(FieldNames.areaId)) {
+ case 103663511:
+ case -1081377058: {
+ if (input.isAtField(FieldNames.mapId)) {
if (!input.trySkipNullValue()) {
- areaId = input.readUInt32();
+ mapId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -560,11 +560,11 @@ public final class RogueAreaOuterClass {
}
break;
}
- case 888045080:
- case 328196941: {
- if (input.isAtField(FieldNames.curReachRoomNum)) {
+ case -1409553784:
+ case -746472947: {
+ if (input.isAtField(FieldNames.areaId)) {
if (!input.trySkipNullValue()) {
- curReachRoomNum = input.readUInt32();
+ areaId = input.readUInt32();
bitField0_ |= 0x00000008;
}
} else {
@@ -572,11 +572,11 @@ public final class RogueAreaOuterClass {
}
break;
}
- case 103663511:
- case -1081377058: {
- if (input.isAtField(FieldNames.mapId)) {
+ case 888045080:
+ case 328196941: {
+ if (input.isAtField(FieldNames.curReachRoomNum)) {
if (!input.trySkipNullValue()) {
- mapId = input.readUInt32();
+ curReachRoomNum = input.readUInt32();
bitField0_ |= 0x00000010;
}
} else {
@@ -650,13 +650,13 @@ public final class RogueAreaOuterClass {
static class FieldNames {
static final FieldName rogueAreaStatus = FieldName.forField("rogueAreaStatus", "rogue_area_status");
- static final FieldName areaId = FieldName.forField("areaId", "area_id");
+ static final FieldName mapId = FieldName.forField("mapId", "map_id");
static final FieldName rogueStatus = FieldName.forField("rogueStatus", "rogue_status");
- static final FieldName curReachRoomNum = FieldName.forField("curReachRoomNum", "cur_reach_room_num");
+ static final FieldName areaId = FieldName.forField("areaId", "area_id");
- static final FieldName mapId = FieldName.forField("mapId", "map_id");
+ static final FieldName curReachRoomNum = FieldName.forField("curReachRoomNum", "cur_reach_room_num");
static final FieldName hasTakenRewards = FieldName.forField("hasTakenRewards", "has_taken_rewards");
}
diff --git a/src/generated/main/emu/lunarcore/proto/RogueAvatarInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAvatarInfoOuterClass.java
index 31ad009..643585a 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueAvatarInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueAvatarInfoOuterClass.java
@@ -20,7 +20,7 @@ public final class RogueAvatarInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated uint32 base_avatar_id_list = 8;
+ * repeated uint32 base_avatar_id_list = 7;
*/
private final RepeatedInt baseAvatarIdList = RepeatedInt.newEmptyInstance();
@@ -35,7 +35,7 @@ public final class RogueAvatarInfoOuterClass {
}
/**
- * repeated uint32 base_avatar_id_list = 8;
+ * repeated uint32 base_avatar_id_list = 7;
* @return whether the baseAvatarIdList field is set
*/
public boolean hasBaseAvatarIdList() {
@@ -43,7 +43,7 @@ public final class RogueAvatarInfoOuterClass {
}
/**
- * repeated uint32 base_avatar_id_list = 8;
+ * repeated uint32 base_avatar_id_list = 7;
* @return this
*/
public RogueAvatarInfo clearBaseAvatarIdList() {
@@ -53,7 +53,7 @@ public final class RogueAvatarInfoOuterClass {
}
/**
- * repeated uint32 base_avatar_id_list = 8;
+ * repeated uint32 base_avatar_id_list = 7;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class RogueAvatarInfoOuterClass {
}
/**
- * repeated uint32 base_avatar_id_list = 8;
+ * repeated uint32 base_avatar_id_list = 7;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class RogueAvatarInfoOuterClass {
}
/**
- * repeated uint32 base_avatar_id_list = 8;
+ * repeated uint32 base_avatar_id_list = 7;
* @param value the baseAvatarIdList to add
* @return this
*/
@@ -92,7 +92,7 @@ public final class RogueAvatarInfoOuterClass {
}
/**
- * repeated uint32 base_avatar_id_list = 8;
+ * repeated uint32 base_avatar_id_list = 7;
* @param values the baseAvatarIdList to add
* @return this
*/
@@ -163,7 +163,7 @@ public final class RogueAvatarInfoOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < baseAvatarIdList.length(); i++) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(baseAvatarIdList.array()[i]);
}
}
@@ -185,7 +185,7 @@ public final class RogueAvatarInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 66: {
+ case 58: {
// baseAvatarIdList [packed=true]
input.readPackedUInt32(baseAvatarIdList, tag);
bitField0_ |= 0x00000001;
@@ -204,7 +204,7 @@ public final class RogueAvatarInfoOuterClass {
tag = input.readTag();
break;
}
- case 64: {
+ case 56: {
// baseAvatarIdList [packed=false]
tag = input.readRepeatedUInt32(baseAvatarIdList, tag);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueBonusSelectInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBonusSelectInfoOuterClass.java
index c56df24..8f94628 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueBonusSelectInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueBonusSelectInfoOuterClass.java
@@ -20,7 +20,7 @@ public final class RogueBonusSelectInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated uint32 bonus_info = 11;
+ * repeated uint32 bonus_info = 14;
*/
private final RepeatedInt bonusInfo = RepeatedInt.newEmptyInstance();
@@ -35,7 +35,7 @@ public final class RogueBonusSelectInfoOuterClass {
}
/**
- * repeated uint32 bonus_info = 11;
+ * repeated uint32 bonus_info = 14;
* @return whether the bonusInfo field is set
*/
public boolean hasBonusInfo() {
@@ -43,7 +43,7 @@ public final class RogueBonusSelectInfoOuterClass {
}
/**
- * repeated uint32 bonus_info = 11;
+ * repeated uint32 bonus_info = 14;
* @return this
*/
public RogueBonusSelectInfo clearBonusInfo() {
@@ -53,7 +53,7 @@ public final class RogueBonusSelectInfoOuterClass {
}
/**
- * repeated uint32 bonus_info = 11;
+ * repeated uint32 bonus_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.
@@ -67,7 +67,7 @@ public final class RogueBonusSelectInfoOuterClass {
}
/**
- * repeated uint32 bonus_info = 11;
+ * repeated uint32 bonus_info = 14;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class RogueBonusSelectInfoOuterClass {
}
/**
- * repeated uint32 bonus_info = 11;
+ * repeated uint32 bonus_info = 14;
* @param value the bonusInfo to add
* @return this
*/
@@ -92,7 +92,7 @@ public final class RogueBonusSelectInfoOuterClass {
}
/**
- * repeated uint32 bonus_info = 11;
+ * repeated uint32 bonus_info = 14;
* @param values the bonusInfo to add
* @return this
*/
@@ -163,7 +163,7 @@ public final class RogueBonusSelectInfoOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < bonusInfo.length(); i++) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 112);
output.writeUInt32NoTag(bonusInfo.array()[i]);
}
}
@@ -185,7 +185,7 @@ public final class RogueBonusSelectInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 90: {
+ case 114: {
// bonusInfo [packed=true]
input.readPackedUInt32(bonusInfo, tag);
bitField0_ |= 0x00000001;
@@ -204,7 +204,7 @@ public final class RogueBonusSelectInfoOuterClass {
tag = input.readTag();
break;
}
- case 88: {
+ case 112: {
// bonusInfo [packed=false]
tag = input.readRepeatedUInt32(bonusInfo, tag);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueBonusSelectResultOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBonusSelectResultOuterClass.java
index 5cafe33..affc529 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueBonusSelectResultOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueBonusSelectResultOuterClass.java
@@ -19,7 +19,7 @@ public final class RogueBonusSelectResultOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 bonus_id = 12;
+ * optional uint32 bonus_id = 14;
*/
private int bonusId;
@@ -34,7 +34,7 @@ public final class RogueBonusSelectResultOuterClass {
}
/**
- * optional uint32 bonus_id = 12;
+ * optional uint32 bonus_id = 14;
* @return whether the bonusId field is set
*/
public boolean hasBonusId() {
@@ -42,7 +42,7 @@ public final class RogueBonusSelectResultOuterClass {
}
/**
- * optional uint32 bonus_id = 12;
+ * optional uint32 bonus_id = 14;
* @return this
*/
public RogueBonusSelectResult clearBonusId() {
@@ -52,7 +52,7 @@ public final class RogueBonusSelectResultOuterClass {
}
/**
- * optional uint32 bonus_id = 12;
+ * optional uint32 bonus_id = 14;
* @return the bonusId
*/
public int getBonusId() {
@@ -60,7 +60,7 @@ public final class RogueBonusSelectResultOuterClass {
}
/**
- * optional uint32 bonus_id = 12;
+ * optional uint32 bonus_id = 14;
* @param value the bonusId to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class RogueBonusSelectResultOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 112);
output.writeUInt32NoTag(bonusId);
}
}
@@ -150,7 +150,7 @@ public final class RogueBonusSelectResultOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 96: {
+ case 112: {
// bonusId
bonusId = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueBuffDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBuffDataOuterClass.java
index a9ccbb8..13b95f6 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueBuffDataOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueBuffDataOuterClass.java
@@ -19,15 +19,15 @@ public final class RogueBuffDataOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 buff_id = 5;
- */
- private int buffId;
-
- /**
- * optional uint32 level = 9;
+ * optional uint32 level = 5;
*/
private int level;
+ /**
+ * optional uint32 buff_id = 15;
+ */
+ private int buffId;
+
private RogueBuffData() {
}
@@ -39,62 +39,25 @@ public final class RogueBuffDataOuterClass {
}
/**
- * optional uint32 buff_id = 5;
- * @return whether the buffId field is set
+ * optional uint32 level = 5;
+ * @return whether the level field is set
*/
- public boolean hasBuffId() {
+ public boolean hasLevel() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 buff_id = 5;
- * @return this
- */
- public RogueBuffData clearBuffId() {
- bitField0_ &= ~0x00000001;
- buffId = 0;
- return this;
- }
-
- /**
- * optional uint32 buff_id = 5;
- * @return the buffId
- */
- public int getBuffId() {
- return buffId;
- }
-
- /**
- * optional uint32 buff_id = 5;
- * @param value the buffId to set
- * @return this
- */
- public RogueBuffData setBuffId(final int value) {
- bitField0_ |= 0x00000001;
- buffId = value;
- return this;
- }
-
- /**
- * optional uint32 level = 9;
- * @return whether the level field is set
- */
- public boolean hasLevel() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 level = 9;
+ * optional uint32 level = 5;
* @return this
*/
public RogueBuffData clearLevel() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
level = 0;
return this;
}
/**
- * optional uint32 level = 9;
+ * optional uint32 level = 5;
* @return the level
*/
public int getLevel() {
@@ -102,23 +65,60 @@ public final class RogueBuffDataOuterClass {
}
/**
- * optional uint32 level = 9;
+ * optional uint32 level = 5;
* @param value the level to set
* @return this
*/
public RogueBuffData setLevel(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
level = value;
return this;
}
+ /**
+ * optional uint32 buff_id = 15;
+ * @return whether the buffId field is set
+ */
+ public boolean hasBuffId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 buff_id = 15;
+ * @return this
+ */
+ public RogueBuffData clearBuffId() {
+ bitField0_ &= ~0x00000002;
+ buffId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 buff_id = 15;
+ * @return the buffId
+ */
+ public int getBuffId() {
+ return buffId;
+ }
+
+ /**
+ * optional uint32 buff_id = 15;
+ * @param value the buffId to set
+ * @return this
+ */
+ public RogueBuffData setBuffId(final int value) {
+ bitField0_ |= 0x00000002;
+ buffId = value;
+ return this;
+ }
+
@Override
public RogueBuffData copyFrom(final RogueBuffData other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- buffId = other.buffId;
level = other.level;
+ buffId = other.buffId;
}
return this;
}
@@ -129,12 +129,12 @@ public final class RogueBuffDataOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasBuffId()) {
- setBuffId(other.buffId);
- }
if (other.hasLevel()) {
setLevel(other.level);
}
+ if (other.hasBuffId()) {
+ setBuffId(other.buffId);
+ }
return this;
}
@@ -145,8 +145,8 @@ public final class RogueBuffDataOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- buffId = 0;
level = 0;
+ buffId = 0;
return this;
}
@@ -170,19 +170,19 @@ public final class RogueBuffDataOuterClass {
}
RogueBuffData other = (RogueBuffData) o;
return bitField0_ == other.bitField0_
- && (!hasBuffId() || buffId == other.buffId)
- && (!hasLevel() || level == other.level);
+ && (!hasLevel() || level == other.level)
+ && (!hasBuffId() || buffId == other.buffId);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 40);
- output.writeUInt32NoTag(buffId);
+ output.writeUInt32NoTag(level);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 72);
- output.writeUInt32NoTag(level);
+ output.writeRawByte((byte) 120);
+ output.writeUInt32NoTag(buffId);
}
}
@@ -190,10 +190,10 @@ public final class RogueBuffDataOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId);
}
return size;
}
@@ -206,17 +206,17 @@ public final class RogueBuffDataOuterClass {
while (true) {
switch (tag) {
case 40: {
- // buffId
- buffId = input.readUInt32();
+ // level
+ level = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 72) {
+ if (tag != 120) {
break;
}
}
- case 72: {
- // level
- level = input.readUInt32();
+ case 120: {
+ // buffId
+ buffId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
@@ -241,10 +241,10 @@ public final class RogueBuffDataOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.buffId, buffId);
+ output.writeUInt32(FieldNames.level, level);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.level, level);
+ output.writeUInt32(FieldNames.buffId, buffId);
}
output.endObject();
}
@@ -256,11 +256,10 @@ public final class RogueBuffDataOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1378119474:
- case 227990663: {
- if (input.isAtField(FieldNames.buffId)) {
+ case 102865796: {
+ if (input.isAtField(FieldNames.level)) {
if (!input.trySkipNullValue()) {
- buffId = input.readUInt32();
+ level = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -268,10 +267,11 @@ public final class RogueBuffDataOuterClass {
}
break;
}
- case 102865796: {
- if (input.isAtField(FieldNames.level)) {
+ case -1378119474:
+ case 227990663: {
+ if (input.isAtField(FieldNames.buffId)) {
if (!input.trySkipNullValue()) {
- level = input.readUInt32();
+ buffId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -331,9 +331,9 @@ public final class RogueBuffDataOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName buffId = FieldName.forField("buffId", "buff_id");
-
static final FieldName level = FieldName.forField("level");
+
+ static final FieldName buffId = FieldName.forField("buffId", "buff_id");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceInfoOuterClass.java
index d081de1..2cce8b6 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceInfoOuterClass.java
@@ -20,17 +20,17 @@ public final class RogueBuffEnhanceInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional float unk_float = 14;
+ * optional float unk_float = 10;
*/
private float unkFloat;
/**
- * optional uint32 buff_id = 9;
+ * optional uint32 buff_id = 7;
*/
private int buffId;
/**
- * optional .ItemCostList item_cost_list = 8;
+ * optional .ItemCostList item_cost_list = 3;
*/
private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance();
@@ -45,7 +45,7 @@ public final class RogueBuffEnhanceInfoOuterClass {
}
/**
- * optional float unk_float = 14;
+ * optional float unk_float = 10;
* @return whether the unkFloat field is set
*/
public boolean hasUnkFloat() {
@@ -53,7 +53,7 @@ public final class RogueBuffEnhanceInfoOuterClass {
}
/**
- * optional float unk_float = 14;
+ * optional float unk_float = 10;
* @return this
*/
public RogueBuffEnhanceInfo clearUnkFloat() {
@@ -63,7 +63,7 @@ public final class RogueBuffEnhanceInfoOuterClass {
}
/**
- * optional float unk_float = 14;
+ * optional float unk_float = 10;
* @return the unkFloat
*/
public float getUnkFloat() {
@@ -71,7 +71,7 @@ public final class RogueBuffEnhanceInfoOuterClass {
}
/**
- * optional float unk_float = 14;
+ * optional float unk_float = 10;
* @param value the unkFloat to set
* @return this
*/
@@ -82,7 +82,7 @@ public final class RogueBuffEnhanceInfoOuterClass {
}
/**
- * optional uint32 buff_id = 9;
+ * optional uint32 buff_id = 7;
* @return whether the buffId field is set
*/
public boolean hasBuffId() {
@@ -90,7 +90,7 @@ public final class RogueBuffEnhanceInfoOuterClass {
}
/**
- * optional uint32 buff_id = 9;
+ * optional uint32 buff_id = 7;
* @return this
*/
public RogueBuffEnhanceInfo clearBuffId() {
@@ -100,7 +100,7 @@ public final class RogueBuffEnhanceInfoOuterClass {
}
/**
- * optional uint32 buff_id = 9;
+ * optional uint32 buff_id = 7;
* @return the buffId
*/
public int getBuffId() {
@@ -108,7 +108,7 @@ public final class RogueBuffEnhanceInfoOuterClass {
}
/**
- * optional uint32 buff_id = 9;
+ * optional uint32 buff_id = 7;
* @param value the buffId to set
* @return this
*/
@@ -119,7 +119,7 @@ public final class RogueBuffEnhanceInfoOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 8;
+ * optional .ItemCostList item_cost_list = 3;
* @return whether the itemCostList field is set
*/
public boolean hasItemCostList() {
@@ -127,7 +127,7 @@ public final class RogueBuffEnhanceInfoOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 8;
+ * optional .ItemCostList item_cost_list = 3;
* @return this
*/
public RogueBuffEnhanceInfo clearItemCostList() {
@@ -137,7 +137,7 @@ public final class RogueBuffEnhanceInfoOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 8;
+ * 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.
@@ -151,7 +151,7 @@ public final class RogueBuffEnhanceInfoOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 8;
+ * 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
@@ -165,7 +165,7 @@ public final class RogueBuffEnhanceInfoOuterClass {
}
/**
- * optional .ItemCostList item_cost_list = 8;
+ * optional .ItemCostList item_cost_list = 3;
* @param value the itemCostList to set
* @return this
*/
@@ -247,15 +247,15 @@ public final class RogueBuffEnhanceInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 117);
+ output.writeRawByte((byte) 85);
output.writeFloatNoTag(unkFloat);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(buffId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 66);
+ output.writeRawByte((byte) 26);
output.writeMessageNoTag(itemCostList);
}
}
@@ -282,25 +282,25 @@ public final class RogueBuffEnhanceInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 117: {
+ case 85: {
// unkFloat
unkFloat = input.readFloat();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 72) {
+ if (tag != 56) {
break;
}
}
- case 72: {
+ case 56: {
// buffId
buffId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 66) {
+ if (tag != 26) {
break;
}
}
- case 66: {
+ case 26: {
// itemCostList
input.readMessage(itemCostList);
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceShopInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceShopInfoOuterClass.java
index 3402b21..1bec44c 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceShopInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceShopInfoOuterClass.java
@@ -20,7 +20,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated .RogueBuffEnhanceInfo buff_info = 11;
+ * repeated .RogueBuffEnhanceInfo buff_info = 10;
*/
private final RepeatedMessagerepeated .RogueBuffEnhanceInfo buff_info = 11;
+ * repeated .RogueBuffEnhanceInfo buff_info = 10;
* @return whether the buffInfo field is set
*/
public boolean hasBuffInfo() {
@@ -43,7 +43,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass {
}
/**
- * repeated .RogueBuffEnhanceInfo buff_info = 11;
+ * repeated .RogueBuffEnhanceInfo buff_info = 10;
* @return this
*/
public RogueBuffEnhanceShopInfo clearBuffInfo() {
@@ -53,7 +53,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass {
}
/**
- * repeated .RogueBuffEnhanceInfo buff_info = 11;
+ * repeated .RogueBuffEnhanceInfo buff_info = 10;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass {
}
/**
- * repeated .RogueBuffEnhanceInfo buff_info = 11;
+ * repeated .RogueBuffEnhanceInfo buff_info = 10;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -82,7 +82,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass {
}
/**
- * repeated .RogueBuffEnhanceInfo buff_info = 11;
+ * repeated .RogueBuffEnhanceInfo buff_info = 10;
* @param value the buffInfo to add
* @return this
*/
@@ -94,7 +94,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass {
}
/**
- * repeated .RogueBuffEnhanceInfo buff_info = 11;
+ * repeated .RogueBuffEnhanceInfo buff_info = 10;
* @param values the buffInfo to add
* @return this
*/
@@ -166,7 +166,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < buffInfo.length(); i++) {
- output.writeRawByte((byte) 90);
+ output.writeRawByte((byte) 82);
output.writeMessageNoTag(buffInfo.get(i));
}
}
@@ -188,7 +188,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 90: {
+ case 82: {
// buffInfo
tag = input.readRepeatedMessage(buffInfo, tag);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueBuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBuffInfoOuterClass.java
index c8fcd7a..7293fac 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueBuffInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueBuffInfoOuterClass.java
@@ -20,7 +20,7 @@ public final class RogueBuffInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated .RogueBuff maze_buff_list = 10;
+ * repeated .RogueBuff maze_buff_list = 8;
*/
private final RepeatedMessagerepeated .RogueBuff maze_buff_list = 10;
+ * repeated .RogueBuff maze_buff_list = 8;
* @return whether the mazeBuffList field is set
*/
public boolean hasMazeBuffList() {
@@ -43,7 +43,7 @@ public final class RogueBuffInfoOuterClass {
}
/**
- * repeated .RogueBuff maze_buff_list = 10;
+ * repeated .RogueBuff maze_buff_list = 8;
* @return this
*/
public RogueBuffInfo clearMazeBuffList() {
@@ -53,7 +53,7 @@ public final class RogueBuffInfoOuterClass {
}
/**
- * repeated .RogueBuff maze_buff_list = 10;
+ * repeated .RogueBuff maze_buff_list = 8;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class RogueBuffInfoOuterClass {
}
/**
- * repeated .RogueBuff maze_buff_list = 10;
+ * repeated .RogueBuff maze_buff_list = 8;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class RogueBuffInfoOuterClass {
}
/**
- * repeated .RogueBuff maze_buff_list = 10;
+ * repeated .RogueBuff maze_buff_list = 8;
* @param value the mazeBuffList to add
* @return this
*/
@@ -92,7 +92,7 @@ public final class RogueBuffInfoOuterClass {
}
/**
- * repeated .RogueBuff maze_buff_list = 10;
+ * repeated .RogueBuff maze_buff_list = 8;
* @param values the mazeBuffList to add
* @return this
*/
@@ -163,7 +163,7 @@ public final class RogueBuffInfoOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < mazeBuffList.length(); i++) {
- output.writeRawByte((byte) 82);
+ output.writeRawByte((byte) 66);
output.writeMessageNoTag(mazeBuffList.get(i));
}
}
@@ -185,7 +185,7 @@ public final class RogueBuffInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 82: {
+ case 66: {
// mazeBuffList
tag = input.readRepeatedMessage(mazeBuffList, tag);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueBuffOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBuffOuterClass.java
index fdf7913..5c9f004 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueBuffOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueBuffOuterClass.java
@@ -24,7 +24,7 @@ public final class RogueBuffOuterClass {
private int buffId;
/**
- * optional uint32 level = 8;
+ * optional uint32 level = 11;
*/
private int level;
@@ -76,7 +76,7 @@ public final class RogueBuffOuterClass {
}
/**
- * optional uint32 level = 8;
+ * optional uint32 level = 11;
* @return whether the level field is set
*/
public boolean hasLevel() {
@@ -84,7 +84,7 @@ public final class RogueBuffOuterClass {
}
/**
- * optional uint32 level = 8;
+ * optional uint32 level = 11;
* @return this
*/
public RogueBuff clearLevel() {
@@ -94,7 +94,7 @@ public final class RogueBuffOuterClass {
}
/**
- * optional uint32 level = 8;
+ * optional uint32 level = 11;
* @return the level
*/
public int getLevel() {
@@ -102,7 +102,7 @@ public final class RogueBuffOuterClass {
}
/**
- * optional uint32 level = 8;
+ * optional uint32 level = 11;
* @param value the level to set
* @return this
*/
@@ -181,7 +181,7 @@ public final class RogueBuffOuterClass {
output.writeUInt32NoTag(buffId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(level);
}
}
@@ -210,11 +210,11 @@ public final class RogueBuffOuterClass {
buffId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 64) {
+ if (tag != 88) {
break;
}
}
- case 64: {
+ case 88: {
// level
level = input.readUInt32();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffOuterClass.java
index 2ee3d28..fbaf6e5 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffOuterClass.java
@@ -19,12 +19,12 @@ public final class RogueCommonBuffOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 buff_level = 2;
+ * optional uint32 buff_level = 5;
*/
private int buffLevel;
/**
- * optional uint32 buff_id = 5;
+ * optional uint32 buff_id = 15;
*/
private int buffId;
@@ -39,7 +39,7 @@ public final class RogueCommonBuffOuterClass {
}
/**
- * optional uint32 buff_level = 2;
+ * optional uint32 buff_level = 5;
* @return whether the buffLevel field is set
*/
public boolean hasBuffLevel() {
@@ -47,7 +47,7 @@ public final class RogueCommonBuffOuterClass {
}
/**
- * optional uint32 buff_level = 2;
+ * optional uint32 buff_level = 5;
* @return this
*/
public RogueCommonBuff clearBuffLevel() {
@@ -57,7 +57,7 @@ public final class RogueCommonBuffOuterClass {
}
/**
- * optional uint32 buff_level = 2;
+ * optional uint32 buff_level = 5;
* @return the buffLevel
*/
public int getBuffLevel() {
@@ -65,7 +65,7 @@ public final class RogueCommonBuffOuterClass {
}
/**
- * optional uint32 buff_level = 2;
+ * optional uint32 buff_level = 5;
* @param value the buffLevel to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class RogueCommonBuffOuterClass {
}
/**
- * optional uint32 buff_id = 5;
+ * optional uint32 buff_id = 15;
* @return whether the buffId field is set
*/
public boolean hasBuffId() {
@@ -84,7 +84,7 @@ public final class RogueCommonBuffOuterClass {
}
/**
- * optional uint32 buff_id = 5;
+ * optional uint32 buff_id = 15;
* @return this
*/
public RogueCommonBuff clearBuffId() {
@@ -94,7 +94,7 @@ public final class RogueCommonBuffOuterClass {
}
/**
- * optional uint32 buff_id = 5;
+ * optional uint32 buff_id = 15;
* @return the buffId
*/
public int getBuffId() {
@@ -102,7 +102,7 @@ public final class RogueCommonBuffOuterClass {
}
/**
- * optional uint32 buff_id = 5;
+ * optional uint32 buff_id = 15;
* @param value the buffId to set
* @return this
*/
@@ -177,11 +177,11 @@ public final class RogueCommonBuffOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(buffLevel);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(buffId);
}
}
@@ -205,16 +205,16 @@ public final class RogueCommonBuffOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
+ case 40: {
// buffLevel
buffLevel = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 40) {
+ if (tag != 120) {
break;
}
}
- case 40: {
+ case 120: {
// buffId
buffId = input.readUInt32();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectInfoOuterClass.java
index 24e945d..fae0a20 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectInfoOuterClass.java
@@ -21,62 +21,62 @@ public final class RogueCommonBuffSelectInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 source_total_count = 1;
- */
- private int sourceTotalCount;
-
- /**
- * optional uint32 select_buff_source_hint = 6;
- */
- private int selectBuffSourceHint;
-
- /**
- * optional uint32 roll_buff_times = 8;
- */
- private int rollBuffTimes;
-
- /**
- * optional uint32 roll_buff_max_times = 12;
+ * optional uint32 roll_buff_max_times = 2;
*/
private int rollBuffMaxTimes;
/**
- * optional uint32 roll_buff_free_count = 13;
+ * optional uint32 roll_buff_free_count = 3;
*/
private int rollBuffFreeCount;
/**
- * optional uint32 source_cur_count = 15;
+ * optional uint32 source_total_count = 5;
+ */
+ private int sourceTotalCount;
+
+ /**
+ * optional uint32 source_cur_count = 7;
*/
private int sourceCurCount;
/**
- * optional .RogueCommonBuffSelectSource source_type = 9;
+ * optional uint32 select_buff_source_hint = 10;
+ */
+ private int selectBuffSourceHint;
+
+ /**
+ * optional uint32 roll_buff_times = 11;
+ */
+ private int rollBuffTimes;
+
+ /**
+ * optional .RogueCommonBuffSelectSource source_type = 13;
*/
private int sourceType;
/**
- * optional bool can_roll = 14;
+ * optional bool can_roll = 6;
*/
private boolean canRoll;
/**
- * optional .ItemCostList roll_buffs_cost = 2;
+ * optional .ItemCostList roll_buffs_cost = 14;
*/
private final ItemCostListOuterClass.ItemCostList rollBuffsCost = ItemCostListOuterClass.ItemCostList.newInstance();
/**
- * repeated uint32 first_buff_type_list = 7;
+ * repeated uint32 first_buff_type_list = 4;
*/
private final RepeatedInt firstBuffTypeList = RepeatedInt.newEmptyInstance();
/**
- * repeated uint32 handbook_unlock_buff_id_list = 11;
+ * repeated uint32 handbook_unlock_buff_id_list = 8;
*/
private final RepeatedInt handbookUnlockBuffIdList = RepeatedInt.newEmptyInstance();
/**
- * repeated .RogueCommonBuff maze_buff_list = 5;
+ * repeated .RogueCommonBuff maze_buff_list = 12;
*/
private final RepeatedMessageoptional uint32 source_total_count = 1;
- * @return whether the sourceTotalCount field is set
+ * optional uint32 roll_buff_max_times = 2;
+ * @return whether the rollBuffMaxTimes field is set
*/
- public boolean hasSourceTotalCount() {
+ public boolean hasRollBuffMaxTimes() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 source_total_count = 1;
- * @return this
- */
- public RogueCommonBuffSelectInfo clearSourceTotalCount() {
- bitField0_ &= ~0x00000001;
- sourceTotalCount = 0;
- return this;
- }
-
- /**
- * optional uint32 source_total_count = 1;
- * @return the sourceTotalCount
- */
- public int getSourceTotalCount() {
- return sourceTotalCount;
- }
-
- /**
- * optional uint32 source_total_count = 1;
- * @param value the sourceTotalCount to set
- * @return this
- */
- public RogueCommonBuffSelectInfo setSourceTotalCount(final int value) {
- bitField0_ |= 0x00000001;
- sourceTotalCount = value;
- return this;
- }
-
- /**
- * optional uint32 select_buff_source_hint = 6;
- * @return whether the selectBuffSourceHint field is set
- */
- public boolean hasSelectBuffSourceHint() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 select_buff_source_hint = 6;
- * @return this
- */
- public RogueCommonBuffSelectInfo clearSelectBuffSourceHint() {
- bitField0_ &= ~0x00000002;
- selectBuffSourceHint = 0;
- return this;
- }
-
- /**
- * optional uint32 select_buff_source_hint = 6;
- * @return the selectBuffSourceHint
- */
- public int getSelectBuffSourceHint() {
- return selectBuffSourceHint;
- }
-
- /**
- * optional uint32 select_buff_source_hint = 6;
- * @param value the selectBuffSourceHint to set
- * @return this
- */
- public RogueCommonBuffSelectInfo setSelectBuffSourceHint(final int value) {
- bitField0_ |= 0x00000002;
- selectBuffSourceHint = value;
- return this;
- }
-
- /**
- * optional uint32 roll_buff_times = 8;
- * @return whether the rollBuffTimes field is set
- */
- public boolean hasRollBuffTimes() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 roll_buff_times = 8;
- * @return this
- */
- public RogueCommonBuffSelectInfo clearRollBuffTimes() {
- bitField0_ &= ~0x00000004;
- rollBuffTimes = 0;
- return this;
- }
-
- /**
- * optional uint32 roll_buff_times = 8;
- * @return the rollBuffTimes
- */
- public int getRollBuffTimes() {
- return rollBuffTimes;
- }
-
- /**
- * optional uint32 roll_buff_times = 8;
- * @param value the rollBuffTimes to set
- * @return this
- */
- public RogueCommonBuffSelectInfo setRollBuffTimes(final int value) {
- bitField0_ |= 0x00000004;
- rollBuffTimes = value;
- return this;
- }
-
- /**
- * optional uint32 roll_buff_max_times = 12;
- * @return whether the rollBuffMaxTimes field is set
- */
- public boolean hasRollBuffMaxTimes() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional uint32 roll_buff_max_times = 12;
+ * optional uint32 roll_buff_max_times = 2;
* @return this
*/
public RogueCommonBuffSelectInfo clearRollBuffMaxTimes() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000001;
rollBuffMaxTimes = 0;
return this;
}
/**
- * optional uint32 roll_buff_max_times = 12;
+ * optional uint32 roll_buff_max_times = 2;
* @return the rollBuffMaxTimes
*/
public int getRollBuffMaxTimes() {
@@ -228,36 +117,36 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * optional uint32 roll_buff_max_times = 12;
+ * optional uint32 roll_buff_max_times = 2;
* @param value the rollBuffMaxTimes to set
* @return this
*/
public RogueCommonBuffSelectInfo setRollBuffMaxTimes(final int value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000001;
rollBuffMaxTimes = value;
return this;
}
/**
- * optional uint32 roll_buff_free_count = 13;
+ * optional uint32 roll_buff_free_count = 3;
* @return whether the rollBuffFreeCount field is set
*/
public boolean hasRollBuffFreeCount() {
- return (bitField0_ & 0x00000010) != 0;
+ return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 roll_buff_free_count = 13;
+ * optional uint32 roll_buff_free_count = 3;
* @return this
*/
public RogueCommonBuffSelectInfo clearRollBuffFreeCount() {
- bitField0_ &= ~0x00000010;
+ bitField0_ &= ~0x00000002;
rollBuffFreeCount = 0;
return this;
}
/**
- * optional uint32 roll_buff_free_count = 13;
+ * optional uint32 roll_buff_free_count = 3;
* @return the rollBuffFreeCount
*/
public int getRollBuffFreeCount() {
@@ -265,36 +154,73 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * optional uint32 roll_buff_free_count = 13;
+ * optional uint32 roll_buff_free_count = 3;
* @param value the rollBuffFreeCount to set
* @return this
*/
public RogueCommonBuffSelectInfo setRollBuffFreeCount(final int value) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000002;
rollBuffFreeCount = value;
return this;
}
/**
- * optional uint32 source_cur_count = 15;
- * @return whether the sourceCurCount field is set
+ * optional uint32 source_total_count = 5;
+ * @return whether the sourceTotalCount field is set
*/
- public boolean hasSourceCurCount() {
- return (bitField0_ & 0x00000020) != 0;
+ public boolean hasSourceTotalCount() {
+ return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 source_cur_count = 15;
+ * optional uint32 source_total_count = 5;
+ * @return this
+ */
+ public RogueCommonBuffSelectInfo clearSourceTotalCount() {
+ bitField0_ &= ~0x00000004;
+ sourceTotalCount = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 source_total_count = 5;
+ * @return the sourceTotalCount
+ */
+ public int getSourceTotalCount() {
+ return sourceTotalCount;
+ }
+
+ /**
+ * optional uint32 source_total_count = 5;
+ * @param value the sourceTotalCount to set
+ * @return this
+ */
+ public RogueCommonBuffSelectInfo setSourceTotalCount(final int value) {
+ bitField0_ |= 0x00000004;
+ sourceTotalCount = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 source_cur_count = 7;
+ * @return whether the sourceCurCount field is set
+ */
+ public boolean hasSourceCurCount() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional uint32 source_cur_count = 7;
* @return this
*/
public RogueCommonBuffSelectInfo clearSourceCurCount() {
- bitField0_ &= ~0x00000020;
+ bitField0_ &= ~0x00000008;
sourceCurCount = 0;
return this;
}
/**
- * optional uint32 source_cur_count = 15;
+ * optional uint32 source_cur_count = 7;
* @return the sourceCurCount
*/
public int getSourceCurCount() {
@@ -302,18 +228,92 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * optional uint32 source_cur_count = 15;
+ * optional uint32 source_cur_count = 7;
* @param value the sourceCurCount to set
* @return this
*/
public RogueCommonBuffSelectInfo setSourceCurCount(final int value) {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000008;
sourceCurCount = value;
return this;
}
/**
- * optional .RogueCommonBuffSelectSource source_type = 9;
+ * optional uint32 select_buff_source_hint = 10;
+ * @return whether the selectBuffSourceHint field is set
+ */
+ public boolean hasSelectBuffSourceHint() {
+ return (bitField0_ & 0x00000010) != 0;
+ }
+
+ /**
+ * optional uint32 select_buff_source_hint = 10;
+ * @return this
+ */
+ public RogueCommonBuffSelectInfo clearSelectBuffSourceHint() {
+ bitField0_ &= ~0x00000010;
+ selectBuffSourceHint = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 select_buff_source_hint = 10;
+ * @return the selectBuffSourceHint
+ */
+ public int getSelectBuffSourceHint() {
+ return selectBuffSourceHint;
+ }
+
+ /**
+ * optional uint32 select_buff_source_hint = 10;
+ * @param value the selectBuffSourceHint to set
+ * @return this
+ */
+ public RogueCommonBuffSelectInfo setSelectBuffSourceHint(final int value) {
+ bitField0_ |= 0x00000010;
+ selectBuffSourceHint = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 roll_buff_times = 11;
+ * @return whether the rollBuffTimes field is set
+ */
+ public boolean hasRollBuffTimes() {
+ return (bitField0_ & 0x00000020) != 0;
+ }
+
+ /**
+ * optional uint32 roll_buff_times = 11;
+ * @return this
+ */
+ public RogueCommonBuffSelectInfo clearRollBuffTimes() {
+ bitField0_ &= ~0x00000020;
+ rollBuffTimes = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 roll_buff_times = 11;
+ * @return the rollBuffTimes
+ */
+ public int getRollBuffTimes() {
+ return rollBuffTimes;
+ }
+
+ /**
+ * optional uint32 roll_buff_times = 11;
+ * @param value the rollBuffTimes to set
+ * @return this
+ */
+ public RogueCommonBuffSelectInfo setRollBuffTimes(final int value) {
+ bitField0_ |= 0x00000020;
+ rollBuffTimes = value;
+ return this;
+ }
+
+ /**
+ * optional .RogueCommonBuffSelectSource source_type = 13;
* @return whether the sourceType field is set
*/
public boolean hasSourceType() {
@@ -321,7 +321,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * optional .RogueCommonBuffSelectSource source_type = 9;
+ * optional .RogueCommonBuffSelectSource source_type = 13;
* @return this
*/
public RogueCommonBuffSelectInfo clearSourceType() {
@@ -331,7 +331,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * optional .RogueCommonBuffSelectSource source_type = 9;
+ * optional .RogueCommonBuffSelectSource source_type = 13;
* @return the sourceType
*/
public RogueCommonBuffSelectSourceOuterClass.RogueCommonBuffSelectSource getSourceType() {
@@ -364,7 +364,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * optional .RogueCommonBuffSelectSource source_type = 9;
+ * optional .RogueCommonBuffSelectSource source_type = 13;
* @param value the sourceType to set
* @return this
*/
@@ -376,7 +376,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * optional bool can_roll = 14;
+ * optional bool can_roll = 6;
* @return whether the canRoll field is set
*/
public boolean hasCanRoll() {
@@ -384,7 +384,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * optional bool can_roll = 14;
+ * optional bool can_roll = 6;
* @return this
*/
public RogueCommonBuffSelectInfo clearCanRoll() {
@@ -394,7 +394,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * optional bool can_roll = 14;
+ * optional bool can_roll = 6;
* @return the canRoll
*/
public boolean getCanRoll() {
@@ -402,7 +402,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * optional bool can_roll = 14;
+ * optional bool can_roll = 6;
* @param value the canRoll to set
* @return this
*/
@@ -413,7 +413,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * optional .ItemCostList roll_buffs_cost = 2;
+ * optional .ItemCostList roll_buffs_cost = 14;
* @return whether the rollBuffsCost field is set
*/
public boolean hasRollBuffsCost() {
@@ -421,7 +421,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * optional .ItemCostList roll_buffs_cost = 2;
+ * optional .ItemCostList roll_buffs_cost = 14;
* @return this
*/
public RogueCommonBuffSelectInfo clearRollBuffsCost() {
@@ -431,7 +431,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * optional .ItemCostList roll_buffs_cost = 2;
+ * optional .ItemCostList roll_buffs_cost = 14;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -445,7 +445,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * optional .ItemCostList roll_buffs_cost = 2;
+ * optional .ItemCostList roll_buffs_cost = 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
@@ -459,7 +459,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * optional .ItemCostList roll_buffs_cost = 2;
+ * optional .ItemCostList roll_buffs_cost = 14;
* @param value the rollBuffsCost to set
* @return this
*/
@@ -471,7 +471,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * repeated uint32 first_buff_type_list = 7;
+ * repeated uint32 first_buff_type_list = 4;
* @return whether the firstBuffTypeList field is set
*/
public boolean hasFirstBuffTypeList() {
@@ -479,7 +479,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * repeated uint32 first_buff_type_list = 7;
+ * repeated uint32 first_buff_type_list = 4;
* @return this
*/
public RogueCommonBuffSelectInfo clearFirstBuffTypeList() {
@@ -489,7 +489,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * repeated uint32 first_buff_type_list = 7;
+ * repeated uint32 first_buff_type_list = 4;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -503,7 +503,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * repeated uint32 first_buff_type_list = 7;
+ * repeated uint32 first_buff_type_list = 4;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -517,7 +517,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * repeated uint32 first_buff_type_list = 7;
+ * repeated uint32 first_buff_type_list = 4;
* @param value the firstBuffTypeList to add
* @return this
*/
@@ -528,7 +528,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * repeated uint32 first_buff_type_list = 7;
+ * repeated uint32 first_buff_type_list = 4;
* @param values the firstBuffTypeList to add
* @return this
*/
@@ -539,7 +539,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * repeated uint32 handbook_unlock_buff_id_list = 11;
+ * repeated uint32 handbook_unlock_buff_id_list = 8;
* @return whether the handbookUnlockBuffIdList field is set
*/
public boolean hasHandbookUnlockBuffIdList() {
@@ -547,7 +547,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * repeated uint32 handbook_unlock_buff_id_list = 11;
+ * repeated uint32 handbook_unlock_buff_id_list = 8;
* @return this
*/
public RogueCommonBuffSelectInfo clearHandbookUnlockBuffIdList() {
@@ -557,7 +557,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * repeated uint32 handbook_unlock_buff_id_list = 11;
+ * repeated uint32 handbook_unlock_buff_id_list = 8;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -571,7 +571,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * repeated uint32 handbook_unlock_buff_id_list = 11;
+ * repeated uint32 handbook_unlock_buff_id_list = 8;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -585,7 +585,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * repeated uint32 handbook_unlock_buff_id_list = 11;
+ * repeated uint32 handbook_unlock_buff_id_list = 8;
* @param value the handbookUnlockBuffIdList to add
* @return this
*/
@@ -596,7 +596,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * repeated uint32 handbook_unlock_buff_id_list = 11;
+ * repeated uint32 handbook_unlock_buff_id_list = 8;
* @param values the handbookUnlockBuffIdList to add
* @return this
*/
@@ -607,7 +607,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * repeated .RogueCommonBuff maze_buff_list = 5;
+ * repeated .RogueCommonBuff maze_buff_list = 12;
* @return whether the mazeBuffList field is set
*/
public boolean hasMazeBuffList() {
@@ -615,7 +615,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * repeated .RogueCommonBuff maze_buff_list = 5;
+ * repeated .RogueCommonBuff maze_buff_list = 12;
* @return this
*/
public RogueCommonBuffSelectInfo clearMazeBuffList() {
@@ -625,7 +625,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * repeated .RogueCommonBuff maze_buff_list = 5;
+ * repeated .RogueCommonBuff maze_buff_list = 12;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -639,7 +639,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * repeated .RogueCommonBuff maze_buff_list = 5;
+ * repeated .RogueCommonBuff maze_buff_list = 12;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -653,7 +653,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * repeated .RogueCommonBuff maze_buff_list = 5;
+ * repeated .RogueCommonBuff maze_buff_list = 12;
* @param value the mazeBuffList to add
* @return this
*/
@@ -665,7 +665,7 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
/**
- * repeated .RogueCommonBuff maze_buff_list = 5;
+ * repeated .RogueCommonBuff maze_buff_list = 12;
* @param values the mazeBuffList to add
* @return this
*/
@@ -681,12 +681,12 @@ public final class RogueCommonBuffSelectInfoOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- sourceTotalCount = other.sourceTotalCount;
- selectBuffSourceHint = other.selectBuffSourceHint;
- rollBuffTimes = other.rollBuffTimes;
rollBuffMaxTimes = other.rollBuffMaxTimes;
rollBuffFreeCount = other.rollBuffFreeCount;
+ sourceTotalCount = other.sourceTotalCount;
sourceCurCount = other.sourceCurCount;
+ selectBuffSourceHint = other.selectBuffSourceHint;
+ rollBuffTimes = other.rollBuffTimes;
sourceType = other.sourceType;
canRoll = other.canRoll;
rollBuffsCost.copyFrom(other.rollBuffsCost);
@@ -703,24 +703,24 @@ public final class RogueCommonBuffSelectInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasSourceTotalCount()) {
- setSourceTotalCount(other.sourceTotalCount);
- }
- if (other.hasSelectBuffSourceHint()) {
- setSelectBuffSourceHint(other.selectBuffSourceHint);
- }
- if (other.hasRollBuffTimes()) {
- setRollBuffTimes(other.rollBuffTimes);
- }
if (other.hasRollBuffMaxTimes()) {
setRollBuffMaxTimes(other.rollBuffMaxTimes);
}
if (other.hasRollBuffFreeCount()) {
setRollBuffFreeCount(other.rollBuffFreeCount);
}
+ if (other.hasSourceTotalCount()) {
+ setSourceTotalCount(other.sourceTotalCount);
+ }
if (other.hasSourceCurCount()) {
setSourceCurCount(other.sourceCurCount);
}
+ if (other.hasSelectBuffSourceHint()) {
+ setSelectBuffSourceHint(other.selectBuffSourceHint);
+ }
+ if (other.hasRollBuffTimes()) {
+ setRollBuffTimes(other.rollBuffTimes);
+ }
if (other.hasSourceType()) {
setSourceTypeValue(other.sourceType);
}
@@ -749,12 +749,12 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- sourceTotalCount = 0;
- selectBuffSourceHint = 0;
- rollBuffTimes = 0;
rollBuffMaxTimes = 0;
rollBuffFreeCount = 0;
+ sourceTotalCount = 0;
sourceCurCount = 0;
+ selectBuffSourceHint = 0;
+ rollBuffTimes = 0;
sourceType = 0;
canRoll = false;
rollBuffsCost.clear();
@@ -788,12 +788,12 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
RogueCommonBuffSelectInfo other = (RogueCommonBuffSelectInfo) o;
return bitField0_ == other.bitField0_
- && (!hasSourceTotalCount() || sourceTotalCount == other.sourceTotalCount)
- && (!hasSelectBuffSourceHint() || selectBuffSourceHint == other.selectBuffSourceHint)
- && (!hasRollBuffTimes() || rollBuffTimes == other.rollBuffTimes)
&& (!hasRollBuffMaxTimes() || rollBuffMaxTimes == other.rollBuffMaxTimes)
&& (!hasRollBuffFreeCount() || rollBuffFreeCount == other.rollBuffFreeCount)
+ && (!hasSourceTotalCount() || sourceTotalCount == other.sourceTotalCount)
&& (!hasSourceCurCount() || sourceCurCount == other.sourceCurCount)
+ && (!hasSelectBuffSourceHint() || selectBuffSourceHint == other.selectBuffSourceHint)
+ && (!hasRollBuffTimes() || rollBuffTimes == other.rollBuffTimes)
&& (!hasSourceType() || sourceType == other.sourceType)
&& (!hasCanRoll() || canRoll == other.canRoll)
&& (!hasRollBuffsCost() || rollBuffsCost.equals(other.rollBuffsCost))
@@ -805,56 +805,56 @@ public final class RogueCommonBuffSelectInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(sourceTotalCount);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 48);
- output.writeUInt32NoTag(selectBuffSourceHint);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 64);
- output.writeUInt32NoTag(rollBuffTimes);
- }
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(rollBuffMaxTimes);
}
- if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 104);
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 24);
output.writeUInt32NoTag(rollBuffFreeCount);
}
- if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 120);
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 40);
+ output.writeUInt32NoTag(sourceTotalCount);
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(sourceCurCount);
}
+ if ((bitField0_ & 0x00000010) != 0) {
+ output.writeRawByte((byte) 80);
+ output.writeUInt32NoTag(selectBuffSourceHint);
+ }
+ if ((bitField0_ & 0x00000020) != 0) {
+ output.writeRawByte((byte) 88);
+ output.writeUInt32NoTag(rollBuffTimes);
+ }
if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 104);
output.writeEnumNoTag(sourceType);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 48);
output.writeBoolNoTag(canRoll);
}
if ((bitField0_ & 0x00000100) != 0) {
- output.writeRawByte((byte) 18);
+ output.writeRawByte((byte) 114);
output.writeMessageNoTag(rollBuffsCost);
}
if ((bitField0_ & 0x00000200) != 0) {
for (int i = 0; i < firstBuffTypeList.length(); i++) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(firstBuffTypeList.array()[i]);
}
}
if ((bitField0_ & 0x00000400) != 0) {
for (int i = 0; i < handbookUnlockBuffIdList.length(); i++) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(handbookUnlockBuffIdList.array()[i]);
}
}
if ((bitField0_ & 0x00000800) != 0) {
for (int i = 0; i < mazeBuffList.length(); i++) {
- output.writeRawByte((byte) 42);
+ output.writeRawByte((byte) 98);
output.writeMessageNoTag(mazeBuffList.get(i));
}
}
@@ -864,23 +864,23 @@ public final class RogueCommonBuffSelectInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(sourceTotalCount);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(selectBuffSourceHint);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffTimes);
- }
- if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffMaxTimes);
}
- if ((bitField0_ & 0x00000010) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffFreeCount);
}
- if ((bitField0_ & 0x00000020) != 0) {
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(sourceTotalCount);
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(sourceCurCount);
}
+ if ((bitField0_ & 0x00000010) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(selectBuffSourceHint);
+ }
+ if ((bitField0_ & 0x00000020) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffTimes);
+ }
if ((bitField0_ & 0x00000040) != 0) {
size += 1 + ProtoSink.computeEnumSizeNoTag(sourceType);
}
@@ -909,61 +909,61 @@ public final class RogueCommonBuffSelectInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
- // sourceTotalCount
- sourceTotalCount = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 48) {
- break;
- }
- }
- case 48: {
- // selectBuffSourceHint
- selectBuffSourceHint = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 64) {
- break;
- }
- }
- case 64: {
- // rollBuffTimes
- rollBuffTimes = input.readUInt32();
- bitField0_ |= 0x00000004;
- tag = input.readTag();
- if (tag != 96) {
- break;
- }
- }
- case 96: {
+ case 16: {
// rollBuffMaxTimes
rollBuffMaxTimes = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 24) {
+ break;
+ }
+ }
+ case 24: {
+ // rollBuffFreeCount
+ rollBuffFreeCount = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 40) {
+ break;
+ }
+ }
+ case 40: {
+ // sourceTotalCount
+ sourceTotalCount = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 56) {
+ break;
+ }
+ }
+ case 56: {
+ // sourceCurCount
+ sourceCurCount = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
+ if (tag != 80) {
+ break;
+ }
+ }
+ case 80: {
+ // selectBuffSourceHint
+ selectBuffSourceHint = input.readUInt32();
+ bitField0_ |= 0x00000010;
+ tag = input.readTag();
+ if (tag != 88) {
+ break;
+ }
+ }
+ case 88: {
+ // rollBuffTimes
+ rollBuffTimes = input.readUInt32();
+ bitField0_ |= 0x00000020;
+ tag = input.readTag();
if (tag != 104) {
break;
}
}
case 104: {
- // rollBuffFreeCount
- rollBuffFreeCount = input.readUInt32();
- bitField0_ |= 0x00000010;
- tag = input.readTag();
- if (tag != 120) {
- break;
- }
- }
- case 120: {
- // sourceCurCount
- sourceCurCount = input.readUInt32();
- bitField0_ |= 0x00000020;
- tag = input.readTag();
- if (tag != 72) {
- break;
- }
- }
- case 72: {
// sourceType
final int value = input.readInt32();
if (RogueCommonBuffSelectSourceOuterClass.RogueCommonBuffSelectSource.forNumber(value) != null) {
@@ -971,47 +971,47 @@ public final class RogueCommonBuffSelectInfoOuterClass {
bitField0_ |= 0x00000040;
}
tag = input.readTag();
- if (tag != 112) {
+ if (tag != 48) {
break;
}
}
- case 112: {
+ case 48: {
// canRoll
canRoll = input.readBool();
bitField0_ |= 0x00000080;
tag = input.readTag();
- if (tag != 18) {
+ if (tag != 114) {
break;
}
}
- case 18: {
+ case 114: {
// rollBuffsCost
input.readMessage(rollBuffsCost);
bitField0_ |= 0x00000100;
tag = input.readTag();
- if (tag != 58) {
+ if (tag != 34) {
break;
}
}
- case 58: {
+ case 34: {
// firstBuffTypeList [packed=true]
input.readPackedUInt32(firstBuffTypeList, tag);
bitField0_ |= 0x00000200;
tag = input.readTag();
- if (tag != 90) {
+ if (tag != 66) {
break;
}
}
- case 90: {
+ case 66: {
// handbookUnlockBuffIdList [packed=true]
input.readPackedUInt32(handbookUnlockBuffIdList, tag);
bitField0_ |= 0x00000400;
tag = input.readTag();
- if (tag != 42) {
+ if (tag != 98) {
break;
}
}
- case 42: {
+ case 98: {
// mazeBuffList
tag = input.readRepeatedMessage(mazeBuffList, tag);
bitField0_ |= 0x00000800;
@@ -1029,13 +1029,13 @@ public final class RogueCommonBuffSelectInfoOuterClass {
tag = input.readTag();
break;
}
- case 56: {
+ case 32: {
// firstBuffTypeList [packed=false]
tag = input.readRepeatedUInt32(firstBuffTypeList, tag);
bitField0_ |= 0x00000200;
break;
}
- case 88: {
+ case 64: {
// handbookUnlockBuffIdList [packed=false]
tag = input.readRepeatedUInt32(handbookUnlockBuffIdList, tag);
bitField0_ |= 0x00000400;
@@ -1049,23 +1049,23 @@ public final class RogueCommonBuffSelectInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.sourceTotalCount, sourceTotalCount);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.selectBuffSourceHint, selectBuffSourceHint);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.rollBuffTimes, rollBuffTimes);
- }
- if ((bitField0_ & 0x00000008) != 0) {
output.writeUInt32(FieldNames.rollBuffMaxTimes, rollBuffMaxTimes);
}
- if ((bitField0_ & 0x00000010) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.rollBuffFreeCount, rollBuffFreeCount);
}
- if ((bitField0_ & 0x00000020) != 0) {
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeUInt32(FieldNames.sourceTotalCount, sourceTotalCount);
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
output.writeUInt32(FieldNames.sourceCurCount, sourceCurCount);
}
+ if ((bitField0_ & 0x00000010) != 0) {
+ output.writeUInt32(FieldNames.selectBuffSourceHint, selectBuffSourceHint);
+ }
+ if ((bitField0_ & 0x00000020) != 0) {
+ output.writeUInt32(FieldNames.rollBuffTimes, rollBuffTimes);
+ }
if ((bitField0_ & 0x00000040) != 0) {
output.writeEnum(FieldNames.sourceType, sourceType, RogueCommonBuffSelectSourceOuterClass.RogueCommonBuffSelectSource.converter());
}
@@ -1094,48 +1094,12 @@ public final class RogueCommonBuffSelectInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1098445146:
- case -1750826448: {
- if (input.isAtField(FieldNames.sourceTotalCount)) {
- if (!input.trySkipNullValue()) {
- sourceTotalCount = input.readUInt32();
- bitField0_ |= 0x00000001;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case -1160450543:
- case -335538398: {
- if (input.isAtField(FieldNames.selectBuffSourceHint)) {
- if (!input.trySkipNullValue()) {
- selectBuffSourceHint = input.readUInt32();
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case -436216138:
- case 2038334812: {
- if (input.isAtField(FieldNames.rollBuffTimes)) {
- if (!input.trySkipNullValue()) {
- rollBuffTimes = input.readUInt32();
- bitField0_ |= 0x00000004;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case -564731182:
case -792528959: {
if (input.isAtField(FieldNames.rollBuffMaxTimes)) {
if (!input.trySkipNullValue()) {
rollBuffMaxTimes = input.readUInt32();
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000001;
}
} else {
input.skipUnknownField();
@@ -1147,7 +1111,19 @@ public final class RogueCommonBuffSelectInfoOuterClass {
if (input.isAtField(FieldNames.rollBuffFreeCount)) {
if (!input.trySkipNullValue()) {
rollBuffFreeCount = input.readUInt32();
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -1098445146:
+ case -1750826448: {
+ if (input.isAtField(FieldNames.sourceTotalCount)) {
+ if (!input.trySkipNullValue()) {
+ sourceTotalCount = input.readUInt32();
+ bitField0_ |= 0x00000004;
}
} else {
input.skipUnknownField();
@@ -1159,6 +1135,30 @@ public final class RogueCommonBuffSelectInfoOuterClass {
if (input.isAtField(FieldNames.sourceCurCount)) {
if (!input.trySkipNullValue()) {
sourceCurCount = input.readUInt32();
+ bitField0_ |= 0x00000008;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -1160450543:
+ case -335538398: {
+ if (input.isAtField(FieldNames.selectBuffSourceHint)) {
+ if (!input.trySkipNullValue()) {
+ selectBuffSourceHint = input.readUInt32();
+ bitField0_ |= 0x00000010;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -436216138:
+ case 2038334812: {
+ if (input.isAtField(FieldNames.rollBuffTimes)) {
+ if (!input.trySkipNullValue()) {
+ rollBuffTimes = input.readUInt32();
bitField0_ |= 0x00000020;
}
} else {
@@ -1296,18 +1296,18 @@ public final class RogueCommonBuffSelectInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName sourceTotalCount = FieldName.forField("sourceTotalCount", "source_total_count");
-
- static final FieldName selectBuffSourceHint = FieldName.forField("selectBuffSourceHint", "select_buff_source_hint");
-
- static final FieldName rollBuffTimes = FieldName.forField("rollBuffTimes", "roll_buff_times");
-
static final FieldName rollBuffMaxTimes = FieldName.forField("rollBuffMaxTimes", "roll_buff_max_times");
static final FieldName rollBuffFreeCount = FieldName.forField("rollBuffFreeCount", "roll_buff_free_count");
+ static final FieldName sourceTotalCount = FieldName.forField("sourceTotalCount", "source_total_count");
+
static final FieldName sourceCurCount = FieldName.forField("sourceCurCount", "source_cur_count");
+ static final FieldName selectBuffSourceHint = FieldName.forField("selectBuffSourceHint", "select_buff_source_hint");
+
+ static final FieldName rollBuffTimes = FieldName.forField("rollBuffTimes", "roll_buff_times");
+
static final FieldName sourceType = FieldName.forField("sourceType", "source_type");
static final FieldName canRoll = FieldName.forField("canRoll", "can_roll");
diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectResultOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectResultOuterClass.java
index e0b0f26..7ccb6b7 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectResultOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectResultOuterClass.java
@@ -19,7 +19,7 @@ public final class RogueCommonBuffSelectResultOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 buff_id = 1;
+ * optional uint32 buff_id = 4;
*/
private int buffId;
@@ -34,7 +34,7 @@ public final class RogueCommonBuffSelectResultOuterClass {
}
/**
- * optional uint32 buff_id = 1;
+ * optional uint32 buff_id = 4;
* @return whether the buffId field is set
*/
public boolean hasBuffId() {
@@ -42,7 +42,7 @@ public final class RogueCommonBuffSelectResultOuterClass {
}
/**
- * optional uint32 buff_id = 1;
+ * optional uint32 buff_id = 4;
* @return this
*/
public RogueCommonBuffSelectResult clearBuffId() {
@@ -52,7 +52,7 @@ public final class RogueCommonBuffSelectResultOuterClass {
}
/**
- * optional uint32 buff_id = 1;
+ * optional uint32 buff_id = 4;
* @return the buffId
*/
public int getBuffId() {
@@ -60,7 +60,7 @@ public final class RogueCommonBuffSelectResultOuterClass {
}
/**
- * optional uint32 buff_id = 1;
+ * optional uint32 buff_id = 4;
* @param value the buffId to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class RogueCommonBuffSelectResultOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(buffId);
}
}
@@ -150,7 +150,7 @@ public final class RogueCommonBuffSelectResultOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 32: {
// buffId
buffId = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java
index eb9070c..9f1916c 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java
@@ -24,7 +24,7 @@ public final class RogueCommonPendingActionOuterClass {
private int uniqueId;
/**
- * optional .RogueAction rogue_action = 4;
+ * optional .RogueAction rogue_action = 6;
*/
private final RogueActionOuterClass.RogueAction rogueAction = RogueActionOuterClass.RogueAction.newInstance();
@@ -76,7 +76,7 @@ public final class RogueCommonPendingActionOuterClass {
}
/**
- * optional .RogueAction rogue_action = 4;
+ * optional .RogueAction rogue_action = 6;
* @return whether the rogueAction field is set
*/
public boolean hasRogueAction() {
@@ -84,7 +84,7 @@ public final class RogueCommonPendingActionOuterClass {
}
/**
- * optional .RogueAction rogue_action = 4;
+ * optional .RogueAction rogue_action = 6;
* @return this
*/
public RogueCommonPendingAction clearRogueAction() {
@@ -94,7 +94,7 @@ public final class RogueCommonPendingActionOuterClass {
}
/**
- * optional .RogueAction rogue_action = 4;
+ * optional .RogueAction rogue_action = 6;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class RogueCommonPendingActionOuterClass {
}
/**
- * optional .RogueAction rogue_action = 4;
+ * optional .RogueAction rogue_action = 6;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class RogueCommonPendingActionOuterClass {
}
/**
- * optional .RogueAction rogue_action = 4;
+ * optional .RogueAction rogue_action = 6;
* @param value the rogueAction to set
* @return this
*/
@@ -202,7 +202,7 @@ public final class RogueCommonPendingActionOuterClass {
output.writeUInt32NoTag(uniqueId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 34);
+ output.writeRawByte((byte) 50);
output.writeMessageNoTag(rogueAction);
}
}
@@ -231,11 +231,11 @@ public final class RogueCommonPendingActionOuterClass {
uniqueId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 34) {
+ if (tag != 50) {
break;
}
}
- case 34: {
+ case 50: {
// rogueAction
input.readMessage(rogueAction);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueCurVirtualItemInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCurVirtualItemInfoOuterClass.java
index bfce899..bf5c0f0 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueCurVirtualItemInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueCurVirtualItemInfoOuterClass.java
@@ -19,15 +19,19 @@ public final class RogueCurVirtualItemInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 cur_rogue_coin = 8;
- */
- private int curRogueCoin;
-
- /**
- * optional uint32 cur_rogue_ability_point = 9;
+ * + * idk, isnt being used by official server + *+ * + *
optional uint32 cur_rogue_ability_point = 1;
*/
private int curRogueAbilityPoint;
+ /**
+ * optional uint32 cur_rogue_coin = 12;
+ */
+ private int curRogueCoin;
+
private RogueCurVirtualItemInfo() {
}
@@ -39,62 +43,37 @@ public final class RogueCurVirtualItemInfoOuterClass {
}
/**
- * optional uint32 cur_rogue_coin = 8;
- * @return whether the curRogueCoin field is set
+ * + * idk, isnt being used by official server + *+ * + *
optional uint32 cur_rogue_ability_point = 1;
+ * @return whether the curRogueAbilityPoint field is set
*/
- public boolean hasCurRogueCoin() {
+ public boolean hasCurRogueAbilityPoint() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 cur_rogue_coin = 8;
- * @return this
- */
- public RogueCurVirtualItemInfo clearCurRogueCoin() {
- bitField0_ &= ~0x00000001;
- curRogueCoin = 0;
- return this;
- }
-
- /**
- * optional uint32 cur_rogue_coin = 8;
- * @return the curRogueCoin
- */
- public int getCurRogueCoin() {
- return curRogueCoin;
- }
-
- /**
- * optional uint32 cur_rogue_coin = 8;
- * @param value the curRogueCoin to set
- * @return this
- */
- public RogueCurVirtualItemInfo setCurRogueCoin(final int value) {
- bitField0_ |= 0x00000001;
- curRogueCoin = value;
- return this;
- }
-
- /**
- * optional uint32 cur_rogue_ability_point = 9;
- * @return whether the curRogueAbilityPoint field is set
- */
- public boolean hasCurRogueAbilityPoint() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 cur_rogue_ability_point = 9;
+ * + * idk, isnt being used by official server + *+ * + *
optional uint32 cur_rogue_ability_point = 1;
* @return this
*/
public RogueCurVirtualItemInfo clearCurRogueAbilityPoint() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
curRogueAbilityPoint = 0;
return this;
}
/**
- * optional uint32 cur_rogue_ability_point = 9;
+ * + * idk, isnt being used by official server + *+ * + *
optional uint32 cur_rogue_ability_point = 1;
* @return the curRogueAbilityPoint
*/
public int getCurRogueAbilityPoint() {
@@ -102,23 +81,64 @@ public final class RogueCurVirtualItemInfoOuterClass {
}
/**
- * optional uint32 cur_rogue_ability_point = 9;
+ * + * idk, isnt being used by official server + *+ * + *
optional uint32 cur_rogue_ability_point = 1;
* @param value the curRogueAbilityPoint to set
* @return this
*/
public RogueCurVirtualItemInfo setCurRogueAbilityPoint(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
curRogueAbilityPoint = value;
return this;
}
+ /**
+ * optional uint32 cur_rogue_coin = 12;
+ * @return whether the curRogueCoin field is set
+ */
+ public boolean hasCurRogueCoin() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 cur_rogue_coin = 12;
+ * @return this
+ */
+ public RogueCurVirtualItemInfo clearCurRogueCoin() {
+ bitField0_ &= ~0x00000002;
+ curRogueCoin = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 cur_rogue_coin = 12;
+ * @return the curRogueCoin
+ */
+ public int getCurRogueCoin() {
+ return curRogueCoin;
+ }
+
+ /**
+ * optional uint32 cur_rogue_coin = 12;
+ * @param value the curRogueCoin to set
+ * @return this
+ */
+ public RogueCurVirtualItemInfo setCurRogueCoin(final int value) {
+ bitField0_ |= 0x00000002;
+ curRogueCoin = value;
+ return this;
+ }
+
@Override
public RogueCurVirtualItemInfo copyFrom(final RogueCurVirtualItemInfo other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- curRogueCoin = other.curRogueCoin;
curRogueAbilityPoint = other.curRogueAbilityPoint;
+ curRogueCoin = other.curRogueCoin;
}
return this;
}
@@ -129,12 +149,12 @@ public final class RogueCurVirtualItemInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasCurRogueCoin()) {
- setCurRogueCoin(other.curRogueCoin);
- }
if (other.hasCurRogueAbilityPoint()) {
setCurRogueAbilityPoint(other.curRogueAbilityPoint);
}
+ if (other.hasCurRogueCoin()) {
+ setCurRogueCoin(other.curRogueCoin);
+ }
return this;
}
@@ -145,8 +165,8 @@ public final class RogueCurVirtualItemInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- curRogueCoin = 0;
curRogueAbilityPoint = 0;
+ curRogueCoin = 0;
return this;
}
@@ -170,19 +190,19 @@ public final class RogueCurVirtualItemInfoOuterClass {
}
RogueCurVirtualItemInfo other = (RogueCurVirtualItemInfo) o;
return bitField0_ == other.bitField0_
- && (!hasCurRogueCoin() || curRogueCoin == other.curRogueCoin)
- && (!hasCurRogueAbilityPoint() || curRogueAbilityPoint == other.curRogueAbilityPoint);
+ && (!hasCurRogueAbilityPoint() || curRogueAbilityPoint == other.curRogueAbilityPoint)
+ && (!hasCurRogueCoin() || curRogueCoin == other.curRogueCoin);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 64);
- output.writeUInt32NoTag(curRogueCoin);
+ output.writeRawByte((byte) 8);
+ output.writeUInt32NoTag(curRogueAbilityPoint);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 72);
- output.writeUInt32NoTag(curRogueAbilityPoint);
+ output.writeRawByte((byte) 96);
+ output.writeUInt32NoTag(curRogueCoin);
}
}
@@ -190,10 +210,10 @@ public final class RogueCurVirtualItemInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(curRogueCoin);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(curRogueAbilityPoint);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(curRogueAbilityPoint);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(curRogueCoin);
}
return size;
}
@@ -205,18 +225,18 @@ public final class RogueCurVirtualItemInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 64: {
- // curRogueCoin
- curRogueCoin = input.readUInt32();
+ case 8: {
+ // curRogueAbilityPoint
+ curRogueAbilityPoint = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 72) {
+ if (tag != 96) {
break;
}
}
- case 72: {
- // curRogueAbilityPoint
- curRogueAbilityPoint = input.readUInt32();
+ case 96: {
+ // curRogueCoin
+ curRogueCoin = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
@@ -241,10 +261,10 @@ public final class RogueCurVirtualItemInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.curRogueCoin, curRogueCoin);
+ output.writeUInt32(FieldNames.curRogueAbilityPoint, curRogueAbilityPoint);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.curRogueAbilityPoint, curRogueAbilityPoint);
+ output.writeUInt32(FieldNames.curRogueCoin, curRogueCoin);
}
output.endObject();
}
@@ -256,11 +276,11 @@ public final class RogueCurVirtualItemInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 1836271915:
- case -979997387: {
- if (input.isAtField(FieldNames.curRogueCoin)) {
+ case 1423162144:
+ case 1565581335: {
+ if (input.isAtField(FieldNames.curRogueAbilityPoint)) {
if (!input.trySkipNullValue()) {
- curRogueCoin = input.readUInt32();
+ curRogueAbilityPoint = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -268,11 +288,11 @@ public final class RogueCurVirtualItemInfoOuterClass {
}
break;
}
- case 1423162144:
- case 1565581335: {
- if (input.isAtField(FieldNames.curRogueAbilityPoint)) {
+ case 1836271915:
+ case -979997387: {
+ if (input.isAtField(FieldNames.curRogueCoin)) {
if (!input.trySkipNullValue()) {
- curRogueAbilityPoint = input.readUInt32();
+ curRogueCoin = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -333,9 +353,9 @@ public final class RogueCurVirtualItemInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName curRogueCoin = FieldName.forField("curRogueCoin", "cur_rogue_coin");
-
static final FieldName curRogueAbilityPoint = FieldName.forField("curRogueAbilityPoint", "cur_rogue_ability_point");
+
+ static final FieldName curRogueCoin = FieldName.forField("curRogueCoin", "cur_rogue_coin");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/RogueCurrentInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCurrentInfoOuterClass.java
index 433e7e8..935cc04 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueCurrentInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueCurrentInfoOuterClass.java
@@ -19,14 +19,14 @@ public final class RogueCurrentInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .RogueStatus status = 4;
+ * optional .RogueStatus status = 7;
*/
private int status;
/**
- * optional .RogueBuffInfo rogue_buff_info = 1;
+ * optional .RogueMiracleInfo rogue_miracle_info = 2;
*/
- private final RogueBuffInfoOuterClass.RogueBuffInfo rogueBuffInfo = RogueBuffInfoOuterClass.RogueBuffInfo.newInstance();
+ private final RogueMiracleInfoOuterClass.RogueMiracleInfo rogueMiracleInfo = RogueMiracleInfoOuterClass.RogueMiracleInfo.newInstance();
/**
* optional .RogueAeon rogue_aeon_info = 3;
@@ -39,24 +39,24 @@ public final class RogueCurrentInfoOuterClass {
private final RogueAvatarInfoOuterClass.RogueAvatarInfo rogueAvatarInfo = RogueAvatarInfoOuterClass.RogueAvatarInfo.newInstance();
/**
- * optional .RogueVirtualItemInfo rogue_virtual_item = 9;
+ * optional .RogueCommonPendingAction pending_action = 8;
*/
- private final RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo rogueVirtualItem = RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo.newInstance();
+ private final RogueCommonPendingActionOuterClass.RogueCommonPendingAction pendingAction = RogueCommonPendingActionOuterClass.RogueCommonPendingAction.newInstance();
/**
- * optional .RogueMapInfo room_map = 10;
+ * optional .RogueMapInfo room_map = 9;
*/
private final RogueMapInfoOuterClass.RogueMapInfo roomMap = RogueMapInfoOuterClass.RogueMapInfo.newInstance();
/**
- * optional .RogueMiracleInfo rogue_miracle_info = 14;
+ * optional .RogueVirtualItemInfo rogue_virtual_item = 10;
*/
- private final RogueMiracleInfoOuterClass.RogueMiracleInfo rogueMiracleInfo = RogueMiracleInfoOuterClass.RogueMiracleInfo.newInstance();
+ private final RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo rogueVirtualItem = RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo.newInstance();
/**
- * optional .RogueCommonPendingAction pending_action = 15;
+ * optional .RogueBuffInfo rogue_buff_info = 14;
*/
- private final RogueCommonPendingActionOuterClass.RogueCommonPendingAction pendingAction = RogueCommonPendingActionOuterClass.RogueCommonPendingAction.newInstance();
+ private final RogueBuffInfoOuterClass.RogueBuffInfo rogueBuffInfo = RogueBuffInfoOuterClass.RogueBuffInfo.newInstance();
private RogueCurrentInfo() {
}
@@ -69,7 +69,7 @@ public final class RogueCurrentInfoOuterClass {
}
/**
- * optional .RogueStatus status = 4;
+ * optional .RogueStatus status = 7;
* @return whether the status field is set
*/
public boolean hasStatus() {
@@ -77,7 +77,7 @@ public final class RogueCurrentInfoOuterClass {
}
/**
- * optional .RogueStatus status = 4;
+ * optional .RogueStatus status = 7;
* @return this
*/
public RogueCurrentInfo clearStatus() {
@@ -87,7 +87,7 @@ public final class RogueCurrentInfoOuterClass {
}
/**
- * optional .RogueStatus status = 4;
+ * optional .RogueStatus status = 7;
* @return the status
*/
public RogueStatusOuterClass.RogueStatus getStatus() {
@@ -120,7 +120,7 @@ public final class RogueCurrentInfoOuterClass {
}
/**
- * optional .RogueStatus status = 4;
+ * optional .RogueStatus status = 7;
* @param value the status to set
* @return this
*/
@@ -131,39 +131,39 @@ public final class RogueCurrentInfoOuterClass {
}
/**
- * optional .RogueBuffInfo rogue_buff_info = 1;
- * @return whether the rogueBuffInfo field is set
+ * optional .RogueMiracleInfo rogue_miracle_info = 2;
+ * @return whether the rogueMiracleInfo field is set
*/
- public boolean hasRogueBuffInfo() {
+ public boolean hasRogueMiracleInfo() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional .RogueBuffInfo rogue_buff_info = 1;
+ * optional .RogueMiracleInfo rogue_miracle_info = 2;
* @return this
*/
- public RogueCurrentInfo clearRogueBuffInfo() {
+ public RogueCurrentInfo clearRogueMiracleInfo() {
bitField0_ &= ~0x00000002;
- rogueBuffInfo.clear();
+ rogueMiracleInfo.clear();
return this;
}
/**
- * optional .RogueBuffInfo rogue_buff_info = 1;
+ * optional .RogueMiracleInfo rogue_miracle_info = 2;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
*
- * Use {@link #getMutableRogueBuffInfo()} if you want to modify it.
+ * Use {@link #getMutableRogueMiracleInfo()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public RogueBuffInfoOuterClass.RogueBuffInfo getRogueBuffInfo() {
- return rogueBuffInfo;
+ public RogueMiracleInfoOuterClass.RogueMiracleInfo getRogueMiracleInfo() {
+ return rogueMiracleInfo;
}
/**
- * optional .RogueBuffInfo rogue_buff_info = 1;
+ * optional .RogueMiracleInfo rogue_miracle_info = 2;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -171,19 +171,20 @@ public final class RogueCurrentInfoOuterClass {
*
* @return internal storage object for modifications
*/
- public RogueBuffInfoOuterClass.RogueBuffInfo getMutableRogueBuffInfo() {
+ public RogueMiracleInfoOuterClass.RogueMiracleInfo getMutableRogueMiracleInfo() {
bitField0_ |= 0x00000002;
- return rogueBuffInfo;
+ return rogueMiracleInfo;
}
/**
- * optional .RogueBuffInfo rogue_buff_info = 1;
- * @param value the rogueBuffInfo to set
+ * optional .RogueMiracleInfo rogue_miracle_info = 2;
+ * @param value the rogueMiracleInfo to set
* @return this
*/
- public RogueCurrentInfo setRogueBuffInfo(final RogueBuffInfoOuterClass.RogueBuffInfo value) {
+ public RogueCurrentInfo setRogueMiracleInfo(
+ final RogueMiracleInfoOuterClass.RogueMiracleInfo value) {
bitField0_ |= 0x00000002;
- rogueBuffInfo.copyFrom(value);
+ rogueMiracleInfo.copyFrom(value);
return this;
}
@@ -303,198 +304,25 @@ public final class RogueCurrentInfoOuterClass {
}
/**
- * optional .RogueVirtualItemInfo rogue_virtual_item = 9;
- * @return whether the rogueVirtualItem field is set
+ * optional .RogueCommonPendingAction pending_action = 8;
+ * @return whether the pendingAction field is set
*/
- public boolean hasRogueVirtualItem() {
+ public boolean hasPendingAction() {
return (bitField0_ & 0x00000010) != 0;
}
/**
- * optional .RogueVirtualItemInfo rogue_virtual_item = 9;
- * @return this
- */
- public RogueCurrentInfo clearRogueVirtualItem() {
- bitField0_ &= ~0x00000010;
- rogueVirtualItem.clear();
- return this;
- }
-
- /**
- * optional .RogueVirtualItemInfo rogue_virtual_item = 9;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableRogueVirtualItem()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo getRogueVirtualItem() {
- return rogueVirtualItem;
- }
-
- /**
- * optional .RogueVirtualItemInfo rogue_virtual_item = 9;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo getMutableRogueVirtualItem() {
- bitField0_ |= 0x00000010;
- return rogueVirtualItem;
- }
-
- /**
- * optional .RogueVirtualItemInfo rogue_virtual_item = 9;
- * @param value the rogueVirtualItem to set
- * @return this
- */
- public RogueCurrentInfo setRogueVirtualItem(
- final RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo value) {
- bitField0_ |= 0x00000010;
- rogueVirtualItem.copyFrom(value);
- return this;
- }
-
- /**
- * optional .RogueMapInfo room_map = 10;
- * @return whether the roomMap field is set
- */
- public boolean hasRoomMap() {
- return (bitField0_ & 0x00000020) != 0;
- }
-
- /**
- * optional .RogueMapInfo room_map = 10;
- * @return this
- */
- public RogueCurrentInfo clearRoomMap() {
- bitField0_ &= ~0x00000020;
- roomMap.clear();
- return this;
- }
-
- /**
- * optional .RogueMapInfo room_map = 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 #getMutableRoomMap()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RogueMapInfoOuterClass.RogueMapInfo getRoomMap() {
- return roomMap;
- }
-
- /**
- * optional .RogueMapInfo room_map = 10;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RogueMapInfoOuterClass.RogueMapInfo getMutableRoomMap() {
- bitField0_ |= 0x00000020;
- return roomMap;
- }
-
- /**
- * optional .RogueMapInfo room_map = 10;
- * @param value the roomMap to set
- * @return this
- */
- public RogueCurrentInfo setRoomMap(final RogueMapInfoOuterClass.RogueMapInfo value) {
- bitField0_ |= 0x00000020;
- roomMap.copyFrom(value);
- return this;
- }
-
- /**
- * optional .RogueMiracleInfo rogue_miracle_info = 14;
- * @return whether the rogueMiracleInfo field is set
- */
- public boolean hasRogueMiracleInfo() {
- return (bitField0_ & 0x00000040) != 0;
- }
-
- /**
- * optional .RogueMiracleInfo rogue_miracle_info = 14;
- * @return this
- */
- public RogueCurrentInfo clearRogueMiracleInfo() {
- bitField0_ &= ~0x00000040;
- rogueMiracleInfo.clear();
- return this;
- }
-
- /**
- * optional .RogueMiracleInfo rogue_miracle_info = 14;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableRogueMiracleInfo()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RogueMiracleInfoOuterClass.RogueMiracleInfo getRogueMiracleInfo() {
- return rogueMiracleInfo;
- }
-
- /**
- * optional .RogueMiracleInfo rogue_miracle_info = 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 RogueMiracleInfoOuterClass.RogueMiracleInfo getMutableRogueMiracleInfo() {
- bitField0_ |= 0x00000040;
- return rogueMiracleInfo;
- }
-
- /**
- * optional .RogueMiracleInfo rogue_miracle_info = 14;
- * @param value the rogueMiracleInfo to set
- * @return this
- */
- public RogueCurrentInfo setRogueMiracleInfo(
- final RogueMiracleInfoOuterClass.RogueMiracleInfo value) {
- bitField0_ |= 0x00000040;
- rogueMiracleInfo.copyFrom(value);
- return this;
- }
-
- /**
- * optional .RogueCommonPendingAction pending_action = 15;
- * @return whether the pendingAction field is set
- */
- public boolean hasPendingAction() {
- return (bitField0_ & 0x00000080) != 0;
- }
-
- /**
- * optional .RogueCommonPendingAction pending_action = 15;
+ * optional .RogueCommonPendingAction pending_action = 8;
* @return this
*/
public RogueCurrentInfo clearPendingAction() {
- bitField0_ &= ~0x00000080;
+ bitField0_ &= ~0x00000010;
pendingAction.clear();
return this;
}
/**
- * optional .RogueCommonPendingAction pending_action = 15;
+ * optional .RogueCommonPendingAction pending_action = 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.
@@ -508,7 +336,7 @@ public final class RogueCurrentInfoOuterClass {
}
/**
- * optional .RogueCommonPendingAction pending_action = 15;
+ * optional .RogueCommonPendingAction pending_action = 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
@@ -517,35 +345,207 @@ public final class RogueCurrentInfoOuterClass {
* @return internal storage object for modifications
*/
public RogueCommonPendingActionOuterClass.RogueCommonPendingAction getMutablePendingAction() {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000010;
return pendingAction;
}
/**
- * optional .RogueCommonPendingAction pending_action = 15;
+ * optional .RogueCommonPendingAction pending_action = 8;
* @param value the pendingAction to set
* @return this
*/
public RogueCurrentInfo setPendingAction(
final RogueCommonPendingActionOuterClass.RogueCommonPendingAction value) {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000010;
pendingAction.copyFrom(value);
return this;
}
+ /**
+ * optional .RogueMapInfo room_map = 9;
+ * @return whether the roomMap field is set
+ */
+ public boolean hasRoomMap() {
+ return (bitField0_ & 0x00000020) != 0;
+ }
+
+ /**
+ * optional .RogueMapInfo room_map = 9;
+ * @return this
+ */
+ public RogueCurrentInfo clearRoomMap() {
+ bitField0_ &= ~0x00000020;
+ roomMap.clear();
+ return this;
+ }
+
+ /**
+ * optional .RogueMapInfo room_map = 9;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableRoomMap()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RogueMapInfoOuterClass.RogueMapInfo getRoomMap() {
+ return roomMap;
+ }
+
+ /**
+ * optional .RogueMapInfo room_map = 9;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RogueMapInfoOuterClass.RogueMapInfo getMutableRoomMap() {
+ bitField0_ |= 0x00000020;
+ return roomMap;
+ }
+
+ /**
+ * optional .RogueMapInfo room_map = 9;
+ * @param value the roomMap to set
+ * @return this
+ */
+ public RogueCurrentInfo setRoomMap(final RogueMapInfoOuterClass.RogueMapInfo value) {
+ bitField0_ |= 0x00000020;
+ roomMap.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional .RogueVirtualItemInfo rogue_virtual_item = 10;
+ * @return whether the rogueVirtualItem field is set
+ */
+ public boolean hasRogueVirtualItem() {
+ return (bitField0_ & 0x00000040) != 0;
+ }
+
+ /**
+ * optional .RogueVirtualItemInfo rogue_virtual_item = 10;
+ * @return this
+ */
+ public RogueCurrentInfo clearRogueVirtualItem() {
+ bitField0_ &= ~0x00000040;
+ rogueVirtualItem.clear();
+ return this;
+ }
+
+ /**
+ * optional .RogueVirtualItemInfo rogue_virtual_item = 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 #getMutableRogueVirtualItem()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo getRogueVirtualItem() {
+ return rogueVirtualItem;
+ }
+
+ /**
+ * optional .RogueVirtualItemInfo rogue_virtual_item = 10;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo getMutableRogueVirtualItem() {
+ bitField0_ |= 0x00000040;
+ return rogueVirtualItem;
+ }
+
+ /**
+ * optional .RogueVirtualItemInfo rogue_virtual_item = 10;
+ * @param value the rogueVirtualItem to set
+ * @return this
+ */
+ public RogueCurrentInfo setRogueVirtualItem(
+ final RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo value) {
+ bitField0_ |= 0x00000040;
+ rogueVirtualItem.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional .RogueBuffInfo rogue_buff_info = 14;
+ * @return whether the rogueBuffInfo field is set
+ */
+ public boolean hasRogueBuffInfo() {
+ return (bitField0_ & 0x00000080) != 0;
+ }
+
+ /**
+ * optional .RogueBuffInfo rogue_buff_info = 14;
+ * @return this
+ */
+ public RogueCurrentInfo clearRogueBuffInfo() {
+ bitField0_ &= ~0x00000080;
+ rogueBuffInfo.clear();
+ return this;
+ }
+
+ /**
+ * optional .RogueBuffInfo rogue_buff_info = 14;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableRogueBuffInfo()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RogueBuffInfoOuterClass.RogueBuffInfo getRogueBuffInfo() {
+ return rogueBuffInfo;
+ }
+
+ /**
+ * optional .RogueBuffInfo rogue_buff_info = 14;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RogueBuffInfoOuterClass.RogueBuffInfo getMutableRogueBuffInfo() {
+ bitField0_ |= 0x00000080;
+ return rogueBuffInfo;
+ }
+
+ /**
+ * optional .RogueBuffInfo rogue_buff_info = 14;
+ * @param value the rogueBuffInfo to set
+ * @return this
+ */
+ public RogueCurrentInfo setRogueBuffInfo(final RogueBuffInfoOuterClass.RogueBuffInfo value) {
+ bitField0_ |= 0x00000080;
+ rogueBuffInfo.copyFrom(value);
+ return this;
+ }
+
@Override
public RogueCurrentInfo copyFrom(final RogueCurrentInfo other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
status = other.status;
- rogueBuffInfo.copyFrom(other.rogueBuffInfo);
+ rogueMiracleInfo.copyFrom(other.rogueMiracleInfo);
rogueAeonInfo.copyFrom(other.rogueAeonInfo);
rogueAvatarInfo.copyFrom(other.rogueAvatarInfo);
- rogueVirtualItem.copyFrom(other.rogueVirtualItem);
- roomMap.copyFrom(other.roomMap);
- rogueMiracleInfo.copyFrom(other.rogueMiracleInfo);
pendingAction.copyFrom(other.pendingAction);
+ roomMap.copyFrom(other.roomMap);
+ rogueVirtualItem.copyFrom(other.rogueVirtualItem);
+ rogueBuffInfo.copyFrom(other.rogueBuffInfo);
}
return this;
}
@@ -559,8 +559,8 @@ public final class RogueCurrentInfoOuterClass {
if (other.hasStatus()) {
setStatusValue(other.status);
}
- if (other.hasRogueBuffInfo()) {
- getMutableRogueBuffInfo().mergeFrom(other.rogueBuffInfo);
+ if (other.hasRogueMiracleInfo()) {
+ getMutableRogueMiracleInfo().mergeFrom(other.rogueMiracleInfo);
}
if (other.hasRogueAeonInfo()) {
getMutableRogueAeonInfo().mergeFrom(other.rogueAeonInfo);
@@ -568,17 +568,17 @@ public final class RogueCurrentInfoOuterClass {
if (other.hasRogueAvatarInfo()) {
getMutableRogueAvatarInfo().mergeFrom(other.rogueAvatarInfo);
}
- if (other.hasRogueVirtualItem()) {
- getMutableRogueVirtualItem().mergeFrom(other.rogueVirtualItem);
+ if (other.hasPendingAction()) {
+ getMutablePendingAction().mergeFrom(other.pendingAction);
}
if (other.hasRoomMap()) {
getMutableRoomMap().mergeFrom(other.roomMap);
}
- if (other.hasRogueMiracleInfo()) {
- getMutableRogueMiracleInfo().mergeFrom(other.rogueMiracleInfo);
+ if (other.hasRogueVirtualItem()) {
+ getMutableRogueVirtualItem().mergeFrom(other.rogueVirtualItem);
}
- if (other.hasPendingAction()) {
- getMutablePendingAction().mergeFrom(other.pendingAction);
+ if (other.hasRogueBuffInfo()) {
+ getMutableRogueBuffInfo().mergeFrom(other.rogueBuffInfo);
}
return this;
}
@@ -591,13 +591,13 @@ public final class RogueCurrentInfoOuterClass {
cachedSize = -1;
bitField0_ = 0;
status = 0;
- rogueBuffInfo.clear();
+ rogueMiracleInfo.clear();
rogueAeonInfo.clear();
rogueAvatarInfo.clear();
- rogueVirtualItem.clear();
- roomMap.clear();
- rogueMiracleInfo.clear();
pendingAction.clear();
+ roomMap.clear();
+ rogueVirtualItem.clear();
+ rogueBuffInfo.clear();
return this;
}
@@ -608,13 +608,13 @@ public final class RogueCurrentInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- rogueBuffInfo.clearQuick();
+ rogueMiracleInfo.clearQuick();
rogueAeonInfo.clearQuick();
rogueAvatarInfo.clearQuick();
- rogueVirtualItem.clearQuick();
- roomMap.clearQuick();
- rogueMiracleInfo.clearQuick();
pendingAction.clearQuick();
+ roomMap.clearQuick();
+ rogueVirtualItem.clearQuick();
+ rogueBuffInfo.clearQuick();
return this;
}
@@ -629,24 +629,24 @@ public final class RogueCurrentInfoOuterClass {
RogueCurrentInfo other = (RogueCurrentInfo) o;
return bitField0_ == other.bitField0_
&& (!hasStatus() || status == other.status)
- && (!hasRogueBuffInfo() || rogueBuffInfo.equals(other.rogueBuffInfo))
+ && (!hasRogueMiracleInfo() || rogueMiracleInfo.equals(other.rogueMiracleInfo))
&& (!hasRogueAeonInfo() || rogueAeonInfo.equals(other.rogueAeonInfo))
&& (!hasRogueAvatarInfo() || rogueAvatarInfo.equals(other.rogueAvatarInfo))
- && (!hasRogueVirtualItem() || rogueVirtualItem.equals(other.rogueVirtualItem))
+ && (!hasPendingAction() || pendingAction.equals(other.pendingAction))
&& (!hasRoomMap() || roomMap.equals(other.roomMap))
- && (!hasRogueMiracleInfo() || rogueMiracleInfo.equals(other.rogueMiracleInfo))
- && (!hasPendingAction() || pendingAction.equals(other.pendingAction));
+ && (!hasRogueVirtualItem() || rogueVirtualItem.equals(other.rogueVirtualItem))
+ && (!hasRogueBuffInfo() || rogueBuffInfo.equals(other.rogueBuffInfo));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 56);
output.writeEnumNoTag(status);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 10);
- output.writeMessageNoTag(rogueBuffInfo);
+ output.writeRawByte((byte) 18);
+ output.writeMessageNoTag(rogueMiracleInfo);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 26);
@@ -657,20 +657,20 @@ public final class RogueCurrentInfoOuterClass {
output.writeMessageNoTag(rogueAvatarInfo);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 74);
- output.writeMessageNoTag(rogueVirtualItem);
+ output.writeRawByte((byte) 66);
+ output.writeMessageNoTag(pendingAction);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 82);
+ output.writeRawByte((byte) 74);
output.writeMessageNoTag(roomMap);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawByte((byte) 114);
- output.writeMessageNoTag(rogueMiracleInfo);
+ output.writeRawByte((byte) 82);
+ output.writeMessageNoTag(rogueVirtualItem);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRawByte((byte) 122);
- output.writeMessageNoTag(pendingAction);
+ output.writeRawByte((byte) 114);
+ output.writeMessageNoTag(rogueBuffInfo);
}
}
@@ -681,7 +681,7 @@ public final class RogueCurrentInfoOuterClass {
size += 1 + ProtoSink.computeEnumSizeNoTag(status);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(rogueBuffInfo);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(rogueMiracleInfo);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAeonInfo);
@@ -690,16 +690,16 @@ public final class RogueCurrentInfoOuterClass {
size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAvatarInfo);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(rogueVirtualItem);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(pendingAction);
}
if ((bitField0_ & 0x00000020) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(roomMap);
}
if ((bitField0_ & 0x00000040) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(rogueMiracleInfo);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(rogueVirtualItem);
}
if ((bitField0_ & 0x00000080) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(pendingAction);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(rogueBuffInfo);
}
return size;
}
@@ -711,7 +711,7 @@ public final class RogueCurrentInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
+ case 56: {
// status
final int value = input.readInt32();
if (RogueStatusOuterClass.RogueStatus.forNumber(value) != null) {
@@ -719,13 +719,13 @@ public final class RogueCurrentInfoOuterClass {
bitField0_ |= 0x00000001;
}
tag = input.readTag();
- if (tag != 10) {
+ if (tag != 18) {
break;
}
}
- case 10: {
- // rogueBuffInfo
- input.readMessage(rogueBuffInfo);
+ case 18: {
+ // rogueMiracleInfo
+ input.readMessage(rogueMiracleInfo);
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 26) {
@@ -746,40 +746,40 @@ public final class RogueCurrentInfoOuterClass {
input.readMessage(rogueAvatarInfo);
bitField0_ |= 0x00000008;
tag = input.readTag();
+ if (tag != 66) {
+ break;
+ }
+ }
+ case 66: {
+ // pendingAction
+ input.readMessage(pendingAction);
+ bitField0_ |= 0x00000010;
+ tag = input.readTag();
if (tag != 74) {
break;
}
}
case 74: {
- // rogueVirtualItem
- input.readMessage(rogueVirtualItem);
- bitField0_ |= 0x00000010;
+ // roomMap
+ input.readMessage(roomMap);
+ bitField0_ |= 0x00000020;
tag = input.readTag();
if (tag != 82) {
break;
}
}
case 82: {
- // roomMap
- input.readMessage(roomMap);
- bitField0_ |= 0x00000020;
+ // rogueVirtualItem
+ input.readMessage(rogueVirtualItem);
+ bitField0_ |= 0x00000040;
tag = input.readTag();
if (tag != 114) {
break;
}
}
case 114: {
- // rogueMiracleInfo
- input.readMessage(rogueMiracleInfo);
- bitField0_ |= 0x00000040;
- tag = input.readTag();
- if (tag != 122) {
- break;
- }
- }
- case 122: {
- // pendingAction
- input.readMessage(pendingAction);
+ // rogueBuffInfo
+ input.readMessage(rogueBuffInfo);
bitField0_ |= 0x00000080;
tag = input.readTag();
if (tag != 0) {
@@ -807,7 +807,7 @@ public final class RogueCurrentInfoOuterClass {
output.writeEnum(FieldNames.status, status, RogueStatusOuterClass.RogueStatus.converter());
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeMessage(FieldNames.rogueBuffInfo, rogueBuffInfo);
+ output.writeMessage(FieldNames.rogueMiracleInfo, rogueMiracleInfo);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeMessage(FieldNames.rogueAeonInfo, rogueAeonInfo);
@@ -816,16 +816,16 @@ public final class RogueCurrentInfoOuterClass {
output.writeMessage(FieldNames.rogueAvatarInfo, rogueAvatarInfo);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeMessage(FieldNames.rogueVirtualItem, rogueVirtualItem);
+ output.writeMessage(FieldNames.pendingAction, pendingAction);
}
if ((bitField0_ & 0x00000020) != 0) {
output.writeMessage(FieldNames.roomMap, roomMap);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeMessage(FieldNames.rogueMiracleInfo, rogueMiracleInfo);
+ output.writeMessage(FieldNames.rogueVirtualItem, rogueVirtualItem);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeMessage(FieldNames.pendingAction, pendingAction);
+ output.writeMessage(FieldNames.rogueBuffInfo, rogueBuffInfo);
}
output.endObject();
}
@@ -853,11 +853,11 @@ public final class RogueCurrentInfoOuterClass {
}
break;
}
- case 1107898267:
- case -694847243: {
- if (input.isAtField(FieldNames.rogueBuffInfo)) {
+ case -452511099:
+ case 1925436929: {
+ if (input.isAtField(FieldNames.rogueMiracleInfo)) {
if (!input.trySkipNullValue()) {
- input.readMessage(rogueBuffInfo);
+ input.readMessage(rogueMiracleInfo);
bitField0_ |= 0x00000002;
}
} else {
@@ -889,11 +889,11 @@ public final class RogueCurrentInfoOuterClass {
}
break;
}
- case 2090167940:
- case -856063476: {
- if (input.isAtField(FieldNames.rogueVirtualItem)) {
+ case -110680403:
+ case 1646545374: {
+ if (input.isAtField(FieldNames.pendingAction)) {
if (!input.trySkipNullValue()) {
- input.readMessage(rogueVirtualItem);
+ input.readMessage(pendingAction);
bitField0_ |= 0x00000010;
}
} else {
@@ -913,11 +913,11 @@ public final class RogueCurrentInfoOuterClass {
}
break;
}
- case -452511099:
- case 1925436929: {
- if (input.isAtField(FieldNames.rogueMiracleInfo)) {
+ case 2090167940:
+ case -856063476: {
+ if (input.isAtField(FieldNames.rogueVirtualItem)) {
if (!input.trySkipNullValue()) {
- input.readMessage(rogueMiracleInfo);
+ input.readMessage(rogueVirtualItem);
bitField0_ |= 0x00000040;
}
} else {
@@ -925,11 +925,11 @@ public final class RogueCurrentInfoOuterClass {
}
break;
}
- case -110680403:
- case 1646545374: {
- if (input.isAtField(FieldNames.pendingAction)) {
+ case 1107898267:
+ case -694847243: {
+ if (input.isAtField(FieldNames.rogueBuffInfo)) {
if (!input.trySkipNullValue()) {
- input.readMessage(pendingAction);
+ input.readMessage(rogueBuffInfo);
bitField0_ |= 0x00000080;
}
} else {
@@ -992,19 +992,19 @@ public final class RogueCurrentInfoOuterClass {
static class FieldNames {
static final FieldName status = FieldName.forField("status");
- static final FieldName rogueBuffInfo = FieldName.forField("rogueBuffInfo", "rogue_buff_info");
+ static final FieldName rogueMiracleInfo = FieldName.forField("rogueMiracleInfo", "rogue_miracle_info");
static final FieldName rogueAeonInfo = FieldName.forField("rogueAeonInfo", "rogue_aeon_info");
static final FieldName rogueAvatarInfo = FieldName.forField("rogueAvatarInfo", "rogue_avatar_info");
- static final FieldName rogueVirtualItem = FieldName.forField("rogueVirtualItem", "rogue_virtual_item");
+ static final FieldName pendingAction = FieldName.forField("pendingAction", "pending_action");
static final FieldName roomMap = FieldName.forField("roomMap", "room_map");
- static final FieldName rogueMiracleInfo = FieldName.forField("rogueMiracleInfo", "rogue_miracle_info");
+ static final FieldName rogueVirtualItem = FieldName.forField("rogueVirtualItem", "rogue_virtual_item");
- static final FieldName pendingAction = FieldName.forField("pendingAction", "pending_action");
+ static final FieldName rogueBuffInfo = FieldName.forField("rogueBuffInfo", "rogue_buff_info");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/RogueDialogueEventOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueDialogueEventOuterClass.java
index 4673889..f896b1b 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueDialogueEventOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueDialogueEventOuterClass.java
@@ -21,32 +21,32 @@ public final class RogueDialogueEventOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 KKCPLMGIADL = 1;
- */
- private int kKCPLMGIADL;
-
- /**
- * optional uint32 game_mode_type = 2;
- */
- private int gameModeType;
-
- /**
- * optional uint32 npc_id = 10;
+ * optional uint32 npc_id = 1;
*/
private int npcId;
+ /**
+ * optional uint32 dialogue_group_id = 5;
+ */
+ private int dialogueGroupId;
+
+ /**
+ * optional uint32 game_mode_type = 6;
+ */
+ private int gameModeType;
+
/**
* optional uint32 MBNBIEJIBFJ = 13;
*/
private int mBNBIEJIBFJ;
/**
- * repeated uint32 select_event_id = 15;
+ * repeated uint32 select_event_id = 11;
*/
private final RepeatedInt selectEventId = RepeatedInt.newEmptyInstance();
/**
- * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 12;
+ * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 9;
*/
private final RepeatedMessageoptional uint32 KKCPLMGIADL = 1;
- * @return whether the kKCPLMGIADL field is set
+ * optional uint32 npc_id = 1;
+ * @return whether the npcId field is set
*/
- public boolean hasKKCPLMGIADL() {
+ public boolean hasNpcId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 KKCPLMGIADL = 1;
- * @return this
- */
- public RogueDialogueEvent clearKKCPLMGIADL() {
- bitField0_ &= ~0x00000001;
- kKCPLMGIADL = 0;
- return this;
- }
-
- /**
- * optional uint32 KKCPLMGIADL = 1;
- * @return the kKCPLMGIADL
- */
- public int getKKCPLMGIADL() {
- return kKCPLMGIADL;
- }
-
- /**
- * optional uint32 KKCPLMGIADL = 1;
- * @param value the kKCPLMGIADL to set
- * @return this
- */
- public RogueDialogueEvent setKKCPLMGIADL(final int value) {
- bitField0_ |= 0x00000001;
- kKCPLMGIADL = value;
- return this;
- }
-
- /**
- * optional uint32 game_mode_type = 2;
- * @return whether the gameModeType field is set
- */
- public boolean hasGameModeType() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 game_mode_type = 2;
- * @return this
- */
- public RogueDialogueEvent clearGameModeType() {
- bitField0_ &= ~0x00000002;
- gameModeType = 0;
- return this;
- }
-
- /**
- * optional uint32 game_mode_type = 2;
- * @return the gameModeType
- */
- public int getGameModeType() {
- return gameModeType;
- }
-
- /**
- * optional uint32 game_mode_type = 2;
- * @param value the gameModeType to set
- * @return this
- */
- public RogueDialogueEvent setGameModeType(final int value) {
- bitField0_ |= 0x00000002;
- gameModeType = value;
- return this;
- }
-
- /**
- * optional uint32 npc_id = 10;
- * @return whether the npcId field is set
- */
- public boolean hasNpcId() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 npc_id = 10;
+ * optional uint32 npc_id = 1;
* @return this
*/
public RogueDialogueEvent clearNpcId() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000001;
npcId = 0;
return this;
}
/**
- * optional uint32 npc_id = 10;
+ * optional uint32 npc_id = 1;
* @return the npcId
*/
public int getNpcId() {
@@ -161,16 +87,90 @@ public final class RogueDialogueEventOuterClass {
}
/**
- * optional uint32 npc_id = 10;
+ * optional uint32 npc_id = 1;
* @param value the npcId to set
* @return this
*/
public RogueDialogueEvent setNpcId(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
npcId = value;
return this;
}
+ /**
+ * optional uint32 dialogue_group_id = 5;
+ * @return whether the dialogueGroupId field is set
+ */
+ public boolean hasDialogueGroupId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 dialogue_group_id = 5;
+ * @return this
+ */
+ public RogueDialogueEvent clearDialogueGroupId() {
+ bitField0_ &= ~0x00000002;
+ dialogueGroupId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 dialogue_group_id = 5;
+ * @return the dialogueGroupId
+ */
+ public int getDialogueGroupId() {
+ return dialogueGroupId;
+ }
+
+ /**
+ * optional uint32 dialogue_group_id = 5;
+ * @param value the dialogueGroupId to set
+ * @return this
+ */
+ public RogueDialogueEvent setDialogueGroupId(final int value) {
+ bitField0_ |= 0x00000002;
+ dialogueGroupId = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 game_mode_type = 6;
+ * @return whether the gameModeType field is set
+ */
+ public boolean hasGameModeType() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 game_mode_type = 6;
+ * @return this
+ */
+ public RogueDialogueEvent clearGameModeType() {
+ bitField0_ &= ~0x00000004;
+ gameModeType = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 game_mode_type = 6;
+ * @return the gameModeType
+ */
+ public int getGameModeType() {
+ return gameModeType;
+ }
+
+ /**
+ * optional uint32 game_mode_type = 6;
+ * @param value the gameModeType to set
+ * @return this
+ */
+ public RogueDialogueEvent setGameModeType(final int value) {
+ bitField0_ |= 0x00000004;
+ gameModeType = value;
+ return this;
+ }
+
/**
* optional uint32 MBNBIEJIBFJ = 13;
* @return whether the mBNBIEJIBFJ field is set
@@ -209,7 +209,7 @@ public final class RogueDialogueEventOuterClass {
}
/**
- * repeated uint32 select_event_id = 15;
+ * repeated uint32 select_event_id = 11;
* @return whether the selectEventId field is set
*/
public boolean hasSelectEventId() {
@@ -217,7 +217,7 @@ public final class RogueDialogueEventOuterClass {
}
/**
- * repeated uint32 select_event_id = 15;
+ * repeated uint32 select_event_id = 11;
* @return this
*/
public RogueDialogueEvent clearSelectEventId() {
@@ -227,7 +227,7 @@ public final class RogueDialogueEventOuterClass {
}
/**
- * repeated uint32 select_event_id = 15;
+ * repeated uint32 select_event_id = 11;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -241,7 +241,7 @@ public final class RogueDialogueEventOuterClass {
}
/**
- * repeated uint32 select_event_id = 15;
+ * repeated uint32 select_event_id = 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
@@ -255,7 +255,7 @@ public final class RogueDialogueEventOuterClass {
}
/**
- * repeated uint32 select_event_id = 15;
+ * repeated uint32 select_event_id = 11;
* @param value the selectEventId to add
* @return this
*/
@@ -266,7 +266,7 @@ public final class RogueDialogueEventOuterClass {
}
/**
- * repeated uint32 select_event_id = 15;
+ * repeated uint32 select_event_id = 11;
* @param values the selectEventId to add
* @return this
*/
@@ -277,7 +277,7 @@ public final class RogueDialogueEventOuterClass {
}
/**
- * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 12;
+ * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 9;
* @return whether the rogueDialogueEventParam field is set
*/
public boolean hasRogueDialogueEventParam() {
@@ -285,7 +285,7 @@ public final class RogueDialogueEventOuterClass {
}
/**
- * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 12;
+ * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 9;
* @return this
*/
public RogueDialogueEvent clearRogueDialogueEventParam() {
@@ -295,7 +295,7 @@ public final class RogueDialogueEventOuterClass {
}
/**
- * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 12;
+ * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 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.
@@ -310,7 +310,7 @@ public final class RogueDialogueEventOuterClass {
}
/**
- * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 12;
+ * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 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
@@ -325,7 +325,7 @@ public final class RogueDialogueEventOuterClass {
}
/**
- * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 12;
+ * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 9;
* @param value the rogueDialogueEventParam to add
* @return this
*/
@@ -337,7 +337,7 @@ public final class RogueDialogueEventOuterClass {
}
/**
- * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 12;
+ * repeated .RogueDialogueEventParam rogue_dialogue_event_param = 9;
* @param values the rogueDialogueEventParam to add
* @return this
*/
@@ -353,9 +353,9 @@ public final class RogueDialogueEventOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- kKCPLMGIADL = other.kKCPLMGIADL;
- gameModeType = other.gameModeType;
npcId = other.npcId;
+ dialogueGroupId = other.dialogueGroupId;
+ gameModeType = other.gameModeType;
mBNBIEJIBFJ = other.mBNBIEJIBFJ;
selectEventId.copyFrom(other.selectEventId);
rogueDialogueEventParam.copyFrom(other.rogueDialogueEventParam);
@@ -369,15 +369,15 @@ public final class RogueDialogueEventOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasKKCPLMGIADL()) {
- setKKCPLMGIADL(other.kKCPLMGIADL);
+ if (other.hasNpcId()) {
+ setNpcId(other.npcId);
+ }
+ if (other.hasDialogueGroupId()) {
+ setDialogueGroupId(other.dialogueGroupId);
}
if (other.hasGameModeType()) {
setGameModeType(other.gameModeType);
}
- if (other.hasNpcId()) {
- setNpcId(other.npcId);
- }
if (other.hasMBNBIEJIBFJ()) {
setMBNBIEJIBFJ(other.mBNBIEJIBFJ);
}
@@ -397,9 +397,9 @@ public final class RogueDialogueEventOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- kKCPLMGIADL = 0;
- gameModeType = 0;
npcId = 0;
+ dialogueGroupId = 0;
+ gameModeType = 0;
mBNBIEJIBFJ = 0;
selectEventId.clear();
rogueDialogueEventParam.clear();
@@ -428,9 +428,9 @@ public final class RogueDialogueEventOuterClass {
}
RogueDialogueEvent other = (RogueDialogueEvent) o;
return bitField0_ == other.bitField0_
- && (!hasKKCPLMGIADL() || kKCPLMGIADL == other.kKCPLMGIADL)
- && (!hasGameModeType() || gameModeType == other.gameModeType)
&& (!hasNpcId() || npcId == other.npcId)
+ && (!hasDialogueGroupId() || dialogueGroupId == other.dialogueGroupId)
+ && (!hasGameModeType() || gameModeType == other.gameModeType)
&& (!hasMBNBIEJIBFJ() || mBNBIEJIBFJ == other.mBNBIEJIBFJ)
&& (!hasSelectEventId() || selectEventId.equals(other.selectEventId))
&& (!hasRogueDialogueEventParam() || rogueDialogueEventParam.equals(other.rogueDialogueEventParam));
@@ -440,15 +440,15 @@ public final class RogueDialogueEventOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(kKCPLMGIADL);
+ output.writeUInt32NoTag(npcId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(gameModeType);
+ output.writeRawByte((byte) 40);
+ output.writeUInt32NoTag(dialogueGroupId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(npcId);
+ output.writeRawByte((byte) 48);
+ output.writeUInt32NoTag(gameModeType);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeRawByte((byte) 104);
@@ -456,13 +456,13 @@ public final class RogueDialogueEventOuterClass {
}
if ((bitField0_ & 0x00000010) != 0) {
for (int i = 0; i < selectEventId.length(); i++) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(selectEventId.array()[i]);
}
}
if ((bitField0_ & 0x00000020) != 0) {
for (int i = 0; i < rogueDialogueEventParam.length(); i++) {
- output.writeRawByte((byte) 98);
+ output.writeRawByte((byte) 74);
output.writeMessageNoTag(rogueDialogueEventParam.get(i));
}
}
@@ -472,13 +472,13 @@ public final class RogueDialogueEventOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(kKCPLMGIADL);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(npcId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(gameModeType);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueGroupId);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(npcId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(gameModeType);
}
if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(mBNBIEJIBFJ);
@@ -500,26 +500,26 @@ public final class RogueDialogueEventOuterClass {
while (true) {
switch (tag) {
case 8: {
- // kKCPLMGIADL
- kKCPLMGIADL = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 16) {
- break;
- }
- }
- case 16: {
- // gameModeType
- gameModeType = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 80) {
- break;
- }
- }
- case 80: {
// npcId
npcId = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 40) {
+ break;
+ }
+ }
+ case 40: {
+ // dialogueGroupId
+ dialogueGroupId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 48) {
+ break;
+ }
+ }
+ case 48: {
+ // gameModeType
+ gameModeType = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 104) {
@@ -531,20 +531,20 @@ public final class RogueDialogueEventOuterClass {
mBNBIEJIBFJ = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 122) {
+ if (tag != 90) {
break;
}
}
- case 122: {
+ case 90: {
// selectEventId [packed=true]
input.readPackedUInt32(selectEventId, tag);
bitField0_ |= 0x00000010;
tag = input.readTag();
- if (tag != 98) {
+ if (tag != 74) {
break;
}
}
- case 98: {
+ case 74: {
// rogueDialogueEventParam
tag = input.readRepeatedMessage(rogueDialogueEventParam, tag);
bitField0_ |= 0x00000020;
@@ -562,7 +562,7 @@ public final class RogueDialogueEventOuterClass {
tag = input.readTag();
break;
}
- case 120: {
+ case 88: {
// selectEventId [packed=false]
tag = input.readRepeatedUInt32(selectEventId, tag);
bitField0_ |= 0x00000010;
@@ -576,13 +576,13 @@ public final class RogueDialogueEventOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.kKCPLMGIADL, kKCPLMGIADL);
+ output.writeUInt32(FieldNames.npcId, npcId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.gameModeType, gameModeType);
+ output.writeUInt32(FieldNames.dialogueGroupId, dialogueGroupId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.npcId, npcId);
+ output.writeUInt32(FieldNames.gameModeType, gameModeType);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeUInt32(FieldNames.mBNBIEJIBFJ, mBNBIEJIBFJ);
@@ -603,10 +603,11 @@ public final class RogueDialogueEventOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1332411111: {
- if (input.isAtField(FieldNames.kKCPLMGIADL)) {
+ case 105021404:
+ case -1039282375: {
+ if (input.isAtField(FieldNames.npcId)) {
if (!input.trySkipNullValue()) {
- kKCPLMGIADL = input.readUInt32();
+ npcId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -614,23 +615,23 @@ public final class RogueDialogueEventOuterClass {
}
break;
}
+ case 1758320386:
+ case 1899979106: {
+ if (input.isAtField(FieldNames.dialogueGroupId)) {
+ if (!input.trySkipNullValue()) {
+ dialogueGroupId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case -464498289:
case 1937775689: {
if (input.isAtField(FieldNames.gameModeType)) {
if (!input.trySkipNullValue()) {
gameModeType = input.readUInt32();
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 105021404:
- case -1039282375: {
- if (input.isAtField(FieldNames.npcId)) {
- if (!input.trySkipNullValue()) {
- npcId = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -726,12 +727,12 @@ public final class RogueDialogueEventOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName kKCPLMGIADL = FieldName.forField("KKCPLMGIADL");
+ static final FieldName npcId = FieldName.forField("npcId", "npc_id");
+
+ static final FieldName dialogueGroupId = FieldName.forField("dialogueGroupId", "dialogue_group_id");
static final FieldName gameModeType = FieldName.forField("gameModeType", "game_mode_type");
- static final FieldName npcId = FieldName.forField("npcId", "npc_id");
-
static final FieldName mBNBIEJIBFJ = FieldName.forField("MBNBIEJIBFJ");
static final FieldName selectEventId = FieldName.forField("selectEventId", "select_event_id");
diff --git a/src/generated/main/emu/lunarcore/proto/RogueDialogueEventParamOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueDialogueEventParamOuterClass.java
index 32b0b37..8413afa 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueDialogueEventParamOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueDialogueEventParamOuterClass.java
@@ -20,27 +20,27 @@ public final class RogueDialogueEventParamOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional float ratio = 13;
+ * optional float ratio = 4;
*/
private float ratio;
/**
- * optional int32 int_value = 10;
- */
- private int intValue;
-
- /**
- * optional uint32 dialogue_event_id = 7;
+ * optional uint32 dialogue_event_id = 8;
*/
private int dialogueEventId;
/**
- * optional uint32 arg_id = 11;
+ * optional uint32 arg_id = 14;
*/
private int argId;
/**
- * optional bool is_valid = 15;
+ * optional sint32 int_value = 5;
+ */
+ private int intValue;
+
+ /**
+ * optional bool is_valid = 11;
*/
private boolean isValid;
@@ -55,7 +55,7 @@ public final class RogueDialogueEventParamOuterClass {
}
/**
- * optional float ratio = 13;
+ * optional float ratio = 4;
* @return whether the ratio field is set
*/
public boolean hasRatio() {
@@ -63,7 +63,7 @@ public final class RogueDialogueEventParamOuterClass {
}
/**
- * optional float ratio = 13;
+ * optional float ratio = 4;
* @return this
*/
public RogueDialogueEventParam clearRatio() {
@@ -73,7 +73,7 @@ public final class RogueDialogueEventParamOuterClass {
}
/**
- * optional float ratio = 13;
+ * optional float ratio = 4;
* @return the ratio
*/
public float getRatio() {
@@ -81,7 +81,7 @@ public final class RogueDialogueEventParamOuterClass {
}
/**
- * optional float ratio = 13;
+ * optional float ratio = 4;
* @param value the ratio to set
* @return this
*/
@@ -92,62 +92,25 @@ public final class RogueDialogueEventParamOuterClass {
}
/**
- * optional int32 int_value = 10;
- * @return whether the intValue field is set
+ * optional uint32 dialogue_event_id = 8;
+ * @return whether the dialogueEventId field is set
*/
- public boolean hasIntValue() {
+ public boolean hasDialogueEventId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional int32 int_value = 10;
- * @return this
- */
- public RogueDialogueEventParam clearIntValue() {
- bitField0_ &= ~0x00000002;
- intValue = 0;
- return this;
- }
-
- /**
- * optional int32 int_value = 10;
- * @return the intValue
- */
- public int getIntValue() {
- return intValue;
- }
-
- /**
- * optional int32 int_value = 10;
- * @param value the intValue to set
- * @return this
- */
- public RogueDialogueEventParam setIntValue(final int value) {
- bitField0_ |= 0x00000002;
- intValue = value;
- return this;
- }
-
- /**
- * optional uint32 dialogue_event_id = 7;
- * @return whether the dialogueEventId field is set
- */
- public boolean hasDialogueEventId() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 dialogue_event_id = 7;
+ * optional uint32 dialogue_event_id = 8;
* @return this
*/
public RogueDialogueEventParam clearDialogueEventId() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
dialogueEventId = 0;
return this;
}
/**
- * optional uint32 dialogue_event_id = 7;
+ * optional uint32 dialogue_event_id = 8;
* @return the dialogueEventId
*/
public int getDialogueEventId() {
@@ -155,36 +118,36 @@ public final class RogueDialogueEventParamOuterClass {
}
/**
- * optional uint32 dialogue_event_id = 7;
+ * optional uint32 dialogue_event_id = 8;
* @param value the dialogueEventId to set
* @return this
*/
public RogueDialogueEventParam setDialogueEventId(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
dialogueEventId = value;
return this;
}
/**
- * optional uint32 arg_id = 11;
+ * optional uint32 arg_id = 14;
* @return whether the argId field is set
*/
public boolean hasArgId() {
- return (bitField0_ & 0x00000008) != 0;
+ return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 arg_id = 11;
+ * optional uint32 arg_id = 14;
* @return this
*/
public RogueDialogueEventParam clearArgId() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000004;
argId = 0;
return this;
}
/**
- * optional uint32 arg_id = 11;
+ * optional uint32 arg_id = 14;
* @return the argId
*/
public int getArgId() {
@@ -192,18 +155,55 @@ public final class RogueDialogueEventParamOuterClass {
}
/**
- * optional uint32 arg_id = 11;
+ * optional uint32 arg_id = 14;
* @param value the argId to set
* @return this
*/
public RogueDialogueEventParam setArgId(final int value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
argId = value;
return this;
}
/**
- * optional bool is_valid = 15;
+ * optional sint32 int_value = 5;
+ * @return whether the intValue field is set
+ */
+ public boolean hasIntValue() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional sint32 int_value = 5;
+ * @return this
+ */
+ public RogueDialogueEventParam clearIntValue() {
+ bitField0_ &= ~0x00000008;
+ intValue = 0;
+ return this;
+ }
+
+ /**
+ * optional sint32 int_value = 5;
+ * @return the intValue
+ */
+ public int getIntValue() {
+ return intValue;
+ }
+
+ /**
+ * optional sint32 int_value = 5;
+ * @param value the intValue to set
+ * @return this
+ */
+ public RogueDialogueEventParam setIntValue(final int value) {
+ bitField0_ |= 0x00000008;
+ intValue = value;
+ return this;
+ }
+
+ /**
+ * optional bool is_valid = 11;
* @return whether the isValid field is set
*/
public boolean hasIsValid() {
@@ -211,7 +211,7 @@ public final class RogueDialogueEventParamOuterClass {
}
/**
- * optional bool is_valid = 15;
+ * optional bool is_valid = 11;
* @return this
*/
public RogueDialogueEventParam clearIsValid() {
@@ -221,7 +221,7 @@ public final class RogueDialogueEventParamOuterClass {
}
/**
- * optional bool is_valid = 15;
+ * optional bool is_valid = 11;
* @return the isValid
*/
public boolean getIsValid() {
@@ -229,7 +229,7 @@ public final class RogueDialogueEventParamOuterClass {
}
/**
- * optional bool is_valid = 15;
+ * optional bool is_valid = 11;
* @param value the isValid to set
* @return this
*/
@@ -245,9 +245,9 @@ public final class RogueDialogueEventParamOuterClass {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
ratio = other.ratio;
- intValue = other.intValue;
dialogueEventId = other.dialogueEventId;
argId = other.argId;
+ intValue = other.intValue;
isValid = other.isValid;
}
return this;
@@ -262,15 +262,15 @@ public final class RogueDialogueEventParamOuterClass {
if (other.hasRatio()) {
setRatio(other.ratio);
}
- if (other.hasIntValue()) {
- setIntValue(other.intValue);
- }
if (other.hasDialogueEventId()) {
setDialogueEventId(other.dialogueEventId);
}
if (other.hasArgId()) {
setArgId(other.argId);
}
+ if (other.hasIntValue()) {
+ setIntValue(other.intValue);
+ }
if (other.hasIsValid()) {
setIsValid(other.isValid);
}
@@ -285,9 +285,9 @@ public final class RogueDialogueEventParamOuterClass {
cachedSize = -1;
bitField0_ = 0;
ratio = 0F;
- intValue = 0;
dialogueEventId = 0;
argId = 0;
+ intValue = 0;
isValid = false;
return this;
}
@@ -313,32 +313,32 @@ public final class RogueDialogueEventParamOuterClass {
RogueDialogueEventParam other = (RogueDialogueEventParam) o;
return bitField0_ == other.bitField0_
&& (!hasRatio() || ProtoUtil.isEqual(ratio, other.ratio))
- && (!hasIntValue() || intValue == other.intValue)
&& (!hasDialogueEventId() || dialogueEventId == other.dialogueEventId)
&& (!hasArgId() || argId == other.argId)
+ && (!hasIntValue() || intValue == other.intValue)
&& (!hasIsValid() || isValid == other.isValid);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 109);
+ output.writeRawByte((byte) 37);
output.writeFloatNoTag(ratio);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 80);
- output.writeInt32NoTag(intValue);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(dialogueEventId);
}
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 88);
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 112);
output.writeUInt32NoTag(argId);
}
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeRawByte((byte) 40);
+ output.writeSInt32NoTag(intValue);
+ }
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 88);
output.writeBoolNoTag(isValid);
}
}
@@ -350,14 +350,14 @@ public final class RogueDialogueEventParamOuterClass {
size += 5;
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeInt32SizeNoTag(intValue);
- }
- if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueEventId);
}
- if ((bitField0_ & 0x00000008) != 0) {
+ if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(argId);
}
+ if ((bitField0_ & 0x00000008) != 0) {
+ size += 1 + ProtoSink.computeSInt32SizeNoTag(intValue);
+ }
if ((bitField0_ & 0x00000010) != 0) {
size += 2;
}
@@ -371,43 +371,43 @@ public final class RogueDialogueEventParamOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 109: {
+ case 37: {
// ratio
ratio = input.readFloat();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 80) {
+ if (tag != 64) {
break;
}
}
- case 80: {
- // intValue
- intValue = input.readInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 56) {
- break;
- }
- }
- case 56: {
+ case 64: {
// dialogueEventId
dialogueEventId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 112) {
+ break;
+ }
+ }
+ case 112: {
+ // argId
+ argId = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
+ if (tag != 40) {
+ break;
+ }
+ }
+ case 40: {
+ // intValue
+ intValue = input.readSInt32();
+ bitField0_ |= 0x00000008;
+ tag = input.readTag();
if (tag != 88) {
break;
}
}
case 88: {
- // argId
- argId = input.readUInt32();
- bitField0_ |= 0x00000008;
- tag = input.readTag();
- if (tag != 120) {
- break;
- }
- }
- case 120: {
// isValid
isValid = input.readBool();
bitField0_ |= 0x00000010;
@@ -437,14 +437,14 @@ public final class RogueDialogueEventParamOuterClass {
output.writeFloat(FieldNames.ratio, ratio);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeInt32(FieldNames.intValue, intValue);
- }
- if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.dialogueEventId, dialogueEventId);
}
- if ((bitField0_ & 0x00000008) != 0) {
+ if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.argId, argId);
}
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeSInt32(FieldNames.intValue, intValue);
+ }
if ((bitField0_ & 0x00000010) != 0) {
output.writeBool(FieldNames.isValid, isValid);
}
@@ -469,24 +469,12 @@ public final class RogueDialogueEventParamOuterClass {
}
break;
}
- case 556050114:
- case 334404897: {
- if (input.isAtField(FieldNames.intValue)) {
- if (!input.trySkipNullValue()) {
- intValue = input.readInt32();
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 88389725:
case 1671736167: {
if (input.isAtField(FieldNames.dialogueEventId)) {
if (!input.trySkipNullValue()) {
dialogueEventId = input.readUInt32();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
}
} else {
input.skipUnknownField();
@@ -498,6 +486,18 @@ public final class RogueDialogueEventParamOuterClass {
if (input.isAtField(FieldNames.argId)) {
if (!input.trySkipNullValue()) {
argId = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 556050114:
+ case 334404897: {
+ if (input.isAtField(FieldNames.intValue)) {
+ if (!input.trySkipNullValue()) {
+ intValue = input.readSInt32();
bitField0_ |= 0x00000008;
}
} else {
@@ -572,12 +572,12 @@ public final class RogueDialogueEventParamOuterClass {
static class FieldNames {
static final FieldName ratio = FieldName.forField("ratio");
- static final FieldName intValue = FieldName.forField("intValue", "int_value");
-
static final FieldName dialogueEventId = FieldName.forField("dialogueEventId", "dialogue_event_id");
static final FieldName argId = FieldName.forField("argId", "arg_id");
+ static final FieldName intValue = FieldName.forField("intValue", "int_value");
+
static final FieldName isValid = FieldName.forField("isValid", "is_valid");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/RogueFinishInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueFinishInfoOuterClass.java
index 85b08c4..37f3716 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueFinishInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueFinishInfoOuterClass.java
@@ -19,49 +19,61 @@ public final class RogueFinishInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 total_score = 1;
- */
- private int totalScore;
-
- /**
- * optional uint32 pass_room_count = 4;
+ * optional uint32 pass_room_count = 3;
*/
private int passRoomCount;
+ /**
+ * optional uint32 total_score = 9;
+ */
+ private int totalScore;
+
/**
* optional uint32 taken_score = 10;
*/
private int takenScore;
/**
- * optional uint32 area_id = 260;
+ * optional uint32 area_id = 1131;
*/
private int areaId;
/**
- * optional uint32 reach_room_count = 682;
+ * + * unfinished + *+ * + *
optional uint32 reach_room_count = 1911;
*/
private int reachRoomCount;
/**
- * optional bool is_win = 8;
+ * optional bool is_win = 4;
*/
private boolean isWin;
/**
- * optional .RogueScoreRewardInfo cur_score_reward_info = 11;
+ * optional .RogueRecordInfo record_info = 5;
*/
- private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo curScoreRewardInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance();
+ private final RogueRecordInfoOuterClass.RogueRecordInfo recordInfo = RogueRecordInfoOuterClass.RogueRecordInfo.newInstance();
/**
- * optional .RogueScoreRewardInfo score_reward_info = 12;
+ * + * may be 14 + *+ * + *
optional .RogueScoreRewardInfo score_reward_info = 7;
*/
private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo scoreRewardInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance();
/**
- * optional .RogueRecordInfo record_info = 13;
+ * + * may be 7 + *+ * + *
optional .RogueScoreRewardInfo cur_score_reward_info = 14;
*/
- private final RogueRecordInfoOuterClass.RogueRecordInfo recordInfo = RogueRecordInfoOuterClass.RogueRecordInfo.newInstance();
+ private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo curScoreRewardInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance();
private RogueFinishInfo() {
}
@@ -74,62 +86,25 @@ public final class RogueFinishInfoOuterClass {
}
/**
- * optional uint32 total_score = 1;
- * @return whether the totalScore field is set
+ * optional uint32 pass_room_count = 3;
+ * @return whether the passRoomCount field is set
*/
- public boolean hasTotalScore() {
+ public boolean hasPassRoomCount() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 total_score = 1;
- * @return this
- */
- public RogueFinishInfo clearTotalScore() {
- bitField0_ &= ~0x00000001;
- totalScore = 0;
- return this;
- }
-
- /**
- * optional uint32 total_score = 1;
- * @return the totalScore
- */
- public int getTotalScore() {
- return totalScore;
- }
-
- /**
- * optional uint32 total_score = 1;
- * @param value the totalScore to set
- * @return this
- */
- public RogueFinishInfo setTotalScore(final int value) {
- bitField0_ |= 0x00000001;
- totalScore = value;
- return this;
- }
-
- /**
- * optional uint32 pass_room_count = 4;
- * @return whether the passRoomCount field is set
- */
- public boolean hasPassRoomCount() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 pass_room_count = 4;
+ * optional uint32 pass_room_count = 3;
* @return this
*/
public RogueFinishInfo clearPassRoomCount() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
passRoomCount = 0;
return this;
}
/**
- * optional uint32 pass_room_count = 4;
+ * optional uint32 pass_room_count = 3;
* @return the passRoomCount
*/
public int getPassRoomCount() {
@@ -137,16 +112,53 @@ public final class RogueFinishInfoOuterClass {
}
/**
- * optional uint32 pass_room_count = 4;
+ * optional uint32 pass_room_count = 3;
* @param value the passRoomCount to set
* @return this
*/
public RogueFinishInfo setPassRoomCount(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
passRoomCount = value;
return this;
}
+ /**
+ * optional uint32 total_score = 9;
+ * @return whether the totalScore field is set
+ */
+ public boolean hasTotalScore() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 total_score = 9;
+ * @return this
+ */
+ public RogueFinishInfo clearTotalScore() {
+ bitField0_ &= ~0x00000002;
+ totalScore = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 total_score = 9;
+ * @return the totalScore
+ */
+ public int getTotalScore() {
+ return totalScore;
+ }
+
+ /**
+ * optional uint32 total_score = 9;
+ * @param value the totalScore to set
+ * @return this
+ */
+ public RogueFinishInfo setTotalScore(final int value) {
+ bitField0_ |= 0x00000002;
+ totalScore = value;
+ return this;
+ }
+
/**
* optional uint32 taken_score = 10;
* @return whether the takenScore field is set
@@ -185,7 +197,7 @@ public final class RogueFinishInfoOuterClass {
}
/**
- * optional uint32 area_id = 260;
+ * optional uint32 area_id = 1131;
* @return whether the areaId field is set
*/
public boolean hasAreaId() {
@@ -193,7 +205,7 @@ public final class RogueFinishInfoOuterClass {
}
/**
- * optional uint32 area_id = 260;
+ * optional uint32 area_id = 1131;
* @return this
*/
public RogueFinishInfo clearAreaId() {
@@ -203,7 +215,7 @@ public final class RogueFinishInfoOuterClass {
}
/**
- * optional uint32 area_id = 260;
+ * optional uint32 area_id = 1131;
* @return the areaId
*/
public int getAreaId() {
@@ -211,7 +223,7 @@ public final class RogueFinishInfoOuterClass {
}
/**
- * optional uint32 area_id = 260;
+ * optional uint32 area_id = 1131;
* @param value the areaId to set
* @return this
*/
@@ -222,7 +234,11 @@ public final class RogueFinishInfoOuterClass {
}
/**
- * optional uint32 reach_room_count = 682;
+ * + * unfinished + *+ * + *
optional uint32 reach_room_count = 1911;
* @return whether the reachRoomCount field is set
*/
public boolean hasReachRoomCount() {
@@ -230,7 +246,11 @@ public final class RogueFinishInfoOuterClass {
}
/**
- * optional uint32 reach_room_count = 682;
+ * + * unfinished + *+ * + *
optional uint32 reach_room_count = 1911;
* @return this
*/
public RogueFinishInfo clearReachRoomCount() {
@@ -240,7 +260,11 @@ public final class RogueFinishInfoOuterClass {
}
/**
- * optional uint32 reach_room_count = 682;
+ * + * unfinished + *+ * + *
optional uint32 reach_room_count = 1911;
* @return the reachRoomCount
*/
public int getReachRoomCount() {
@@ -248,7 +272,11 @@ public final class RogueFinishInfoOuterClass {
}
/**
- * optional uint32 reach_room_count = 682;
+ * + * unfinished + *+ * + *
optional uint32 reach_room_count = 1911;
* @param value the reachRoomCount to set
* @return this
*/
@@ -259,7 +287,7 @@ public final class RogueFinishInfoOuterClass {
}
/**
- * optional bool is_win = 8;
+ * optional bool is_win = 4;
* @return whether the isWin field is set
*/
public boolean hasIsWin() {
@@ -267,7 +295,7 @@ public final class RogueFinishInfoOuterClass {
}
/**
- * optional bool is_win = 8;
+ * optional bool is_win = 4;
* @return this
*/
public RogueFinishInfo clearIsWin() {
@@ -277,7 +305,7 @@ public final class RogueFinishInfoOuterClass {
}
/**
- * optional bool is_win = 8;
+ * optional bool is_win = 4;
* @return the isWin
*/
public boolean getIsWin() {
@@ -285,7 +313,7 @@ public final class RogueFinishInfoOuterClass {
}
/**
- * optional bool is_win = 8;
+ * optional bool is_win = 4;
* @param value the isWin to set
* @return this
*/
@@ -296,141 +324,25 @@ public final class RogueFinishInfoOuterClass {
}
/**
- * optional .RogueScoreRewardInfo cur_score_reward_info = 11;
- * @return whether the curScoreRewardInfo field is set
+ * optional .RogueRecordInfo record_info = 5;
+ * @return whether the recordInfo field is set
*/
- public boolean hasCurScoreRewardInfo() {
+ public boolean hasRecordInfo() {
return (bitField0_ & 0x00000040) != 0;
}
/**
- * optional .RogueScoreRewardInfo cur_score_reward_info = 11;
- * @return this
- */
- public RogueFinishInfo clearCurScoreRewardInfo() {
- bitField0_ &= ~0x00000040;
- curScoreRewardInfo.clear();
- return this;
- }
-
- /**
- * optional .RogueScoreRewardInfo cur_score_reward_info = 11;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableCurScoreRewardInfo()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getCurScoreRewardInfo() {
- return curScoreRewardInfo;
- }
-
- /**
- * optional .RogueScoreRewardInfo cur_score_reward_info = 11;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getMutableCurScoreRewardInfo() {
- bitField0_ |= 0x00000040;
- return curScoreRewardInfo;
- }
-
- /**
- * optional .RogueScoreRewardInfo cur_score_reward_info = 11;
- * @param value the curScoreRewardInfo to set
- * @return this
- */
- public RogueFinishInfo setCurScoreRewardInfo(
- final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo value) {
- bitField0_ |= 0x00000040;
- curScoreRewardInfo.copyFrom(value);
- return this;
- }
-
- /**
- * optional .RogueScoreRewardInfo score_reward_info = 12;
- * @return whether the scoreRewardInfo field is set
- */
- public boolean hasScoreRewardInfo() {
- return (bitField0_ & 0x00000080) != 0;
- }
-
- /**
- * optional .RogueScoreRewardInfo score_reward_info = 12;
- * @return this
- */
- public RogueFinishInfo clearScoreRewardInfo() {
- bitField0_ &= ~0x00000080;
- scoreRewardInfo.clear();
- return this;
- }
-
- /**
- * optional .RogueScoreRewardInfo score_reward_info = 12;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableScoreRewardInfo()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getScoreRewardInfo() {
- return scoreRewardInfo;
- }
-
- /**
- * optional .RogueScoreRewardInfo score_reward_info = 12;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getMutableScoreRewardInfo() {
- bitField0_ |= 0x00000080;
- return scoreRewardInfo;
- }
-
- /**
- * optional .RogueScoreRewardInfo score_reward_info = 12;
- * @param value the scoreRewardInfo to set
- * @return this
- */
- public RogueFinishInfo setScoreRewardInfo(
- final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo value) {
- bitField0_ |= 0x00000080;
- scoreRewardInfo.copyFrom(value);
- return this;
- }
-
- /**
- * optional .RogueRecordInfo record_info = 13;
- * @return whether the recordInfo field is set
- */
- public boolean hasRecordInfo() {
- return (bitField0_ & 0x00000100) != 0;
- }
-
- /**
- * optional .RogueRecordInfo record_info = 13;
+ * optional .RogueRecordInfo record_info = 5;
* @return this
*/
public RogueFinishInfo clearRecordInfo() {
- bitField0_ &= ~0x00000100;
+ bitField0_ &= ~0x00000040;
recordInfo.clear();
return this;
}
/**
- * optional .RogueRecordInfo record_info = 13;
+ * optional .RogueRecordInfo record_info = 5;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -444,7 +356,7 @@ public final class RogueFinishInfoOuterClass {
}
/**
- * optional .RogueRecordInfo record_info = 13;
+ * optional .RogueRecordInfo record_info = 5;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -453,35 +365,191 @@ public final class RogueFinishInfoOuterClass {
* @return internal storage object for modifications
*/
public RogueRecordInfoOuterClass.RogueRecordInfo getMutableRecordInfo() {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000040;
return recordInfo;
}
/**
- * optional .RogueRecordInfo record_info = 13;
+ * optional .RogueRecordInfo record_info = 5;
* @param value the recordInfo to set
* @return this
*/
public RogueFinishInfo setRecordInfo(final RogueRecordInfoOuterClass.RogueRecordInfo value) {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000040;
recordInfo.copyFrom(value);
return this;
}
+ /**
+ * + * may be 14 + *+ * + *
optional .RogueScoreRewardInfo score_reward_info = 7;
+ * @return whether the scoreRewardInfo field is set
+ */
+ public boolean hasScoreRewardInfo() {
+ return (bitField0_ & 0x00000080) != 0;
+ }
+
+ /**
+ * + * may be 14 + *+ * + *
optional .RogueScoreRewardInfo score_reward_info = 7;
+ * @return this
+ */
+ public RogueFinishInfo clearScoreRewardInfo() {
+ bitField0_ &= ~0x00000080;
+ scoreRewardInfo.clear();
+ return this;
+ }
+
+ /**
+ * + * may be 14 + *+ * + *
optional .RogueScoreRewardInfo score_reward_info = 7;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableScoreRewardInfo()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getScoreRewardInfo() {
+ return scoreRewardInfo;
+ }
+
+ /**
+ * + * may be 14 + *+ * + *
optional .RogueScoreRewardInfo score_reward_info = 7;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getMutableScoreRewardInfo() {
+ bitField0_ |= 0x00000080;
+ return scoreRewardInfo;
+ }
+
+ /**
+ * + * may be 14 + *+ * + *
optional .RogueScoreRewardInfo score_reward_info = 7;
+ * @param value the scoreRewardInfo to set
+ * @return this
+ */
+ public RogueFinishInfo setScoreRewardInfo(
+ final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo value) {
+ bitField0_ |= 0x00000080;
+ scoreRewardInfo.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * + * may be 7 + *+ * + *
optional .RogueScoreRewardInfo cur_score_reward_info = 14;
+ * @return whether the curScoreRewardInfo field is set
+ */
+ public boolean hasCurScoreRewardInfo() {
+ return (bitField0_ & 0x00000100) != 0;
+ }
+
+ /**
+ * + * may be 7 + *+ * + *
optional .RogueScoreRewardInfo cur_score_reward_info = 14;
+ * @return this
+ */
+ public RogueFinishInfo clearCurScoreRewardInfo() {
+ bitField0_ &= ~0x00000100;
+ curScoreRewardInfo.clear();
+ return this;
+ }
+
+ /**
+ * + * may be 7 + *+ * + *
optional .RogueScoreRewardInfo cur_score_reward_info = 14;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableCurScoreRewardInfo()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getCurScoreRewardInfo() {
+ return curScoreRewardInfo;
+ }
+
+ /**
+ * + * may be 7 + *+ * + *
optional .RogueScoreRewardInfo cur_score_reward_info = 14;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getMutableCurScoreRewardInfo() {
+ bitField0_ |= 0x00000100;
+ return curScoreRewardInfo;
+ }
+
+ /**
+ * + * may be 7 + *+ * + *
optional .RogueScoreRewardInfo cur_score_reward_info = 14;
+ * @param value the curScoreRewardInfo to set
+ * @return this
+ */
+ public RogueFinishInfo setCurScoreRewardInfo(
+ final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo value) {
+ bitField0_ |= 0x00000100;
+ curScoreRewardInfo.copyFrom(value);
+ return this;
+ }
+
@Override
public RogueFinishInfo copyFrom(final RogueFinishInfo other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- totalScore = other.totalScore;
passRoomCount = other.passRoomCount;
+ totalScore = other.totalScore;
takenScore = other.takenScore;
areaId = other.areaId;
reachRoomCount = other.reachRoomCount;
isWin = other.isWin;
- curScoreRewardInfo.copyFrom(other.curScoreRewardInfo);
- scoreRewardInfo.copyFrom(other.scoreRewardInfo);
recordInfo.copyFrom(other.recordInfo);
+ scoreRewardInfo.copyFrom(other.scoreRewardInfo);
+ curScoreRewardInfo.copyFrom(other.curScoreRewardInfo);
}
return this;
}
@@ -492,12 +560,12 @@ public final class RogueFinishInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasTotalScore()) {
- setTotalScore(other.totalScore);
- }
if (other.hasPassRoomCount()) {
setPassRoomCount(other.passRoomCount);
}
+ if (other.hasTotalScore()) {
+ setTotalScore(other.totalScore);
+ }
if (other.hasTakenScore()) {
setTakenScore(other.takenScore);
}
@@ -510,14 +578,14 @@ public final class RogueFinishInfoOuterClass {
if (other.hasIsWin()) {
setIsWin(other.isWin);
}
- if (other.hasCurScoreRewardInfo()) {
- getMutableCurScoreRewardInfo().mergeFrom(other.curScoreRewardInfo);
+ if (other.hasRecordInfo()) {
+ getMutableRecordInfo().mergeFrom(other.recordInfo);
}
if (other.hasScoreRewardInfo()) {
getMutableScoreRewardInfo().mergeFrom(other.scoreRewardInfo);
}
- if (other.hasRecordInfo()) {
- getMutableRecordInfo().mergeFrom(other.recordInfo);
+ if (other.hasCurScoreRewardInfo()) {
+ getMutableCurScoreRewardInfo().mergeFrom(other.curScoreRewardInfo);
}
return this;
}
@@ -529,15 +597,15 @@ public final class RogueFinishInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- totalScore = 0;
passRoomCount = 0;
+ totalScore = 0;
takenScore = 0;
areaId = 0;
reachRoomCount = 0;
isWin = false;
- curScoreRewardInfo.clear();
- scoreRewardInfo.clear();
recordInfo.clear();
+ scoreRewardInfo.clear();
+ curScoreRewardInfo.clear();
return this;
}
@@ -548,9 +616,9 @@ public final class RogueFinishInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- curScoreRewardInfo.clearQuick();
- scoreRewardInfo.clearQuick();
recordInfo.clearQuick();
+ scoreRewardInfo.clearQuick();
+ curScoreRewardInfo.clearQuick();
return this;
}
@@ -564,54 +632,54 @@ public final class RogueFinishInfoOuterClass {
}
RogueFinishInfo other = (RogueFinishInfo) o;
return bitField0_ == other.bitField0_
- && (!hasTotalScore() || totalScore == other.totalScore)
&& (!hasPassRoomCount() || passRoomCount == other.passRoomCount)
+ && (!hasTotalScore() || totalScore == other.totalScore)
&& (!hasTakenScore() || takenScore == other.takenScore)
&& (!hasAreaId() || areaId == other.areaId)
&& (!hasReachRoomCount() || reachRoomCount == other.reachRoomCount)
&& (!hasIsWin() || isWin == other.isWin)
- && (!hasCurScoreRewardInfo() || curScoreRewardInfo.equals(other.curScoreRewardInfo))
+ && (!hasRecordInfo() || recordInfo.equals(other.recordInfo))
&& (!hasScoreRewardInfo() || scoreRewardInfo.equals(other.scoreRewardInfo))
- && (!hasRecordInfo() || recordInfo.equals(other.recordInfo));
+ && (!hasCurScoreRewardInfo() || curScoreRewardInfo.equals(other.curScoreRewardInfo));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(totalScore);
+ output.writeRawByte((byte) 24);
+ output.writeUInt32NoTag(passRoomCount);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(passRoomCount);
+ output.writeRawByte((byte) 72);
+ output.writeUInt32NoTag(totalScore);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 80);
output.writeUInt32NoTag(takenScore);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawLittleEndian16((short) 4256);
+ output.writeRawLittleEndian16((short) 18136);
output.writeUInt32NoTag(areaId);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawLittleEndian16((short) 10960);
+ output.writeRawLittleEndian16((short) 30648);
output.writeUInt32NoTag(reachRoomCount);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 32);
output.writeBoolNoTag(isWin);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawByte((byte) 90);
- output.writeMessageNoTag(curScoreRewardInfo);
+ output.writeRawByte((byte) 42);
+ output.writeMessageNoTag(recordInfo);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRawByte((byte) 98);
+ output.writeRawByte((byte) 58);
output.writeMessageNoTag(scoreRewardInfo);
}
if ((bitField0_ & 0x00000100) != 0) {
- output.writeRawByte((byte) 106);
- output.writeMessageNoTag(recordInfo);
+ output.writeRawByte((byte) 114);
+ output.writeMessageNoTag(curScoreRewardInfo);
}
}
@@ -619,10 +687,10 @@ public final class RogueFinishInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(totalScore);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(passRoomCount);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(passRoomCount);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(totalScore);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(takenScore);
@@ -637,13 +705,13 @@ public final class RogueFinishInfoOuterClass {
size += 2;
}
if ((bitField0_ & 0x00000040) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(curScoreRewardInfo);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(recordInfo);
}
if ((bitField0_ & 0x00000080) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(scoreRewardInfo);
}
if ((bitField0_ & 0x00000100) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(recordInfo);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(curScoreRewardInfo);
}
return size;
}
@@ -655,18 +723,18 @@ public final class RogueFinishInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
- // totalScore
- totalScore = input.readUInt32();
+ case 24: {
+ // passRoomCount
+ passRoomCount = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 32) {
+ if (tag != 72) {
break;
}
}
- case 32: {
- // passRoomCount
- passRoomCount = input.readUInt32();
+ case 72: {
+ // totalScore
+ totalScore = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 80) {
@@ -678,58 +746,58 @@ public final class RogueFinishInfoOuterClass {
takenScore = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 2080) {
+ if (tag != 9048) {
break;
}
}
- case 2080: {
+ case 9048: {
// areaId
areaId = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 5456) {
+ if (tag != 15288) {
break;
}
}
- case 5456: {
+ case 15288: {
// reachRoomCount
reachRoomCount = input.readUInt32();
bitField0_ |= 0x00000010;
tag = input.readTag();
- if (tag != 64) {
+ if (tag != 32) {
break;
}
}
- case 64: {
+ case 32: {
// isWin
isWin = input.readBool();
bitField0_ |= 0x00000020;
tag = input.readTag();
- if (tag != 90) {
+ if (tag != 42) {
break;
}
}
- case 90: {
- // curScoreRewardInfo
- input.readMessage(curScoreRewardInfo);
+ case 42: {
+ // recordInfo
+ input.readMessage(recordInfo);
bitField0_ |= 0x00000040;
tag = input.readTag();
- if (tag != 98) {
+ if (tag != 58) {
break;
}
}
- case 98: {
+ case 58: {
// scoreRewardInfo
input.readMessage(scoreRewardInfo);
bitField0_ |= 0x00000080;
tag = input.readTag();
- if (tag != 106) {
+ if (tag != 114) {
break;
}
}
- case 106: {
- // recordInfo
- input.readMessage(recordInfo);
+ case 114: {
+ // curScoreRewardInfo
+ input.readMessage(curScoreRewardInfo);
bitField0_ |= 0x00000100;
tag = input.readTag();
if (tag != 0) {
@@ -754,10 +822,10 @@ public final class RogueFinishInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.totalScore, totalScore);
+ output.writeUInt32(FieldNames.passRoomCount, passRoomCount);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.passRoomCount, passRoomCount);
+ output.writeUInt32(FieldNames.totalScore, totalScore);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.takenScore, takenScore);
@@ -772,13 +840,13 @@ public final class RogueFinishInfoOuterClass {
output.writeBool(FieldNames.isWin, isWin);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeMessage(FieldNames.curScoreRewardInfo, curScoreRewardInfo);
+ output.writeMessage(FieldNames.recordInfo, recordInfo);
}
if ((bitField0_ & 0x00000080) != 0) {
output.writeMessage(FieldNames.scoreRewardInfo, scoreRewardInfo);
}
if ((bitField0_ & 0x00000100) != 0) {
- output.writeMessage(FieldNames.recordInfo, recordInfo);
+ output.writeMessage(FieldNames.curScoreRewardInfo, curScoreRewardInfo);
}
output.endObject();
}
@@ -790,11 +858,11 @@ public final class RogueFinishInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -716972626:
- case -393348649: {
- if (input.isAtField(FieldNames.totalScore)) {
+ case 430108643:
+ case 173887897: {
+ if (input.isAtField(FieldNames.passRoomCount)) {
if (!input.trySkipNullValue()) {
- totalScore = input.readUInt32();
+ passRoomCount = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -802,11 +870,11 @@ public final class RogueFinishInfoOuterClass {
}
break;
}
- case 430108643:
- case 173887897: {
- if (input.isAtField(FieldNames.passRoomCount)) {
+ case -716972626:
+ case -393348649: {
+ if (input.isAtField(FieldNames.totalScore)) {
if (!input.trySkipNullValue()) {
- passRoomCount = input.readUInt32();
+ totalScore = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -862,11 +930,11 @@ public final class RogueFinishInfoOuterClass {
}
break;
}
- case 1101722191:
- case 1894162770: {
- if (input.isAtField(FieldNames.curScoreRewardInfo)) {
+ case 734573727:
+ case 1317125084: {
+ if (input.isAtField(FieldNames.recordInfo)) {
if (!input.trySkipNullValue()) {
- input.readMessage(curScoreRewardInfo);
+ input.readMessage(recordInfo);
bitField0_ |= 0x00000040;
}
} else {
@@ -886,11 +954,11 @@ public final class RogueFinishInfoOuterClass {
}
break;
}
- case 734573727:
- case 1317125084: {
- if (input.isAtField(FieldNames.recordInfo)) {
+ case 1101722191:
+ case 1894162770: {
+ if (input.isAtField(FieldNames.curScoreRewardInfo)) {
if (!input.trySkipNullValue()) {
- input.readMessage(recordInfo);
+ input.readMessage(curScoreRewardInfo);
bitField0_ |= 0x00000100;
}
} else {
@@ -951,10 +1019,10 @@ public final class RogueFinishInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName totalScore = FieldName.forField("totalScore", "total_score");
-
static final FieldName passRoomCount = FieldName.forField("passRoomCount", "pass_room_count");
+ static final FieldName totalScore = FieldName.forField("totalScore", "total_score");
+
static final FieldName takenScore = FieldName.forField("takenScore", "taken_score");
static final FieldName areaId = FieldName.forField("areaId", "area_id");
@@ -963,11 +1031,11 @@ public final class RogueFinishInfoOuterClass {
static final FieldName isWin = FieldName.forField("isWin", "is_win");
- static final FieldName curScoreRewardInfo = FieldName.forField("curScoreRewardInfo", "cur_score_reward_info");
+ static final FieldName recordInfo = FieldName.forField("recordInfo", "record_info");
static final FieldName scoreRewardInfo = FieldName.forField("scoreRewardInfo", "score_reward_info");
- static final FieldName recordInfo = FieldName.forField("recordInfo", "record_info");
+ static final FieldName curScoreRewardInfo = FieldName.forField("curScoreRewardInfo", "cur_score_reward_info");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/RogueHandbookAeonOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueHandbookAeonOuterClass.java
index cd71803..8be634a 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueHandbookAeonOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueHandbookAeonOuterClass.java
@@ -20,43 +20,43 @@ public final class RogueHandbookAeonOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 aeon_id = 5;
- */
- private int aeonId;
-
- /**
- * optional uint32 exp = 6;
+ * optional uint32 exp = 1;
*/
private int exp;
/**
- * optional uint32 level = 10;
+ * optional uint32 aeon_id = 8;
*/
- private int level;
+ private int aeonId;
/**
- * optional uint32 max_level = 14;
+ * optional uint32 max_level = 9;
*/
private int maxLevel;
/**
- * - * BODAGGMFDMJ - *- * - *
repeated uint32 taken_reward_list = 7;
+ * optional uint32 level = 13;
*/
- private final RepeatedInt takenRewardList = RepeatedInt.newEmptyInstance();
+ private int level;
/**
*
- * KPFEEKHKANG
+ * IFCNJDJDNBL
*
*
- * repeated uint32 archive_unlock_list = 15;
+ * repeated uint32 archive_unlock_list = 3;
*/
private final RepeatedInt archiveUnlockList = RepeatedInt.newEmptyInstance();
+ /**
+ * + * JNOHODCLONM + *+ * + *
repeated uint32 taken_reward_list = 12;
+ */
+ private final RepeatedInt takenRewardList = RepeatedInt.newEmptyInstance();
+
private RogueHandbookAeon() {
}
@@ -68,62 +68,25 @@ public final class RogueHandbookAeonOuterClass {
}
/**
- * optional uint32 aeon_id = 5;
- * @return whether the aeonId field is set
+ * optional uint32 exp = 1;
+ * @return whether the exp field is set
*/
- public boolean hasAeonId() {
+ public boolean hasExp() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 aeon_id = 5;
- * @return this
- */
- public RogueHandbookAeon clearAeonId() {
- bitField0_ &= ~0x00000001;
- aeonId = 0;
- return this;
- }
-
- /**
- * optional uint32 aeon_id = 5;
- * @return the aeonId
- */
- public int getAeonId() {
- return aeonId;
- }
-
- /**
- * optional uint32 aeon_id = 5;
- * @param value the aeonId to set
- * @return this
- */
- public RogueHandbookAeon setAeonId(final int value) {
- bitField0_ |= 0x00000001;
- aeonId = value;
- return this;
- }
-
- /**
- * optional uint32 exp = 6;
- * @return whether the exp field is set
- */
- public boolean hasExp() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 exp = 6;
+ * optional uint32 exp = 1;
* @return this
*/
public RogueHandbookAeon clearExp() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
exp = 0;
return this;
}
/**
- * optional uint32 exp = 6;
+ * optional uint32 exp = 1;
* @return the exp
*/
public int getExp() {
@@ -131,73 +94,73 @@ public final class RogueHandbookAeonOuterClass {
}
/**
- * optional uint32 exp = 6;
+ * optional uint32 exp = 1;
* @param value the exp to set
* @return this
*/
public RogueHandbookAeon setExp(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
exp = value;
return this;
}
/**
- * optional uint32 level = 10;
- * @return whether the level field is set
+ * optional uint32 aeon_id = 8;
+ * @return whether the aeonId field is set
*/
- public boolean hasLevel() {
+ public boolean hasAeonId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 aeon_id = 8;
+ * @return this
+ */
+ public RogueHandbookAeon clearAeonId() {
+ bitField0_ &= ~0x00000002;
+ aeonId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 aeon_id = 8;
+ * @return the aeonId
+ */
+ public int getAeonId() {
+ return aeonId;
+ }
+
+ /**
+ * optional uint32 aeon_id = 8;
+ * @param value the aeonId to set
+ * @return this
+ */
+ public RogueHandbookAeon setAeonId(final int value) {
+ bitField0_ |= 0x00000002;
+ aeonId = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 max_level = 9;
+ * @return whether the maxLevel field is set
+ */
+ public boolean hasMaxLevel() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 level = 10;
- * @return this
- */
- public RogueHandbookAeon clearLevel() {
- bitField0_ &= ~0x00000004;
- level = 0;
- return this;
- }
-
- /**
- * optional uint32 level = 10;
- * @return the level
- */
- public int getLevel() {
- return level;
- }
-
- /**
- * optional uint32 level = 10;
- * @param value the level to set
- * @return this
- */
- public RogueHandbookAeon setLevel(final int value) {
- bitField0_ |= 0x00000004;
- level = value;
- return this;
- }
-
- /**
- * optional uint32 max_level = 14;
- * @return whether the maxLevel field is set
- */
- public boolean hasMaxLevel() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional uint32 max_level = 14;
+ * optional uint32 max_level = 9;
* @return this
*/
public RogueHandbookAeon clearMaxLevel() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000004;
maxLevel = 0;
return this;
}
/**
- * optional uint32 max_level = 14;
+ * optional uint32 max_level = 9;
* @return the maxLevel
*/
public int getMaxLevel() {
@@ -205,140 +168,85 @@ public final class RogueHandbookAeonOuterClass {
}
/**
- * optional uint32 max_level = 14;
+ * optional uint32 max_level = 9;
* @param value the maxLevel to set
* @return this
*/
public RogueHandbookAeon setMaxLevel(final int value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
maxLevel = value;
return this;
}
+ /**
+ * optional uint32 level = 13;
+ * @return whether the level field is set
+ */
+ public boolean hasLevel() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional uint32 level = 13;
+ * @return this
+ */
+ public RogueHandbookAeon clearLevel() {
+ bitField0_ &= ~0x00000008;
+ level = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 level = 13;
+ * @return the level
+ */
+ public int getLevel() {
+ return level;
+ }
+
+ /**
+ * optional uint32 level = 13;
+ * @param value the level to set
+ * @return this
+ */
+ public RogueHandbookAeon setLevel(final int value) {
+ bitField0_ |= 0x00000008;
+ level = value;
+ return this;
+ }
+
/**
*
- * BODAGGMFDMJ
+ * IFCNJDJDNBL
*
*
- * repeated uint32 taken_reward_list = 7;
- * @return whether the takenRewardList field is set
+ * repeated uint32 archive_unlock_list = 3;
+ * @return whether the archiveUnlockList field is set
*/
- public boolean hasTakenRewardList() {
+ public boolean hasArchiveUnlockList() {
return (bitField0_ & 0x00000010) != 0;
}
/**
*
- * BODAGGMFDMJ
+ * IFCNJDJDNBL
*
*
- * repeated uint32 taken_reward_list = 7;
- * @return this
- */
- public RogueHandbookAeon clearTakenRewardList() {
- bitField0_ &= ~0x00000010;
- takenRewardList.clear();
- return this;
- }
-
- /**
- * - * BODAGGMFDMJ - *- * - *
repeated uint32 taken_reward_list = 7;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableTakenRewardList()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedInt getTakenRewardList() {
- return takenRewardList;
- }
-
- /**
- * - * BODAGGMFDMJ - *- * - *
repeated uint32 taken_reward_list = 7;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedInt getMutableTakenRewardList() {
- bitField0_ |= 0x00000010;
- return takenRewardList;
- }
-
- /**
- * - * BODAGGMFDMJ - *- * - *
repeated uint32 taken_reward_list = 7;
- * @param value the takenRewardList to add
- * @return this
- */
- public RogueHandbookAeon addTakenRewardList(final int value) {
- bitField0_ |= 0x00000010;
- takenRewardList.add(value);
- return this;
- }
-
- /**
- * - * BODAGGMFDMJ - *- * - *
repeated uint32 taken_reward_list = 7;
- * @param values the takenRewardList to add
- * @return this
- */
- public RogueHandbookAeon addAllTakenRewardList(final int... values) {
- bitField0_ |= 0x00000010;
- takenRewardList.addAll(values);
- return this;
- }
-
- /**
- * - * KPFEEKHKANG - *- * - *
repeated uint32 archive_unlock_list = 15;
- * @return whether the archiveUnlockList field is set
- */
- public boolean hasArchiveUnlockList() {
- return (bitField0_ & 0x00000020) != 0;
- }
-
- /**
- * - * KPFEEKHKANG - *- * - *
repeated uint32 archive_unlock_list = 15;
+ * repeated uint32 archive_unlock_list = 3;
* @return this
*/
public RogueHandbookAeon clearArchiveUnlockList() {
- bitField0_ &= ~0x00000020;
+ bitField0_ &= ~0x00000010;
archiveUnlockList.clear();
return this;
}
/**
*
- * KPFEEKHKANG
+ * IFCNJDJDNBL
*
*
- * repeated uint32 archive_unlock_list = 15;
+ * repeated uint32 archive_unlock_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.
@@ -353,10 +261,10 @@ public final class RogueHandbookAeonOuterClass {
/**
*
- * KPFEEKHKANG
+ * IFCNJDJDNBL
*
*
- * repeated uint32 archive_unlock_list = 15;
+ * repeated uint32 archive_unlock_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
@@ -365,51 +273,143 @@ public final class RogueHandbookAeonOuterClass {
* @return internal storage object for modifications
*/
public RepeatedInt getMutableArchiveUnlockList() {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
return archiveUnlockList;
}
/**
*
- * KPFEEKHKANG
+ * IFCNJDJDNBL
*
*
- * repeated uint32 archive_unlock_list = 15;
+ * repeated uint32 archive_unlock_list = 3;
* @param value the archiveUnlockList to add
* @return this
*/
public RogueHandbookAeon addArchiveUnlockList(final int value) {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
archiveUnlockList.add(value);
return this;
}
/**
*
- * KPFEEKHKANG
+ * IFCNJDJDNBL
*
*
- * repeated uint32 archive_unlock_list = 15;
+ * repeated uint32 archive_unlock_list = 3;
* @param values the archiveUnlockList to add
* @return this
*/
public RogueHandbookAeon addAllArchiveUnlockList(final int... values) {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
archiveUnlockList.addAll(values);
return this;
}
+ /**
+ * + * JNOHODCLONM + *+ * + *
repeated uint32 taken_reward_list = 12;
+ * @return whether the takenRewardList field is set
+ */
+ public boolean hasTakenRewardList() {
+ return (bitField0_ & 0x00000020) != 0;
+ }
+
+ /**
+ * + * JNOHODCLONM + *+ * + *
repeated uint32 taken_reward_list = 12;
+ * @return this
+ */
+ public RogueHandbookAeon clearTakenRewardList() {
+ bitField0_ &= ~0x00000020;
+ takenRewardList.clear();
+ return this;
+ }
+
+ /**
+ * + * JNOHODCLONM + *+ * + *
repeated uint32 taken_reward_list = 12;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableTakenRewardList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedInt getTakenRewardList() {
+ return takenRewardList;
+ }
+
+ /**
+ * + * JNOHODCLONM + *+ * + *
repeated uint32 taken_reward_list = 12;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedInt getMutableTakenRewardList() {
+ bitField0_ |= 0x00000020;
+ return takenRewardList;
+ }
+
+ /**
+ * + * JNOHODCLONM + *+ * + *
repeated uint32 taken_reward_list = 12;
+ * @param value the takenRewardList to add
+ * @return this
+ */
+ public RogueHandbookAeon addTakenRewardList(final int value) {
+ bitField0_ |= 0x00000020;
+ takenRewardList.add(value);
+ return this;
+ }
+
+ /**
+ * + * JNOHODCLONM + *+ * + *
repeated uint32 taken_reward_list = 12;
+ * @param values the takenRewardList to add
+ * @return this
+ */
+ public RogueHandbookAeon addAllTakenRewardList(final int... values) {
+ bitField0_ |= 0x00000020;
+ takenRewardList.addAll(values);
+ return this;
+ }
+
@Override
public RogueHandbookAeon copyFrom(final RogueHandbookAeon other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- aeonId = other.aeonId;
exp = other.exp;
- level = other.level;
+ aeonId = other.aeonId;
maxLevel = other.maxLevel;
- takenRewardList.copyFrom(other.takenRewardList);
+ level = other.level;
archiveUnlockList.copyFrom(other.archiveUnlockList);
+ takenRewardList.copyFrom(other.takenRewardList);
}
return this;
}
@@ -420,24 +420,24 @@ public final class RogueHandbookAeonOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasAeonId()) {
- setAeonId(other.aeonId);
- }
if (other.hasExp()) {
setExp(other.exp);
}
- if (other.hasLevel()) {
- setLevel(other.level);
+ if (other.hasAeonId()) {
+ setAeonId(other.aeonId);
}
if (other.hasMaxLevel()) {
setMaxLevel(other.maxLevel);
}
- if (other.hasTakenRewardList()) {
- getMutableTakenRewardList().addAll(other.takenRewardList);
+ if (other.hasLevel()) {
+ setLevel(other.level);
}
if (other.hasArchiveUnlockList()) {
getMutableArchiveUnlockList().addAll(other.archiveUnlockList);
}
+ if (other.hasTakenRewardList()) {
+ getMutableTakenRewardList().addAll(other.takenRewardList);
+ }
return this;
}
@@ -448,12 +448,12 @@ public final class RogueHandbookAeonOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- aeonId = 0;
exp = 0;
- level = 0;
+ aeonId = 0;
maxLevel = 0;
- takenRewardList.clear();
+ level = 0;
archiveUnlockList.clear();
+ takenRewardList.clear();
return this;
}
@@ -464,8 +464,8 @@ public final class RogueHandbookAeonOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- takenRewardList.clear();
archiveUnlockList.clear();
+ takenRewardList.clear();
return this;
}
@@ -479,42 +479,42 @@ public final class RogueHandbookAeonOuterClass {
}
RogueHandbookAeon other = (RogueHandbookAeon) o;
return bitField0_ == other.bitField0_
- && (!hasAeonId() || aeonId == other.aeonId)
&& (!hasExp() || exp == other.exp)
- && (!hasLevel() || level == other.level)
+ && (!hasAeonId() || aeonId == other.aeonId)
&& (!hasMaxLevel() || maxLevel == other.maxLevel)
- && (!hasTakenRewardList() || takenRewardList.equals(other.takenRewardList))
- && (!hasArchiveUnlockList() || archiveUnlockList.equals(other.archiveUnlockList));
+ && (!hasLevel() || level == other.level)
+ && (!hasArchiveUnlockList() || archiveUnlockList.equals(other.archiveUnlockList))
+ && (!hasTakenRewardList() || takenRewardList.equals(other.takenRewardList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
- output.writeUInt32NoTag(aeonId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(exp);
}
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(level);
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 64);
+ output.writeUInt32NoTag(aeonId);
}
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 112);
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 72);
output.writeUInt32NoTag(maxLevel);
}
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(level);
+ }
if ((bitField0_ & 0x00000010) != 0) {
- for (int i = 0; i < takenRewardList.length(); i++) {
- output.writeRawByte((byte) 56);
- output.writeUInt32NoTag(takenRewardList.array()[i]);
+ for (int i = 0; i < archiveUnlockList.length(); i++) {
+ output.writeRawByte((byte) 24);
+ output.writeUInt32NoTag(archiveUnlockList.array()[i]);
}
}
if ((bitField0_ & 0x00000020) != 0) {
- for (int i = 0; i < archiveUnlockList.length(); i++) {
- output.writeRawByte((byte) 120);
- output.writeUInt32NoTag(archiveUnlockList.array()[i]);
+ for (int i = 0; i < takenRewardList.length(); i++) {
+ output.writeRawByte((byte) 96);
+ output.writeUInt32NoTag(takenRewardList.array()[i]);
}
}
}
@@ -523,22 +523,22 @@ public final class RogueHandbookAeonOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(exp);
}
- if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
+ if ((bitField0_ & 0x00000002) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonId);
}
- if ((bitField0_ & 0x00000008) != 0) {
+ if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(maxLevel);
}
+ if ((bitField0_ & 0x00000008) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
+ }
if ((bitField0_ & 0x00000010) != 0) {
- size += (1 * takenRewardList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(takenRewardList);
+ size += (1 * archiveUnlockList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveUnlockList);
}
if ((bitField0_ & 0x00000020) != 0) {
- size += (1 * archiveUnlockList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveUnlockList);
+ size += (1 * takenRewardList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(takenRewardList);
}
return size;
}
@@ -550,54 +550,54 @@ public final class RogueHandbookAeonOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
- // aeonId
- aeonId = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 48) {
- break;
- }
- }
- case 48: {
+ case 8: {
// exp
exp = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 64) {
+ break;
+ }
+ }
+ case 64: {
+ // aeonId
+ aeonId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 80) {
+ if (tag != 72) {
break;
}
}
- case 80: {
- // level
- level = input.readUInt32();
- bitField0_ |= 0x00000004;
- tag = input.readTag();
- if (tag != 112) {
- break;
- }
- }
- case 112: {
+ case 72: {
// maxLevel
maxLevel = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 104) {
+ break;
+ }
+ }
+ case 104: {
+ // level
+ level = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 58) {
+ if (tag != 26) {
break;
}
}
- case 58: {
- // takenRewardList [packed=true]
- input.readPackedUInt32(takenRewardList, tag);
- bitField0_ |= 0x00000010;
- tag = input.readTag();
- if (tag != 122) {
- break;
- }
- }
- case 122: {
+ case 26: {
// archiveUnlockList [packed=true]
input.readPackedUInt32(archiveUnlockList, tag);
+ bitField0_ |= 0x00000010;
+ tag = input.readTag();
+ if (tag != 98) {
+ break;
+ }
+ }
+ case 98: {
+ // takenRewardList [packed=true]
+ input.readPackedUInt32(takenRewardList, tag);
bitField0_ |= 0x00000020;
tag = input.readTag();
if (tag != 0) {
@@ -614,15 +614,15 @@ public final class RogueHandbookAeonOuterClass {
tag = input.readTag();
break;
}
- case 56: {
- // takenRewardList [packed=false]
- tag = input.readRepeatedUInt32(takenRewardList, tag);
+ case 24: {
+ // archiveUnlockList [packed=false]
+ tag = input.readRepeatedUInt32(archiveUnlockList, tag);
bitField0_ |= 0x00000010;
break;
}
- case 120: {
- // archiveUnlockList [packed=false]
- tag = input.readRepeatedUInt32(archiveUnlockList, tag);
+ case 96: {
+ // takenRewardList [packed=false]
+ tag = input.readRepeatedUInt32(takenRewardList, tag);
bitField0_ |= 0x00000020;
break;
}
@@ -634,22 +634,22 @@ public final class RogueHandbookAeonOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.aeonId, aeonId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.exp, exp);
}
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.level, level);
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeUInt32(FieldNames.aeonId, aeonId);
}
- if ((bitField0_ & 0x00000008) != 0) {
+ if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.maxLevel, maxLevel);
}
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeUInt32(FieldNames.level, level);
+ }
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRepeatedUInt32(FieldNames.takenRewardList, takenRewardList);
+ output.writeRepeatedUInt32(FieldNames.archiveUnlockList, archiveUnlockList);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRepeatedUInt32(FieldNames.archiveUnlockList, archiveUnlockList);
+ output.writeRepeatedUInt32(FieldNames.takenRewardList, takenRewardList);
}
output.endObject();
}
@@ -661,11 +661,10 @@ public final class RogueHandbookAeonOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1421249154:
- case -1109029417: {
- if (input.isAtField(FieldNames.aeonId)) {
+ case 100893: {
+ if (input.isAtField(FieldNames.exp)) {
if (!input.trySkipNullValue()) {
- aeonId = input.readUInt32();
+ exp = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -673,10 +672,11 @@ public final class RogueHandbookAeonOuterClass {
}
break;
}
- case 100893: {
- if (input.isAtField(FieldNames.exp)) {
+ case -1421249154:
+ case -1109029417: {
+ if (input.isAtField(FieldNames.aeonId)) {
if (!input.trySkipNullValue()) {
- exp = input.readUInt32();
+ aeonId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -684,35 +684,23 @@ public final class RogueHandbookAeonOuterClass {
}
break;
}
- case 102865796: {
- if (input.isAtField(FieldNames.level)) {
- if (!input.trySkipNullValue()) {
- level = input.readUInt32();
- bitField0_ |= 0x00000004;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 390120576:
case -241235735: {
if (input.isAtField(FieldNames.maxLevel)) {
if (!input.trySkipNullValue()) {
maxLevel = input.readUInt32();
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
}
} else {
input.skipUnknownField();
}
break;
}
- case -600805228:
- case 1027082294: {
- if (input.isAtField(FieldNames.takenRewardList)) {
+ case 102865796: {
+ if (input.isAtField(FieldNames.level)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedUInt32(takenRewardList);
- bitField0_ |= 0x00000010;
+ level = input.readUInt32();
+ bitField0_ |= 0x00000008;
}
} else {
input.skipUnknownField();
@@ -724,6 +712,18 @@ public final class RogueHandbookAeonOuterClass {
if (input.isAtField(FieldNames.archiveUnlockList)) {
if (!input.trySkipNullValue()) {
input.readRepeatedUInt32(archiveUnlockList);
+ bitField0_ |= 0x00000010;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -600805228:
+ case 1027082294: {
+ if (input.isAtField(FieldNames.takenRewardList)) {
+ if (!input.trySkipNullValue()) {
+ input.readRepeatedUInt32(takenRewardList);
bitField0_ |= 0x00000020;
}
} else {
@@ -784,17 +784,17 @@ public final class RogueHandbookAeonOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName aeonId = FieldName.forField("aeonId", "aeon_id");
-
static final FieldName exp = FieldName.forField("exp");
- static final FieldName level = FieldName.forField("level");
+ static final FieldName aeonId = FieldName.forField("aeonId", "aeon_id");
static final FieldName maxLevel = FieldName.forField("maxLevel", "max_level");
- static final FieldName takenRewardList = FieldName.forField("takenRewardList", "taken_reward_list");
+ static final FieldName level = FieldName.forField("level");
static final FieldName archiveUnlockList = FieldName.forField("archiveUnlockList", "archive_unlock_list");
+
+ static final FieldName takenRewardList = FieldName.forField("takenRewardList", "taken_reward_list");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/RogueHandbookBuffOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueHandbookBuffOuterClass.java
index 267438d..6c95ee4 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueHandbookBuffOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueHandbookBuffOuterClass.java
@@ -19,7 +19,7 @@ public final class RogueHandbookBuffOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 buff_id = 7;
+ * optional uint32 buff_id = 5;
*/
private int buffId;
@@ -34,7 +34,7 @@ public final class RogueHandbookBuffOuterClass {
}
/**
- * optional uint32 buff_id = 7;
+ * optional uint32 buff_id = 5;
* @return whether the buffId field is set
*/
public boolean hasBuffId() {
@@ -42,7 +42,7 @@ public final class RogueHandbookBuffOuterClass {
}
/**
- * optional uint32 buff_id = 7;
+ * optional uint32 buff_id = 5;
* @return this
*/
public RogueHandbookBuff clearBuffId() {
@@ -52,7 +52,7 @@ public final class RogueHandbookBuffOuterClass {
}
/**
- * optional uint32 buff_id = 7;
+ * optional uint32 buff_id = 5;
* @return the buffId
*/
public int getBuffId() {
@@ -60,7 +60,7 @@ public final class RogueHandbookBuffOuterClass {
}
/**
- * optional uint32 buff_id = 7;
+ * optional uint32 buff_id = 5;
* @param value the buffId to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class RogueHandbookBuffOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(buffId);
}
}
@@ -150,7 +150,7 @@ public final class RogueHandbookBuffOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
+ case 40: {
// buffId
buffId = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueHandbookDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueHandbookDataOuterClass.java
index a5da412..a629a1c 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueHandbookDataOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueHandbookDataOuterClass.java
@@ -20,14 +20,14 @@ public final class RogueHandbookDataOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated .RogueHandbookMiracle miracle_list = 5;
+ * repeated .RogueHandbookMiracle miracle_list = 3;
*/
private final RepeatedMessagerepeated .RogueHandbookBuff buff_list = 10;
+ * repeated .RogueHandbookAeon rogue_aeon_list = 9;
*/
- private final RepeatedMessagerepeated .RogueHandbookEvent rogue_event = 12;
@@ -35,9 +35,9 @@ public final class RogueHandbookDataOuterClass {
private final RepeatedMessagerepeated .RogueHandbookAeon rogue_aeon_list = 15;
+ * repeated .RogueHandbookBuff buff_list = 15;
*/
- private final RepeatedMessagerepeated .RogueHandbookMiracle miracle_list = 5;
+ * repeated .RogueHandbookMiracle miracle_list = 3;
* @return whether the miracleList field is set
*/
public boolean hasMiracleList() {
@@ -58,7 +58,7 @@ public final class RogueHandbookDataOuterClass {
}
/**
- * repeated .RogueHandbookMiracle miracle_list = 5;
+ * repeated .RogueHandbookMiracle miracle_list = 3;
* @return this
*/
public RogueHandbookData clearMiracleList() {
@@ -68,7 +68,7 @@ public final class RogueHandbookDataOuterClass {
}
/**
- * repeated .RogueHandbookMiracle miracle_list = 5;
+ * repeated .RogueHandbookMiracle miracle_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.
@@ -82,7 +82,7 @@ public final class RogueHandbookDataOuterClass {
}
/**
- * repeated .RogueHandbookMiracle miracle_list = 5;
+ * repeated .RogueHandbookMiracle miracle_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
@@ -97,7 +97,7 @@ public final class RogueHandbookDataOuterClass {
}
/**
- * repeated .RogueHandbookMiracle miracle_list = 5;
+ * repeated .RogueHandbookMiracle miracle_list = 3;
* @param value the miracleList to add
* @return this
*/
@@ -109,7 +109,7 @@ public final class RogueHandbookDataOuterClass {
}
/**
- * repeated .RogueHandbookMiracle miracle_list = 5;
+ * repeated .RogueHandbookMiracle miracle_list = 3;
* @param values the miracleList to add
* @return this
*/
@@ -121,39 +121,39 @@ public final class RogueHandbookDataOuterClass {
}
/**
- * repeated .RogueHandbookBuff buff_list = 10;
- * @return whether the buffList field is set
+ * repeated .RogueHandbookAeon rogue_aeon_list = 9;
+ * @return whether the rogueAeonList field is set
*/
- public boolean hasBuffList() {
+ public boolean hasRogueAeonList() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * repeated .RogueHandbookBuff buff_list = 10;
+ * repeated .RogueHandbookAeon rogue_aeon_list = 9;
* @return this
*/
- public RogueHandbookData clearBuffList() {
+ public RogueHandbookData clearRogueAeonList() {
bitField0_ &= ~0x00000002;
- buffList.clear();
+ rogueAeonList.clear();
return this;
}
/**
- * repeated .RogueHandbookBuff buff_list = 10;
+ * repeated .RogueHandbookAeon rogue_aeon_list = 9;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
*
- * Use {@link #getMutableBuffList()} if you want to modify it.
+ * Use {@link #getMutableRogueAeonList()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public RepeatedMessagerepeated .RogueHandbookBuff buff_list = 10;
+ * repeated .RogueHandbookAeon rogue_aeon_list = 9;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -161,32 +161,33 @@ public final class RogueHandbookDataOuterClass {
*
* @return internal storage object for modifications
*/
- public RepeatedMessagerepeated .RogueHandbookBuff buff_list = 10;
- * @param value the buffList to add
+ * repeated .RogueHandbookAeon rogue_aeon_list = 9;
+ * @param value the rogueAeonList to add
* @return this
*/
- public RogueHandbookData addBuffList(
- final RogueHandbookBuffOuterClass.RogueHandbookBuff value) {
+ public RogueHandbookData addRogueAeonList(
+ final RogueHandbookAeonOuterClass.RogueHandbookAeon value) {
bitField0_ |= 0x00000002;
- buffList.add(value);
+ rogueAeonList.add(value);
return this;
}
/**
- * repeated .RogueHandbookBuff buff_list = 10;
- * @param values the buffList to add
+ * repeated .RogueHandbookAeon rogue_aeon_list = 9;
+ * @param values the rogueAeonList to add
* @return this
*/
- public RogueHandbookData addAllBuffList(
- final RogueHandbookBuffOuterClass.RogueHandbookBuff... values) {
+ public RogueHandbookData addAllRogueAeonList(
+ final RogueHandbookAeonOuterClass.RogueHandbookAeon... values) {
bitField0_ |= 0x00000002;
- buffList.addAll(values);
+ rogueAeonList.addAll(values);
return this;
}
@@ -261,39 +262,39 @@ public final class RogueHandbookDataOuterClass {
}
/**
- * repeated .RogueHandbookAeon rogue_aeon_list = 15;
- * @return whether the rogueAeonList field is set
+ * repeated .RogueHandbookBuff buff_list = 15;
+ * @return whether the buffList field is set
*/
- public boolean hasRogueAeonList() {
+ public boolean hasBuffList() {
return (bitField0_ & 0x00000008) != 0;
}
/**
- * repeated .RogueHandbookAeon rogue_aeon_list = 15;
+ * repeated .RogueHandbookBuff buff_list = 15;
* @return this
*/
- public RogueHandbookData clearRogueAeonList() {
+ public RogueHandbookData clearBuffList() {
bitField0_ &= ~0x00000008;
- rogueAeonList.clear();
+ buffList.clear();
return this;
}
/**
- * repeated .RogueHandbookAeon rogue_aeon_list = 15;
+ * repeated .RogueHandbookBuff buff_list = 15;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
*
- * Use {@link #getMutableRogueAeonList()} if you want to modify it.
+ * Use {@link #getMutableBuffList()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public RepeatedMessagerepeated .RogueHandbookAeon rogue_aeon_list = 15;
+ * repeated .RogueHandbookBuff buff_list = 15;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -301,33 +302,32 @@ public final class RogueHandbookDataOuterClass {
*
* @return internal storage object for modifications
*/
- public RepeatedMessagerepeated .RogueHandbookAeon rogue_aeon_list = 15;
- * @param value the rogueAeonList to add
+ * repeated .RogueHandbookBuff buff_list = 15;
+ * @param value the buffList to add
* @return this
*/
- public RogueHandbookData addRogueAeonList(
- final RogueHandbookAeonOuterClass.RogueHandbookAeon value) {
+ public RogueHandbookData addBuffList(
+ final RogueHandbookBuffOuterClass.RogueHandbookBuff value) {
bitField0_ |= 0x00000008;
- rogueAeonList.add(value);
+ buffList.add(value);
return this;
}
/**
- * repeated .RogueHandbookAeon rogue_aeon_list = 15;
- * @param values the rogueAeonList to add
+ * repeated .RogueHandbookBuff buff_list = 15;
+ * @param values the buffList to add
* @return this
*/
- public RogueHandbookData addAllRogueAeonList(
- final RogueHandbookAeonOuterClass.RogueHandbookAeon... values) {
+ public RogueHandbookData addAllBuffList(
+ final RogueHandbookBuffOuterClass.RogueHandbookBuff... values) {
bitField0_ |= 0x00000008;
- rogueAeonList.addAll(values);
+ buffList.addAll(values);
return this;
}
@@ -337,9 +337,9 @@ public final class RogueHandbookDataOuterClass {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
miracleList.copyFrom(other.miracleList);
- buffList.copyFrom(other.buffList);
- rogueEvent.copyFrom(other.rogueEvent);
rogueAeonList.copyFrom(other.rogueAeonList);
+ rogueEvent.copyFrom(other.rogueEvent);
+ buffList.copyFrom(other.buffList);
}
return this;
}
@@ -353,14 +353,14 @@ public final class RogueHandbookDataOuterClass {
if (other.hasMiracleList()) {
getMutableMiracleList().addAll(other.miracleList);
}
- if (other.hasBuffList()) {
- getMutableBuffList().addAll(other.buffList);
+ if (other.hasRogueAeonList()) {
+ getMutableRogueAeonList().addAll(other.rogueAeonList);
}
if (other.hasRogueEvent()) {
getMutableRogueEvent().addAll(other.rogueEvent);
}
- if (other.hasRogueAeonList()) {
- getMutableRogueAeonList().addAll(other.rogueAeonList);
+ if (other.hasBuffList()) {
+ getMutableBuffList().addAll(other.buffList);
}
return this;
}
@@ -373,9 +373,9 @@ public final class RogueHandbookDataOuterClass {
cachedSize = -1;
bitField0_ = 0;
miracleList.clear();
- buffList.clear();
- rogueEvent.clear();
rogueAeonList.clear();
+ rogueEvent.clear();
+ buffList.clear();
return this;
}
@@ -387,9 +387,9 @@ public final class RogueHandbookDataOuterClass {
cachedSize = -1;
bitField0_ = 0;
miracleList.clearQuick();
- buffList.clearQuick();
- rogueEvent.clearQuick();
rogueAeonList.clearQuick();
+ rogueEvent.clearQuick();
+ buffList.clearQuick();
return this;
}
@@ -404,23 +404,23 @@ public final class RogueHandbookDataOuterClass {
RogueHandbookData other = (RogueHandbookData) o;
return bitField0_ == other.bitField0_
&& (!hasMiracleList() || miracleList.equals(other.miracleList))
- && (!hasBuffList() || buffList.equals(other.buffList))
+ && (!hasRogueAeonList() || rogueAeonList.equals(other.rogueAeonList))
&& (!hasRogueEvent() || rogueEvent.equals(other.rogueEvent))
- && (!hasRogueAeonList() || rogueAeonList.equals(other.rogueAeonList));
+ && (!hasBuffList() || buffList.equals(other.buffList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < miracleList.length(); i++) {
- output.writeRawByte((byte) 42);
+ output.writeRawByte((byte) 26);
output.writeMessageNoTag(miracleList.get(i));
}
}
if ((bitField0_ & 0x00000002) != 0) {
- for (int i = 0; i < buffList.length(); i++) {
- output.writeRawByte((byte) 82);
- output.writeMessageNoTag(buffList.get(i));
+ for (int i = 0; i < rogueAeonList.length(); i++) {
+ output.writeRawByte((byte) 74);
+ output.writeMessageNoTag(rogueAeonList.get(i));
}
}
if ((bitField0_ & 0x00000004) != 0) {
@@ -430,9 +430,9 @@ public final class RogueHandbookDataOuterClass {
}
}
if ((bitField0_ & 0x00000008) != 0) {
- for (int i = 0; i < rogueAeonList.length(); i++) {
+ for (int i = 0; i < buffList.length(); i++) {
output.writeRawByte((byte) 122);
- output.writeMessageNoTag(rogueAeonList.get(i));
+ output.writeMessageNoTag(buffList.get(i));
}
}
}
@@ -444,13 +444,13 @@ public final class RogueHandbookDataOuterClass {
size += (1 * miracleList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(miracleList);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += (1 * buffList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(buffList);
+ size += (1 * rogueAeonList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(rogueAeonList);
}
if ((bitField0_ & 0x00000004) != 0) {
size += (1 * rogueEvent.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(rogueEvent);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += (1 * rogueAeonList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(rogueAeonList);
+ size += (1 * buffList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(buffList);
}
return size;
}
@@ -462,17 +462,17 @@ public final class RogueHandbookDataOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 42: {
+ case 26: {
// miracleList
tag = input.readRepeatedMessage(miracleList, tag);
bitField0_ |= 0x00000001;
- if (tag != 82) {
+ if (tag != 74) {
break;
}
}
- case 82: {
- // buffList
- tag = input.readRepeatedMessage(buffList, tag);
+ case 74: {
+ // rogueAeonList
+ tag = input.readRepeatedMessage(rogueAeonList, tag);
bitField0_ |= 0x00000002;
if (tag != 98) {
break;
@@ -487,8 +487,8 @@ public final class RogueHandbookDataOuterClass {
}
}
case 122: {
- // rogueAeonList
- tag = input.readRepeatedMessage(rogueAeonList, tag);
+ // buffList
+ tag = input.readRepeatedMessage(buffList, tag);
bitField0_ |= 0x00000008;
if (tag != 0) {
break;
@@ -515,13 +515,13 @@ public final class RogueHandbookDataOuterClass {
output.writeRepeatedMessage(FieldNames.miracleList, miracleList);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRepeatedMessage(FieldNames.buffList, buffList);
+ output.writeRepeatedMessage(FieldNames.rogueAeonList, rogueAeonList);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRepeatedMessage(FieldNames.rogueEvent, rogueEvent);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRepeatedMessage(FieldNames.rogueAeonList, rogueAeonList);
+ output.writeRepeatedMessage(FieldNames.buffList, buffList);
}
output.endObject();
}
@@ -545,11 +545,11 @@ public final class RogueHandbookDataOuterClass {
}
break;
}
- case -1522789487:
- case 55792906: {
- if (input.isAtField(FieldNames.buffList)) {
+ case -1684933573:
+ case -1375837643: {
+ if (input.isAtField(FieldNames.rogueAeonList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(buffList);
+ input.readRepeatedMessage(rogueAeonList);
bitField0_ |= 0x00000002;
}
} else {
@@ -569,11 +569,11 @@ public final class RogueHandbookDataOuterClass {
}
break;
}
- case -1684933573:
- case -1375837643: {
- if (input.isAtField(FieldNames.rogueAeonList)) {
+ case -1522789487:
+ case 55792906: {
+ if (input.isAtField(FieldNames.buffList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(rogueAeonList);
+ input.readRepeatedMessage(buffList);
bitField0_ |= 0x00000008;
}
} else {
@@ -636,11 +636,11 @@ public final class RogueHandbookDataOuterClass {
static class FieldNames {
static final FieldName miracleList = FieldName.forField("miracleList", "miracle_list");
- static final FieldName buffList = FieldName.forField("buffList", "buff_list");
+ static final FieldName rogueAeonList = FieldName.forField("rogueAeonList", "rogue_aeon_list");
static final FieldName rogueEvent = FieldName.forField("rogueEvent", "rogue_event");
- static final FieldName rogueAeonList = FieldName.forField("rogueAeonList", "rogue_aeon_list");
+ static final FieldName buffList = FieldName.forField("buffList", "buff_list");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/RogueHandbookEventOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueHandbookEventOuterClass.java
index 15db84e..eccbb9c 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueHandbookEventOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueHandbookEventOuterClass.java
@@ -20,17 +20,17 @@ public final class RogueHandbookEventOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 event_id = 7;
+ * optional uint32 event_id = 11;
*/
private int eventId;
/**
- * optional bool is_unlocked = 2;
+ * optional bool is_unlocked = 14;
*/
private boolean isUnlocked;
/**
- * repeated uint32 MDALHHJKHNJ = 6;
+ * repeated uint32 MDALHHJKHNJ = 13;
*/
private final RepeatedInt mDALHHJKHNJ = RepeatedInt.newEmptyInstance();
@@ -45,7 +45,7 @@ public final class RogueHandbookEventOuterClass {
}
/**
- * optional uint32 event_id = 7;
+ * optional uint32 event_id = 11;
* @return whether the eventId field is set
*/
public boolean hasEventId() {
@@ -53,7 +53,7 @@ public final class RogueHandbookEventOuterClass {
}
/**
- * optional uint32 event_id = 7;
+ * optional uint32 event_id = 11;
* @return this
*/
public RogueHandbookEvent clearEventId() {
@@ -63,7 +63,7 @@ public final class RogueHandbookEventOuterClass {
}
/**
- * optional uint32 event_id = 7;
+ * optional uint32 event_id = 11;
* @return the eventId
*/
public int getEventId() {
@@ -71,7 +71,7 @@ public final class RogueHandbookEventOuterClass {
}
/**
- * optional uint32 event_id = 7;
+ * optional uint32 event_id = 11;
* @param value the eventId to set
* @return this
*/
@@ -82,7 +82,7 @@ public final class RogueHandbookEventOuterClass {
}
/**
- * optional bool is_unlocked = 2;
+ * optional bool is_unlocked = 14;
* @return whether the isUnlocked field is set
*/
public boolean hasIsUnlocked() {
@@ -90,7 +90,7 @@ public final class RogueHandbookEventOuterClass {
}
/**
- * optional bool is_unlocked = 2;
+ * optional bool is_unlocked = 14;
* @return this
*/
public RogueHandbookEvent clearIsUnlocked() {
@@ -100,7 +100,7 @@ public final class RogueHandbookEventOuterClass {
}
/**
- * optional bool is_unlocked = 2;
+ * optional bool is_unlocked = 14;
* @return the isUnlocked
*/
public boolean getIsUnlocked() {
@@ -108,7 +108,7 @@ public final class RogueHandbookEventOuterClass {
}
/**
- * optional bool is_unlocked = 2;
+ * optional bool is_unlocked = 14;
* @param value the isUnlocked to set
* @return this
*/
@@ -119,7 +119,7 @@ public final class RogueHandbookEventOuterClass {
}
/**
- * repeated uint32 MDALHHJKHNJ = 6;
+ * repeated uint32 MDALHHJKHNJ = 13;
* @return whether the mDALHHJKHNJ field is set
*/
public boolean hasMDALHHJKHNJ() {
@@ -127,7 +127,7 @@ public final class RogueHandbookEventOuterClass {
}
/**
- * repeated uint32 MDALHHJKHNJ = 6;
+ * repeated uint32 MDALHHJKHNJ = 13;
* @return this
*/
public RogueHandbookEvent clearMDALHHJKHNJ() {
@@ -137,7 +137,7 @@ public final class RogueHandbookEventOuterClass {
}
/**
- * repeated uint32 MDALHHJKHNJ = 6;
+ * repeated uint32 MDALHHJKHNJ = 13;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -151,7 +151,7 @@ public final class RogueHandbookEventOuterClass {
}
/**
- * repeated uint32 MDALHHJKHNJ = 6;
+ * repeated uint32 MDALHHJKHNJ = 13;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -165,7 +165,7 @@ public final class RogueHandbookEventOuterClass {
}
/**
- * repeated uint32 MDALHHJKHNJ = 6;
+ * repeated uint32 MDALHHJKHNJ = 13;
* @param value the mDALHHJKHNJ to add
* @return this
*/
@@ -176,7 +176,7 @@ public final class RogueHandbookEventOuterClass {
}
/**
- * repeated uint32 MDALHHJKHNJ = 6;
+ * repeated uint32 MDALHHJKHNJ = 13;
* @param values the mDALHHJKHNJ to add
* @return this
*/
@@ -258,16 +258,16 @@ public final class RogueHandbookEventOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(eventId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 112);
output.writeBoolNoTag(isUnlocked);
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < mDALHHJKHNJ.length(); i++) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 104);
output.writeUInt32NoTag(mDALHHJKHNJ.array()[i]);
}
}
@@ -295,25 +295,25 @@ public final class RogueHandbookEventOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
+ case 88: {
// eventId
eventId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 16) {
+ if (tag != 112) {
break;
}
}
- case 16: {
+ case 112: {
// isUnlocked
isUnlocked = input.readBool();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 50) {
+ if (tag != 106) {
break;
}
}
- case 50: {
+ case 106: {
// mDALHHJKHNJ [packed=true]
input.readPackedUInt32(mDALHHJKHNJ, tag);
bitField0_ |= 0x00000004;
@@ -332,7 +332,7 @@ public final class RogueHandbookEventOuterClass {
tag = input.readTag();
break;
}
- case 48: {
+ case 104: {
// mDALHHJKHNJ [packed=false]
tag = input.readRepeatedUInt32(mDALHHJKHNJ, tag);
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueHandbookMiracleOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueHandbookMiracleOuterClass.java
index 9c1e13e..a5feccd 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueHandbookMiracleOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueHandbookMiracleOuterClass.java
@@ -19,12 +19,12 @@ public final class RogueHandbookMiracleOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 miracle_id = 3;
+ * optional uint32 miracle_id = 11;
*/
private int miracleId;
/**
- * optional bool is_unlocked = 14;
+ * optional bool is_unlocked = 3;
*/
private boolean isUnlocked;
@@ -39,7 +39,7 @@ public final class RogueHandbookMiracleOuterClass {
}
/**
- * optional uint32 miracle_id = 3;
+ * optional uint32 miracle_id = 11;
* @return whether the miracleId field is set
*/
public boolean hasMiracleId() {
@@ -47,7 +47,7 @@ public final class RogueHandbookMiracleOuterClass {
}
/**
- * optional uint32 miracle_id = 3;
+ * optional uint32 miracle_id = 11;
* @return this
*/
public RogueHandbookMiracle clearMiracleId() {
@@ -57,7 +57,7 @@ public final class RogueHandbookMiracleOuterClass {
}
/**
- * optional uint32 miracle_id = 3;
+ * optional uint32 miracle_id = 11;
* @return the miracleId
*/
public int getMiracleId() {
@@ -65,7 +65,7 @@ public final class RogueHandbookMiracleOuterClass {
}
/**
- * optional uint32 miracle_id = 3;
+ * optional uint32 miracle_id = 11;
* @param value the miracleId to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class RogueHandbookMiracleOuterClass {
}
/**
- * optional bool is_unlocked = 14;
+ * optional bool is_unlocked = 3;
* @return whether the isUnlocked field is set
*/
public boolean hasIsUnlocked() {
@@ -84,7 +84,7 @@ public final class RogueHandbookMiracleOuterClass {
}
/**
- * optional bool is_unlocked = 14;
+ * optional bool is_unlocked = 3;
* @return this
*/
public RogueHandbookMiracle clearIsUnlocked() {
@@ -94,7 +94,7 @@ public final class RogueHandbookMiracleOuterClass {
}
/**
- * optional bool is_unlocked = 14;
+ * optional bool is_unlocked = 3;
* @return the isUnlocked
*/
public boolean getIsUnlocked() {
@@ -102,7 +102,7 @@ public final class RogueHandbookMiracleOuterClass {
}
/**
- * optional bool is_unlocked = 14;
+ * optional bool is_unlocked = 3;
* @param value the isUnlocked to set
* @return this
*/
@@ -177,11 +177,11 @@ public final class RogueHandbookMiracleOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(miracleId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 24);
output.writeBoolNoTag(isUnlocked);
}
}
@@ -205,16 +205,16 @@ public final class RogueHandbookMiracleOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
+ case 88: {
// miracleId
miracleId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 112) {
+ if (tag != 24) {
break;
}
}
- case 112: {
+ case 24: {
// isUnlocked
isUnlocked = input.readBool();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueInfoDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueInfoDataOuterClass.java
index c4380d1..8413d41 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueInfoDataOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueInfoDataOuterClass.java
@@ -19,30 +19,30 @@ public final class RogueInfoDataOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .RogueAeonInfo rogue_aeon_info = 8;
+ * optional .RogueAeonInfo rogue_aeon_info = 2;
*/
private final RogueAeonInfoOuterClass.RogueAeonInfo rogueAeonInfo = RogueAeonInfoOuterClass.RogueAeonInfo.newInstance();
/**
- * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 9;
- */
- private final RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo rogueVirtualItemInfo = RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo.newInstance();
-
- /**
- * optional .RogueAreaInfo rogue_area_info = 11;
+ * optional .RogueAreaInfo rogue_area_info = 3;
*/
private final RogueAreaInfoOuterClass.RogueAreaInfo rogueAreaInfo = RogueAreaInfoOuterClass.RogueAreaInfo.newInstance();
/**
- * optional .RogueSeasonInfo rogue_season_info = 12;
- */
- private final RogueSeasonInfoOuterClass.RogueSeasonInfo rogueSeasonInfo = RogueSeasonInfoOuterClass.RogueSeasonInfo.newInstance();
-
- /**
- * optional .RogueScoreRewardInfo rogue_score_info = 15;
+ * optional .RogueScoreRewardInfo rogue_score_info = 10;
*/
private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo rogueScoreInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance();
+ /**
+ * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 11;
+ */
+ private final RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo rogueVirtualItemInfo = RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo.newInstance();
+
+ /**
+ * optional .RogueSeasonInfo rogue_season_info = 14;
+ */
+ private final RogueSeasonInfoOuterClass.RogueSeasonInfo rogueSeasonInfo = RogueSeasonInfoOuterClass.RogueSeasonInfo.newInstance();
+
private RogueInfoData() {
}
@@ -54,7 +54,7 @@ public final class RogueInfoDataOuterClass {
}
/**
- * optional .RogueAeonInfo rogue_aeon_info = 8;
+ * optional .RogueAeonInfo rogue_aeon_info = 2;
* @return whether the rogueAeonInfo field is set
*/
public boolean hasRogueAeonInfo() {
@@ -62,7 +62,7 @@ public final class RogueInfoDataOuterClass {
}
/**
- * optional .RogueAeonInfo rogue_aeon_info = 8;
+ * optional .RogueAeonInfo rogue_aeon_info = 2;
* @return this
*/
public RogueInfoData clearRogueAeonInfo() {
@@ -72,7 +72,7 @@ public final class RogueInfoDataOuterClass {
}
/**
- * optional .RogueAeonInfo rogue_aeon_info = 8;
+ * optional .RogueAeonInfo rogue_aeon_info = 2;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -86,7 +86,7 @@ public final class RogueInfoDataOuterClass {
}
/**
- * optional .RogueAeonInfo rogue_aeon_info = 8;
+ * optional .RogueAeonInfo rogue_aeon_info = 2;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -100,7 +100,7 @@ public final class RogueInfoDataOuterClass {
}
/**
- * optional .RogueAeonInfo rogue_aeon_info = 8;
+ * optional .RogueAeonInfo rogue_aeon_info = 2;
* @param value the rogueAeonInfo to set
* @return this
*/
@@ -111,84 +111,25 @@ public final class RogueInfoDataOuterClass {
}
/**
- * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 9;
- * @return whether the rogueVirtualItemInfo field is set
+ * optional .RogueAreaInfo rogue_area_info = 3;
+ * @return whether the rogueAreaInfo field is set
*/
- public boolean hasRogueVirtualItemInfo() {
+ public boolean hasRogueAreaInfo() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 9;
- * @return this
- */
- public RogueInfoData clearRogueVirtualItemInfo() {
- bitField0_ &= ~0x00000002;
- rogueVirtualItemInfo.clear();
- return this;
- }
-
- /**
- * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 9;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableRogueVirtualItemInfo()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo getRogueVirtualItemInfo() {
- return rogueVirtualItemInfo;
- }
-
- /**
- * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 9;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo getMutableRogueVirtualItemInfo(
- ) {
- bitField0_ |= 0x00000002;
- return rogueVirtualItemInfo;
- }
-
- /**
- * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 9;
- * @param value the rogueVirtualItemInfo to set
- * @return this
- */
- public RogueInfoData setRogueVirtualItemInfo(
- final RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo value) {
- bitField0_ |= 0x00000002;
- rogueVirtualItemInfo.copyFrom(value);
- return this;
- }
-
- /**
- * optional .RogueAreaInfo rogue_area_info = 11;
- * @return whether the rogueAreaInfo field is set
- */
- public boolean hasRogueAreaInfo() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional .RogueAreaInfo rogue_area_info = 11;
+ * optional .RogueAreaInfo rogue_area_info = 3;
* @return this
*/
public RogueInfoData clearRogueAreaInfo() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
rogueAreaInfo.clear();
return this;
}
/**
- * optional .RogueAreaInfo rogue_area_info = 11;
+ * optional .RogueAreaInfo rogue_area_info = 3;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -202,7 +143,7 @@ public final class RogueInfoDataOuterClass {
}
/**
- * optional .RogueAreaInfo rogue_area_info = 11;
+ * optional .RogueAreaInfo rogue_area_info = 3;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -211,98 +152,41 @@ public final class RogueInfoDataOuterClass {
* @return internal storage object for modifications
*/
public RogueAreaInfoOuterClass.RogueAreaInfo getMutableRogueAreaInfo() {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
return rogueAreaInfo;
}
/**
- * optional .RogueAreaInfo rogue_area_info = 11;
+ * optional .RogueAreaInfo rogue_area_info = 3;
* @param value the rogueAreaInfo to set
* @return this
*/
public RogueInfoData setRogueAreaInfo(final RogueAreaInfoOuterClass.RogueAreaInfo value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
rogueAreaInfo.copyFrom(value);
return this;
}
/**
- * optional .RogueSeasonInfo rogue_season_info = 12;
- * @return whether the rogueSeasonInfo field is set
- */
- public boolean hasRogueSeasonInfo() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional .RogueSeasonInfo rogue_season_info = 12;
- * @return this
- */
- public RogueInfoData clearRogueSeasonInfo() {
- bitField0_ &= ~0x00000008;
- rogueSeasonInfo.clear();
- return this;
- }
-
- /**
- * optional .RogueSeasonInfo rogue_season_info = 12;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableRogueSeasonInfo()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RogueSeasonInfoOuterClass.RogueSeasonInfo getRogueSeasonInfo() {
- return rogueSeasonInfo;
- }
-
- /**
- * optional .RogueSeasonInfo rogue_season_info = 12;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RogueSeasonInfoOuterClass.RogueSeasonInfo getMutableRogueSeasonInfo() {
- bitField0_ |= 0x00000008;
- return rogueSeasonInfo;
- }
-
- /**
- * optional .RogueSeasonInfo rogue_season_info = 12;
- * @param value the rogueSeasonInfo to set
- * @return this
- */
- public RogueInfoData setRogueSeasonInfo(final RogueSeasonInfoOuterClass.RogueSeasonInfo value) {
- bitField0_ |= 0x00000008;
- rogueSeasonInfo.copyFrom(value);
- return this;
- }
-
- /**
- * optional .RogueScoreRewardInfo rogue_score_info = 15;
+ * optional .RogueScoreRewardInfo rogue_score_info = 10;
* @return whether the rogueScoreInfo field is set
*/
public boolean hasRogueScoreInfo() {
- return (bitField0_ & 0x00000010) != 0;
+ return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional .RogueScoreRewardInfo rogue_score_info = 15;
+ * optional .RogueScoreRewardInfo rogue_score_info = 10;
* @return this
*/
public RogueInfoData clearRogueScoreInfo() {
- bitField0_ &= ~0x00000010;
+ bitField0_ &= ~0x00000004;
rogueScoreInfo.clear();
return this;
}
/**
- * optional .RogueScoreRewardInfo rogue_score_info = 15;
+ * optional .RogueScoreRewardInfo rogue_score_info = 10;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -316,7 +200,7 @@ public final class RogueInfoDataOuterClass {
}
/**
- * optional .RogueScoreRewardInfo rogue_score_info = 15;
+ * optional .RogueScoreRewardInfo rogue_score_info = 10;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -325,32 +209,148 @@ public final class RogueInfoDataOuterClass {
* @return internal storage object for modifications
*/
public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getMutableRogueScoreInfo() {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000004;
return rogueScoreInfo;
}
/**
- * optional .RogueScoreRewardInfo rogue_score_info = 15;
+ * optional .RogueScoreRewardInfo rogue_score_info = 10;
* @param value the rogueScoreInfo to set
* @return this
*/
public RogueInfoData setRogueScoreInfo(
final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo value) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000004;
rogueScoreInfo.copyFrom(value);
return this;
}
+ /**
+ * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 11;
+ * @return whether the rogueVirtualItemInfo field is set
+ */
+ public boolean hasRogueVirtualItemInfo() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 11;
+ * @return this
+ */
+ public RogueInfoData clearRogueVirtualItemInfo() {
+ bitField0_ &= ~0x00000008;
+ rogueVirtualItemInfo.clear();
+ return this;
+ }
+
+ /**
+ * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 11;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableRogueVirtualItemInfo()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo getRogueVirtualItemInfo() {
+ return rogueVirtualItemInfo;
+ }
+
+ /**
+ * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 11;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo getMutableRogueVirtualItemInfo(
+ ) {
+ bitField0_ |= 0x00000008;
+ return rogueVirtualItemInfo;
+ }
+
+ /**
+ * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 11;
+ * @param value the rogueVirtualItemInfo to set
+ * @return this
+ */
+ public RogueInfoData setRogueVirtualItemInfo(
+ final RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo value) {
+ bitField0_ |= 0x00000008;
+ rogueVirtualItemInfo.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional .RogueSeasonInfo rogue_season_info = 14;
+ * @return whether the rogueSeasonInfo field is set
+ */
+ public boolean hasRogueSeasonInfo() {
+ return (bitField0_ & 0x00000010) != 0;
+ }
+
+ /**
+ * optional .RogueSeasonInfo rogue_season_info = 14;
+ * @return this
+ */
+ public RogueInfoData clearRogueSeasonInfo() {
+ bitField0_ &= ~0x00000010;
+ rogueSeasonInfo.clear();
+ return this;
+ }
+
+ /**
+ * optional .RogueSeasonInfo rogue_season_info = 14;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableRogueSeasonInfo()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RogueSeasonInfoOuterClass.RogueSeasonInfo getRogueSeasonInfo() {
+ return rogueSeasonInfo;
+ }
+
+ /**
+ * optional .RogueSeasonInfo rogue_season_info = 14;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RogueSeasonInfoOuterClass.RogueSeasonInfo getMutableRogueSeasonInfo() {
+ bitField0_ |= 0x00000010;
+ return rogueSeasonInfo;
+ }
+
+ /**
+ * optional .RogueSeasonInfo rogue_season_info = 14;
+ * @param value the rogueSeasonInfo to set
+ * @return this
+ */
+ public RogueInfoData setRogueSeasonInfo(final RogueSeasonInfoOuterClass.RogueSeasonInfo value) {
+ bitField0_ |= 0x00000010;
+ rogueSeasonInfo.copyFrom(value);
+ return this;
+ }
+
@Override
public RogueInfoData copyFrom(final RogueInfoData other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
rogueAeonInfo.copyFrom(other.rogueAeonInfo);
- rogueVirtualItemInfo.copyFrom(other.rogueVirtualItemInfo);
rogueAreaInfo.copyFrom(other.rogueAreaInfo);
- rogueSeasonInfo.copyFrom(other.rogueSeasonInfo);
rogueScoreInfo.copyFrom(other.rogueScoreInfo);
+ rogueVirtualItemInfo.copyFrom(other.rogueVirtualItemInfo);
+ rogueSeasonInfo.copyFrom(other.rogueSeasonInfo);
}
return this;
}
@@ -364,18 +364,18 @@ public final class RogueInfoDataOuterClass {
if (other.hasRogueAeonInfo()) {
getMutableRogueAeonInfo().mergeFrom(other.rogueAeonInfo);
}
- if (other.hasRogueVirtualItemInfo()) {
- getMutableRogueVirtualItemInfo().mergeFrom(other.rogueVirtualItemInfo);
- }
if (other.hasRogueAreaInfo()) {
getMutableRogueAreaInfo().mergeFrom(other.rogueAreaInfo);
}
- if (other.hasRogueSeasonInfo()) {
- getMutableRogueSeasonInfo().mergeFrom(other.rogueSeasonInfo);
- }
if (other.hasRogueScoreInfo()) {
getMutableRogueScoreInfo().mergeFrom(other.rogueScoreInfo);
}
+ if (other.hasRogueVirtualItemInfo()) {
+ getMutableRogueVirtualItemInfo().mergeFrom(other.rogueVirtualItemInfo);
+ }
+ if (other.hasRogueSeasonInfo()) {
+ getMutableRogueSeasonInfo().mergeFrom(other.rogueSeasonInfo);
+ }
return this;
}
@@ -387,10 +387,10 @@ public final class RogueInfoDataOuterClass {
cachedSize = -1;
bitField0_ = 0;
rogueAeonInfo.clear();
- rogueVirtualItemInfo.clear();
rogueAreaInfo.clear();
- rogueSeasonInfo.clear();
rogueScoreInfo.clear();
+ rogueVirtualItemInfo.clear();
+ rogueSeasonInfo.clear();
return this;
}
@@ -402,10 +402,10 @@ public final class RogueInfoDataOuterClass {
cachedSize = -1;
bitField0_ = 0;
rogueAeonInfo.clearQuick();
- rogueVirtualItemInfo.clearQuick();
rogueAreaInfo.clearQuick();
- rogueSeasonInfo.clearQuick();
rogueScoreInfo.clearQuick();
+ rogueVirtualItemInfo.clearQuick();
+ rogueSeasonInfo.clearQuick();
return this;
}
@@ -420,33 +420,33 @@ public final class RogueInfoDataOuterClass {
RogueInfoData other = (RogueInfoData) o;
return bitField0_ == other.bitField0_
&& (!hasRogueAeonInfo() || rogueAeonInfo.equals(other.rogueAeonInfo))
- && (!hasRogueVirtualItemInfo() || rogueVirtualItemInfo.equals(other.rogueVirtualItemInfo))
&& (!hasRogueAreaInfo() || rogueAreaInfo.equals(other.rogueAreaInfo))
- && (!hasRogueSeasonInfo() || rogueSeasonInfo.equals(other.rogueSeasonInfo))
- && (!hasRogueScoreInfo() || rogueScoreInfo.equals(other.rogueScoreInfo));
+ && (!hasRogueScoreInfo() || rogueScoreInfo.equals(other.rogueScoreInfo))
+ && (!hasRogueVirtualItemInfo() || rogueVirtualItemInfo.equals(other.rogueVirtualItemInfo))
+ && (!hasRogueSeasonInfo() || rogueSeasonInfo.equals(other.rogueSeasonInfo));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 66);
+ output.writeRawByte((byte) 18);
output.writeMessageNoTag(rogueAeonInfo);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 74);
- output.writeMessageNoTag(rogueVirtualItemInfo);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 90);
+ output.writeRawByte((byte) 26);
output.writeMessageNoTag(rogueAreaInfo);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 82);
+ output.writeMessageNoTag(rogueScoreInfo);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 98);
- output.writeMessageNoTag(rogueSeasonInfo);
+ output.writeRawByte((byte) 90);
+ output.writeMessageNoTag(rogueVirtualItemInfo);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 122);
- output.writeMessageNoTag(rogueScoreInfo);
+ output.writeRawByte((byte) 114);
+ output.writeMessageNoTag(rogueSeasonInfo);
}
}
@@ -457,16 +457,16 @@ public final class RogueInfoDataOuterClass {
size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAeonInfo);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(rogueVirtualItemInfo);
- }
- if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAreaInfo);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += 1 + ProtoSink.computeMessageSizeNoTag(rogueScoreInfo);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(rogueSeasonInfo);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(rogueVirtualItemInfo);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(rogueScoreInfo);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(rogueSeasonInfo);
}
return size;
}
@@ -478,45 +478,45 @@ public final class RogueInfoDataOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 66: {
+ case 18: {
// rogueAeonInfo
input.readMessage(rogueAeonInfo);
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 74) {
+ if (tag != 26) {
break;
}
}
- case 74: {
- // rogueVirtualItemInfo
- input.readMessage(rogueVirtualItemInfo);
+ case 26: {
+ // rogueAreaInfo
+ input.readMessage(rogueAreaInfo);
bitField0_ |= 0x00000002;
tag = input.readTag();
+ if (tag != 82) {
+ break;
+ }
+ }
+ case 82: {
+ // rogueScoreInfo
+ input.readMessage(rogueScoreInfo);
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
if (tag != 90) {
break;
}
}
case 90: {
- // rogueAreaInfo
- input.readMessage(rogueAreaInfo);
- bitField0_ |= 0x00000004;
- tag = input.readTag();
- if (tag != 98) {
- break;
- }
- }
- case 98: {
- // rogueSeasonInfo
- input.readMessage(rogueSeasonInfo);
+ // rogueVirtualItemInfo
+ input.readMessage(rogueVirtualItemInfo);
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 122) {
+ if (tag != 114) {
break;
}
}
- case 122: {
- // rogueScoreInfo
- input.readMessage(rogueScoreInfo);
+ case 114: {
+ // rogueSeasonInfo
+ input.readMessage(rogueSeasonInfo);
bitField0_ |= 0x00000010;
tag = input.readTag();
if (tag != 0) {
@@ -544,16 +544,16 @@ public final class RogueInfoDataOuterClass {
output.writeMessage(FieldNames.rogueAeonInfo, rogueAeonInfo);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeMessage(FieldNames.rogueVirtualItemInfo, rogueVirtualItemInfo);
- }
- if ((bitField0_ & 0x00000004) != 0) {
output.writeMessage(FieldNames.rogueAreaInfo, rogueAreaInfo);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeMessage(FieldNames.rogueScoreInfo, rogueScoreInfo);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- output.writeMessage(FieldNames.rogueSeasonInfo, rogueSeasonInfo);
+ output.writeMessage(FieldNames.rogueVirtualItemInfo, rogueVirtualItemInfo);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeMessage(FieldNames.rogueScoreInfo, rogueScoreInfo);
+ output.writeMessage(FieldNames.rogueSeasonInfo, rogueSeasonInfo);
}
output.endObject();
}
@@ -577,36 +577,12 @@ public final class RogueInfoDataOuterClass {
}
break;
}
- case 1066755410:
- case 1452147457: {
- if (input.isAtField(FieldNames.rogueVirtualItemInfo)) {
- if (!input.trySkipNullValue()) {
- input.readMessage(rogueVirtualItemInfo);
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 964297429:
case -851505925: {
if (input.isAtField(FieldNames.rogueAreaInfo)) {
if (!input.trySkipNullValue()) {
input.readMessage(rogueAreaInfo);
- bitField0_ |= 0x00000004;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case -1037341781:
- case -588845659: {
- if (input.isAtField(FieldNames.rogueSeasonInfo)) {
- if (!input.trySkipNullValue()) {
- input.readMessage(rogueSeasonInfo);
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000002;
}
} else {
input.skipUnknownField();
@@ -618,6 +594,30 @@ public final class RogueInfoDataOuterClass {
if (input.isAtField(FieldNames.rogueScoreInfo)) {
if (!input.trySkipNullValue()) {
input.readMessage(rogueScoreInfo);
+ bitField0_ |= 0x00000004;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 1066755410:
+ case 1452147457: {
+ if (input.isAtField(FieldNames.rogueVirtualItemInfo)) {
+ if (!input.trySkipNullValue()) {
+ input.readMessage(rogueVirtualItemInfo);
+ bitField0_ |= 0x00000008;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -1037341781:
+ case -588845659: {
+ if (input.isAtField(FieldNames.rogueSeasonInfo)) {
+ if (!input.trySkipNullValue()) {
+ input.readMessage(rogueSeasonInfo);
bitField0_ |= 0x00000010;
}
} else {
@@ -679,13 +679,13 @@ public final class RogueInfoDataOuterClass {
static class FieldNames {
static final FieldName rogueAeonInfo = FieldName.forField("rogueAeonInfo", "rogue_aeon_info");
- static final FieldName rogueVirtualItemInfo = FieldName.forField("rogueVirtualItemInfo", "rogue_virtual_item_info");
-
static final FieldName rogueAreaInfo = FieldName.forField("rogueAreaInfo", "rogue_area_info");
- static final FieldName rogueSeasonInfo = FieldName.forField("rogueSeasonInfo", "rogue_season_info");
-
static final FieldName rogueScoreInfo = FieldName.forField("rogueScoreInfo", "rogue_score_info");
+
+ static final FieldName rogueVirtualItemInfo = FieldName.forField("rogueVirtualItemInfo", "rogue_virtual_item_info");
+
+ static final FieldName rogueSeasonInfo = FieldName.forField("rogueSeasonInfo", "rogue_season_info");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java
index 3e237da..89d3372 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java
@@ -19,12 +19,12 @@ public final class RogueInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .RogueInfoData rogue_info_data = 748;
+ * optional .RogueInfoData rogue_info_data = 806;
*/
private final RogueInfoDataOuterClass.RogueInfoData rogueInfoData = RogueInfoDataOuterClass.RogueInfoData.newInstance();
/**
- * optional .RogueCurrentInfo rogue_current_info = 902;
+ * optional .RogueCurrentInfo rogue_current_info = 1236;
*/
private final RogueCurrentInfoOuterClass.RogueCurrentInfo rogueCurrentInfo = RogueCurrentInfoOuterClass.RogueCurrentInfo.newInstance();
@@ -39,7 +39,7 @@ public final class RogueInfoOuterClass {
}
/**
- * optional .RogueInfoData rogue_info_data = 748;
+ * optional .RogueInfoData rogue_info_data = 806;
* @return whether the rogueInfoData field is set
*/
public boolean hasRogueInfoData() {
@@ -47,7 +47,7 @@ public final class RogueInfoOuterClass {
}
/**
- * optional .RogueInfoData rogue_info_data = 748;
+ * optional .RogueInfoData rogue_info_data = 806;
* @return this
*/
public RogueInfo clearRogueInfoData() {
@@ -57,7 +57,7 @@ public final class RogueInfoOuterClass {
}
/**
- * optional .RogueInfoData rogue_info_data = 748;
+ * optional .RogueInfoData rogue_info_data = 806;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -71,7 +71,7 @@ public final class RogueInfoOuterClass {
}
/**
- * optional .RogueInfoData rogue_info_data = 748;
+ * optional .RogueInfoData rogue_info_data = 806;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -85,7 +85,7 @@ public final class RogueInfoOuterClass {
}
/**
- * optional .RogueInfoData rogue_info_data = 748;
+ * optional .RogueInfoData rogue_info_data = 806;
* @param value the rogueInfoData to set
* @return this
*/
@@ -96,7 +96,7 @@ public final class RogueInfoOuterClass {
}
/**
- * optional .RogueCurrentInfo rogue_current_info = 902;
+ * optional .RogueCurrentInfo rogue_current_info = 1236;
* @return whether the rogueCurrentInfo field is set
*/
public boolean hasRogueCurrentInfo() {
@@ -104,7 +104,7 @@ public final class RogueInfoOuterClass {
}
/**
- * optional .RogueCurrentInfo rogue_current_info = 902;
+ * optional .RogueCurrentInfo rogue_current_info = 1236;
* @return this
*/
public RogueInfo clearRogueCurrentInfo() {
@@ -114,7 +114,7 @@ public final class RogueInfoOuterClass {
}
/**
- * optional .RogueCurrentInfo rogue_current_info = 902;
+ * optional .RogueCurrentInfo rogue_current_info = 1236;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -128,7 +128,7 @@ public final class RogueInfoOuterClass {
}
/**
- * optional .RogueCurrentInfo rogue_current_info = 902;
+ * optional .RogueCurrentInfo rogue_current_info = 1236;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -142,7 +142,7 @@ public final class RogueInfoOuterClass {
}
/**
- * optional .RogueCurrentInfo rogue_current_info = 902;
+ * optional .RogueCurrentInfo rogue_current_info = 1236;
* @param value the rogueCurrentInfo to set
* @return this
*/
@@ -219,11 +219,11 @@ public final class RogueInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawLittleEndian16((short) 12002);
+ output.writeRawLittleEndian16((short) 12978);
output.writeMessageNoTag(rogueInfoData);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawLittleEndian16((short) 14514);
+ output.writeRawLittleEndian16((short) 19874);
output.writeMessageNoTag(rogueCurrentInfo);
}
}
@@ -247,16 +247,16 @@ public final class RogueInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 5986: {
+ case 6450: {
// rogueInfoData
input.readMessage(rogueInfoData);
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 7218) {
+ if (tag != 9890) {
break;
}
}
- case 7218: {
+ case 9890: {
// rogueCurrentInfo
input.readMessage(rogueCurrentInfo);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueMapInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMapInfoOuterClass.java
index f4bf096..d73fad4 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueMapInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueMapInfoOuterClass.java
@@ -20,27 +20,27 @@ public final class RogueMapInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 cur_room_id = 3;
+ * optional uint32 map_id = 2;
+ */
+ private int mapId;
+
+ /**
+ * optional uint32 cur_room_id = 4;
*/
private int curRoomId;
/**
- * optional uint32 cur_site_id = 8;
+ * optional uint32 cur_site_id = 11;
*/
private int curSiteId;
- /**
- * optional uint32 map_id = 10;
- */
- private int mapId;
-
/**
* optional uint32 area_id = 13;
*/
private int areaId;
/**
- * repeated .RogueRoom room_list = 12;
+ * repeated .RogueRoom room_list = 3;
*/
private final RepeatedMessageoptional uint32 cur_room_id = 3;
- * @return whether the curRoomId field is set
+ * optional uint32 map_id = 2;
+ * @return whether the mapId field is set
*/
- public boolean hasCurRoomId() {
+ public boolean hasMapId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 cur_room_id = 3;
- * @return this
- */
- public RogueMapInfo clearCurRoomId() {
- bitField0_ &= ~0x00000001;
- curRoomId = 0;
- return this;
- }
-
- /**
- * optional uint32 cur_room_id = 3;
- * @return the curRoomId
- */
- public int getCurRoomId() {
- return curRoomId;
- }
-
- /**
- * optional uint32 cur_room_id = 3;
- * @param value the curRoomId to set
- * @return this
- */
- public RogueMapInfo setCurRoomId(final int value) {
- bitField0_ |= 0x00000001;
- curRoomId = value;
- return this;
- }
-
- /**
- * optional uint32 cur_site_id = 8;
- * @return whether the curSiteId field is set
- */
- public boolean hasCurSiteId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 cur_site_id = 8;
- * @return this
- */
- public RogueMapInfo clearCurSiteId() {
- bitField0_ &= ~0x00000002;
- curSiteId = 0;
- return this;
- }
-
- /**
- * optional uint32 cur_site_id = 8;
- * @return the curSiteId
- */
- public int getCurSiteId() {
- return curSiteId;
- }
-
- /**
- * optional uint32 cur_site_id = 8;
- * @param value the curSiteId to set
- * @return this
- */
- public RogueMapInfo setCurSiteId(final int value) {
- bitField0_ |= 0x00000002;
- curSiteId = value;
- return this;
- }
-
- /**
- * optional uint32 map_id = 10;
- * @return whether the mapId field is set
- */
- public boolean hasMapId() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 map_id = 10;
+ * optional uint32 map_id = 2;
* @return this
*/
public RogueMapInfo clearMapId() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000001;
mapId = 0;
return this;
}
/**
- * optional uint32 map_id = 10;
+ * optional uint32 map_id = 2;
* @return the mapId
*/
public int getMapId() {
@@ -155,16 +81,90 @@ public final class RogueMapInfoOuterClass {
}
/**
- * optional uint32 map_id = 10;
+ * optional uint32 map_id = 2;
* @param value the mapId to set
* @return this
*/
public RogueMapInfo setMapId(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
mapId = value;
return this;
}
+ /**
+ * optional uint32 cur_room_id = 4;
+ * @return whether the curRoomId field is set
+ */
+ public boolean hasCurRoomId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 cur_room_id = 4;
+ * @return this
+ */
+ public RogueMapInfo clearCurRoomId() {
+ bitField0_ &= ~0x00000002;
+ curRoomId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 cur_room_id = 4;
+ * @return the curRoomId
+ */
+ public int getCurRoomId() {
+ return curRoomId;
+ }
+
+ /**
+ * optional uint32 cur_room_id = 4;
+ * @param value the curRoomId to set
+ * @return this
+ */
+ public RogueMapInfo setCurRoomId(final int value) {
+ bitField0_ |= 0x00000002;
+ curRoomId = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 cur_site_id = 11;
+ * @return whether the curSiteId field is set
+ */
+ public boolean hasCurSiteId() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 cur_site_id = 11;
+ * @return this
+ */
+ public RogueMapInfo clearCurSiteId() {
+ bitField0_ &= ~0x00000004;
+ curSiteId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 cur_site_id = 11;
+ * @return the curSiteId
+ */
+ public int getCurSiteId() {
+ return curSiteId;
+ }
+
+ /**
+ * optional uint32 cur_site_id = 11;
+ * @param value the curSiteId to set
+ * @return this
+ */
+ public RogueMapInfo setCurSiteId(final int value) {
+ bitField0_ |= 0x00000004;
+ curSiteId = value;
+ return this;
+ }
+
/**
* optional uint32 area_id = 13;
* @return whether the areaId field is set
@@ -203,7 +203,7 @@ public final class RogueMapInfoOuterClass {
}
/**
- * repeated .RogueRoom room_list = 12;
+ * repeated .RogueRoom room_list = 3;
* @return whether the roomList field is set
*/
public boolean hasRoomList() {
@@ -211,7 +211,7 @@ public final class RogueMapInfoOuterClass {
}
/**
- * repeated .RogueRoom room_list = 12;
+ * repeated .RogueRoom room_list = 3;
* @return this
*/
public RogueMapInfo clearRoomList() {
@@ -221,7 +221,7 @@ public final class RogueMapInfoOuterClass {
}
/**
- * repeated .RogueRoom room_list = 12;
+ * repeated .RogueRoom room_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.
@@ -235,7 +235,7 @@ public final class RogueMapInfoOuterClass {
}
/**
- * repeated .RogueRoom room_list = 12;
+ * repeated .RogueRoom room_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
@@ -249,7 +249,7 @@ public final class RogueMapInfoOuterClass {
}
/**
- * repeated .RogueRoom room_list = 12;
+ * repeated .RogueRoom room_list = 3;
* @param value the roomList to add
* @return this
*/
@@ -260,7 +260,7 @@ public final class RogueMapInfoOuterClass {
}
/**
- * repeated .RogueRoom room_list = 12;
+ * repeated .RogueRoom room_list = 3;
* @param values the roomList to add
* @return this
*/
@@ -275,9 +275,9 @@ public final class RogueMapInfoOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
+ mapId = other.mapId;
curRoomId = other.curRoomId;
curSiteId = other.curSiteId;
- mapId = other.mapId;
areaId = other.areaId;
roomList.copyFrom(other.roomList);
}
@@ -290,15 +290,15 @@ public final class RogueMapInfoOuterClass {
return this;
}
cachedSize = -1;
+ if (other.hasMapId()) {
+ setMapId(other.mapId);
+ }
if (other.hasCurRoomId()) {
setCurRoomId(other.curRoomId);
}
if (other.hasCurSiteId()) {
setCurSiteId(other.curSiteId);
}
- if (other.hasMapId()) {
- setMapId(other.mapId);
- }
if (other.hasAreaId()) {
setAreaId(other.areaId);
}
@@ -315,9 +315,9 @@ public final class RogueMapInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
+ mapId = 0;
curRoomId = 0;
curSiteId = 0;
- mapId = 0;
areaId = 0;
roomList.clear();
return this;
@@ -344,9 +344,9 @@ public final class RogueMapInfoOuterClass {
}
RogueMapInfo other = (RogueMapInfo) o;
return bitField0_ == other.bitField0_
+ && (!hasMapId() || mapId == other.mapId)
&& (!hasCurRoomId() || curRoomId == other.curRoomId)
&& (!hasCurSiteId() || curSiteId == other.curSiteId)
- && (!hasMapId() || mapId == other.mapId)
&& (!hasAreaId() || areaId == other.areaId)
&& (!hasRoomList() || roomList.equals(other.roomList));
}
@@ -354,16 +354,16 @@ public final class RogueMapInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(curRoomId);
+ output.writeRawByte((byte) 16);
+ output.writeUInt32NoTag(mapId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 64);
- output.writeUInt32NoTag(curSiteId);
+ output.writeRawByte((byte) 32);
+ output.writeUInt32NoTag(curRoomId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(mapId);
+ output.writeRawByte((byte) 88);
+ output.writeUInt32NoTag(curSiteId);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeRawByte((byte) 104);
@@ -371,7 +371,7 @@ public final class RogueMapInfoOuterClass {
}
if ((bitField0_ & 0x00000010) != 0) {
for (int i = 0; i < roomList.length(); i++) {
- output.writeRawByte((byte) 98);
+ output.writeRawByte((byte) 26);
output.writeMessageNoTag(roomList.get(i));
}
}
@@ -381,13 +381,13 @@ public final class RogueMapInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(curRoomId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(mapId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(curSiteId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(curRoomId);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(mapId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(curSiteId);
}
if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(areaId);
@@ -405,27 +405,27 @@ public final class RogueMapInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
- // curRoomId
- curRoomId = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 64) {
- break;
- }
- }
- case 64: {
- // curSiteId
- curSiteId = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 80) {
- break;
- }
- }
- case 80: {
+ case 16: {
// mapId
mapId = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 32) {
+ break;
+ }
+ }
+ case 32: {
+ // curRoomId
+ curRoomId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 88) {
+ break;
+ }
+ }
+ case 88: {
+ // curSiteId
+ curSiteId = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 104) {
@@ -437,11 +437,11 @@ public final class RogueMapInfoOuterClass {
areaId = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 98) {
+ if (tag != 26) {
break;
}
}
- case 98: {
+ case 26: {
// roomList
tag = input.readRepeatedMessage(roomList, tag);
bitField0_ |= 0x00000010;
@@ -467,13 +467,13 @@ public final class RogueMapInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.curRoomId, curRoomId);
+ output.writeUInt32(FieldNames.mapId, mapId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.curSiteId, curSiteId);
+ output.writeUInt32(FieldNames.curRoomId, curRoomId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.mapId, mapId);
+ output.writeUInt32(FieldNames.curSiteId, curSiteId);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeUInt32(FieldNames.areaId, areaId);
@@ -491,12 +491,24 @@ public final class RogueMapInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
+ case 103663511:
+ case -1081377058: {
+ if (input.isAtField(FieldNames.mapId)) {
+ if (!input.trySkipNullValue()) {
+ mapId = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case -249266762:
case 524969984: {
if (input.isAtField(FieldNames.curRoomId)) {
if (!input.trySkipNullValue()) {
curRoomId = input.readUInt32();
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
}
} else {
input.skipUnknownField();
@@ -508,18 +520,6 @@ public final class RogueMapInfoOuterClass {
if (input.isAtField(FieldNames.curSiteId)) {
if (!input.trySkipNullValue()) {
curSiteId = input.readUInt32();
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 103663511:
- case -1081377058: {
- if (input.isAtField(FieldNames.mapId)) {
- if (!input.trySkipNullValue()) {
- mapId = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -603,12 +603,12 @@ public final class RogueMapInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
+ static final FieldName mapId = FieldName.forField("mapId", "map_id");
+
static final FieldName curRoomId = FieldName.forField("curRoomId", "cur_room_id");
static final FieldName curSiteId = FieldName.forField("curSiteId", "cur_site_id");
- static final FieldName mapId = FieldName.forField("mapId", "map_id");
-
static final FieldName areaId = FieldName.forField("areaId", "area_id");
static final FieldName roomList = FieldName.forField("roomList", "room_list");
diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleDataInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleDataInfoOuterClass.java
index 1ed1d40..7598e5b 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueMiracleDataInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleDataInfoOuterClass.java
@@ -19,30 +19,30 @@ public final class RogueMiracleDataInfoOuterClass {
public static final class RogueMiracleDataInfo extends ProtoMessageoptional uint32 JGBGAMHIIKD = 2;
- */
- private int jGBGAMHIIKD;
-
- /**
- * optional uint32 NOGMPAIOFJH = 5;
- */
- private int nOGMPAIOFJH;
-
/**
* optional uint32 miracle_id = 7;
*/
private int miracleId;
/**
- * optional uint32 GOIJOIBBBCP = 9;
+ * optional uint32 MMFONFFPNJM = 8;
*/
- private int gOIJOIBBBCP;
+ private int mMFONFFPNJM;
/**
- * repeated .RogueMiracleDataInfo.OGIABDBDCFHEntry OGIABDBDCFH = 11;
+ * optional uint32 NKBEHFHLPEF = 11;
*/
- private final RepeatedMessageoptional uint32 DCLABPANBJG = 12;
+ */
+ private int dCLABPANBJG;
+
+ /**
+ * repeated .RogueMiracleDataInfo.KONAGCDHKKHEntry KONAGCDHKKH = 15;
+ */
+ private final RepeatedMessageoptional uint32 JGBGAMHIIKD = 2;
- * @return whether the jGBGAMHIIKD field is set
- */
- public boolean hasJGBGAMHIIKD() {
- return (bitField0_ & 0x00000001) != 0;
- }
-
- /**
- * optional uint32 JGBGAMHIIKD = 2;
- * @return this
- */
- public RogueMiracleDataInfo clearJGBGAMHIIKD() {
- bitField0_ &= ~0x00000001;
- jGBGAMHIIKD = 0;
- return this;
- }
-
- /**
- * optional uint32 JGBGAMHIIKD = 2;
- * @return the jGBGAMHIIKD
- */
- public int getJGBGAMHIIKD() {
- return jGBGAMHIIKD;
- }
-
- /**
- * optional uint32 JGBGAMHIIKD = 2;
- * @param value the jGBGAMHIIKD to set
- * @return this
- */
- public RogueMiracleDataInfo setJGBGAMHIIKD(final int value) {
- bitField0_ |= 0x00000001;
- jGBGAMHIIKD = value;
- return this;
- }
-
- /**
- * optional uint32 NOGMPAIOFJH = 5;
- * @return whether the nOGMPAIOFJH field is set
- */
- public boolean hasNOGMPAIOFJH() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 NOGMPAIOFJH = 5;
- * @return this
- */
- public RogueMiracleDataInfo clearNOGMPAIOFJH() {
- bitField0_ &= ~0x00000002;
- nOGMPAIOFJH = 0;
- return this;
- }
-
- /**
- * optional uint32 NOGMPAIOFJH = 5;
- * @return the nOGMPAIOFJH
- */
- public int getNOGMPAIOFJH() {
- return nOGMPAIOFJH;
- }
-
- /**
- * optional uint32 NOGMPAIOFJH = 5;
- * @param value the nOGMPAIOFJH to set
- * @return this
- */
- public RogueMiracleDataInfo setNOGMPAIOFJH(final int value) {
- bitField0_ |= 0x00000002;
- nOGMPAIOFJH = value;
- return this;
- }
-
/**
* optional uint32 miracle_id = 7;
* @return whether the miracleId field is set
*/
public boolean hasMiracleId() {
- return (bitField0_ & 0x00000004) != 0;
+ return (bitField0_ & 0x00000001) != 0;
}
/**
@@ -141,7 +67,7 @@ public final class RogueMiracleDataInfoOuterClass {
* @return this
*/
public RogueMiracleDataInfo clearMiracleId() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000001;
miracleId = 0;
return this;
}
@@ -160,82 +86,156 @@ public final class RogueMiracleDataInfoOuterClass {
* @return this
*/
public RogueMiracleDataInfo setMiracleId(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
miracleId = value;
return this;
}
/**
- * optional uint32 GOIJOIBBBCP = 9;
- * @return whether the gOIJOIBBBCP field is set
+ * optional uint32 MMFONFFPNJM = 8;
+ * @return whether the mMFONFFPNJM field is set
*/
- public boolean hasGOIJOIBBBCP() {
+ public boolean hasMMFONFFPNJM() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 MMFONFFPNJM = 8;
+ * @return this
+ */
+ public RogueMiracleDataInfo clearMMFONFFPNJM() {
+ bitField0_ &= ~0x00000002;
+ mMFONFFPNJM = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 MMFONFFPNJM = 8;
+ * @return the mMFONFFPNJM
+ */
+ public int getMMFONFFPNJM() {
+ return mMFONFFPNJM;
+ }
+
+ /**
+ * optional uint32 MMFONFFPNJM = 8;
+ * @param value the mMFONFFPNJM to set
+ * @return this
+ */
+ public RogueMiracleDataInfo setMMFONFFPNJM(final int value) {
+ bitField0_ |= 0x00000002;
+ mMFONFFPNJM = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 NKBEHFHLPEF = 11;
+ * @return whether the nKBEHFHLPEF field is set
+ */
+ public boolean hasNKBEHFHLPEF() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 NKBEHFHLPEF = 11;
+ * @return this
+ */
+ public RogueMiracleDataInfo clearNKBEHFHLPEF() {
+ bitField0_ &= ~0x00000004;
+ nKBEHFHLPEF = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 NKBEHFHLPEF = 11;
+ * @return the nKBEHFHLPEF
+ */
+ public int getNKBEHFHLPEF() {
+ return nKBEHFHLPEF;
+ }
+
+ /**
+ * optional uint32 NKBEHFHLPEF = 11;
+ * @param value the nKBEHFHLPEF to set
+ * @return this
+ */
+ public RogueMiracleDataInfo setNKBEHFHLPEF(final int value) {
+ bitField0_ |= 0x00000004;
+ nKBEHFHLPEF = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 DCLABPANBJG = 12;
+ * @return whether the dCLABPANBJG field is set
+ */
+ public boolean hasDCLABPANBJG() {
return (bitField0_ & 0x00000008) != 0;
}
/**
- * optional uint32 GOIJOIBBBCP = 9;
+ * optional uint32 DCLABPANBJG = 12;
* @return this
*/
- public RogueMiracleDataInfo clearGOIJOIBBBCP() {
+ public RogueMiracleDataInfo clearDCLABPANBJG() {
bitField0_ &= ~0x00000008;
- gOIJOIBBBCP = 0;
+ dCLABPANBJG = 0;
return this;
}
/**
- * optional uint32 GOIJOIBBBCP = 9;
- * @return the gOIJOIBBBCP
+ * optional uint32 DCLABPANBJG = 12;
+ * @return the dCLABPANBJG
*/
- public int getGOIJOIBBBCP() {
- return gOIJOIBBBCP;
+ public int getDCLABPANBJG() {
+ return dCLABPANBJG;
}
/**
- * optional uint32 GOIJOIBBBCP = 9;
- * @param value the gOIJOIBBBCP to set
+ * optional uint32 DCLABPANBJG = 12;
+ * @param value the dCLABPANBJG to set
* @return this
*/
- public RogueMiracleDataInfo setGOIJOIBBBCP(final int value) {
+ public RogueMiracleDataInfo setDCLABPANBJG(final int value) {
bitField0_ |= 0x00000008;
- gOIJOIBBBCP = value;
+ dCLABPANBJG = value;
return this;
}
/**
- * repeated .RogueMiracleDataInfo.OGIABDBDCFHEntry OGIABDBDCFH = 11;
- * @return whether the oGIABDBDCFH field is set
+ * repeated .RogueMiracleDataInfo.KONAGCDHKKHEntry KONAGCDHKKH = 15;
+ * @return whether the kONAGCDHKKH field is set
*/
- public boolean hasOGIABDBDCFH() {
+ public boolean hasKONAGCDHKKH() {
return (bitField0_ & 0x00000010) != 0;
}
/**
- * repeated .RogueMiracleDataInfo.OGIABDBDCFHEntry OGIABDBDCFH = 11;
+ * repeated .RogueMiracleDataInfo.KONAGCDHKKHEntry KONAGCDHKKH = 15;
* @return this
*/
- public RogueMiracleDataInfo clearOGIABDBDCFH() {
+ public RogueMiracleDataInfo clearKONAGCDHKKH() {
bitField0_ &= ~0x00000010;
- oGIABDBDCFH.clear();
+ kONAGCDHKKH.clear();
return this;
}
/**
- * repeated .RogueMiracleDataInfo.OGIABDBDCFHEntry OGIABDBDCFH = 11;
+ * repeated .RogueMiracleDataInfo.KONAGCDHKKHEntry KONAGCDHKKH = 15;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
*
- * Use {@link #getMutableOGIABDBDCFH()} if you want to modify it.
+ * Use {@link #getMutableKONAGCDHKKH()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public RepeatedMessagerepeated .RogueMiracleDataInfo.OGIABDBDCFHEntry OGIABDBDCFH = 11;
+ * repeated .RogueMiracleDataInfo.KONAGCDHKKHEntry KONAGCDHKKH = 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
@@ -243,30 +243,30 @@ public final class RogueMiracleDataInfoOuterClass {
*
* @return internal storage object for modifications
*/
- public RepeatedMessagerepeated .RogueMiracleDataInfo.OGIABDBDCFHEntry OGIABDBDCFH = 11;
- * @param value the oGIABDBDCFH to add
+ * repeated .RogueMiracleDataInfo.KONAGCDHKKHEntry KONAGCDHKKH = 15;
+ * @param value the kONAGCDHKKH to add
* @return this
*/
- public RogueMiracleDataInfo addOGIABDBDCFH(final OGIABDBDCFHEntry value) {
+ public RogueMiracleDataInfo addKONAGCDHKKH(final KONAGCDHKKHEntry value) {
bitField0_ |= 0x00000010;
- oGIABDBDCFH.add(value);
+ kONAGCDHKKH.add(value);
return this;
}
/**
- * repeated .RogueMiracleDataInfo.OGIABDBDCFHEntry OGIABDBDCFH = 11;
- * @param values the oGIABDBDCFH to add
+ * repeated .RogueMiracleDataInfo.KONAGCDHKKHEntry KONAGCDHKKH = 15;
+ * @param values the kONAGCDHKKH to add
* @return this
*/
- public RogueMiracleDataInfo addAllOGIABDBDCFH(final OGIABDBDCFHEntry... values) {
+ public RogueMiracleDataInfo addAllKONAGCDHKKH(final KONAGCDHKKHEntry... values) {
bitField0_ |= 0x00000010;
- oGIABDBDCFH.addAll(values);
+ kONAGCDHKKH.addAll(values);
return this;
}
@@ -275,11 +275,11 @@ public final class RogueMiracleDataInfoOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- jGBGAMHIIKD = other.jGBGAMHIIKD;
- nOGMPAIOFJH = other.nOGMPAIOFJH;
miracleId = other.miracleId;
- gOIJOIBBBCP = other.gOIJOIBBBCP;
- oGIABDBDCFH.copyFrom(other.oGIABDBDCFH);
+ mMFONFFPNJM = other.mMFONFFPNJM;
+ nKBEHFHLPEF = other.nKBEHFHLPEF;
+ dCLABPANBJG = other.dCLABPANBJG;
+ kONAGCDHKKH.copyFrom(other.kONAGCDHKKH);
}
return this;
}
@@ -290,20 +290,20 @@ public final class RogueMiracleDataInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasJGBGAMHIIKD()) {
- setJGBGAMHIIKD(other.jGBGAMHIIKD);
- }
- if (other.hasNOGMPAIOFJH()) {
- setNOGMPAIOFJH(other.nOGMPAIOFJH);
- }
if (other.hasMiracleId()) {
setMiracleId(other.miracleId);
}
- if (other.hasGOIJOIBBBCP()) {
- setGOIJOIBBBCP(other.gOIJOIBBBCP);
+ if (other.hasMMFONFFPNJM()) {
+ setMMFONFFPNJM(other.mMFONFFPNJM);
}
- if (other.hasOGIABDBDCFH()) {
- getMutableOGIABDBDCFH().addAll(other.oGIABDBDCFH);
+ if (other.hasNKBEHFHLPEF()) {
+ setNKBEHFHLPEF(other.nKBEHFHLPEF);
+ }
+ if (other.hasDCLABPANBJG()) {
+ setDCLABPANBJG(other.dCLABPANBJG);
+ }
+ if (other.hasKONAGCDHKKH()) {
+ getMutableKONAGCDHKKH().addAll(other.kONAGCDHKKH);
}
return this;
}
@@ -315,11 +315,11 @@ public final class RogueMiracleDataInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- jGBGAMHIIKD = 0;
- nOGMPAIOFJH = 0;
miracleId = 0;
- gOIJOIBBBCP = 0;
- oGIABDBDCFH.clear();
+ mMFONFFPNJM = 0;
+ nKBEHFHLPEF = 0;
+ dCLABPANBJG = 0;
+ kONAGCDHKKH.clear();
return this;
}
@@ -330,7 +330,7 @@ public final class RogueMiracleDataInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- oGIABDBDCFH.clearQuick();
+ kONAGCDHKKH.clearQuick();
return this;
}
@@ -344,35 +344,35 @@ public final class RogueMiracleDataInfoOuterClass {
}
RogueMiracleDataInfo other = (RogueMiracleDataInfo) o;
return bitField0_ == other.bitField0_
- && (!hasJGBGAMHIIKD() || jGBGAMHIIKD == other.jGBGAMHIIKD)
- && (!hasNOGMPAIOFJH() || nOGMPAIOFJH == other.nOGMPAIOFJH)
&& (!hasMiracleId() || miracleId == other.miracleId)
- && (!hasGOIJOIBBBCP() || gOIJOIBBBCP == other.gOIJOIBBBCP)
- && (!hasOGIABDBDCFH() || oGIABDBDCFH.equals(other.oGIABDBDCFH));
+ && (!hasMMFONFFPNJM() || mMFONFFPNJM == other.mMFONFFPNJM)
+ && (!hasNKBEHFHLPEF() || nKBEHFHLPEF == other.nKBEHFHLPEF)
+ && (!hasDCLABPANBJG() || dCLABPANBJG == other.dCLABPANBJG)
+ && (!hasKONAGCDHKKH() || kONAGCDHKKH.equals(other.kONAGCDHKKH));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(jGBGAMHIIKD);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 40);
- output.writeUInt32NoTag(nOGMPAIOFJH);
- }
- if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 56);
output.writeUInt32NoTag(miracleId);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 64);
+ output.writeUInt32NoTag(mMFONFFPNJM);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 88);
+ output.writeUInt32NoTag(nKBEHFHLPEF);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 72);
- output.writeUInt32NoTag(gOIJOIBBBCP);
+ output.writeRawByte((byte) 96);
+ output.writeUInt32NoTag(dCLABPANBJG);
}
if ((bitField0_ & 0x00000010) != 0) {
- for (int i = 0; i < oGIABDBDCFH.length(); i++) {
- output.writeRawByte((byte) 90);
- output.writeMessageNoTag(oGIABDBDCFH.get(i));
+ for (int i = 0; i < kONAGCDHKKH.length(); i++) {
+ output.writeRawByte((byte) 122);
+ output.writeMessageNoTag(kONAGCDHKKH.get(i));
}
}
}
@@ -381,19 +381,19 @@ public final class RogueMiracleDataInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(jGBGAMHIIKD);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(nOGMPAIOFJH);
- }
- if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(miracleId);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(mMFONFFPNJM);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(nKBEHFHLPEF);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(gOIJOIBBBCP);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(dCLABPANBJG);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += (1 * oGIABDBDCFH.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(oGIABDBDCFH);
+ size += (1 * kONAGCDHKKH.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(kONAGCDHKKH);
}
return size;
}
@@ -405,45 +405,45 @@ public final class RogueMiracleDataInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
- // jGBGAMHIIKD
- jGBGAMHIIKD = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 40) {
- break;
- }
- }
- case 40: {
- // nOGMPAIOFJH
- nOGMPAIOFJH = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 56) {
- break;
- }
- }
case 56: {
// miracleId
miracleId = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 64) {
+ break;
+ }
+ }
+ case 64: {
+ // mMFONFFPNJM
+ mMFONFFPNJM = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 88) {
+ break;
+ }
+ }
+ case 88: {
+ // nKBEHFHLPEF
+ nKBEHFHLPEF = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 72) {
+ if (tag != 96) {
break;
}
}
- case 72: {
- // gOIJOIBBBCP
- gOIJOIBBBCP = input.readUInt32();
+ case 96: {
+ // dCLABPANBJG
+ dCLABPANBJG = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 90) {
+ if (tag != 122) {
break;
}
}
- case 90: {
- // oGIABDBDCFH
- tag = input.readRepeatedMessage(oGIABDBDCFH, tag);
+ case 122: {
+ // kONAGCDHKKH
+ tag = input.readRepeatedMessage(kONAGCDHKKH, tag);
bitField0_ |= 0x00000010;
if (tag != 0) {
break;
@@ -467,19 +467,19 @@ public final class RogueMiracleDataInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.jGBGAMHIIKD, jGBGAMHIIKD);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.nOGMPAIOFJH, nOGMPAIOFJH);
- }
- if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.miracleId, miracleId);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeUInt32(FieldNames.mMFONFFPNJM, mMFONFFPNJM);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeUInt32(FieldNames.nKBEHFHLPEF, nKBEHFHLPEF);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.gOIJOIBBBCP, gOIJOIBBBCP);
+ output.writeUInt32(FieldNames.dCLABPANBJG, dCLABPANBJG);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRepeatedMessage(FieldNames.oGIABDBDCFH, oGIABDBDCFH);
+ output.writeRepeatedMessage(FieldNames.kONAGCDHKKH, kONAGCDHKKH);
}
output.endObject();
}
@@ -491,10 +491,11 @@ public final class RogueMiracleDataInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -914016877: {
- if (input.isAtField(FieldNames.jGBGAMHIIKD)) {
+ case -164571796:
+ case -806736983: {
+ if (input.isAtField(FieldNames.miracleId)) {
if (!input.trySkipNullValue()) {
- jGBGAMHIIKD = input.readUInt32();
+ miracleId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -502,10 +503,10 @@ public final class RogueMiracleDataInfoOuterClass {
}
break;
}
- case 420796806: {
- if (input.isAtField(FieldNames.nOGMPAIOFJH)) {
+ case 1974288326: {
+ if (input.isAtField(FieldNames.mMFONFFPNJM)) {
if (!input.trySkipNullValue()) {
- nOGMPAIOFJH = input.readUInt32();
+ mMFONFFPNJM = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -513,11 +514,10 @@ public final class RogueMiracleDataInfoOuterClass {
}
break;
}
- case -164571796:
- case -806736983: {
- if (input.isAtField(FieldNames.miracleId)) {
+ case -2066312081: {
+ if (input.isAtField(FieldNames.nKBEHFHLPEF)) {
if (!input.trySkipNullValue()) {
- miracleId = input.readUInt32();
+ nKBEHFHLPEF = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -525,10 +525,10 @@ public final class RogueMiracleDataInfoOuterClass {
}
break;
}
- case -804177364: {
- if (input.isAtField(FieldNames.gOIJOIBBBCP)) {
+ case 269276528: {
+ if (input.isAtField(FieldNames.dCLABPANBJG)) {
if (!input.trySkipNullValue()) {
- gOIJOIBBBCP = input.readUInt32();
+ dCLABPANBJG = input.readUInt32();
bitField0_ |= 0x00000008;
}
} else {
@@ -536,10 +536,10 @@ public final class RogueMiracleDataInfoOuterClass {
}
break;
}
- case 1976066769: {
- if (input.isAtField(FieldNames.oGIABDBDCFH)) {
+ case -1329612143: {
+ if (input.isAtField(FieldNames.kONAGCDHKKH)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(oGIABDBDCFH);
+ input.readRepeatedMessage(kONAGCDHKKH);
bitField0_ |= 0x00000010;
}
} else {
@@ -588,9 +588,9 @@ public final class RogueMiracleDataInfoOuterClass {
}
/**
- * Protobuf type {@code OGIABDBDCFHEntry}
+ * Protobuf type {@code KONAGCDHKKHEntry}
*/
- public static final class OGIABDBDCFHEntry extends ProtoMessageoptional uint32 key = 1;
* @return this
*/
- public OGIABDBDCFHEntry clearKey() {
+ public KONAGCDHKKHEntry clearKey() {
bitField0_ &= ~0x00000001;
key = 0;
return this;
@@ -644,7 +644,7 @@ public final class RogueMiracleDataInfoOuterClass {
* @param value the key to set
* @return this
*/
- public OGIABDBDCFHEntry setKey(final int value) {
+ public KONAGCDHKKHEntry setKey(final int value) {
bitField0_ |= 0x00000001;
key = value;
return this;
@@ -662,7 +662,7 @@ public final class RogueMiracleDataInfoOuterClass {
* optional uint32 value = 2;
* @return this
*/
- public OGIABDBDCFHEntry clearValue() {
+ public KONAGCDHKKHEntry clearValue() {
bitField0_ &= ~0x00000002;
value_ = 0;
return this;
@@ -681,14 +681,14 @@ public final class RogueMiracleDataInfoOuterClass {
* @param value the value_ to set
* @return this
*/
- public OGIABDBDCFHEntry setValue(final int value) {
+ public KONAGCDHKKHEntry setValue(final int value) {
bitField0_ |= 0x00000002;
value_ = value;
return this;
}
@Override
- public OGIABDBDCFHEntry copyFrom(final OGIABDBDCFHEntry other) {
+ public KONAGCDHKKHEntry copyFrom(final KONAGCDHKKHEntry other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
@@ -699,7 +699,7 @@ public final class RogueMiracleDataInfoOuterClass {
}
@Override
- public OGIABDBDCFHEntry mergeFrom(final OGIABDBDCFHEntry other) {
+ public KONAGCDHKKHEntry mergeFrom(final KONAGCDHKKHEntry other) {
if (other.isEmpty()) {
return this;
}
@@ -714,7 +714,7 @@ public final class RogueMiracleDataInfoOuterClass {
}
@Override
- public OGIABDBDCFHEntry clear() {
+ public KONAGCDHKKHEntry clear() {
if (isEmpty()) {
return this;
}
@@ -726,7 +726,7 @@ public final class RogueMiracleDataInfoOuterClass {
}
@Override
- public OGIABDBDCFHEntry clearQuick() {
+ public KONAGCDHKKHEntry clearQuick() {
if (isEmpty()) {
return this;
}
@@ -740,10 +740,10 @@ public final class RogueMiracleDataInfoOuterClass {
if (o == this) {
return true;
}
- if (!(o instanceof OGIABDBDCFHEntry)) {
+ if (!(o instanceof KONAGCDHKKHEntry)) {
return false;
}
- OGIABDBDCFHEntry other = (OGIABDBDCFHEntry) o;
+ KONAGCDHKKHEntry other = (KONAGCDHKKHEntry) o;
return bitField0_ == other.bitField0_
&& (!hasKey() || key == other.key)
&& (!hasValue() || value_ == other.value_);
@@ -775,7 +775,7 @@ public final class RogueMiracleDataInfoOuterClass {
@Override
@SuppressWarnings("fallthrough")
- public OGIABDBDCFHEntry mergeFrom(final ProtoSource input) throws IOException {
+ public KONAGCDHKKHEntry mergeFrom(final ProtoSource input) throws IOException {
// Enabled Fall-Through Optimization (QuickBuffers)
int tag = input.readTag();
while (true) {
@@ -825,7 +825,7 @@ public final class RogueMiracleDataInfoOuterClass {
}
@Override
- public OGIABDBDCFHEntry mergeFrom(final JsonSource input) throws IOException {
+ public KONAGCDHKKHEntry mergeFrom(final JsonSource input) throws IOException {
if (!input.beginObject()) {
return this;
}
@@ -864,8 +864,8 @@ public final class RogueMiracleDataInfoOuterClass {
}
@Override
- public OGIABDBDCFHEntry clone() {
- return new OGIABDBDCFHEntry().copyFrom(this);
+ public KONAGCDHKKHEntry clone() {
+ return new KONAGCDHKKHEntry().copyFrom(this);
}
@Override
@@ -873,32 +873,32 @@ public final class RogueMiracleDataInfoOuterClass {
return ((bitField0_) == 0);
}
- public static OGIABDBDCFHEntry parseFrom(final byte[] data) throws
+ public static KONAGCDHKKHEntry parseFrom(final byte[] data) throws
InvalidProtocolBufferException {
- return ProtoMessage.mergeFrom(new OGIABDBDCFHEntry(), data).checkInitialized();
+ return ProtoMessage.mergeFrom(new KONAGCDHKKHEntry(), data).checkInitialized();
}
- public static OGIABDBDCFHEntry parseFrom(final ProtoSource input) throws IOException {
- return ProtoMessage.mergeFrom(new OGIABDBDCFHEntry(), input).checkInitialized();
+ public static KONAGCDHKKHEntry parseFrom(final ProtoSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new KONAGCDHKKHEntry(), input).checkInitialized();
}
- public static OGIABDBDCFHEntry parseFrom(final JsonSource input) throws IOException {
- return ProtoMessage.mergeFrom(new OGIABDBDCFHEntry(), input).checkInitialized();
+ public static KONAGCDHKKHEntry parseFrom(final JsonSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new KONAGCDHKKHEntry(), input).checkInitialized();
}
/**
- * @return factory for creating OGIABDBDCFHEntry messages
+ * @return factory for creating KONAGCDHKKHEntry messages
*/
- public static MessageFactoryoptional .RogueMiracle rogue_miracle = 13;
+ * optional .RogueMiracle rogue_miracle = 5;
*/
private final RogueMiracleOuterClass.RogueMiracle rogueMiracle = RogueMiracleOuterClass.RogueMiracle.newInstance();
@@ -34,7 +34,7 @@ public final class RogueMiracleDataOuterClass {
}
/**
- * optional .RogueMiracle rogue_miracle = 13;
+ * optional .RogueMiracle rogue_miracle = 5;
* @return whether the rogueMiracle field is set
*/
public boolean hasRogueMiracle() {
@@ -42,7 +42,7 @@ public final class RogueMiracleDataOuterClass {
}
/**
- * optional .RogueMiracle rogue_miracle = 13;
+ * optional .RogueMiracle rogue_miracle = 5;
* @return this
*/
public RogueMiracleData clearRogueMiracle() {
@@ -52,7 +52,7 @@ public final class RogueMiracleDataOuterClass {
}
/**
- * optional .RogueMiracle rogue_miracle = 13;
+ * optional .RogueMiracle rogue_miracle = 5;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -66,7 +66,7 @@ public final class RogueMiracleDataOuterClass {
}
/**
- * optional .RogueMiracle rogue_miracle = 13;
+ * optional .RogueMiracle rogue_miracle = 5;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -80,7 +80,7 @@ public final class RogueMiracleDataOuterClass {
}
/**
- * optional .RogueMiracle rogue_miracle = 13;
+ * optional .RogueMiracle rogue_miracle = 5;
* @param value the rogueMiracle to set
* @return this
*/
@@ -150,7 +150,7 @@ public final class RogueMiracleDataOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 106);
+ output.writeRawByte((byte) 42);
output.writeMessageNoTag(rogueMiracle);
}
}
@@ -171,7 +171,7 @@ public final class RogueMiracleDataOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 106: {
+ case 42: {
// rogueMiracle
input.readMessage(rogueMiracle);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoDataOuterClass.java
index 109fb7c..b2838da 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoDataOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoDataOuterClass.java
@@ -20,17 +20,17 @@ public final class RogueMiracleInfoDataOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 EIPDPOKBFBP = 3;
+ * optional uint32 DMJLJNDFOGP = 12;
*/
- private int eIPDPOKBFBP;
+ private int dMJLJNDFOGP;
/**
- * optional uint32 FIEIECEEFJN = 10;
+ * optional uint32 KHBDIKDDIIB = 15;
*/
- private int fIEIECEEFJN;
+ private int kHBDIKDDIIB;
/**
- * repeated .RogueMiracleDataInfo rogue_miracle_list = 14;
+ * repeated .RogueMiracleDataInfo rogue_miracle_list = 2;
*/
private final RepeatedMessageoptional uint32 EIPDPOKBFBP = 3;
- * @return whether the eIPDPOKBFBP field is set
+ * optional uint32 DMJLJNDFOGP = 12;
+ * @return whether the dMJLJNDFOGP field is set
*/
- public boolean hasEIPDPOKBFBP() {
+ public boolean hasDMJLJNDFOGP() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 EIPDPOKBFBP = 3;
+ * optional uint32 DMJLJNDFOGP = 12;
* @return this
*/
- public RogueMiracleInfoData clearEIPDPOKBFBP() {
+ public RogueMiracleInfoData clearDMJLJNDFOGP() {
bitField0_ &= ~0x00000001;
- eIPDPOKBFBP = 0;
+ dMJLJNDFOGP = 0;
return this;
}
/**
- * optional uint32 EIPDPOKBFBP = 3;
- * @return the eIPDPOKBFBP
+ * optional uint32 DMJLJNDFOGP = 12;
+ * @return the dMJLJNDFOGP
*/
- public int getEIPDPOKBFBP() {
- return eIPDPOKBFBP;
+ public int getDMJLJNDFOGP() {
+ return dMJLJNDFOGP;
}
/**
- * optional uint32 EIPDPOKBFBP = 3;
- * @param value the eIPDPOKBFBP to set
+ * optional uint32 DMJLJNDFOGP = 12;
+ * @param value the dMJLJNDFOGP to set
* @return this
*/
- public RogueMiracleInfoData setEIPDPOKBFBP(final int value) {
+ public RogueMiracleInfoData setDMJLJNDFOGP(final int value) {
bitField0_ |= 0x00000001;
- eIPDPOKBFBP = value;
+ dMJLJNDFOGP = value;
return this;
}
/**
- * optional uint32 FIEIECEEFJN = 10;
- * @return whether the fIEIECEEFJN field is set
+ * optional uint32 KHBDIKDDIIB = 15;
+ * @return whether the kHBDIKDDIIB field is set
*/
- public boolean hasFIEIECEEFJN() {
+ public boolean hasKHBDIKDDIIB() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 FIEIECEEFJN = 10;
+ * optional uint32 KHBDIKDDIIB = 15;
* @return this
*/
- public RogueMiracleInfoData clearFIEIECEEFJN() {
+ public RogueMiracleInfoData clearKHBDIKDDIIB() {
bitField0_ &= ~0x00000002;
- fIEIECEEFJN = 0;
+ kHBDIKDDIIB = 0;
return this;
}
/**
- * optional uint32 FIEIECEEFJN = 10;
- * @return the fIEIECEEFJN
+ * optional uint32 KHBDIKDDIIB = 15;
+ * @return the kHBDIKDDIIB
*/
- public int getFIEIECEEFJN() {
- return fIEIECEEFJN;
+ public int getKHBDIKDDIIB() {
+ return kHBDIKDDIIB;
}
/**
- * optional uint32 FIEIECEEFJN = 10;
- * @param value the fIEIECEEFJN to set
+ * optional uint32 KHBDIKDDIIB = 15;
+ * @param value the kHBDIKDDIIB to set
* @return this
*/
- public RogueMiracleInfoData setFIEIECEEFJN(final int value) {
+ public RogueMiracleInfoData setKHBDIKDDIIB(final int value) {
bitField0_ |= 0x00000002;
- fIEIECEEFJN = value;
+ kHBDIKDDIIB = value;
return this;
}
/**
- * repeated .RogueMiracleDataInfo rogue_miracle_list = 14;
+ * repeated .RogueMiracleDataInfo rogue_miracle_list = 2;
* @return whether the rogueMiracleList field is set
*/
public boolean hasRogueMiracleList() {
@@ -127,7 +127,7 @@ public final class RogueMiracleInfoDataOuterClass {
}
/**
- * repeated .RogueMiracleDataInfo rogue_miracle_list = 14;
+ * repeated .RogueMiracleDataInfo rogue_miracle_list = 2;
* @return this
*/
public RogueMiracleInfoData clearRogueMiracleList() {
@@ -137,7 +137,7 @@ public final class RogueMiracleInfoDataOuterClass {
}
/**
- * repeated .RogueMiracleDataInfo rogue_miracle_list = 14;
+ * repeated .RogueMiracleDataInfo rogue_miracle_list = 2;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -152,7 +152,7 @@ public final class RogueMiracleInfoDataOuterClass {
}
/**
- * repeated .RogueMiracleDataInfo rogue_miracle_list = 14;
+ * repeated .RogueMiracleDataInfo rogue_miracle_list = 2;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -167,7 +167,7 @@ public final class RogueMiracleInfoDataOuterClass {
}
/**
- * repeated .RogueMiracleDataInfo rogue_miracle_list = 14;
+ * repeated .RogueMiracleDataInfo rogue_miracle_list = 2;
* @param value the rogueMiracleList to add
* @return this
*/
@@ -179,7 +179,7 @@ public final class RogueMiracleInfoDataOuterClass {
}
/**
- * repeated .RogueMiracleDataInfo rogue_miracle_list = 14;
+ * repeated .RogueMiracleDataInfo rogue_miracle_list = 2;
* @param values the rogueMiracleList to add
* @return this
*/
@@ -195,8 +195,8 @@ public final class RogueMiracleInfoDataOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- eIPDPOKBFBP = other.eIPDPOKBFBP;
- fIEIECEEFJN = other.fIEIECEEFJN;
+ dMJLJNDFOGP = other.dMJLJNDFOGP;
+ kHBDIKDDIIB = other.kHBDIKDDIIB;
rogueMiracleList.copyFrom(other.rogueMiracleList);
}
return this;
@@ -208,11 +208,11 @@ public final class RogueMiracleInfoDataOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasEIPDPOKBFBP()) {
- setEIPDPOKBFBP(other.eIPDPOKBFBP);
+ if (other.hasDMJLJNDFOGP()) {
+ setDMJLJNDFOGP(other.dMJLJNDFOGP);
}
- if (other.hasFIEIECEEFJN()) {
- setFIEIECEEFJN(other.fIEIECEEFJN);
+ if (other.hasKHBDIKDDIIB()) {
+ setKHBDIKDDIIB(other.kHBDIKDDIIB);
}
if (other.hasRogueMiracleList()) {
getMutableRogueMiracleList().addAll(other.rogueMiracleList);
@@ -227,8 +227,8 @@ public final class RogueMiracleInfoDataOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- eIPDPOKBFBP = 0;
- fIEIECEEFJN = 0;
+ dMJLJNDFOGP = 0;
+ kHBDIKDDIIB = 0;
rogueMiracleList.clear();
return this;
}
@@ -254,24 +254,24 @@ public final class RogueMiracleInfoDataOuterClass {
}
RogueMiracleInfoData other = (RogueMiracleInfoData) o;
return bitField0_ == other.bitField0_
- && (!hasEIPDPOKBFBP() || eIPDPOKBFBP == other.eIPDPOKBFBP)
- && (!hasFIEIECEEFJN() || fIEIECEEFJN == other.fIEIECEEFJN)
+ && (!hasDMJLJNDFOGP() || dMJLJNDFOGP == other.dMJLJNDFOGP)
+ && (!hasKHBDIKDDIIB() || kHBDIKDDIIB == other.kHBDIKDDIIB)
&& (!hasRogueMiracleList() || rogueMiracleList.equals(other.rogueMiracleList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(eIPDPOKBFBP);
+ output.writeRawByte((byte) 96);
+ output.writeUInt32NoTag(dMJLJNDFOGP);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(fIEIECEEFJN);
+ output.writeRawByte((byte) 120);
+ output.writeUInt32NoTag(kHBDIKDDIIB);
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < rogueMiracleList.length(); i++) {
- output.writeRawByte((byte) 114);
+ output.writeRawByte((byte) 18);
output.writeMessageNoTag(rogueMiracleList.get(i));
}
}
@@ -281,10 +281,10 @@ public final class RogueMiracleInfoDataOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(eIPDPOKBFBP);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(dMJLJNDFOGP);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(fIEIECEEFJN);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(kHBDIKDDIIB);
}
if ((bitField0_ & 0x00000004) != 0) {
size += (1 * rogueMiracleList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(rogueMiracleList);
@@ -299,25 +299,25 @@ public final class RogueMiracleInfoDataOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
- // eIPDPOKBFBP
- eIPDPOKBFBP = input.readUInt32();
+ case 96: {
+ // dMJLJNDFOGP
+ dMJLJNDFOGP = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 80) {
+ if (tag != 120) {
break;
}
}
- case 80: {
- // fIEIECEEFJN
- fIEIECEEFJN = input.readUInt32();
+ case 120: {
+ // kHBDIKDDIIB
+ kHBDIKDDIIB = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 114) {
+ if (tag != 18) {
break;
}
}
- case 114: {
+ case 18: {
// rogueMiracleList
tag = input.readRepeatedMessage(rogueMiracleList, tag);
bitField0_ |= 0x00000004;
@@ -343,10 +343,10 @@ public final class RogueMiracleInfoDataOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.eIPDPOKBFBP, eIPDPOKBFBP);
+ output.writeUInt32(FieldNames.dMJLJNDFOGP, dMJLJNDFOGP);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.fIEIECEEFJN, fIEIECEEFJN);
+ output.writeUInt32(FieldNames.kHBDIKDDIIB, kHBDIKDDIIB);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRepeatedMessage(FieldNames.rogueMiracleList, rogueMiracleList);
@@ -361,10 +361,10 @@ public final class RogueMiracleInfoDataOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -892773594: {
- if (input.isAtField(FieldNames.eIPDPOKBFBP)) {
+ case -1929491193: {
+ if (input.isAtField(FieldNames.dMJLJNDFOGP)) {
if (!input.trySkipNullValue()) {
- eIPDPOKBFBP = input.readUInt32();
+ dMJLJNDFOGP = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -372,10 +372,10 @@ public final class RogueMiracleInfoDataOuterClass {
}
break;
}
- case -1385085179: {
- if (input.isAtField(FieldNames.fIEIECEEFJN)) {
+ case -1096984703: {
+ if (input.isAtField(FieldNames.kHBDIKDDIIB)) {
if (!input.trySkipNullValue()) {
- fIEIECEEFJN = input.readUInt32();
+ kHBDIKDDIIB = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -448,9 +448,9 @@ public final class RogueMiracleInfoDataOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName eIPDPOKBFBP = FieldName.forField("EIPDPOKBFBP");
+ static final FieldName dMJLJNDFOGP = FieldName.forField("DMJLJNDFOGP");
- static final FieldName fIEIECEEFJN = FieldName.forField("FIEIECEEFJN");
+ static final FieldName kHBDIKDDIIB = FieldName.forField("KHBDIKDDIIB");
static final FieldName rogueMiracleList = FieldName.forField("rogueMiracleList", "rogue_miracle_list");
}
diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoOuterClass.java
index 2ef7b80..f21bcf3 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoOuterClass.java
@@ -19,7 +19,7 @@ public final class RogueMiracleInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .RogueMiracleInfoData rogue_miracle_info = 1;
+ * optional .RogueMiracleInfoData rogue_miracle_info = 10;
*/
private final RogueMiracleInfoDataOuterClass.RogueMiracleInfoData rogueMiracleInfo = RogueMiracleInfoDataOuterClass.RogueMiracleInfoData.newInstance();
@@ -34,7 +34,7 @@ public final class RogueMiracleInfoOuterClass {
}
/**
- * optional .RogueMiracleInfoData rogue_miracle_info = 1;
+ * optional .RogueMiracleInfoData rogue_miracle_info = 10;
* @return whether the rogueMiracleInfo field is set
*/
public boolean hasRogueMiracleInfo() {
@@ -42,7 +42,7 @@ public final class RogueMiracleInfoOuterClass {
}
/**
- * optional .RogueMiracleInfoData rogue_miracle_info = 1;
+ * optional .RogueMiracleInfoData rogue_miracle_info = 10;
* @return this
*/
public RogueMiracleInfo clearRogueMiracleInfo() {
@@ -52,7 +52,7 @@ public final class RogueMiracleInfoOuterClass {
}
/**
- * optional .RogueMiracleInfoData rogue_miracle_info = 1;
+ * optional .RogueMiracleInfoData rogue_miracle_info = 10;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -66,7 +66,7 @@ public final class RogueMiracleInfoOuterClass {
}
/**
- * optional .RogueMiracleInfoData rogue_miracle_info = 1;
+ * optional .RogueMiracleInfoData rogue_miracle_info = 10;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -80,7 +80,7 @@ public final class RogueMiracleInfoOuterClass {
}
/**
- * optional .RogueMiracleInfoData rogue_miracle_info = 1;
+ * optional .RogueMiracleInfoData rogue_miracle_info = 10;
* @param value the rogueMiracleInfo to set
* @return this
*/
@@ -151,7 +151,7 @@ public final class RogueMiracleInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 10);
+ output.writeRawByte((byte) 82);
output.writeMessageNoTag(rogueMiracleInfo);
}
}
@@ -172,7 +172,7 @@ public final class RogueMiracleInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 10: {
+ case 82: {
// rogueMiracleInfo
input.readMessage(rogueMiracleInfo);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleOuterClass.java
index 5e17ce5..3ea1aec 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueMiracleOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleOuterClass.java
@@ -20,14 +20,18 @@ public final class RogueMiracleOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 CNFMGJHFABD = 8;
+ * + * was set to 3 in pcap + *+ * + *
optional uint32 NKBEHFHLPEF = 1;
*/
- private int cNFMGJHFABD;
+ private int nKBEHFHLPEF;
/**
- * optional uint32 FFLMCOJAJAI = 10;
+ * optional uint32 MMFONFFPNJM = 4;
*/
- private int fFLMCOJAJAI;
+ private int mMFONFFPNJM;
/**
* optional uint32 miracle_id = 12;
@@ -35,9 +39,9 @@ public final class RogueMiracleOuterClass {
private int miracleId;
/**
- * repeated .RogueMiracle.HIFKDHKJGACEntry HIFKDHKJGAC = 15;
+ * repeated .RogueMiracle.KONAGCDHKKHEntry KONAGCDHKKH = 10;
*/
- private final RepeatedMessageoptional uint32 CNFMGJHFABD = 8;
- * @return whether the cNFMGJHFABD field is set
+ * + * was set to 3 in pcap + *+ * + *
optional uint32 NKBEHFHLPEF = 1;
+ * @return whether the nKBEHFHLPEF field is set
*/
- public boolean hasCNFMGJHFABD() {
+ public boolean hasNKBEHFHLPEF() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 CNFMGJHFABD = 8;
+ * + * was set to 3 in pcap + *+ * + *
optional uint32 NKBEHFHLPEF = 1;
* @return this
*/
- public RogueMiracle clearCNFMGJHFABD() {
+ public RogueMiracle clearNKBEHFHLPEF() {
bitField0_ &= ~0x00000001;
- cNFMGJHFABD = 0;
+ nKBEHFHLPEF = 0;
return this;
}
/**
- * optional uint32 CNFMGJHFABD = 8;
- * @return the cNFMGJHFABD
+ * + * was set to 3 in pcap + *+ * + *
optional uint32 NKBEHFHLPEF = 1;
+ * @return the nKBEHFHLPEF
*/
- public int getCNFMGJHFABD() {
- return cNFMGJHFABD;
+ public int getNKBEHFHLPEF() {
+ return nKBEHFHLPEF;
}
/**
- * optional uint32 CNFMGJHFABD = 8;
- * @param value the cNFMGJHFABD to set
+ * + * was set to 3 in pcap + *+ * + *
optional uint32 NKBEHFHLPEF = 1;
+ * @param value the nKBEHFHLPEF to set
* @return this
*/
- public RogueMiracle setCNFMGJHFABD(final int value) {
+ public RogueMiracle setNKBEHFHLPEF(final int value) {
bitField0_ |= 0x00000001;
- cNFMGJHFABD = value;
+ nKBEHFHLPEF = value;
return this;
}
/**
- * optional uint32 FFLMCOJAJAI = 10;
- * @return whether the fFLMCOJAJAI field is set
+ * optional uint32 MMFONFFPNJM = 4;
+ * @return whether the mMFONFFPNJM field is set
*/
- public boolean hasFFLMCOJAJAI() {
+ public boolean hasMMFONFFPNJM() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 FFLMCOJAJAI = 10;
+ * optional uint32 MMFONFFPNJM = 4;
* @return this
*/
- public RogueMiracle clearFFLMCOJAJAI() {
+ public RogueMiracle clearMMFONFFPNJM() {
bitField0_ &= ~0x00000002;
- fFLMCOJAJAI = 0;
+ mMFONFFPNJM = 0;
return this;
}
/**
- * optional uint32 FFLMCOJAJAI = 10;
- * @return the fFLMCOJAJAI
+ * optional uint32 MMFONFFPNJM = 4;
+ * @return the mMFONFFPNJM
*/
- public int getFFLMCOJAJAI() {
- return fFLMCOJAJAI;
+ public int getMMFONFFPNJM() {
+ return mMFONFFPNJM;
}
/**
- * optional uint32 FFLMCOJAJAI = 10;
- * @param value the fFLMCOJAJAI to set
+ * optional uint32 MMFONFFPNJM = 4;
+ * @param value the mMFONFFPNJM to set
* @return this
*/
- public RogueMiracle setFFLMCOJAJAI(final int value) {
+ public RogueMiracle setMMFONFFPNJM(final int value) {
bitField0_ |= 0x00000002;
- fFLMCOJAJAI = value;
+ mMFONFFPNJM = value;
return this;
}
@@ -161,39 +181,39 @@ public final class RogueMiracleOuterClass {
}
/**
- * repeated .RogueMiracle.HIFKDHKJGACEntry HIFKDHKJGAC = 15;
- * @return whether the hIFKDHKJGAC field is set
+ * repeated .RogueMiracle.KONAGCDHKKHEntry KONAGCDHKKH = 10;
+ * @return whether the kONAGCDHKKH field is set
*/
- public boolean hasHIFKDHKJGAC() {
+ public boolean hasKONAGCDHKKH() {
return (bitField0_ & 0x00000008) != 0;
}
/**
- * repeated .RogueMiracle.HIFKDHKJGACEntry HIFKDHKJGAC = 15;
+ * repeated .RogueMiracle.KONAGCDHKKHEntry KONAGCDHKKH = 10;
* @return this
*/
- public RogueMiracle clearHIFKDHKJGAC() {
+ public RogueMiracle clearKONAGCDHKKH() {
bitField0_ &= ~0x00000008;
- hIFKDHKJGAC.clear();
+ kONAGCDHKKH.clear();
return this;
}
/**
- * repeated .RogueMiracle.HIFKDHKJGACEntry HIFKDHKJGAC = 15;
+ * repeated .RogueMiracle.KONAGCDHKKHEntry KONAGCDHKKH = 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 #getMutableHIFKDHKJGAC()} if you want to modify it.
+ * Use {@link #getMutableKONAGCDHKKH()} if you want to modify it.
*
* @return internal storage object for reading
*/
- public RepeatedMessagerepeated .RogueMiracle.HIFKDHKJGACEntry HIFKDHKJGAC = 15;
+ * repeated .RogueMiracle.KONAGCDHKKHEntry KONAGCDHKKH = 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
@@ -201,30 +221,30 @@ public final class RogueMiracleOuterClass {
*
* @return internal storage object for modifications
*/
- public RepeatedMessagerepeated .RogueMiracle.HIFKDHKJGACEntry HIFKDHKJGAC = 15;
- * @param value the hIFKDHKJGAC to add
+ * repeated .RogueMiracle.KONAGCDHKKHEntry KONAGCDHKKH = 10;
+ * @param value the kONAGCDHKKH to add
* @return this
*/
- public RogueMiracle addHIFKDHKJGAC(final HIFKDHKJGACEntry value) {
+ public RogueMiracle addKONAGCDHKKH(final KONAGCDHKKHEntry value) {
bitField0_ |= 0x00000008;
- hIFKDHKJGAC.add(value);
+ kONAGCDHKKH.add(value);
return this;
}
/**
- * repeated .RogueMiracle.HIFKDHKJGACEntry HIFKDHKJGAC = 15;
- * @param values the hIFKDHKJGAC to add
+ * repeated .RogueMiracle.KONAGCDHKKHEntry KONAGCDHKKH = 10;
+ * @param values the kONAGCDHKKH to add
* @return this
*/
- public RogueMiracle addAllHIFKDHKJGAC(final HIFKDHKJGACEntry... values) {
+ public RogueMiracle addAllKONAGCDHKKH(final KONAGCDHKKHEntry... values) {
bitField0_ |= 0x00000008;
- hIFKDHKJGAC.addAll(values);
+ kONAGCDHKKH.addAll(values);
return this;
}
@@ -233,10 +253,10 @@ public final class RogueMiracleOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- cNFMGJHFABD = other.cNFMGJHFABD;
- fFLMCOJAJAI = other.fFLMCOJAJAI;
+ nKBEHFHLPEF = other.nKBEHFHLPEF;
+ mMFONFFPNJM = other.mMFONFFPNJM;
miracleId = other.miracleId;
- hIFKDHKJGAC.copyFrom(other.hIFKDHKJGAC);
+ kONAGCDHKKH.copyFrom(other.kONAGCDHKKH);
}
return this;
}
@@ -247,17 +267,17 @@ public final class RogueMiracleOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasCNFMGJHFABD()) {
- setCNFMGJHFABD(other.cNFMGJHFABD);
+ if (other.hasNKBEHFHLPEF()) {
+ setNKBEHFHLPEF(other.nKBEHFHLPEF);
}
- if (other.hasFFLMCOJAJAI()) {
- setFFLMCOJAJAI(other.fFLMCOJAJAI);
+ if (other.hasMMFONFFPNJM()) {
+ setMMFONFFPNJM(other.mMFONFFPNJM);
}
if (other.hasMiracleId()) {
setMiracleId(other.miracleId);
}
- if (other.hasHIFKDHKJGAC()) {
- getMutableHIFKDHKJGAC().addAll(other.hIFKDHKJGAC);
+ if (other.hasKONAGCDHKKH()) {
+ getMutableKONAGCDHKKH().addAll(other.kONAGCDHKKH);
}
return this;
}
@@ -269,10 +289,10 @@ public final class RogueMiracleOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- cNFMGJHFABD = 0;
- fFLMCOJAJAI = 0;
+ nKBEHFHLPEF = 0;
+ mMFONFFPNJM = 0;
miracleId = 0;
- hIFKDHKJGAC.clear();
+ kONAGCDHKKH.clear();
return this;
}
@@ -283,7 +303,7 @@ public final class RogueMiracleOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- hIFKDHKJGAC.clearQuick();
+ kONAGCDHKKH.clearQuick();
return this;
}
@@ -297,30 +317,30 @@ public final class RogueMiracleOuterClass {
}
RogueMiracle other = (RogueMiracle) o;
return bitField0_ == other.bitField0_
- && (!hasCNFMGJHFABD() || cNFMGJHFABD == other.cNFMGJHFABD)
- && (!hasFFLMCOJAJAI() || fFLMCOJAJAI == other.fFLMCOJAJAI)
+ && (!hasNKBEHFHLPEF() || nKBEHFHLPEF == other.nKBEHFHLPEF)
+ && (!hasMMFONFFPNJM() || mMFONFFPNJM == other.mMFONFFPNJM)
&& (!hasMiracleId() || miracleId == other.miracleId)
- && (!hasHIFKDHKJGAC() || hIFKDHKJGAC.equals(other.hIFKDHKJGAC));
+ && (!hasKONAGCDHKKH() || kONAGCDHKKH.equals(other.kONAGCDHKKH));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 64);
- output.writeUInt32NoTag(cNFMGJHFABD);
+ output.writeRawByte((byte) 8);
+ output.writeUInt32NoTag(nKBEHFHLPEF);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(fFLMCOJAJAI);
+ output.writeRawByte((byte) 32);
+ output.writeUInt32NoTag(mMFONFFPNJM);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 96);
output.writeUInt32NoTag(miracleId);
}
if ((bitField0_ & 0x00000008) != 0) {
- for (int i = 0; i < hIFKDHKJGAC.length(); i++) {
- output.writeRawByte((byte) 122);
- output.writeMessageNoTag(hIFKDHKJGAC.get(i));
+ for (int i = 0; i < kONAGCDHKKH.length(); i++) {
+ output.writeRawByte((byte) 82);
+ output.writeMessageNoTag(kONAGCDHKKH.get(i));
}
}
}
@@ -329,16 +349,16 @@ public final class RogueMiracleOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(cNFMGJHFABD);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(nKBEHFHLPEF);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(fFLMCOJAJAI);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(mMFONFFPNJM);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(miracleId);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += (1 * hIFKDHKJGAC.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(hIFKDHKJGAC);
+ size += (1 * kONAGCDHKKH.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(kONAGCDHKKH);
}
return size;
}
@@ -350,18 +370,18 @@ public final class RogueMiracleOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 64: {
- // cNFMGJHFABD
- cNFMGJHFABD = input.readUInt32();
+ case 8: {
+ // nKBEHFHLPEF
+ nKBEHFHLPEF = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 80) {
+ if (tag != 32) {
break;
}
}
- case 80: {
- // fFLMCOJAJAI
- fFLMCOJAJAI = input.readUInt32();
+ case 32: {
+ // mMFONFFPNJM
+ mMFONFFPNJM = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 96) {
@@ -373,13 +393,13 @@ public final class RogueMiracleOuterClass {
miracleId = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 122) {
+ if (tag != 82) {
break;
}
}
- case 122: {
- // hIFKDHKJGAC
- tag = input.readRepeatedMessage(hIFKDHKJGAC, tag);
+ case 82: {
+ // kONAGCDHKKH
+ tag = input.readRepeatedMessage(kONAGCDHKKH, tag);
bitField0_ |= 0x00000008;
if (tag != 0) {
break;
@@ -403,16 +423,16 @@ public final class RogueMiracleOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.cNFMGJHFABD, cNFMGJHFABD);
+ output.writeUInt32(FieldNames.nKBEHFHLPEF, nKBEHFHLPEF);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.fFLMCOJAJAI, fFLMCOJAJAI);
+ output.writeUInt32(FieldNames.mMFONFFPNJM, mMFONFFPNJM);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.miracleId, miracleId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRepeatedMessage(FieldNames.hIFKDHKJGAC, hIFKDHKJGAC);
+ output.writeRepeatedMessage(FieldNames.kONAGCDHKKH, kONAGCDHKKH);
}
output.endObject();
}
@@ -424,10 +444,10 @@ public final class RogueMiracleOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 1575260368: {
- if (input.isAtField(FieldNames.cNFMGJHFABD)) {
+ case -2066312081: {
+ if (input.isAtField(FieldNames.nKBEHFHLPEF)) {
if (!input.trySkipNullValue()) {
- cNFMGJHFABD = input.readUInt32();
+ nKBEHFHLPEF = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -435,10 +455,10 @@ public final class RogueMiracleOuterClass {
}
break;
}
- case 686494478: {
- if (input.isAtField(FieldNames.fFLMCOJAJAI)) {
+ case 1974288326: {
+ if (input.isAtField(FieldNames.mMFONFFPNJM)) {
if (!input.trySkipNullValue()) {
- fFLMCOJAJAI = input.readUInt32();
+ mMFONFFPNJM = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -458,10 +478,10 @@ public final class RogueMiracleOuterClass {
}
break;
}
- case 255478432: {
- if (input.isAtField(FieldNames.hIFKDHKJGAC)) {
+ case -1329612143: {
+ if (input.isAtField(FieldNames.kONAGCDHKKH)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(hIFKDHKJGAC);
+ input.readRepeatedMessage(kONAGCDHKKH);
bitField0_ |= 0x00000008;
}
} else {
@@ -509,9 +529,9 @@ public final class RogueMiracleOuterClass {
}
/**
- * Protobuf type {@code HIFKDHKJGACEntry}
+ * Protobuf type {@code KONAGCDHKKHEntry}
*/
- public static final class HIFKDHKJGACEntry extends ProtoMessageoptional uint32 key = 1;
* @return this
*/
- public HIFKDHKJGACEntry clearKey() {
+ public KONAGCDHKKHEntry clearKey() {
bitField0_ &= ~0x00000001;
key = 0;
return this;
@@ -565,7 +585,7 @@ public final class RogueMiracleOuterClass {
* @param value the key to set
* @return this
*/
- public HIFKDHKJGACEntry setKey(final int value) {
+ public KONAGCDHKKHEntry setKey(final int value) {
bitField0_ |= 0x00000001;
key = value;
return this;
@@ -583,7 +603,7 @@ public final class RogueMiracleOuterClass {
* optional uint32 value = 2;
* @return this
*/
- public HIFKDHKJGACEntry clearValue() {
+ public KONAGCDHKKHEntry clearValue() {
bitField0_ &= ~0x00000002;
value_ = 0;
return this;
@@ -602,14 +622,14 @@ public final class RogueMiracleOuterClass {
* @param value the value_ to set
* @return this
*/
- public HIFKDHKJGACEntry setValue(final int value) {
+ public KONAGCDHKKHEntry setValue(final int value) {
bitField0_ |= 0x00000002;
value_ = value;
return this;
}
@Override
- public HIFKDHKJGACEntry copyFrom(final HIFKDHKJGACEntry other) {
+ public KONAGCDHKKHEntry copyFrom(final KONAGCDHKKHEntry other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
@@ -620,7 +640,7 @@ public final class RogueMiracleOuterClass {
}
@Override
- public HIFKDHKJGACEntry mergeFrom(final HIFKDHKJGACEntry other) {
+ public KONAGCDHKKHEntry mergeFrom(final KONAGCDHKKHEntry other) {
if (other.isEmpty()) {
return this;
}
@@ -635,7 +655,7 @@ public final class RogueMiracleOuterClass {
}
@Override
- public HIFKDHKJGACEntry clear() {
+ public KONAGCDHKKHEntry clear() {
if (isEmpty()) {
return this;
}
@@ -647,7 +667,7 @@ public final class RogueMiracleOuterClass {
}
@Override
- public HIFKDHKJGACEntry clearQuick() {
+ public KONAGCDHKKHEntry clearQuick() {
if (isEmpty()) {
return this;
}
@@ -661,10 +681,10 @@ public final class RogueMiracleOuterClass {
if (o == this) {
return true;
}
- if (!(o instanceof HIFKDHKJGACEntry)) {
+ if (!(o instanceof KONAGCDHKKHEntry)) {
return false;
}
- HIFKDHKJGACEntry other = (HIFKDHKJGACEntry) o;
+ KONAGCDHKKHEntry other = (KONAGCDHKKHEntry) o;
return bitField0_ == other.bitField0_
&& (!hasKey() || key == other.key)
&& (!hasValue() || value_ == other.value_);
@@ -696,7 +716,7 @@ public final class RogueMiracleOuterClass {
@Override
@SuppressWarnings("fallthrough")
- public HIFKDHKJGACEntry mergeFrom(final ProtoSource input) throws IOException {
+ public KONAGCDHKKHEntry mergeFrom(final ProtoSource input) throws IOException {
// Enabled Fall-Through Optimization (QuickBuffers)
int tag = input.readTag();
while (true) {
@@ -746,7 +766,7 @@ public final class RogueMiracleOuterClass {
}
@Override
- public HIFKDHKJGACEntry mergeFrom(final JsonSource input) throws IOException {
+ public KONAGCDHKKHEntry mergeFrom(final JsonSource input) throws IOException {
if (!input.beginObject()) {
return this;
}
@@ -785,8 +805,8 @@ public final class RogueMiracleOuterClass {
}
@Override
- public HIFKDHKJGACEntry clone() {
- return new HIFKDHKJGACEntry().copyFrom(this);
+ public KONAGCDHKKHEntry clone() {
+ return new KONAGCDHKKHEntry().copyFrom(this);
}
@Override
@@ -794,32 +814,32 @@ public final class RogueMiracleOuterClass {
return ((bitField0_) == 0);
}
- public static HIFKDHKJGACEntry parseFrom(final byte[] data) throws
+ public static KONAGCDHKKHEntry parseFrom(final byte[] data) throws
InvalidProtocolBufferException {
- return ProtoMessage.mergeFrom(new HIFKDHKJGACEntry(), data).checkInitialized();
+ return ProtoMessage.mergeFrom(new KONAGCDHKKHEntry(), data).checkInitialized();
}
- public static HIFKDHKJGACEntry parseFrom(final ProtoSource input) throws IOException {
- return ProtoMessage.mergeFrom(new HIFKDHKJGACEntry(), input).checkInitialized();
+ public static KONAGCDHKKHEntry parseFrom(final ProtoSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new KONAGCDHKKHEntry(), input).checkInitialized();
}
- public static HIFKDHKJGACEntry parseFrom(final JsonSource input) throws IOException {
- return ProtoMessage.mergeFrom(new HIFKDHKJGACEntry(), input).checkInitialized();
+ public static KONAGCDHKKHEntry parseFrom(final JsonSource input) throws IOException {
+ return ProtoMessage.mergeFrom(new KONAGCDHKKHEntry(), input).checkInitialized();
}
/**
- * @return factory for creating HIFKDHKJGACEntry messages
+ * @return factory for creating KONAGCDHKKHEntry messages
*/
- public static MessageFactoryoptional uint32 JDDLGDNOIEC = 6;
+ * optional uint32 JDDLGDNOIEC = 10;
*/
private int jDDLGDNOIEC;
- /**
- * repeated uint32 miracle_info = 2;
- */
- private final RepeatedInt miracleInfo = RepeatedInt.newEmptyInstance();
-
/**
*
- * PDBKKCBKIOL CPDKDDNBEDN = 9;
+ * CMHBBMOKJJB EOIFGPMGFGJ = 11;
*
*
- * repeated uint32 miracle_info_remote = 10;
+ * repeated uint32 miracle_info_remote = 12;
*/
private final RepeatedInt miracleInfoRemote = RepeatedInt.newEmptyInstance();
+ /**
+ * repeated uint32 miracle_info = 15;
+ */
+ private final RepeatedInt miracleInfo = RepeatedInt.newEmptyInstance();
+
private RogueMiracleSelectInfo() {
}
@@ -49,7 +49,7 @@ public final class RogueMiracleSelectInfoOuterClass {
}
/**
- * optional uint32 JDDLGDNOIEC = 6;
+ * optional uint32 JDDLGDNOIEC = 10;
* @return whether the jDDLGDNOIEC field is set
*/
public boolean hasJDDLGDNOIEC() {
@@ -57,7 +57,7 @@ public final class RogueMiracleSelectInfoOuterClass {
}
/**
- * optional uint32 JDDLGDNOIEC = 6;
+ * optional uint32 JDDLGDNOIEC = 10;
* @return this
*/
public RogueMiracleSelectInfo clearJDDLGDNOIEC() {
@@ -67,7 +67,7 @@ public final class RogueMiracleSelectInfoOuterClass {
}
/**
- * optional uint32 JDDLGDNOIEC = 6;
+ * optional uint32 JDDLGDNOIEC = 10;
* @return the jDDLGDNOIEC
*/
public int getJDDLGDNOIEC() {
@@ -75,7 +75,7 @@ public final class RogueMiracleSelectInfoOuterClass {
}
/**
- * optional uint32 JDDLGDNOIEC = 6;
+ * optional uint32 JDDLGDNOIEC = 10;
* @param value the jDDLGDNOIEC to set
* @return this
*/
@@ -86,105 +86,37 @@ public final class RogueMiracleSelectInfoOuterClass {
}
/**
- * repeated uint32 miracle_info = 2;
- * @return whether the miracleInfo field is set
+ * + * CMHBBMOKJJB EOIFGPMGFGJ = 11; + *+ * + *
repeated uint32 miracle_info_remote = 12;
+ * @return whether the miracleInfoRemote field is set
*/
- public boolean hasMiracleInfo() {
+ public boolean hasMiracleInfoRemote() {
return (bitField0_ & 0x00000002) != 0;
}
- /**
- * repeated uint32 miracle_info = 2;
- * @return this
- */
- public RogueMiracleSelectInfo clearMiracleInfo() {
- bitField0_ &= ~0x00000002;
- miracleInfo.clear();
- return this;
- }
-
- /**
- * repeated uint32 miracle_info = 2;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableMiracleInfo()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedInt getMiracleInfo() {
- return miracleInfo;
- }
-
- /**
- * repeated uint32 miracle_info = 2;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedInt getMutableMiracleInfo() {
- bitField0_ |= 0x00000002;
- return miracleInfo;
- }
-
- /**
- * repeated uint32 miracle_info = 2;
- * @param value the miracleInfo to add
- * @return this
- */
- public RogueMiracleSelectInfo addMiracleInfo(final int value) {
- bitField0_ |= 0x00000002;
- miracleInfo.add(value);
- return this;
- }
-
- /**
- * repeated uint32 miracle_info = 2;
- * @param values the miracleInfo to add
- * @return this
- */
- public RogueMiracleSelectInfo addAllMiracleInfo(final int... values) {
- bitField0_ |= 0x00000002;
- miracleInfo.addAll(values);
- return this;
- }
-
/**
*
- * PDBKKCBKIOL CPDKDDNBEDN = 9;
+ * CMHBBMOKJJB EOIFGPMGFGJ = 11;
*
*
- * repeated uint32 miracle_info_remote = 10;
- * @return whether the miracleInfoRemote field is set
- */
- public boolean hasMiracleInfoRemote() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * - * PDBKKCBKIOL CPDKDDNBEDN = 9; - *- * - *
repeated uint32 miracle_info_remote = 10;
+ * repeated uint32 miracle_info_remote = 12;
* @return this
*/
public RogueMiracleSelectInfo clearMiracleInfoRemote() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
miracleInfoRemote.clear();
return this;
}
/**
*
- * PDBKKCBKIOL CPDKDDNBEDN = 9;
+ * CMHBBMOKJJB EOIFGPMGFGJ = 11;
*
*
- * repeated uint32 miracle_info_remote = 10;
+ * repeated uint32 miracle_info_remote = 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.
@@ -199,10 +131,10 @@ public final class RogueMiracleSelectInfoOuterClass {
/**
*
- * PDBKKCBKIOL CPDKDDNBEDN = 9;
+ * CMHBBMOKJJB EOIFGPMGFGJ = 11;
*
*
- * repeated uint32 miracle_info_remote = 10;
+ * repeated uint32 miracle_info_remote = 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
@@ -211,48 +143,116 @@ public final class RogueMiracleSelectInfoOuterClass {
* @return internal storage object for modifications
*/
public RepeatedInt getMutableMiracleInfoRemote() {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
return miracleInfoRemote;
}
/**
*
- * PDBKKCBKIOL CPDKDDNBEDN = 9;
+ * CMHBBMOKJJB EOIFGPMGFGJ = 11;
*
*
- * repeated uint32 miracle_info_remote = 10;
+ * repeated uint32 miracle_info_remote = 12;
* @param value the miracleInfoRemote to add
* @return this
*/
public RogueMiracleSelectInfo addMiracleInfoRemote(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
miracleInfoRemote.add(value);
return this;
}
/**
*
- * PDBKKCBKIOL CPDKDDNBEDN = 9;
+ * CMHBBMOKJJB EOIFGPMGFGJ = 11;
*
*
- * repeated uint32 miracle_info_remote = 10;
+ * repeated uint32 miracle_info_remote = 12;
* @param values the miracleInfoRemote to add
* @return this
*/
public RogueMiracleSelectInfo addAllMiracleInfoRemote(final int... values) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
miracleInfoRemote.addAll(values);
return this;
}
+ /**
+ * repeated uint32 miracle_info = 15;
+ * @return whether the miracleInfo field is set
+ */
+ public boolean hasMiracleInfo() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * repeated uint32 miracle_info = 15;
+ * @return this
+ */
+ public RogueMiracleSelectInfo clearMiracleInfo() {
+ bitField0_ &= ~0x00000004;
+ miracleInfo.clear();
+ return this;
+ }
+
+ /**
+ * repeated uint32 miracle_info = 15;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableMiracleInfo()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedInt getMiracleInfo() {
+ return miracleInfo;
+ }
+
+ /**
+ * repeated uint32 miracle_info = 15;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedInt getMutableMiracleInfo() {
+ bitField0_ |= 0x00000004;
+ return miracleInfo;
+ }
+
+ /**
+ * repeated uint32 miracle_info = 15;
+ * @param value the miracleInfo to add
+ * @return this
+ */
+ public RogueMiracleSelectInfo addMiracleInfo(final int value) {
+ bitField0_ |= 0x00000004;
+ miracleInfo.add(value);
+ return this;
+ }
+
+ /**
+ * repeated uint32 miracle_info = 15;
+ * @param values the miracleInfo to add
+ * @return this
+ */
+ public RogueMiracleSelectInfo addAllMiracleInfo(final int... values) {
+ bitField0_ |= 0x00000004;
+ miracleInfo.addAll(values);
+ return this;
+ }
+
@Override
public RogueMiracleSelectInfo copyFrom(final RogueMiracleSelectInfo other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
jDDLGDNOIEC = other.jDDLGDNOIEC;
- miracleInfo.copyFrom(other.miracleInfo);
miracleInfoRemote.copyFrom(other.miracleInfoRemote);
+ miracleInfo.copyFrom(other.miracleInfo);
}
return this;
}
@@ -266,12 +266,12 @@ public final class RogueMiracleSelectInfoOuterClass {
if (other.hasJDDLGDNOIEC()) {
setJDDLGDNOIEC(other.jDDLGDNOIEC);
}
- if (other.hasMiracleInfo()) {
- getMutableMiracleInfo().addAll(other.miracleInfo);
- }
if (other.hasMiracleInfoRemote()) {
getMutableMiracleInfoRemote().addAll(other.miracleInfoRemote);
}
+ if (other.hasMiracleInfo()) {
+ getMutableMiracleInfo().addAll(other.miracleInfo);
+ }
return this;
}
@@ -283,8 +283,8 @@ public final class RogueMiracleSelectInfoOuterClass {
cachedSize = -1;
bitField0_ = 0;
jDDLGDNOIEC = 0;
- miracleInfo.clear();
miracleInfoRemote.clear();
+ miracleInfo.clear();
return this;
}
@@ -295,8 +295,8 @@ public final class RogueMiracleSelectInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- miracleInfo.clear();
miracleInfoRemote.clear();
+ miracleInfo.clear();
return this;
}
@@ -311,26 +311,26 @@ public final class RogueMiracleSelectInfoOuterClass {
RogueMiracleSelectInfo other = (RogueMiracleSelectInfo) o;
return bitField0_ == other.bitField0_
&& (!hasJDDLGDNOIEC() || jDDLGDNOIEC == other.jDDLGDNOIEC)
- && (!hasMiracleInfo() || miracleInfo.equals(other.miracleInfo))
- && (!hasMiracleInfoRemote() || miracleInfoRemote.equals(other.miracleInfoRemote));
+ && (!hasMiracleInfoRemote() || miracleInfoRemote.equals(other.miracleInfoRemote))
+ && (!hasMiracleInfo() || miracleInfo.equals(other.miracleInfo));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 80);
output.writeUInt32NoTag(jDDLGDNOIEC);
}
if ((bitField0_ & 0x00000002) != 0) {
- for (int i = 0; i < miracleInfo.length(); i++) {
- output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(miracleInfo.array()[i]);
+ for (int i = 0; i < miracleInfoRemote.length(); i++) {
+ output.writeRawByte((byte) 96);
+ output.writeUInt32NoTag(miracleInfoRemote.array()[i]);
}
}
if ((bitField0_ & 0x00000004) != 0) {
- for (int i = 0; i < miracleInfoRemote.length(); i++) {
- output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(miracleInfoRemote.array()[i]);
+ for (int i = 0; i < miracleInfo.length(); i++) {
+ output.writeRawByte((byte) 120);
+ output.writeUInt32NoTag(miracleInfo.array()[i]);
}
}
}
@@ -342,10 +342,10 @@ public final class RogueMiracleSelectInfoOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(jDDLGDNOIEC);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += (1 * miracleInfo.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(miracleInfo);
+ size += (1 * miracleInfoRemote.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(miracleInfoRemote);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += (1 * miracleInfoRemote.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(miracleInfoRemote);
+ size += (1 * miracleInfo.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(miracleInfo);
}
return size;
}
@@ -357,27 +357,27 @@ public final class RogueMiracleSelectInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 48: {
+ case 80: {
// jDDLGDNOIEC
jDDLGDNOIEC = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 18) {
+ if (tag != 98) {
break;
}
}
- case 18: {
- // miracleInfo [packed=true]
- input.readPackedUInt32(miracleInfo, tag);
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 82) {
- break;
- }
- }
- case 82: {
+ case 98: {
// miracleInfoRemote [packed=true]
input.readPackedUInt32(miracleInfoRemote, tag);
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 122) {
+ break;
+ }
+ }
+ case 122: {
+ // miracleInfo [packed=true]
+ input.readPackedUInt32(miracleInfo, tag);
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 0) {
@@ -394,15 +394,15 @@ public final class RogueMiracleSelectInfoOuterClass {
tag = input.readTag();
break;
}
- case 16: {
- // miracleInfo [packed=false]
- tag = input.readRepeatedUInt32(miracleInfo, tag);
+ case 96: {
+ // miracleInfoRemote [packed=false]
+ tag = input.readRepeatedUInt32(miracleInfoRemote, tag);
bitField0_ |= 0x00000002;
break;
}
- case 80: {
- // miracleInfoRemote [packed=false]
- tag = input.readRepeatedUInt32(miracleInfoRemote, tag);
+ case 120: {
+ // miracleInfo [packed=false]
+ tag = input.readRepeatedUInt32(miracleInfo, tag);
bitField0_ |= 0x00000004;
break;
}
@@ -417,10 +417,10 @@ public final class RogueMiracleSelectInfoOuterClass {
output.writeUInt32(FieldNames.jDDLGDNOIEC, jDDLGDNOIEC);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRepeatedUInt32(FieldNames.miracleInfo, miracleInfo);
+ output.writeRepeatedUInt32(FieldNames.miracleInfoRemote, miracleInfoRemote);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRepeatedUInt32(FieldNames.miracleInfoRemote, miracleInfoRemote);
+ output.writeRepeatedUInt32(FieldNames.miracleInfo, miracleInfo);
}
output.endObject();
}
@@ -443,11 +443,11 @@ public final class RogueMiracleSelectInfoOuterClass {
}
break;
}
- case 760306879:
- case 2114852796: {
- if (input.isAtField(FieldNames.miracleInfo)) {
+ case -212699675:
+ case 609350185: {
+ if (input.isAtField(FieldNames.miracleInfoRemote)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedUInt32(miracleInfo);
+ input.readRepeatedUInt32(miracleInfoRemote);
bitField0_ |= 0x00000002;
}
} else {
@@ -455,11 +455,11 @@ public final class RogueMiracleSelectInfoOuterClass {
}
break;
}
- case -212699675:
- case 609350185: {
- if (input.isAtField(FieldNames.miracleInfoRemote)) {
+ case 760306879:
+ case 2114852796: {
+ if (input.isAtField(FieldNames.miracleInfo)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedUInt32(miracleInfoRemote);
+ input.readRepeatedUInt32(miracleInfo);
bitField0_ |= 0x00000004;
}
} else {
@@ -522,9 +522,9 @@ public final class RogueMiracleSelectInfoOuterClass {
static class FieldNames {
static final FieldName jDDLGDNOIEC = FieldName.forField("JDDLGDNOIEC");
- static final FieldName miracleInfo = FieldName.forField("miracleInfo", "miracle_info");
-
static final FieldName miracleInfoRemote = FieldName.forField("miracleInfoRemote", "miracle_info_remote");
+
+ static final FieldName miracleInfo = FieldName.forField("miracleInfo", "miracle_info");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectResultOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectResultOuterClass.java
index 68b2e6b..94ce593 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectResultOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectResultOuterClass.java
@@ -19,7 +19,7 @@ public final class RogueMiracleSelectResultOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 miracle_id = 8;
+ * optional uint32 miracle_id = 9;
*/
private int miracleId;
@@ -34,7 +34,7 @@ public final class RogueMiracleSelectResultOuterClass {
}
/**
- * optional uint32 miracle_id = 8;
+ * optional uint32 miracle_id = 9;
* @return whether the miracleId field is set
*/
public boolean hasMiracleId() {
@@ -42,7 +42,7 @@ public final class RogueMiracleSelectResultOuterClass {
}
/**
- * optional uint32 miracle_id = 8;
+ * optional uint32 miracle_id = 9;
* @return this
*/
public RogueMiracleSelectResult clearMiracleId() {
@@ -52,7 +52,7 @@ public final class RogueMiracleSelectResultOuterClass {
}
/**
- * optional uint32 miracle_id = 8;
+ * optional uint32 miracle_id = 9;
* @return the miracleId
*/
public int getMiracleId() {
@@ -60,7 +60,7 @@ public final class RogueMiracleSelectResultOuterClass {
}
/**
- * optional uint32 miracle_id = 8;
+ * optional uint32 miracle_id = 9;
* @param value the miracleId to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class RogueMiracleSelectResultOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 72);
output.writeUInt32NoTag(miracleId);
}
}
@@ -150,7 +150,7 @@ public final class RogueMiracleSelectResultOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 64: {
+ case 72: {
// miracleId
miracleId = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueNpcDisappearCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueNpcDisappearCsReqOuterClass.java
index 5e9c85e..b838f20 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueNpcDisappearCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueNpcDisappearCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class RogueNpcDisappearCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 entity_id = 8;
+ * optional uint32 entity_id = 7;
*/
private int entityId;
@@ -34,7 +34,7 @@ public final class RogueNpcDisappearCsReqOuterClass {
}
/**
- * optional uint32 entity_id = 8;
+ * optional uint32 entity_id = 7;
* @return whether the entityId field is set
*/
public boolean hasEntityId() {
@@ -42,7 +42,7 @@ public final class RogueNpcDisappearCsReqOuterClass {
}
/**
- * optional uint32 entity_id = 8;
+ * optional uint32 entity_id = 7;
* @return this
*/
public RogueNpcDisappearCsReq clearEntityId() {
@@ -52,7 +52,7 @@ public final class RogueNpcDisappearCsReqOuterClass {
}
/**
- * optional uint32 entity_id = 8;
+ * optional uint32 entity_id = 7;
* @return the entityId
*/
public int getEntityId() {
@@ -60,7 +60,7 @@ public final class RogueNpcDisappearCsReqOuterClass {
}
/**
- * optional uint32 entity_id = 8;
+ * optional uint32 entity_id = 7;
* @param value the entityId to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class RogueNpcDisappearCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(entityId);
}
}
@@ -150,7 +150,7 @@ public final class RogueNpcDisappearCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 64: {
+ case 56: {
// entityId
entityId = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueRecordAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueRecordAvatarOuterClass.java
index 38f98c3..524ae39 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueRecordAvatarOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueRecordAvatarOuterClass.java
@@ -19,17 +19,22 @@ public final class RogueRecordAvatarOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 slot = 7;
+ * optional uint32 level = 1;
+ */
+ private int level;
+
+ /**
+ * optional uint32 slot = 3;
*/
private int slot;
/**
- * optional uint32 id = 14;
+ * optional uint32 id = 5;
*/
private int id;
/**
- * optional .AvatarType avatar_type = 13;
+ * optional .AvatarType avatar_type = 2;
*/
private int avatarType;
@@ -44,25 +49,62 @@ public final class RogueRecordAvatarOuterClass {
}
/**
- * optional uint32 slot = 7;
- * @return whether the slot field is set
+ * optional uint32 level = 1;
+ * @return whether the level field is set
*/
- public boolean hasSlot() {
+ public boolean hasLevel() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 slot = 7;
+ * optional uint32 level = 1;
+ * @return this
+ */
+ public RogueRecordAvatar clearLevel() {
+ bitField0_ &= ~0x00000001;
+ level = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 level = 1;
+ * @return the level
+ */
+ public int getLevel() {
+ return level;
+ }
+
+ /**
+ * optional uint32 level = 1;
+ * @param value the level to set
+ * @return this
+ */
+ public RogueRecordAvatar setLevel(final int value) {
+ bitField0_ |= 0x00000001;
+ level = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 slot = 3;
+ * @return whether the slot field is set
+ */
+ public boolean hasSlot() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 slot = 3;
* @return this
*/
public RogueRecordAvatar clearSlot() {
- bitField0_ &= ~0x00000001;
+ bitField0_ &= ~0x00000002;
slot = 0;
return this;
}
/**
- * optional uint32 slot = 7;
+ * optional uint32 slot = 3;
* @return the slot
*/
public int getSlot() {
@@ -70,36 +112,36 @@ public final class RogueRecordAvatarOuterClass {
}
/**
- * optional uint32 slot = 7;
+ * optional uint32 slot = 3;
* @param value the slot to set
* @return this
*/
public RogueRecordAvatar setSlot(final int value) {
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
slot = value;
return this;
}
/**
- * optional uint32 id = 14;
+ * optional uint32 id = 5;
* @return whether the id field is set
*/
public boolean hasId() {
- return (bitField0_ & 0x00000002) != 0;
+ return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 id = 14;
+ * optional uint32 id = 5;
* @return this
*/
public RogueRecordAvatar clearId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000004;
id = 0;
return this;
}
/**
- * optional uint32 id = 14;
+ * optional uint32 id = 5;
* @return the id
*/
public int getId() {
@@ -107,36 +149,36 @@ public final class RogueRecordAvatarOuterClass {
}
/**
- * optional uint32 id = 14;
+ * optional uint32 id = 5;
* @param value the id to set
* @return this
*/
public RogueRecordAvatar setId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
id = value;
return this;
}
/**
- * optional .AvatarType avatar_type = 13;
+ * optional .AvatarType avatar_type = 2;
* @return whether the avatarType field is set
*/
public boolean hasAvatarType() {
- return (bitField0_ & 0x00000004) != 0;
+ return (bitField0_ & 0x00000008) != 0;
}
/**
- * optional .AvatarType avatar_type = 13;
+ * optional .AvatarType avatar_type = 2;
* @return this
*/
public RogueRecordAvatar clearAvatarType() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000008;
avatarType = 0;
return this;
}
/**
- * optional .AvatarType avatar_type = 13;
+ * optional .AvatarType avatar_type = 2;
* @return the avatarType
*/
public AvatarTypeOuterClass.AvatarType getAvatarType() {
@@ -163,18 +205,18 @@ public final class RogueRecordAvatarOuterClass {
* @return this
*/
public RogueRecordAvatar setAvatarTypeValue(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000008;
avatarType = value;
return this;
}
/**
- * optional .AvatarType avatar_type = 13;
+ * optional .AvatarType avatar_type = 2;
* @param value the avatarType to set
* @return this
*/
public RogueRecordAvatar setAvatarType(final AvatarTypeOuterClass.AvatarType value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000008;
avatarType = value.getNumber();
return this;
}
@@ -184,6 +226,7 @@ public final class RogueRecordAvatarOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
+ level = other.level;
slot = other.slot;
id = other.id;
avatarType = other.avatarType;
@@ -197,6 +240,9 @@ public final class RogueRecordAvatarOuterClass {
return this;
}
cachedSize = -1;
+ if (other.hasLevel()) {
+ setLevel(other.level);
+ }
if (other.hasSlot()) {
setSlot(other.slot);
}
@@ -216,6 +262,7 @@ public final class RogueRecordAvatarOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
+ level = 0;
slot = 0;
id = 0;
avatarType = 0;
@@ -242,6 +289,7 @@ public final class RogueRecordAvatarOuterClass {
}
RogueRecordAvatar other = (RogueRecordAvatar) o;
return bitField0_ == other.bitField0_
+ && (!hasLevel() || level == other.level)
&& (!hasSlot() || slot == other.slot)
&& (!hasId() || id == other.id)
&& (!hasAvatarType() || avatarType == other.avatarType);
@@ -250,15 +298,19 @@ public final class RogueRecordAvatarOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
- output.writeUInt32NoTag(slot);
+ output.writeRawByte((byte) 8);
+ output.writeUInt32NoTag(level);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 112);
- output.writeUInt32NoTag(id);
+ output.writeRawByte((byte) 24);
+ output.writeUInt32NoTag(slot);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 40);
+ output.writeUInt32NoTag(id);
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeRawByte((byte) 16);
output.writeEnumNoTag(avatarType);
}
}
@@ -267,12 +319,15 @@ public final class RogueRecordAvatarOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(slot);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(id);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(slot);
}
if ((bitField0_ & 0x00000004) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(id);
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType);
}
return size;
@@ -285,30 +340,39 @@ public final class RogueRecordAvatarOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
- // slot
- slot = input.readUInt32();
+ case 8: {
+ // level
+ level = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 112) {
+ if (tag != 24) {
break;
}
}
- case 112: {
- // id
- id = input.readUInt32();
+ case 24: {
+ // slot
+ slot = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 40) {
break;
}
}
- case 104: {
+ case 40: {
+ // id
+ id = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 16) {
+ break;
+ }
+ }
+ case 16: {
// avatarType
final int value = input.readInt32();
if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) {
avatarType = value;
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000008;
}
tag = input.readTag();
if (tag != 0) {
@@ -333,12 +397,15 @@ public final class RogueRecordAvatarOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.slot, slot);
+ output.writeUInt32(FieldNames.level, level);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.id, id);
+ output.writeUInt32(FieldNames.slot, slot);
}
if ((bitField0_ & 0x00000004) != 0) {
+ output.writeUInt32(FieldNames.id, id);
+ }
+ if ((bitField0_ & 0x00000008) != 0) {
output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter());
}
output.endObject();
@@ -351,11 +418,22 @@ public final class RogueRecordAvatarOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
+ case 102865796: {
+ if (input.isAtField(FieldNames.level)) {
+ if (!input.trySkipNullValue()) {
+ level = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case 3533310: {
if (input.isAtField(FieldNames.slot)) {
if (!input.trySkipNullValue()) {
slot = input.readUInt32();
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
}
} else {
input.skipUnknownField();
@@ -366,7 +444,7 @@ public final class RogueRecordAvatarOuterClass {
if (input.isAtField(FieldNames.id)) {
if (!input.trySkipNullValue()) {
id = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
}
} else {
input.skipUnknownField();
@@ -380,7 +458,7 @@ public final class RogueRecordAvatarOuterClass {
final AvatarTypeOuterClass.AvatarType value = input.readEnum(AvatarTypeOuterClass.AvatarType.converter());
if (value != null) {
avatarType = value.getNumber();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000008;
} else {
input.skipUnknownEnumValue();
}
@@ -443,6 +521,8 @@ public final class RogueRecordAvatarOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
+ static final FieldName level = FieldName.forField("level");
+
static final FieldName slot = FieldName.forField("slot");
static final FieldName id = FieldName.forField("id");
diff --git a/src/generated/main/emu/lunarcore/proto/RogueRecordInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueRecordInfoOuterClass.java
index a68e528..ebf47ea 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueRecordInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueRecordInfoOuterClass.java
@@ -21,17 +21,17 @@ public final class RogueRecordInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated uint32 rogue_miracle_list = 5;
+ * repeated uint32 rogue_miracle_list = 8;
*/
private final RepeatedInt rogueMiracleList = RepeatedInt.newEmptyInstance();
/**
- * repeated .RogueRecordAvatar avatar_list = 4;
+ * repeated .RogueRecordAvatar avatar_list = 5;
*/
private final RepeatedMessagerepeated .RogueBuff buff_list = 13;
+ * repeated .RogueBuff buff_list = 14;
*/
private final RepeatedMessagerepeated uint32 rogue_miracle_list = 5;
+ * repeated uint32 rogue_miracle_list = 8;
* @return whether the rogueMiracleList field is set
*/
public boolean hasRogueMiracleList() {
@@ -54,7 +54,7 @@ public final class RogueRecordInfoOuterClass {
}
/**
- * repeated uint32 rogue_miracle_list = 5;
+ * repeated uint32 rogue_miracle_list = 8;
* @return this
*/
public RogueRecordInfo clearRogueMiracleList() {
@@ -64,7 +64,7 @@ public final class RogueRecordInfoOuterClass {
}
/**
- * repeated uint32 rogue_miracle_list = 5;
+ * repeated uint32 rogue_miracle_list = 8;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -78,7 +78,7 @@ public final class RogueRecordInfoOuterClass {
}
/**
- * repeated uint32 rogue_miracle_list = 5;
+ * repeated uint32 rogue_miracle_list = 8;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -92,7 +92,7 @@ public final class RogueRecordInfoOuterClass {
}
/**
- * repeated uint32 rogue_miracle_list = 5;
+ * repeated uint32 rogue_miracle_list = 8;
* @param value the rogueMiracleList to add
* @return this
*/
@@ -103,7 +103,7 @@ public final class RogueRecordInfoOuterClass {
}
/**
- * repeated uint32 rogue_miracle_list = 5;
+ * repeated uint32 rogue_miracle_list = 8;
* @param values the rogueMiracleList to add
* @return this
*/
@@ -114,7 +114,7 @@ public final class RogueRecordInfoOuterClass {
}
/**
- * repeated .RogueRecordAvatar avatar_list = 4;
+ * repeated .RogueRecordAvatar avatar_list = 5;
* @return whether the avatarList field is set
*/
public boolean hasAvatarList() {
@@ -122,7 +122,7 @@ public final class RogueRecordInfoOuterClass {
}
/**
- * repeated .RogueRecordAvatar avatar_list = 4;
+ * repeated .RogueRecordAvatar avatar_list = 5;
* @return this
*/
public RogueRecordInfo clearAvatarList() {
@@ -132,7 +132,7 @@ public final class RogueRecordInfoOuterClass {
}
/**
- * repeated .RogueRecordAvatar avatar_list = 4;
+ * repeated .RogueRecordAvatar avatar_list = 5;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -146,7 +146,7 @@ public final class RogueRecordInfoOuterClass {
}
/**
- * repeated .RogueRecordAvatar avatar_list = 4;
+ * repeated .RogueRecordAvatar avatar_list = 5;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -160,7 +160,7 @@ public final class RogueRecordInfoOuterClass {
}
/**
- * repeated .RogueRecordAvatar avatar_list = 4;
+ * repeated .RogueRecordAvatar avatar_list = 5;
* @param value the avatarList to add
* @return this
*/
@@ -172,7 +172,7 @@ public final class RogueRecordInfoOuterClass {
}
/**
- * repeated .RogueRecordAvatar avatar_list = 4;
+ * repeated .RogueRecordAvatar avatar_list = 5;
* @param values the avatarList to add
* @return this
*/
@@ -184,7 +184,7 @@ public final class RogueRecordInfoOuterClass {
}
/**
- * repeated .RogueBuff buff_list = 13;
+ * repeated .RogueBuff buff_list = 14;
* @return whether the buffList field is set
*/
public boolean hasBuffList() {
@@ -192,7 +192,7 @@ public final class RogueRecordInfoOuterClass {
}
/**
- * repeated .RogueBuff buff_list = 13;
+ * repeated .RogueBuff buff_list = 14;
* @return this
*/
public RogueRecordInfo clearBuffList() {
@@ -202,7 +202,7 @@ public final class RogueRecordInfoOuterClass {
}
/**
- * repeated .RogueBuff buff_list = 13;
+ * repeated .RogueBuff buff_list = 14;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -216,7 +216,7 @@ public final class RogueRecordInfoOuterClass {
}
/**
- * repeated .RogueBuff buff_list = 13;
+ * repeated .RogueBuff buff_list = 14;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -230,7 +230,7 @@ public final class RogueRecordInfoOuterClass {
}
/**
- * repeated .RogueBuff buff_list = 13;
+ * repeated .RogueBuff buff_list = 14;
* @param value the buffList to add
* @return this
*/
@@ -241,7 +241,7 @@ public final class RogueRecordInfoOuterClass {
}
/**
- * repeated .RogueBuff buff_list = 13;
+ * repeated .RogueBuff buff_list = 14;
* @param values the buffList to add
* @return this
*/
@@ -326,19 +326,19 @@ public final class RogueRecordInfoOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < rogueMiracleList.length(); i++) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(rogueMiracleList.array()[i]);
}
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < avatarList.length(); i++) {
- output.writeRawByte((byte) 34);
+ output.writeRawByte((byte) 42);
output.writeMessageNoTag(avatarList.get(i));
}
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < buffList.length(); i++) {
- output.writeRawByte((byte) 106);
+ output.writeRawByte((byte) 114);
output.writeMessageNoTag(buffList.get(i));
}
}
@@ -366,24 +366,24 @@ public final class RogueRecordInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 42: {
+ case 66: {
// rogueMiracleList [packed=true]
input.readPackedUInt32(rogueMiracleList, tag);
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 34) {
+ if (tag != 42) {
break;
}
}
- case 34: {
+ case 42: {
// avatarList
tag = input.readRepeatedMessage(avatarList, tag);
bitField0_ |= 0x00000002;
- if (tag != 106) {
+ if (tag != 114) {
break;
}
}
- case 106: {
+ case 114: {
// buffList
tag = input.readRepeatedMessage(buffList, tag);
bitField0_ |= 0x00000004;
@@ -401,7 +401,7 @@ public final class RogueRecordInfoOuterClass {
tag = input.readTag();
break;
}
- case 40: {
+ case 64: {
// rogueMiracleList [packed=false]
tag = input.readRepeatedUInt32(rogueMiracleList, tag);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueRerollBuffOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueRerollBuffOuterClass.java
index 14b4976..734a044 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueRerollBuffOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueRerollBuffOuterClass.java
@@ -19,7 +19,7 @@ public final class RogueRerollBuffOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .RogueCommonBuffSelectInfo buff_select_info = 14;
+ * optional .RogueCommonBuffSelectInfo buff_select_info = 15;
*/
private final RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo buffSelectInfo = RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo.newInstance();
@@ -34,7 +34,7 @@ public final class RogueRerollBuffOuterClass {
}
/**
- * optional .RogueCommonBuffSelectInfo buff_select_info = 14;
+ * optional .RogueCommonBuffSelectInfo buff_select_info = 15;
* @return whether the buffSelectInfo field is set
*/
public boolean hasBuffSelectInfo() {
@@ -42,7 +42,7 @@ public final class RogueRerollBuffOuterClass {
}
/**
- * optional .RogueCommonBuffSelectInfo buff_select_info = 14;
+ * optional .RogueCommonBuffSelectInfo buff_select_info = 15;
* @return this
*/
public RogueRerollBuff clearBuffSelectInfo() {
@@ -52,7 +52,7 @@ public final class RogueRerollBuffOuterClass {
}
/**
- * optional .RogueCommonBuffSelectInfo buff_select_info = 14;
+ * optional .RogueCommonBuffSelectInfo buff_select_info = 15;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -66,7 +66,7 @@ public final class RogueRerollBuffOuterClass {
}
/**
- * optional .RogueCommonBuffSelectInfo buff_select_info = 14;
+ * optional .RogueCommonBuffSelectInfo buff_select_info = 15;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class RogueRerollBuffOuterClass {
}
/**
- * optional .RogueCommonBuffSelectInfo buff_select_info = 14;
+ * optional .RogueCommonBuffSelectInfo buff_select_info = 15;
* @param value the buffSelectInfo to set
* @return this
*/
@@ -152,7 +152,7 @@ public final class RogueRerollBuffOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 114);
+ output.writeRawByte((byte) 122);
output.writeMessageNoTag(buffSelectInfo);
}
}
@@ -173,7 +173,7 @@ public final class RogueRerollBuffOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 114: {
+ case 122: {
// buffSelectInfo
input.readMessage(buffSelectInfo);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java
index 9de60b7..a97b47e 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java
@@ -19,25 +19,25 @@ public final class RogueRoomOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 site_id = 2;
+ * + * uint32 LELFKONOLPP = 4; + *+ * + *
optional uint32 room_id = 2;
+ */
+ private int roomId;
+
+ /**
+ * optional uint32 site_id = 11;
*/
private int siteId;
/**
*
- * uint32 LFNBMDFGOOC = 11;
+ * RogueRoomStatus EPLFPIFPEEM = 8;
*
*
- * optional uint32 room_id = 7;
- */
- private int roomId;
-
- /**
- * - * RogueRoomStatus PJNKDHEEEGE = 5; - *- * - *
optional .RogueRoomStatus room_status = 12;
+ * optional .RogueRoomStatus room_status = 8;
*/
private int roomStatus;
@@ -52,74 +52,37 @@ public final class RogueRoomOuterClass {
}
/**
- * optional uint32 site_id = 2;
- * @return whether the siteId field is set
+ * + * uint32 LELFKONOLPP = 4; + *+ * + *
optional uint32 room_id = 2;
+ * @return whether the roomId field is set
*/
- public boolean hasSiteId() {
+ public boolean hasRoomId() {
return (bitField0_ & 0x00000001) != 0;
}
- /**
- * optional uint32 site_id = 2;
- * @return this
- */
- public RogueRoom clearSiteId() {
- bitField0_ &= ~0x00000001;
- siteId = 0;
- return this;
- }
-
- /**
- * optional uint32 site_id = 2;
- * @return the siteId
- */
- public int getSiteId() {
- return siteId;
- }
-
- /**
- * optional uint32 site_id = 2;
- * @param value the siteId to set
- * @return this
- */
- public RogueRoom setSiteId(final int value) {
- bitField0_ |= 0x00000001;
- siteId = value;
- return this;
- }
-
/**
*
- * uint32 LFNBMDFGOOC = 11;
+ * uint32 LELFKONOLPP = 4;
*
*
- * optional uint32 room_id = 7;
- * @return whether the roomId field is set
- */
- public boolean hasRoomId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * - * uint32 LFNBMDFGOOC = 11; - *- * - *
optional uint32 room_id = 7;
+ * optional uint32 room_id = 2;
* @return this
*/
public RogueRoom clearRoomId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
roomId = 0;
return this;
}
/**
*
- * uint32 LFNBMDFGOOC = 11;
+ * uint32 LELFKONOLPP = 4;
*
*
- * optional uint32 room_id = 7;
+ * optional uint32 room_id = 2;
* @return the roomId
*/
public int getRoomId() {
@@ -128,25 +91,62 @@ public final class RogueRoomOuterClass {
/**
*
- * uint32 LFNBMDFGOOC = 11;
+ * uint32 LELFKONOLPP = 4;
*
*
- * optional uint32 room_id = 7;
+ * optional uint32 room_id = 2;
* @param value the roomId to set
* @return this
*/
public RogueRoom setRoomId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
roomId = value;
return this;
}
+ /**
+ * optional uint32 site_id = 11;
+ * @return whether the siteId field is set
+ */
+ public boolean hasSiteId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 site_id = 11;
+ * @return this
+ */
+ public RogueRoom clearSiteId() {
+ bitField0_ &= ~0x00000002;
+ siteId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 site_id = 11;
+ * @return the siteId
+ */
+ public int getSiteId() {
+ return siteId;
+ }
+
+ /**
+ * optional uint32 site_id = 11;
+ * @param value the siteId to set
+ * @return this
+ */
+ public RogueRoom setSiteId(final int value) {
+ bitField0_ |= 0x00000002;
+ siteId = value;
+ return this;
+ }
+
/**
*
- * RogueRoomStatus PJNKDHEEEGE = 5;
+ * RogueRoomStatus EPLFPIFPEEM = 8;
*
*
- * optional .RogueRoomStatus room_status = 12;
+ * optional .RogueRoomStatus room_status = 8;
* @return whether the roomStatus field is set
*/
public boolean hasRoomStatus() {
@@ -155,10 +155,10 @@ public final class RogueRoomOuterClass {
/**
*
- * RogueRoomStatus PJNKDHEEEGE = 5;
+ * RogueRoomStatus EPLFPIFPEEM = 8;
*
*
- * optional .RogueRoomStatus room_status = 12;
+ * optional .RogueRoomStatus room_status = 8;
* @return this
*/
public RogueRoom clearRoomStatus() {
@@ -169,10 +169,10 @@ public final class RogueRoomOuterClass {
/**
*
- * RogueRoomStatus PJNKDHEEEGE = 5;
+ * RogueRoomStatus EPLFPIFPEEM = 8;
*
*
- * optional .RogueRoomStatus room_status = 12;
+ * optional .RogueRoomStatus room_status = 8;
* @return the roomStatus
*/
public RogueRoomStatusOuterClass.RogueRoomStatus getRoomStatus() {
@@ -206,10 +206,10 @@ public final class RogueRoomOuterClass {
/**
*
- * RogueRoomStatus PJNKDHEEEGE = 5;
+ * RogueRoomStatus EPLFPIFPEEM = 8;
*
*
- * optional .RogueRoomStatus room_status = 12;
+ * optional .RogueRoomStatus room_status = 8;
* @param value the roomStatus to set
* @return this
*/
@@ -224,8 +224,8 @@ public final class RogueRoomOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- siteId = other.siteId;
roomId = other.roomId;
+ siteId = other.siteId;
roomStatus = other.roomStatus;
}
return this;
@@ -237,12 +237,12 @@ public final class RogueRoomOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasSiteId()) {
- setSiteId(other.siteId);
- }
if (other.hasRoomId()) {
setRoomId(other.roomId);
}
+ if (other.hasSiteId()) {
+ setSiteId(other.siteId);
+ }
if (other.hasRoomStatus()) {
setRoomStatusValue(other.roomStatus);
}
@@ -256,8 +256,8 @@ public final class RogueRoomOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- siteId = 0;
roomId = 0;
+ siteId = 0;
roomStatus = 0;
return this;
}
@@ -282,8 +282,8 @@ public final class RogueRoomOuterClass {
}
RogueRoom other = (RogueRoom) o;
return bitField0_ == other.bitField0_
- && (!hasSiteId() || siteId == other.siteId)
&& (!hasRoomId() || roomId == other.roomId)
+ && (!hasSiteId() || siteId == other.siteId)
&& (!hasRoomStatus() || roomStatus == other.roomStatus);
}
@@ -291,14 +291,14 @@ public final class RogueRoomOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(siteId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 56);
output.writeUInt32NoTag(roomId);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 88);
+ output.writeUInt32NoTag(siteId);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 64);
output.writeEnumNoTag(roomStatus);
}
}
@@ -307,10 +307,10 @@ public final class RogueRoomOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(siteId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(roomId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(roomId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(siteId);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeEnumSizeNoTag(roomStatus);
@@ -326,24 +326,24 @@ public final class RogueRoomOuterClass {
while (true) {
switch (tag) {
case 16: {
- // siteId
- siteId = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 56) {
- break;
- }
- }
- case 56: {
// roomId
roomId = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 88) {
break;
}
}
- case 96: {
+ case 88: {
+ // siteId
+ siteId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 64) {
+ break;
+ }
+ }
+ case 64: {
// roomStatus
final int value = input.readInt32();
if (RogueRoomStatusOuterClass.RogueRoomStatus.forNumber(value) != null) {
@@ -373,10 +373,10 @@ public final class RogueRoomOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.siteId, siteId);
+ output.writeUInt32(FieldNames.roomId, roomId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.roomId, roomId);
+ output.writeUInt32(FieldNames.siteId, siteId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeEnum(FieldNames.roomStatus, roomStatus, RogueRoomStatusOuterClass.RogueRoomStatus.converter());
@@ -391,11 +391,11 @@ public final class RogueRoomOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -902090046:
- case 2100001043: {
- if (input.isAtField(FieldNames.siteId)) {
+ case -925319338:
+ case 1379892991: {
+ if (input.isAtField(FieldNames.roomId)) {
if (!input.trySkipNullValue()) {
- siteId = input.readUInt32();
+ roomId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -403,11 +403,11 @@ public final class RogueRoomOuterClass {
}
break;
}
- case -925319338:
- case 1379892991: {
- if (input.isAtField(FieldNames.roomId)) {
+ case -902090046:
+ case 2100001043: {
+ if (input.isAtField(FieldNames.siteId)) {
if (!input.trySkipNullValue()) {
- roomId = input.readUInt32();
+ siteId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -484,10 +484,10 @@ public final class RogueRoomOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName siteId = FieldName.forField("siteId", "site_id");
-
static final FieldName roomId = FieldName.forField("roomId", "room_id");
+ static final FieldName siteId = FieldName.forField("siteId", "site_id");
+
static final FieldName roomStatus = FieldName.forField("roomStatus", "room_status");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java
index 0397574..3427e3d 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java
@@ -20,53 +20,37 @@ public final class RogueScoreRewardInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * - * guess, either this or end_time - *- * - *
optional int64 begin_time = 2;
+ * optional int64 begin_time = 9;
*/
private long beginTime;
/**
- * - * guess, either this or begin_time - *- * - *
optional int64 end_time = 5;
+ * optional int64 end_time = 15;
*/
private long endTime;
/**
- * optional uint32 score = 6;
+ * optional uint32 score = 4;
*/
private int score;
/**
- * optional uint32 pool_id = 9;
+ * optional uint32 pool_id = 6;
*/
private int poolId;
/**
- * - * guess - *- * - *
optional bool has_taken_initial_score = 7;
+ * optional bool has_taken_initial_score = 11;
*/
private boolean hasTakenInitialScore;
/**
- * - * guess - *- * - *
optional bool pool_refreshed = 14;
+ * optional bool pool_refreshed = 13;
*/
private boolean poolRefreshed;
/**
- * repeated uint32 has_taken_reward = 3;
+ * repeated uint32 has_taken_reward = 7;
*/
private final RepeatedInt hasTakenReward = RepeatedInt.newEmptyInstance();
@@ -81,11 +65,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * - * guess, either this or end_time - *- * - *
optional int64 begin_time = 2;
+ * optional int64 begin_time = 9;
* @return whether the beginTime field is set
*/
public boolean hasBeginTime() {
@@ -93,11 +73,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * - * guess, either this or end_time - *- * - *
optional int64 begin_time = 2;
+ * optional int64 begin_time = 9;
* @return this
*/
public RogueScoreRewardInfo clearBeginTime() {
@@ -107,11 +83,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * - * guess, either this or end_time - *- * - *
optional int64 begin_time = 2;
+ * optional int64 begin_time = 9;
* @return the beginTime
*/
public long getBeginTime() {
@@ -119,11 +91,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * - * guess, either this or end_time - *- * - *
optional int64 begin_time = 2;
+ * optional int64 begin_time = 9;
* @param value the beginTime to set
* @return this
*/
@@ -134,11 +102,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * - * guess, either this or begin_time - *- * - *
optional int64 end_time = 5;
+ * optional int64 end_time = 15;
* @return whether the endTime field is set
*/
public boolean hasEndTime() {
@@ -146,11 +110,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * - * guess, either this or begin_time - *- * - *
optional int64 end_time = 5;
+ * optional int64 end_time = 15;
* @return this
*/
public RogueScoreRewardInfo clearEndTime() {
@@ -160,11 +120,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * - * guess, either this or begin_time - *- * - *
optional int64 end_time = 5;
+ * optional int64 end_time = 15;
* @return the endTime
*/
public long getEndTime() {
@@ -172,11 +128,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * - * guess, either this or begin_time - *- * - *
optional int64 end_time = 5;
+ * optional int64 end_time = 15;
* @param value the endTime to set
* @return this
*/
@@ -187,7 +139,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * optional uint32 score = 6;
+ * optional uint32 score = 4;
* @return whether the score field is set
*/
public boolean hasScore() {
@@ -195,7 +147,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * optional uint32 score = 6;
+ * optional uint32 score = 4;
* @return this
*/
public RogueScoreRewardInfo clearScore() {
@@ -205,7 +157,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * optional uint32 score = 6;
+ * optional uint32 score = 4;
* @return the score
*/
public int getScore() {
@@ -213,7 +165,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * optional uint32 score = 6;
+ * optional uint32 score = 4;
* @param value the score to set
* @return this
*/
@@ -224,7 +176,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * optional uint32 pool_id = 9;
+ * optional uint32 pool_id = 6;
* @return whether the poolId field is set
*/
public boolean hasPoolId() {
@@ -232,7 +184,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * optional uint32 pool_id = 9;
+ * optional uint32 pool_id = 6;
* @return this
*/
public RogueScoreRewardInfo clearPoolId() {
@@ -242,7 +194,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * optional uint32 pool_id = 9;
+ * optional uint32 pool_id = 6;
* @return the poolId
*/
public int getPoolId() {
@@ -250,7 +202,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * optional uint32 pool_id = 9;
+ * optional uint32 pool_id = 6;
* @param value the poolId to set
* @return this
*/
@@ -261,11 +213,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * - * guess - *- * - *
optional bool has_taken_initial_score = 7;
+ * optional bool has_taken_initial_score = 11;
* @return whether the hasTakenInitialScore field is set
*/
public boolean hasHasTakenInitialScore() {
@@ -273,11 +221,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * - * guess - *- * - *
optional bool has_taken_initial_score = 7;
+ * optional bool has_taken_initial_score = 11;
* @return this
*/
public RogueScoreRewardInfo clearHasTakenInitialScore() {
@@ -287,11 +231,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * - * guess - *- * - *
optional bool has_taken_initial_score = 7;
+ * optional bool has_taken_initial_score = 11;
* @return the hasTakenInitialScore
*/
public boolean getHasTakenInitialScore() {
@@ -299,11 +239,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * - * guess - *- * - *
optional bool has_taken_initial_score = 7;
+ * optional bool has_taken_initial_score = 11;
* @param value the hasTakenInitialScore to set
* @return this
*/
@@ -314,11 +250,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * - * guess - *- * - *
optional bool pool_refreshed = 14;
+ * optional bool pool_refreshed = 13;
* @return whether the poolRefreshed field is set
*/
public boolean hasPoolRefreshed() {
@@ -326,11 +258,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * - * guess - *- * - *
optional bool pool_refreshed = 14;
+ * optional bool pool_refreshed = 13;
* @return this
*/
public RogueScoreRewardInfo clearPoolRefreshed() {
@@ -340,11 +268,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * - * guess - *- * - *
optional bool pool_refreshed = 14;
+ * optional bool pool_refreshed = 13;
* @return the poolRefreshed
*/
public boolean getPoolRefreshed() {
@@ -352,11 +276,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * - * guess - *- * - *
optional bool pool_refreshed = 14;
+ * optional bool pool_refreshed = 13;
* @param value the poolRefreshed to set
* @return this
*/
@@ -367,7 +287,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * repeated uint32 has_taken_reward = 3;
+ * repeated uint32 has_taken_reward = 7;
* @return whether the hasTakenReward field is set
*/
public boolean hasHasTakenReward() {
@@ -375,7 +295,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * repeated uint32 has_taken_reward = 3;
+ * repeated uint32 has_taken_reward = 7;
* @return this
*/
public RogueScoreRewardInfo clearHasTakenReward() {
@@ -385,7 +305,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * repeated uint32 has_taken_reward = 3;
+ * repeated uint32 has_taken_reward = 7;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -399,7 +319,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * repeated uint32 has_taken_reward = 3;
+ * repeated uint32 has_taken_reward = 7;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -413,7 +333,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * repeated uint32 has_taken_reward = 3;
+ * repeated uint32 has_taken_reward = 7;
* @param value the hasTakenReward to add
* @return this
*/
@@ -424,7 +344,7 @@ public final class RogueScoreRewardInfoOuterClass {
}
/**
- * repeated uint32 has_taken_reward = 3;
+ * repeated uint32 has_taken_reward = 7;
* @param values the hasTakenReward to add
* @return this
*/
@@ -530,32 +450,32 @@ public final class RogueScoreRewardInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 72);
output.writeInt64NoTag(beginTime);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 120);
output.writeInt64NoTag(endTime);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(score);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(poolId);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 88);
output.writeBoolNoTag(hasTakenInitialScore);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 104);
output.writeBoolNoTag(poolRefreshed);
}
if ((bitField0_ & 0x00000040) != 0) {
for (int i = 0; i < hasTakenReward.length(); i++) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(hasTakenReward.array()[i]);
}
}
@@ -595,61 +515,61 @@ public final class RogueScoreRewardInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
+ case 72: {
// beginTime
beginTime = input.readInt64();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 40) {
+ if (tag != 120) {
break;
}
}
- case 40: {
+ case 120: {
// endTime
endTime = input.readInt64();
bitField0_ |= 0x00000002;
tag = input.readTag();
+ if (tag != 32) {
+ break;
+ }
+ }
+ case 32: {
+ // score
+ score = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
if (tag != 48) {
break;
}
}
case 48: {
- // score
- score = input.readUInt32();
- bitField0_ |= 0x00000004;
- tag = input.readTag();
- if (tag != 72) {
- break;
- }
- }
- case 72: {
// poolId
poolId = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 56) {
+ if (tag != 88) {
break;
}
}
- case 56: {
+ case 88: {
// hasTakenInitialScore
hasTakenInitialScore = input.readBool();
bitField0_ |= 0x00000010;
tag = input.readTag();
- if (tag != 112) {
+ if (tag != 104) {
break;
}
}
- case 112: {
+ case 104: {
// poolRefreshed
poolRefreshed = input.readBool();
bitField0_ |= 0x00000020;
tag = input.readTag();
- if (tag != 26) {
+ if (tag != 58) {
break;
}
}
- case 26: {
+ case 58: {
// hasTakenReward [packed=true]
input.readPackedUInt32(hasTakenReward, tag);
bitField0_ |= 0x00000040;
@@ -668,7 +588,7 @@ public final class RogueScoreRewardInfoOuterClass {
tag = input.readTag();
break;
}
- case 24: {
+ case 56: {
// hasTakenReward [packed=false]
tag = input.readRepeatedUInt32(hasTakenReward, tag);
bitField0_ |= 0x00000040;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueSeasonInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueSeasonInfoOuterClass.java
index a39a434..f2879a6 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueSeasonInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueSeasonInfoOuterClass.java
@@ -19,17 +19,17 @@ public final class RogueSeasonInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional int64 end_time = 3;
- */
- private long endTime;
-
- /**
- * optional int64 begin_time = 15;
+ * optional int64 begin_time = 4;
*/
private long beginTime;
/**
- * optional uint32 season_id = 5;
+ * optional int64 end_time = 14;
+ */
+ private long endTime;
+
+ /**
+ * optional uint32 season_id = 11;
*/
private int seasonId;
@@ -44,62 +44,25 @@ public final class RogueSeasonInfoOuterClass {
}
/**
- * optional int64 end_time = 3;
- * @return whether the endTime field is set
+ * optional int64 begin_time = 4;
+ * @return whether the beginTime field is set
*/
- public boolean hasEndTime() {
+ public boolean hasBeginTime() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional int64 end_time = 3;
- * @return this
- */
- public RogueSeasonInfo clearEndTime() {
- bitField0_ &= ~0x00000001;
- endTime = 0L;
- return this;
- }
-
- /**
- * optional int64 end_time = 3;
- * @return the endTime
- */
- public long getEndTime() {
- return endTime;
- }
-
- /**
- * optional int64 end_time = 3;
- * @param value the endTime to set
- * @return this
- */
- public RogueSeasonInfo setEndTime(final long value) {
- bitField0_ |= 0x00000001;
- endTime = value;
- return this;
- }
-
- /**
- * optional int64 begin_time = 15;
- * @return whether the beginTime field is set
- */
- public boolean hasBeginTime() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional int64 begin_time = 15;
+ * optional int64 begin_time = 4;
* @return this
*/
public RogueSeasonInfo clearBeginTime() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
beginTime = 0L;
return this;
}
/**
- * optional int64 begin_time = 15;
+ * optional int64 begin_time = 4;
* @return the beginTime
*/
public long getBeginTime() {
@@ -107,18 +70,55 @@ public final class RogueSeasonInfoOuterClass {
}
/**
- * optional int64 begin_time = 15;
+ * optional int64 begin_time = 4;
* @param value the beginTime to set
* @return this
*/
public RogueSeasonInfo setBeginTime(final long value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
beginTime = value;
return this;
}
/**
- * optional uint32 season_id = 5;
+ * optional int64 end_time = 14;
+ * @return whether the endTime field is set
+ */
+ public boolean hasEndTime() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional int64 end_time = 14;
+ * @return this
+ */
+ public RogueSeasonInfo clearEndTime() {
+ bitField0_ &= ~0x00000002;
+ endTime = 0L;
+ return this;
+ }
+
+ /**
+ * optional int64 end_time = 14;
+ * @return the endTime
+ */
+ public long getEndTime() {
+ return endTime;
+ }
+
+ /**
+ * optional int64 end_time = 14;
+ * @param value the endTime to set
+ * @return this
+ */
+ public RogueSeasonInfo setEndTime(final long value) {
+ bitField0_ |= 0x00000002;
+ endTime = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 season_id = 11;
* @return whether the seasonId field is set
*/
public boolean hasSeasonId() {
@@ -126,7 +126,7 @@ public final class RogueSeasonInfoOuterClass {
}
/**
- * optional uint32 season_id = 5;
+ * optional uint32 season_id = 11;
* @return this
*/
public RogueSeasonInfo clearSeasonId() {
@@ -136,7 +136,7 @@ public final class RogueSeasonInfoOuterClass {
}
/**
- * optional uint32 season_id = 5;
+ * optional uint32 season_id = 11;
* @return the seasonId
*/
public int getSeasonId() {
@@ -144,7 +144,7 @@ public final class RogueSeasonInfoOuterClass {
}
/**
- * optional uint32 season_id = 5;
+ * optional uint32 season_id = 11;
* @param value the seasonId to set
* @return this
*/
@@ -159,8 +159,8 @@ public final class RogueSeasonInfoOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- endTime = other.endTime;
beginTime = other.beginTime;
+ endTime = other.endTime;
seasonId = other.seasonId;
}
return this;
@@ -172,12 +172,12 @@ public final class RogueSeasonInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasEndTime()) {
- setEndTime(other.endTime);
- }
if (other.hasBeginTime()) {
setBeginTime(other.beginTime);
}
+ if (other.hasEndTime()) {
+ setEndTime(other.endTime);
+ }
if (other.hasSeasonId()) {
setSeasonId(other.seasonId);
}
@@ -191,8 +191,8 @@ public final class RogueSeasonInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- endTime = 0L;
beginTime = 0L;
+ endTime = 0L;
seasonId = 0;
return this;
}
@@ -217,23 +217,23 @@ public final class RogueSeasonInfoOuterClass {
}
RogueSeasonInfo other = (RogueSeasonInfo) o;
return bitField0_ == other.bitField0_
- && (!hasEndTime() || endTime == other.endTime)
&& (!hasBeginTime() || beginTime == other.beginTime)
+ && (!hasEndTime() || endTime == other.endTime)
&& (!hasSeasonId() || seasonId == other.seasonId);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
- output.writeInt64NoTag(endTime);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 32);
output.writeInt64NoTag(beginTime);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 112);
+ output.writeInt64NoTag(endTime);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(seasonId);
}
}
@@ -242,10 +242,10 @@ public final class RogueSeasonInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeInt64SizeNoTag(endTime);
+ size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime);
+ size += 1 + ProtoSink.computeInt64SizeNoTag(endTime);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(seasonId);
@@ -260,25 +260,25 @@ public final class RogueSeasonInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
- // endTime
- endTime = input.readInt64();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 120) {
- break;
- }
- }
- case 120: {
+ case 32: {
// beginTime
beginTime = input.readInt64();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 40) {
+ if (tag != 112) {
break;
}
}
- case 40: {
+ case 112: {
+ // endTime
+ endTime = input.readInt64();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 88) {
+ break;
+ }
+ }
+ case 88: {
// seasonId
seasonId = input.readUInt32();
bitField0_ |= 0x00000004;
@@ -305,10 +305,10 @@ public final class RogueSeasonInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeInt64(FieldNames.endTime, endTime);
+ output.writeInt64(FieldNames.beginTime, beginTime);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeInt64(FieldNames.beginTime, beginTime);
+ output.writeInt64(FieldNames.endTime, endTime);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.seasonId, seasonId);
@@ -323,11 +323,11 @@ public final class RogueSeasonInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1607243192:
- case 1725551537: {
- if (input.isAtField(FieldNames.endTime)) {
+ case -1072839914:
+ case 1112183971: {
+ if (input.isAtField(FieldNames.beginTime)) {
if (!input.trySkipNullValue()) {
- endTime = input.readInt64();
+ beginTime = input.readInt64();
bitField0_ |= 0x00000001;
}
} else {
@@ -335,11 +335,11 @@ public final class RogueSeasonInfoOuterClass {
}
break;
}
- case -1072839914:
- case 1112183971: {
- if (input.isAtField(FieldNames.beginTime)) {
+ case -1607243192:
+ case 1725551537: {
+ if (input.isAtField(FieldNames.endTime)) {
if (!input.trySkipNullValue()) {
- beginTime = input.readInt64();
+ endTime = input.readInt64();
bitField0_ |= 0x00000002;
}
} else {
@@ -412,10 +412,10 @@ public final class RogueSeasonInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName endTime = FieldName.forField("endTime", "end_time");
-
static final FieldName beginTime = FieldName.forField("beginTime", "begin_time");
+ static final FieldName endTime = FieldName.forField("endTime", "end_time");
+
static final FieldName seasonId = FieldName.forField("seasonId", "season_id");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/RogueSyncContextBoardEventOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueSyncContextBoardEventOuterClass.java
index c5745b6..1173b47 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueSyncContextBoardEventOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueSyncContextBoardEventOuterClass.java
@@ -24,7 +24,7 @@ public final class RogueSyncContextBoardEventOuterClass {
private int modifierEffectType;
/**
- * optional uint32 board_event_id = 13;
+ * optional uint32 board_event_id = 15;
*/
private int boardEventId;
@@ -76,7 +76,7 @@ public final class RogueSyncContextBoardEventOuterClass {
}
/**
- * optional uint32 board_event_id = 13;
+ * optional uint32 board_event_id = 15;
* @return whether the boardEventId field is set
*/
public boolean hasBoardEventId() {
@@ -84,7 +84,7 @@ public final class RogueSyncContextBoardEventOuterClass {
}
/**
- * optional uint32 board_event_id = 13;
+ * optional uint32 board_event_id = 15;
* @return this
*/
public RogueSyncContextBoardEvent clearBoardEventId() {
@@ -94,7 +94,7 @@ public final class RogueSyncContextBoardEventOuterClass {
}
/**
- * optional uint32 board_event_id = 13;
+ * optional uint32 board_event_id = 15;
* @return the boardEventId
*/
public int getBoardEventId() {
@@ -102,7 +102,7 @@ public final class RogueSyncContextBoardEventOuterClass {
}
/**
- * optional uint32 board_event_id = 13;
+ * optional uint32 board_event_id = 15;
* @param value the boardEventId to set
* @return this
*/
@@ -181,7 +181,7 @@ public final class RogueSyncContextBoardEventOuterClass {
output.writeUInt32NoTag(modifierEffectType);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(boardEventId);
}
}
@@ -210,11 +210,11 @@ public final class RogueSyncContextBoardEventOuterClass {
modifierEffectType = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 120) {
break;
}
}
- case 104: {
+ case 120: {
// boardEventId
boardEventId = input.readUInt32();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueTalentInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueTalentInfoOuterClass.java
index d09150a..ede8372 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueTalentInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueTalentInfoOuterClass.java
@@ -20,7 +20,7 @@ public final class RogueTalentInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated .RogueTalent rogue_talent = 4;
+ * repeated .RogueTalent rogue_talent = 15;
*/
private final RepeatedMessagerepeated .RogueTalent rogue_talent = 4;
+ * repeated .RogueTalent rogue_talent = 15;
* @return whether the rogueTalent field is set
*/
public boolean hasRogueTalent() {
@@ -43,7 +43,7 @@ public final class RogueTalentInfoOuterClass {
}
/**
- * repeated .RogueTalent rogue_talent = 4;
+ * repeated .RogueTalent rogue_talent = 15;
* @return this
*/
public RogueTalentInfo clearRogueTalent() {
@@ -53,7 +53,7 @@ public final class RogueTalentInfoOuterClass {
}
/**
- * repeated .RogueTalent rogue_talent = 4;
+ * repeated .RogueTalent rogue_talent = 15;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class RogueTalentInfoOuterClass {
}
/**
- * repeated .RogueTalent rogue_talent = 4;
+ * repeated .RogueTalent rogue_talent = 15;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class RogueTalentInfoOuterClass {
}
/**
- * repeated .RogueTalent rogue_talent = 4;
+ * repeated .RogueTalent rogue_talent = 15;
* @param value the rogueTalent to add
* @return this
*/
@@ -92,7 +92,7 @@ public final class RogueTalentInfoOuterClass {
}
/**
- * repeated .RogueTalent rogue_talent = 4;
+ * repeated .RogueTalent rogue_talent = 15;
* @param values the rogueTalent to add
* @return this
*/
@@ -163,7 +163,7 @@ public final class RogueTalentInfoOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < rogueTalent.length(); i++) {
- output.writeRawByte((byte) 34);
+ output.writeRawByte((byte) 122);
output.writeMessageNoTag(rogueTalent.get(i));
}
}
@@ -185,7 +185,7 @@ public final class RogueTalentInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 34: {
+ case 122: {
// rogueTalent
tag = input.readRepeatedMessage(rogueTalent, tag);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueTalentOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueTalentOuterClass.java
index 4299455..894da47 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueTalentOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueTalentOuterClass.java
@@ -20,17 +20,17 @@ public final class RogueTalentOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 talent_id = 13;
+ * optional uint32 talent_id = 12;
*/
private int talentId;
/**
- * optional .RogueTalentStatus status = 12;
+ * optional .RogueTalentStatus status = 15;
*/
private int status;
/**
- * repeated .RogueUnlockProgress unlock_progress_list = 3;
+ * repeated .RogueUnlockProgress unlock_progress_list = 13;
*/
private final RepeatedMessageoptional uint32 talent_id = 13;
+ * optional uint32 talent_id = 12;
* @return whether the talentId field is set
*/
public boolean hasTalentId() {
@@ -53,7 +53,7 @@ public final class RogueTalentOuterClass {
}
/**
- * optional uint32 talent_id = 13;
+ * optional uint32 talent_id = 12;
* @return this
*/
public RogueTalent clearTalentId() {
@@ -63,7 +63,7 @@ public final class RogueTalentOuterClass {
}
/**
- * optional uint32 talent_id = 13;
+ * optional uint32 talent_id = 12;
* @return the talentId
*/
public int getTalentId() {
@@ -71,7 +71,7 @@ public final class RogueTalentOuterClass {
}
/**
- * optional uint32 talent_id = 13;
+ * optional uint32 talent_id = 12;
* @param value the talentId to set
* @return this
*/
@@ -82,7 +82,7 @@ public final class RogueTalentOuterClass {
}
/**
- * optional .RogueTalentStatus status = 12;
+ * optional .RogueTalentStatus status = 15;
* @return whether the status field is set
*/
public boolean hasStatus() {
@@ -90,7 +90,7 @@ public final class RogueTalentOuterClass {
}
/**
- * optional .RogueTalentStatus status = 12;
+ * optional .RogueTalentStatus status = 15;
* @return this
*/
public RogueTalent clearStatus() {
@@ -100,7 +100,7 @@ public final class RogueTalentOuterClass {
}
/**
- * optional .RogueTalentStatus status = 12;
+ * optional .RogueTalentStatus status = 15;
* @return the status
*/
public RogueTalentStatusOuterClass.RogueTalentStatus getStatus() {
@@ -133,7 +133,7 @@ public final class RogueTalentOuterClass {
}
/**
- * optional .RogueTalentStatus status = 12;
+ * optional .RogueTalentStatus status = 15;
* @param value the status to set
* @return this
*/
@@ -144,7 +144,7 @@ public final class RogueTalentOuterClass {
}
/**
- * repeated .RogueUnlockProgress unlock_progress_list = 3;
+ * repeated .RogueUnlockProgress unlock_progress_list = 13;
* @return whether the unlockProgressList field is set
*/
public boolean hasUnlockProgressList() {
@@ -152,7 +152,7 @@ public final class RogueTalentOuterClass {
}
/**
- * repeated .RogueUnlockProgress unlock_progress_list = 3;
+ * repeated .RogueUnlockProgress unlock_progress_list = 13;
* @return this
*/
public RogueTalent clearUnlockProgressList() {
@@ -162,7 +162,7 @@ public final class RogueTalentOuterClass {
}
/**
- * repeated .RogueUnlockProgress unlock_progress_list = 3;
+ * repeated .RogueUnlockProgress unlock_progress_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.
@@ -177,7 +177,7 @@ public final class RogueTalentOuterClass {
}
/**
- * repeated .RogueUnlockProgress unlock_progress_list = 3;
+ * repeated .RogueUnlockProgress unlock_progress_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
@@ -192,7 +192,7 @@ public final class RogueTalentOuterClass {
}
/**
- * repeated .RogueUnlockProgress unlock_progress_list = 3;
+ * repeated .RogueUnlockProgress unlock_progress_list = 13;
* @param value the unlockProgressList to add
* @return this
*/
@@ -204,7 +204,7 @@ public final class RogueTalentOuterClass {
}
/**
- * repeated .RogueUnlockProgress unlock_progress_list = 3;
+ * repeated .RogueUnlockProgress unlock_progress_list = 13;
* @param values the unlockProgressList to add
* @return this
*/
@@ -287,16 +287,16 @@ public final class RogueTalentOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(talentId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 120);
output.writeEnumNoTag(status);
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < unlockProgressList.length(); i++) {
- output.writeRawByte((byte) 26);
+ output.writeRawByte((byte) 106);
output.writeMessageNoTag(unlockProgressList.get(i));
}
}
@@ -324,16 +324,16 @@ public final class RogueTalentOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 104: {
+ case 96: {
// talentId
talentId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 120) {
break;
}
}
- case 96: {
+ case 120: {
// status
final int value = input.readInt32();
if (RogueTalentStatusOuterClass.RogueTalentStatus.forNumber(value) != null) {
@@ -341,11 +341,11 @@ public final class RogueTalentOuterClass {
bitField0_ |= 0x00000002;
}
tag = input.readTag();
- if (tag != 26) {
+ if (tag != 106) {
break;
}
}
- case 26: {
+ case 106: {
// unlockProgressList
tag = input.readRepeatedMessage(unlockProgressList, tag);
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueUnlockProgressOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueUnlockProgressOuterClass.java
index 1a00649..8227e1d 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueUnlockProgressOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueUnlockProgressOuterClass.java
@@ -19,17 +19,17 @@ public final class RogueUnlockProgressOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 unlock_id = 12;
- */
- private int unlockId;
-
- /**
- * optional uint32 progress = 15;
+ * optional uint32 progress = 9;
*/
private int progress;
/**
- * optional bool finish = 11;
+ * optional uint32 unlock_id = 13;
+ */
+ private int unlockId;
+
+ /**
+ * optional bool finish = 15;
*/
private boolean finish;
@@ -44,62 +44,25 @@ public final class RogueUnlockProgressOuterClass {
}
/**
- * optional uint32 unlock_id = 12;
- * @return whether the unlockId field is set
+ * optional uint32 progress = 9;
+ * @return whether the progress field is set
*/
- public boolean hasUnlockId() {
+ public boolean hasProgress() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 unlock_id = 12;
- * @return this
- */
- public RogueUnlockProgress clearUnlockId() {
- bitField0_ &= ~0x00000001;
- unlockId = 0;
- return this;
- }
-
- /**
- * optional uint32 unlock_id = 12;
- * @return the unlockId
- */
- public int getUnlockId() {
- return unlockId;
- }
-
- /**
- * optional uint32 unlock_id = 12;
- * @param value the unlockId to set
- * @return this
- */
- public RogueUnlockProgress setUnlockId(final int value) {
- bitField0_ |= 0x00000001;
- unlockId = value;
- return this;
- }
-
- /**
- * optional uint32 progress = 15;
- * @return whether the progress field is set
- */
- public boolean hasProgress() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 progress = 15;
+ * optional uint32 progress = 9;
* @return this
*/
public RogueUnlockProgress clearProgress() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
progress = 0;
return this;
}
/**
- * optional uint32 progress = 15;
+ * optional uint32 progress = 9;
* @return the progress
*/
public int getProgress() {
@@ -107,18 +70,55 @@ public final class RogueUnlockProgressOuterClass {
}
/**
- * optional uint32 progress = 15;
+ * optional uint32 progress = 9;
* @param value the progress to set
* @return this
*/
public RogueUnlockProgress setProgress(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
progress = value;
return this;
}
/**
- * optional bool finish = 11;
+ * optional uint32 unlock_id = 13;
+ * @return whether the unlockId field is set
+ */
+ public boolean hasUnlockId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 unlock_id = 13;
+ * @return this
+ */
+ public RogueUnlockProgress clearUnlockId() {
+ bitField0_ &= ~0x00000002;
+ unlockId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 unlock_id = 13;
+ * @return the unlockId
+ */
+ public int getUnlockId() {
+ return unlockId;
+ }
+
+ /**
+ * optional uint32 unlock_id = 13;
+ * @param value the unlockId to set
+ * @return this
+ */
+ public RogueUnlockProgress setUnlockId(final int value) {
+ bitField0_ |= 0x00000002;
+ unlockId = value;
+ return this;
+ }
+
+ /**
+ * optional bool finish = 15;
* @return whether the finish field is set
*/
public boolean hasFinish() {
@@ -126,7 +126,7 @@ public final class RogueUnlockProgressOuterClass {
}
/**
- * optional bool finish = 11;
+ * optional bool finish = 15;
* @return this
*/
public RogueUnlockProgress clearFinish() {
@@ -136,7 +136,7 @@ public final class RogueUnlockProgressOuterClass {
}
/**
- * optional bool finish = 11;
+ * optional bool finish = 15;
* @return the finish
*/
public boolean getFinish() {
@@ -144,7 +144,7 @@ public final class RogueUnlockProgressOuterClass {
}
/**
- * optional bool finish = 11;
+ * optional bool finish = 15;
* @param value the finish to set
* @return this
*/
@@ -159,8 +159,8 @@ public final class RogueUnlockProgressOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- unlockId = other.unlockId;
progress = other.progress;
+ unlockId = other.unlockId;
finish = other.finish;
}
return this;
@@ -172,12 +172,12 @@ public final class RogueUnlockProgressOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasUnlockId()) {
- setUnlockId(other.unlockId);
- }
if (other.hasProgress()) {
setProgress(other.progress);
}
+ if (other.hasUnlockId()) {
+ setUnlockId(other.unlockId);
+ }
if (other.hasFinish()) {
setFinish(other.finish);
}
@@ -191,8 +191,8 @@ public final class RogueUnlockProgressOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- unlockId = 0;
progress = 0;
+ unlockId = 0;
finish = false;
return this;
}
@@ -217,23 +217,23 @@ public final class RogueUnlockProgressOuterClass {
}
RogueUnlockProgress other = (RogueUnlockProgress) o;
return bitField0_ == other.bitField0_
- && (!hasUnlockId() || unlockId == other.unlockId)
&& (!hasProgress() || progress == other.progress)
+ && (!hasUnlockId() || unlockId == other.unlockId)
&& (!hasFinish() || finish == other.finish);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 96);
- output.writeUInt32NoTag(unlockId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 72);
output.writeUInt32NoTag(progress);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(unlockId);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 120);
output.writeBoolNoTag(finish);
}
}
@@ -242,10 +242,10 @@ public final class RogueUnlockProgressOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(progress);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(progress);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockId);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 2;
@@ -260,25 +260,25 @@ public final class RogueUnlockProgressOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 96: {
+ case 72: {
+ // progress
+ progress = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 104) {
+ break;
+ }
+ }
+ case 104: {
// unlockId
unlockId = input.readUInt32();
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 120) {
break;
}
}
case 120: {
- // progress
- progress = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 88) {
- break;
- }
- }
- case 88: {
// finish
finish = input.readBool();
bitField0_ |= 0x00000004;
@@ -305,10 +305,10 @@ public final class RogueUnlockProgressOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.unlockId, unlockId);
+ output.writeUInt32(FieldNames.progress, progress);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.progress, progress);
+ output.writeUInt32(FieldNames.unlockId, unlockId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeBool(FieldNames.finish, finish);
@@ -323,11 +323,10 @@ public final class RogueUnlockProgressOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -210950273:
- case 2050497526: {
- if (input.isAtField(FieldNames.unlockId)) {
+ case -1001078227: {
+ if (input.isAtField(FieldNames.progress)) {
if (!input.trySkipNullValue()) {
- unlockId = input.readUInt32();
+ progress = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -335,10 +334,11 @@ public final class RogueUnlockProgressOuterClass {
}
break;
}
- case -1001078227: {
- if (input.isAtField(FieldNames.progress)) {
+ case -210950273:
+ case 2050497526: {
+ if (input.isAtField(FieldNames.unlockId)) {
if (!input.trySkipNullValue()) {
- progress = input.readUInt32();
+ unlockId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -410,10 +410,10 @@ public final class RogueUnlockProgressOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName unlockId = FieldName.forField("unlockId", "unlock_id");
-
static final FieldName progress = FieldName.forField("progress");
+ static final FieldName unlockId = FieldName.forField("unlockId", "unlock_id");
+
static final FieldName finish = FieldName.forField("finish");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/RogueVirtualItemDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueVirtualItemDataOuterClass.java
index 78e5477..fa64824 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueVirtualItemDataOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueVirtualItemDataOuterClass.java
@@ -13,18 +13,22 @@ import us.hebi.quickbuf.ProtoSource;
public final class RogueVirtualItemDataOuterClass {
/**
+ * + * pure guess + *+ * * Protobuf type {@code RogueVirtualItemData} */ public static final class RogueVirtualItemData extends ProtoMessage
optional uint32 num = 5;
+ * optional uint32 num = 13;
*/
private int num;
/**
- * optional uint32 MDBPDPDDHBC = 6;
+ * optional uint32 MDBPDPDDHBC = 14;
*/
private int mDBPDPDDHBC;
@@ -32,6 +36,10 @@ public final class RogueVirtualItemDataOuterClass {
}
/**
+ * + * pure guess + *+ * * @return a new empty instance of {@code RogueVirtualItemData} */ public static RogueVirtualItemData newInstance() { @@ -39,7 +47,7 @@ public final class RogueVirtualItemDataOuterClass { } /** - *
optional uint32 num = 5;
+ * optional uint32 num = 13;
* @return whether the num field is set
*/
public boolean hasNum() {
@@ -47,7 +55,7 @@ public final class RogueVirtualItemDataOuterClass {
}
/**
- * optional uint32 num = 5;
+ * optional uint32 num = 13;
* @return this
*/
public RogueVirtualItemData clearNum() {
@@ -57,7 +65,7 @@ public final class RogueVirtualItemDataOuterClass {
}
/**
- * optional uint32 num = 5;
+ * optional uint32 num = 13;
* @return the num
*/
public int getNum() {
@@ -65,7 +73,7 @@ public final class RogueVirtualItemDataOuterClass {
}
/**
- * optional uint32 num = 5;
+ * optional uint32 num = 13;
* @param value the num to set
* @return this
*/
@@ -76,7 +84,7 @@ public final class RogueVirtualItemDataOuterClass {
}
/**
- * optional uint32 MDBPDPDDHBC = 6;
+ * optional uint32 MDBPDPDDHBC = 14;
* @return whether the mDBPDPDDHBC field is set
*/
public boolean hasMDBPDPDDHBC() {
@@ -84,7 +92,7 @@ public final class RogueVirtualItemDataOuterClass {
}
/**
- * optional uint32 MDBPDPDDHBC = 6;
+ * optional uint32 MDBPDPDDHBC = 14;
* @return this
*/
public RogueVirtualItemData clearMDBPDPDDHBC() {
@@ -94,7 +102,7 @@ public final class RogueVirtualItemDataOuterClass {
}
/**
- * optional uint32 MDBPDPDDHBC = 6;
+ * optional uint32 MDBPDPDDHBC = 14;
* @return the mDBPDPDDHBC
*/
public int getMDBPDPDDHBC() {
@@ -102,7 +110,7 @@ public final class RogueVirtualItemDataOuterClass {
}
/**
- * optional uint32 MDBPDPDDHBC = 6;
+ * optional uint32 MDBPDPDDHBC = 14;
* @param value the mDBPDPDDHBC to set
* @return this
*/
@@ -177,11 +185,11 @@ public final class RogueVirtualItemDataOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 104);
output.writeUInt32NoTag(num);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 112);
output.writeUInt32NoTag(mDBPDPDDHBC);
}
}
@@ -205,16 +213,16 @@ public final class RogueVirtualItemDataOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
+ case 104: {
// num
num = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 48) {
+ if (tag != 112) {
break;
}
}
- case 48: {
+ case 112: {
// mDBPDPDDHBC
mDBPDPDDHBC = input.readUInt32();
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueVirtualItemInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueVirtualItemInfoOuterClass.java
index c955d76..7054d50 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueVirtualItemInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueVirtualItemInfoOuterClass.java
@@ -19,26 +19,22 @@ public final class RogueVirtualItemInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 JLGAKDGCBOH = 1;
+ * optional uint32 JLGAKDGCBOH = 4;
*/
private int jLGAKDGCBOH;
/**
- * optional uint32 FGHILCKHDDO = 4;
+ * optional uint32 FGHILCKHDDO = 5;
*/
private int fGHILCKHDDO;
/**
- * optional uint32 LGFMKJAOICA = 8;
+ * optional uint32 LGFMKJAOICA = 11;
*/
private int lGFMKJAOICA;
/**
- * - * IACPIFFPEFP - *- * - *
optional uint32 rogue_coin = 15;
+ * optional uint32 rogue_coin = 14;
*/
private int rogueCoin;
@@ -53,7 +49,7 @@ public final class RogueVirtualItemInfoOuterClass {
}
/**
- * optional uint32 JLGAKDGCBOH = 1;
+ * optional uint32 JLGAKDGCBOH = 4;
* @return whether the jLGAKDGCBOH field is set
*/
public boolean hasJLGAKDGCBOH() {
@@ -61,7 +57,7 @@ public final class RogueVirtualItemInfoOuterClass {
}
/**
- * optional uint32 JLGAKDGCBOH = 1;
+ * optional uint32 JLGAKDGCBOH = 4;
* @return this
*/
public RogueVirtualItemInfo clearJLGAKDGCBOH() {
@@ -71,7 +67,7 @@ public final class RogueVirtualItemInfoOuterClass {
}
/**
- * optional uint32 JLGAKDGCBOH = 1;
+ * optional uint32 JLGAKDGCBOH = 4;
* @return the jLGAKDGCBOH
*/
public int getJLGAKDGCBOH() {
@@ -79,7 +75,7 @@ public final class RogueVirtualItemInfoOuterClass {
}
/**
- * optional uint32 JLGAKDGCBOH = 1;
+ * optional uint32 JLGAKDGCBOH = 4;
* @param value the jLGAKDGCBOH to set
* @return this
*/
@@ -90,7 +86,7 @@ public final class RogueVirtualItemInfoOuterClass {
}
/**
- * optional uint32 FGHILCKHDDO = 4;
+ * optional uint32 FGHILCKHDDO = 5;
* @return whether the fGHILCKHDDO field is set
*/
public boolean hasFGHILCKHDDO() {
@@ -98,7 +94,7 @@ public final class RogueVirtualItemInfoOuterClass {
}
/**
- * optional uint32 FGHILCKHDDO = 4;
+ * optional uint32 FGHILCKHDDO = 5;
* @return this
*/
public RogueVirtualItemInfo clearFGHILCKHDDO() {
@@ -108,7 +104,7 @@ public final class RogueVirtualItemInfoOuterClass {
}
/**
- * optional uint32 FGHILCKHDDO = 4;
+ * optional uint32 FGHILCKHDDO = 5;
* @return the fGHILCKHDDO
*/
public int getFGHILCKHDDO() {
@@ -116,7 +112,7 @@ public final class RogueVirtualItemInfoOuterClass {
}
/**
- * optional uint32 FGHILCKHDDO = 4;
+ * optional uint32 FGHILCKHDDO = 5;
* @param value the fGHILCKHDDO to set
* @return this
*/
@@ -127,7 +123,7 @@ public final class RogueVirtualItemInfoOuterClass {
}
/**
- * optional uint32 LGFMKJAOICA = 8;
+ * optional uint32 LGFMKJAOICA = 11;
* @return whether the lGFMKJAOICA field is set
*/
public boolean hasLGFMKJAOICA() {
@@ -135,7 +131,7 @@ public final class RogueVirtualItemInfoOuterClass {
}
/**
- * optional uint32 LGFMKJAOICA = 8;
+ * optional uint32 LGFMKJAOICA = 11;
* @return this
*/
public RogueVirtualItemInfo clearLGFMKJAOICA() {
@@ -145,7 +141,7 @@ public final class RogueVirtualItemInfoOuterClass {
}
/**
- * optional uint32 LGFMKJAOICA = 8;
+ * optional uint32 LGFMKJAOICA = 11;
* @return the lGFMKJAOICA
*/
public int getLGFMKJAOICA() {
@@ -153,7 +149,7 @@ public final class RogueVirtualItemInfoOuterClass {
}
/**
- * optional uint32 LGFMKJAOICA = 8;
+ * optional uint32 LGFMKJAOICA = 11;
* @param value the lGFMKJAOICA to set
* @return this
*/
@@ -164,11 +160,7 @@ public final class RogueVirtualItemInfoOuterClass {
}
/**
- * - * IACPIFFPEFP - *- * - *
optional uint32 rogue_coin = 15;
+ * optional uint32 rogue_coin = 14;
* @return whether the rogueCoin field is set
*/
public boolean hasRogueCoin() {
@@ -176,11 +168,7 @@ public final class RogueVirtualItemInfoOuterClass {
}
/**
- * - * IACPIFFPEFP - *- * - *
optional uint32 rogue_coin = 15;
+ * optional uint32 rogue_coin = 14;
* @return this
*/
public RogueVirtualItemInfo clearRogueCoin() {
@@ -190,11 +178,7 @@ public final class RogueVirtualItemInfoOuterClass {
}
/**
- * - * IACPIFFPEFP - *- * - *
optional uint32 rogue_coin = 15;
+ * optional uint32 rogue_coin = 14;
* @return the rogueCoin
*/
public int getRogueCoin() {
@@ -202,11 +186,7 @@ public final class RogueVirtualItemInfoOuterClass {
}
/**
- * - * IACPIFFPEFP - *- * - *
optional uint32 rogue_coin = 15;
+ * optional uint32 rogue_coin = 14;
* @param value the rogueCoin to set
* @return this
*/
@@ -293,19 +273,19 @@ public final class RogueVirtualItemInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(jLGAKDGCBOH);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(fGHILCKHDDO);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(lGFMKJAOICA);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 120);
+ output.writeRawByte((byte) 112);
output.writeUInt32NoTag(rogueCoin);
}
}
@@ -335,34 +315,34 @@ public final class RogueVirtualItemInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 32: {
// jLGAKDGCBOH
jLGAKDGCBOH = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 32) {
+ if (tag != 40) {
break;
}
}
- case 32: {
+ case 40: {
// fGHILCKHDDO
fGHILCKHDDO = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 64) {
+ if (tag != 88) {
break;
}
}
- case 64: {
+ case 88: {
// lGFMKJAOICA
lGFMKJAOICA = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 120) {
+ if (tag != 112) {
break;
}
}
- case 120: {
+ case 112: {
// rogueCoin
rogueCoin = input.readUInt32();
bitField0_ |= 0x00000008;
diff --git a/src/generated/main/emu/lunarcore/proto/RogueVirtualItemOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueVirtualItemOuterClass.java
deleted file mode 100644
index 0ed9c62..0000000
--- a/src/generated/main/emu/lunarcore/proto/RogueVirtualItemOuterClass.java
+++ /dev/null
@@ -1,499 +0,0 @@
-// Code generated by protocol buffer compiler. Do not edit!
-package emu.lunarcore.proto;
-
-import java.io.IOException;
-import us.hebi.quickbuf.FieldName;
-import us.hebi.quickbuf.InvalidProtocolBufferException;
-import us.hebi.quickbuf.JsonSink;
-import us.hebi.quickbuf.JsonSource;
-import us.hebi.quickbuf.MessageFactory;
-import us.hebi.quickbuf.ProtoMessage;
-import us.hebi.quickbuf.ProtoSink;
-import us.hebi.quickbuf.ProtoSource;
-
-public final class RogueVirtualItemOuterClass {
- /**
- * Protobuf type {@code RogueVirtualItem}
- */
- public static final class RogueVirtualItem extends ProtoMessageoptional uint32 JLGAKDGCBOH = 1;
- */
- private int jLGAKDGCBOH;
-
- /**
- * optional uint32 FGHILCKHDDO = 4;
- */
- private int fGHILCKHDDO;
-
- /**
- * optional uint32 LGFMKJAOICA = 8;
- */
- private int lGFMKJAOICA;
-
- /**
- * optional uint32 money = 15;
- */
- private int money;
-
- private RogueVirtualItem() {
- }
-
- /**
- * @return a new empty instance of {@code RogueVirtualItem}
- */
- public static RogueVirtualItem newInstance() {
- return new RogueVirtualItem();
- }
-
- /**
- * optional uint32 JLGAKDGCBOH = 1;
- * @return whether the jLGAKDGCBOH field is set
- */
- public boolean hasJLGAKDGCBOH() {
- return (bitField0_ & 0x00000001) != 0;
- }
-
- /**
- * optional uint32 JLGAKDGCBOH = 1;
- * @return this
- */
- public RogueVirtualItem clearJLGAKDGCBOH() {
- bitField0_ &= ~0x00000001;
- jLGAKDGCBOH = 0;
- return this;
- }
-
- /**
- * optional uint32 JLGAKDGCBOH = 1;
- * @return the jLGAKDGCBOH
- */
- public int getJLGAKDGCBOH() {
- return jLGAKDGCBOH;
- }
-
- /**
- * optional uint32 JLGAKDGCBOH = 1;
- * @param value the jLGAKDGCBOH to set
- * @return this
- */
- public RogueVirtualItem setJLGAKDGCBOH(final int value) {
- bitField0_ |= 0x00000001;
- jLGAKDGCBOH = value;
- return this;
- }
-
- /**
- * optional uint32 FGHILCKHDDO = 4;
- * @return whether the fGHILCKHDDO field is set
- */
- public boolean hasFGHILCKHDDO() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 FGHILCKHDDO = 4;
- * @return this
- */
- public RogueVirtualItem clearFGHILCKHDDO() {
- bitField0_ &= ~0x00000002;
- fGHILCKHDDO = 0;
- return this;
- }
-
- /**
- * optional uint32 FGHILCKHDDO = 4;
- * @return the fGHILCKHDDO
- */
- public int getFGHILCKHDDO() {
- return fGHILCKHDDO;
- }
-
- /**
- * optional uint32 FGHILCKHDDO = 4;
- * @param value the fGHILCKHDDO to set
- * @return this
- */
- public RogueVirtualItem setFGHILCKHDDO(final int value) {
- bitField0_ |= 0x00000002;
- fGHILCKHDDO = value;
- return this;
- }
-
- /**
- * optional uint32 LGFMKJAOICA = 8;
- * @return whether the lGFMKJAOICA field is set
- */
- public boolean hasLGFMKJAOICA() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 LGFMKJAOICA = 8;
- * @return this
- */
- public RogueVirtualItem clearLGFMKJAOICA() {
- bitField0_ &= ~0x00000004;
- lGFMKJAOICA = 0;
- return this;
- }
-
- /**
- * optional uint32 LGFMKJAOICA = 8;
- * @return the lGFMKJAOICA
- */
- public int getLGFMKJAOICA() {
- return lGFMKJAOICA;
- }
-
- /**
- * optional uint32 LGFMKJAOICA = 8;
- * @param value the lGFMKJAOICA to set
- * @return this
- */
- public RogueVirtualItem setLGFMKJAOICA(final int value) {
- bitField0_ |= 0x00000004;
- lGFMKJAOICA = value;
- return this;
- }
-
- /**
- * optional uint32 money = 15;
- * @return whether the money field is set
- */
- public boolean hasMoney() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional uint32 money = 15;
- * @return this
- */
- public RogueVirtualItem clearMoney() {
- bitField0_ &= ~0x00000008;
- money = 0;
- return this;
- }
-
- /**
- * optional uint32 money = 15;
- * @return the money
- */
- public int getMoney() {
- return money;
- }
-
- /**
- * optional uint32 money = 15;
- * @param value the money to set
- * @return this
- */
- public RogueVirtualItem setMoney(final int value) {
- bitField0_ |= 0x00000008;
- money = value;
- return this;
- }
-
- @Override
- public RogueVirtualItem copyFrom(final RogueVirtualItem other) {
- cachedSize = other.cachedSize;
- if ((bitField0_ | other.bitField0_) != 0) {
- bitField0_ = other.bitField0_;
- jLGAKDGCBOH = other.jLGAKDGCBOH;
- fGHILCKHDDO = other.fGHILCKHDDO;
- lGFMKJAOICA = other.lGFMKJAOICA;
- money = other.money;
- }
- return this;
- }
-
- @Override
- public RogueVirtualItem mergeFrom(final RogueVirtualItem other) {
- if (other.isEmpty()) {
- return this;
- }
- cachedSize = -1;
- if (other.hasJLGAKDGCBOH()) {
- setJLGAKDGCBOH(other.jLGAKDGCBOH);
- }
- if (other.hasFGHILCKHDDO()) {
- setFGHILCKHDDO(other.fGHILCKHDDO);
- }
- if (other.hasLGFMKJAOICA()) {
- setLGFMKJAOICA(other.lGFMKJAOICA);
- }
- if (other.hasMoney()) {
- setMoney(other.money);
- }
- return this;
- }
-
- @Override
- public RogueVirtualItem clear() {
- if (isEmpty()) {
- return this;
- }
- cachedSize = -1;
- bitField0_ = 0;
- jLGAKDGCBOH = 0;
- fGHILCKHDDO = 0;
- lGFMKJAOICA = 0;
- money = 0;
- return this;
- }
-
- @Override
- public RogueVirtualItem 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 RogueVirtualItem)) {
- return false;
- }
- RogueVirtualItem other = (RogueVirtualItem) o;
- return bitField0_ == other.bitField0_
- && (!hasJLGAKDGCBOH() || jLGAKDGCBOH == other.jLGAKDGCBOH)
- && (!hasFGHILCKHDDO() || fGHILCKHDDO == other.fGHILCKHDDO)
- && (!hasLGFMKJAOICA() || lGFMKJAOICA == other.lGFMKJAOICA)
- && (!hasMoney() || money == other.money);
- }
-
- @Override
- public void writeTo(final ProtoSink output) throws IOException {
- if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(jLGAKDGCBOH);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(fGHILCKHDDO);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 64);
- output.writeUInt32NoTag(lGFMKJAOICA);
- }
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 120);
- output.writeUInt32NoTag(money);
- }
- }
-
- @Override
- protected int computeSerializedSize() {
- int size = 0;
- if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(jLGAKDGCBOH);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(fGHILCKHDDO);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(lGFMKJAOICA);
- }
- if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(money);
- }
- return size;
- }
-
- @Override
- @SuppressWarnings("fallthrough")
- public RogueVirtualItem mergeFrom(final ProtoSource input) throws IOException {
- // Enabled Fall-Through Optimization (QuickBuffers)
- int tag = input.readTag();
- while (true) {
- switch (tag) {
- case 8: {
- // jLGAKDGCBOH
- jLGAKDGCBOH = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 32) {
- break;
- }
- }
- case 32: {
- // fGHILCKHDDO
- fGHILCKHDDO = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 64) {
- break;
- }
- }
- case 64: {
- // lGFMKJAOICA
- lGFMKJAOICA = input.readUInt32();
- bitField0_ |= 0x00000004;
- tag = input.readTag();
- if (tag != 120) {
- break;
- }
- }
- case 120: {
- // money
- money = input.readUInt32();
- bitField0_ |= 0x00000008;
- tag = input.readTag();
- if (tag != 0) {
- break;
- }
- }
- case 0: {
- return this;
- }
- default: {
- if (!input.skipField(tag)) {
- return this;
- }
- tag = input.readTag();
- break;
- }
- }
- }
- }
-
- @Override
- public void writeTo(final JsonSink output) throws IOException {
- output.beginObject();
- if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.jLGAKDGCBOH, jLGAKDGCBOH);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.fGHILCKHDDO, fGHILCKHDDO);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.lGFMKJAOICA, lGFMKJAOICA);
- }
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.money, money);
- }
- output.endObject();
- }
-
- @Override
- public RogueVirtualItem mergeFrom(final JsonSource input) throws IOException {
- if (!input.beginObject()) {
- return this;
- }
- while (!input.isAtEnd()) {
- switch (input.readFieldHash()) {
- case 110448746: {
- if (input.isAtField(FieldNames.jLGAKDGCBOH)) {
- if (!input.trySkipNullValue()) {
- jLGAKDGCBOH = input.readUInt32();
- bitField0_ |= 0x00000001;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case -196267399: {
- if (input.isAtField(FieldNames.fGHILCKHDDO)) {
- if (!input.trySkipNullValue()) {
- fGHILCKHDDO = input.readUInt32();
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case -1087946824: {
- if (input.isAtField(FieldNames.lGFMKJAOICA)) {
- if (!input.trySkipNullValue()) {
- lGFMKJAOICA = input.readUInt32();
- bitField0_ |= 0x00000004;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 104079552: {
- if (input.isAtField(FieldNames.money)) {
- if (!input.trySkipNullValue()) {
- money = input.readUInt32();
- bitField0_ |= 0x00000008;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- default: {
- input.skipUnknownField();
- break;
- }
- }
- }
- input.endObject();
- return this;
- }
-
- @Override
- public RogueVirtualItem clone() {
- return new RogueVirtualItem().copyFrom(this);
- }
-
- @Override
- public boolean isEmpty() {
- return ((bitField0_) == 0);
- }
-
- public static RogueVirtualItem parseFrom(final byte[] data) throws
- InvalidProtocolBufferException {
- return ProtoMessage.mergeFrom(new RogueVirtualItem(), data).checkInitialized();
- }
-
- public static RogueVirtualItem parseFrom(final ProtoSource input) throws IOException {
- return ProtoMessage.mergeFrom(new RogueVirtualItem(), input).checkInitialized();
- }
-
- public static RogueVirtualItem parseFrom(final JsonSource input) throws IOException {
- return ProtoMessage.mergeFrom(new RogueVirtualItem(), input).checkInitialized();
- }
-
- /**
- * @return factory for creating RogueVirtualItem messages
- */
- public static MessageFactoryoptional uint32 group_id = 4;
+ * optional uint32 group_id = 5;
*/
private int groupId;
/**
- * optional uint32 unk_int = 13;
+ * optional uint32 unk_int = 7;
*/
private int unkInt;
/**
- * optional .MotionInfo motion = 10;
- */
- private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance();
-
- /**
- * optional .RotateMapCsReq.NewMapRot rogue_map = 11;
+ * optional .RotateMapCsReq.NewMapRot rogue_map = 6;
*/
private final NewMapRot rogueMap = NewMapRot.newInstance();
+ /**
+ * optional .MotionInfo motion = 12;
+ */
+ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance();
+
private RotateMapCsReq() {
}
@@ -50,7 +50,7 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional uint32 group_id = 4;
+ * optional uint32 group_id = 5;
* @return whether the groupId field is set
*/
public boolean hasGroupId() {
@@ -58,7 +58,7 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional uint32 group_id = 4;
+ * optional uint32 group_id = 5;
* @return this
*/
public RotateMapCsReq clearGroupId() {
@@ -68,7 +68,7 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional uint32 group_id = 4;
+ * optional uint32 group_id = 5;
* @return the groupId
*/
public int getGroupId() {
@@ -76,7 +76,7 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional uint32 group_id = 4;
+ * optional uint32 group_id = 5;
* @param value the groupId to set
* @return this
*/
@@ -87,7 +87,7 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional uint32 unk_int = 13;
+ * optional uint32 unk_int = 7;
* @return whether the unkInt field is set
*/
public boolean hasUnkInt() {
@@ -95,7 +95,7 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional uint32 unk_int = 13;
+ * optional uint32 unk_int = 7;
* @return this
*/
public RotateMapCsReq clearUnkInt() {
@@ -105,7 +105,7 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional uint32 unk_int = 13;
+ * optional uint32 unk_int = 7;
* @return the unkInt
*/
public int getUnkInt() {
@@ -113,7 +113,7 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional uint32 unk_int = 13;
+ * optional uint32 unk_int = 7;
* @param value the unkInt to set
* @return this
*/
@@ -124,82 +124,25 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional .MotionInfo motion = 10;
- * @return whether the motion field is set
+ * optional .RotateMapCsReq.NewMapRot rogue_map = 6;
+ * @return whether the rogueMap field is set
*/
- public boolean hasMotion() {
+ public boolean hasRogueMap() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional .MotionInfo motion = 10;
- * @return this
- */
- public RotateMapCsReq clearMotion() {
- bitField0_ &= ~0x00000004;
- motion.clear();
- return this;
- }
-
- /**
- * optional .MotionInfo motion = 10;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableMotion()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public MotionInfoOuterClass.MotionInfo getMotion() {
- return motion;
- }
-
- /**
- * optional .MotionInfo motion = 10;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public MotionInfoOuterClass.MotionInfo getMutableMotion() {
- bitField0_ |= 0x00000004;
- return motion;
- }
-
- /**
- * optional .MotionInfo motion = 10;
- * @param value the motion to set
- * @return this
- */
- public RotateMapCsReq setMotion(final MotionInfoOuterClass.MotionInfo value) {
- bitField0_ |= 0x00000004;
- motion.copyFrom(value);
- return this;
- }
-
- /**
- * optional .RotateMapCsReq.NewMapRot rogue_map = 11;
- * @return whether the rogueMap field is set
- */
- public boolean hasRogueMap() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional .RotateMapCsReq.NewMapRot rogue_map = 11;
+ * optional .RotateMapCsReq.NewMapRot rogue_map = 6;
* @return this
*/
public RotateMapCsReq clearRogueMap() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000004;
rogueMap.clear();
return this;
}
/**
- * optional .RotateMapCsReq.NewMapRot rogue_map = 11;
+ * optional .RotateMapCsReq.NewMapRot rogue_map = 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.
@@ -213,7 +156,7 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional .RotateMapCsReq.NewMapRot rogue_map = 11;
+ * optional .RotateMapCsReq.NewMapRot rogue_map = 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
@@ -222,21 +165,78 @@ public final class RotateMapCsReqOuterClass {
* @return internal storage object for modifications
*/
public NewMapRot getMutableRogueMap() {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
return rogueMap;
}
/**
- * optional .RotateMapCsReq.NewMapRot rogue_map = 11;
+ * optional .RotateMapCsReq.NewMapRot rogue_map = 6;
* @param value the rogueMap to set
* @return this
*/
public RotateMapCsReq setRogueMap(final NewMapRot value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
rogueMap.copyFrom(value);
return this;
}
+ /**
+ * optional .MotionInfo motion = 12;
+ * @return whether the motion field is set
+ */
+ public boolean hasMotion() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional .MotionInfo motion = 12;
+ * @return this
+ */
+ public RotateMapCsReq clearMotion() {
+ bitField0_ &= ~0x00000008;
+ motion.clear();
+ return this;
+ }
+
+ /**
+ * optional .MotionInfo motion = 12;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableMotion()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public MotionInfoOuterClass.MotionInfo getMotion() {
+ return motion;
+ }
+
+ /**
+ * optional .MotionInfo motion = 12;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public MotionInfoOuterClass.MotionInfo getMutableMotion() {
+ bitField0_ |= 0x00000008;
+ return motion;
+ }
+
+ /**
+ * optional .MotionInfo motion = 12;
+ * @param value the motion to set
+ * @return this
+ */
+ public RotateMapCsReq setMotion(final MotionInfoOuterClass.MotionInfo value) {
+ bitField0_ |= 0x00000008;
+ motion.copyFrom(value);
+ return this;
+ }
+
@Override
public RotateMapCsReq copyFrom(final RotateMapCsReq other) {
cachedSize = other.cachedSize;
@@ -244,8 +244,8 @@ public final class RotateMapCsReqOuterClass {
bitField0_ = other.bitField0_;
groupId = other.groupId;
unkInt = other.unkInt;
- motion.copyFrom(other.motion);
rogueMap.copyFrom(other.rogueMap);
+ motion.copyFrom(other.motion);
}
return this;
}
@@ -262,12 +262,12 @@ public final class RotateMapCsReqOuterClass {
if (other.hasUnkInt()) {
setUnkInt(other.unkInt);
}
- if (other.hasMotion()) {
- getMutableMotion().mergeFrom(other.motion);
- }
if (other.hasRogueMap()) {
getMutableRogueMap().mergeFrom(other.rogueMap);
}
+ if (other.hasMotion()) {
+ getMutableMotion().mergeFrom(other.motion);
+ }
return this;
}
@@ -280,8 +280,8 @@ public final class RotateMapCsReqOuterClass {
bitField0_ = 0;
groupId = 0;
unkInt = 0;
- motion.clear();
rogueMap.clear();
+ motion.clear();
return this;
}
@@ -292,8 +292,8 @@ public final class RotateMapCsReqOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- motion.clearQuick();
rogueMap.clearQuick();
+ motion.clearQuick();
return this;
}
@@ -309,27 +309,27 @@ public final class RotateMapCsReqOuterClass {
return bitField0_ == other.bitField0_
&& (!hasGroupId() || groupId == other.groupId)
&& (!hasUnkInt() || unkInt == other.unkInt)
- && (!hasMotion() || motion.equals(other.motion))
- && (!hasRogueMap() || rogueMap.equals(other.rogueMap));
+ && (!hasRogueMap() || rogueMap.equals(other.rogueMap))
+ && (!hasMotion() || motion.equals(other.motion));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(groupId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(unkInt);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 82);
- output.writeMessageNoTag(motion);
+ output.writeRawByte((byte) 50);
+ output.writeMessageNoTag(rogueMap);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 90);
- output.writeMessageNoTag(rogueMap);
+ output.writeRawByte((byte) 98);
+ output.writeMessageNoTag(motion);
}
}
@@ -343,10 +343,10 @@ public final class RotateMapCsReqOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(unkInt);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(motion);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(rogueMap);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(rogueMap);
+ size += 1 + ProtoSink.computeMessageSizeNoTag(motion);
}
return size;
}
@@ -358,36 +358,36 @@ public final class RotateMapCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
+ case 40: {
// groupId
groupId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 56) {
break;
}
}
- case 104: {
+ case 56: {
// unkInt
unkInt = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 82) {
+ if (tag != 50) {
break;
}
}
- case 82: {
- // motion
- input.readMessage(motion);
- bitField0_ |= 0x00000004;
- tag = input.readTag();
- if (tag != 90) {
- break;
- }
- }
- case 90: {
+ case 50: {
// rogueMap
input.readMessage(rogueMap);
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 98) {
+ break;
+ }
+ }
+ case 98: {
+ // motion
+ input.readMessage(motion);
bitField0_ |= 0x00000008;
tag = input.readTag();
if (tag != 0) {
@@ -418,10 +418,10 @@ public final class RotateMapCsReqOuterClass {
output.writeUInt32(FieldNames.unkInt, unkInt);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeMessage(FieldNames.motion, motion);
+ output.writeMessage(FieldNames.rogueMap, rogueMap);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeMessage(FieldNames.rogueMap, rogueMap);
+ output.writeMessage(FieldNames.motion, motion);
}
output.endObject();
}
@@ -457,10 +457,11 @@ public final class RotateMapCsReqOuterClass {
}
break;
}
- case -1068318794: {
- if (input.isAtField(FieldNames.motion)) {
+ case -394483422:
+ case 656463223: {
+ if (input.isAtField(FieldNames.rogueMap)) {
if (!input.trySkipNullValue()) {
- input.readMessage(motion);
+ input.readMessage(rogueMap);
bitField0_ |= 0x00000004;
}
} else {
@@ -468,11 +469,10 @@ public final class RotateMapCsReqOuterClass {
}
break;
}
- case -394483422:
- case 656463223: {
- if (input.isAtField(FieldNames.rogueMap)) {
+ case -1068318794: {
+ if (input.isAtField(FieldNames.motion)) {
if (!input.trySkipNullValue()) {
- input.readMessage(rogueMap);
+ input.readMessage(motion);
bitField0_ |= 0x00000008;
}
} else {
@@ -527,22 +527,22 @@ public final class RotateMapCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional float z = 1;
- */
- private float z;
-
- /**
- * optional float y = 3;
- */
- private float y;
-
- /**
- * optional float x = 6;
+ * optional float x = 8;
*/
private float x;
/**
- * optional float w = 9;
+ * optional float z = 10;
+ */
+ private float z;
+
+ /**
+ * optional float y = 11;
+ */
+ private float y;
+
+ /**
+ * optional float w = 12;
*/
private float w;
@@ -557,99 +557,25 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional float z = 1;
- * @return whether the z field is set
+ * optional float x = 8;
+ * @return whether the x field is set
*/
- public boolean hasZ() {
+ public boolean hasX() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional float z = 1;
- * @return this
- */
- public Vector4 clearZ() {
- bitField0_ &= ~0x00000001;
- z = 0F;
- return this;
- }
-
- /**
- * optional float z = 1;
- * @return the z
- */
- public float getZ() {
- return z;
- }
-
- /**
- * optional float z = 1;
- * @param value the z to set
- * @return this
- */
- public Vector4 setZ(final float value) {
- bitField0_ |= 0x00000001;
- z = value;
- return this;
- }
-
- /**
- * optional float y = 3;
- * @return whether the y field is set
- */
- public boolean hasY() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional float y = 3;
- * @return this
- */
- public Vector4 clearY() {
- bitField0_ &= ~0x00000002;
- y = 0F;
- return this;
- }
-
- /**
- * optional float y = 3;
- * @return the y
- */
- public float getY() {
- return y;
- }
-
- /**
- * optional float y = 3;
- * @param value the y to set
- * @return this
- */
- public Vector4 setY(final float value) {
- bitField0_ |= 0x00000002;
- y = value;
- return this;
- }
-
- /**
- * optional float x = 6;
- * @return whether the x field is set
- */
- public boolean hasX() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional float x = 6;
+ * optional float x = 8;
* @return this
*/
public Vector4 clearX() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000001;
x = 0F;
return this;
}
/**
- * optional float x = 6;
+ * optional float x = 8;
* @return the x
*/
public float getX() {
@@ -657,18 +583,92 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional float x = 6;
+ * optional float x = 8;
* @param value the x to set
* @return this
*/
public Vector4 setX(final float value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
x = value;
return this;
}
/**
- * optional float w = 9;
+ * optional float z = 10;
+ * @return whether the z field is set
+ */
+ public boolean hasZ() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional float z = 10;
+ * @return this
+ */
+ public Vector4 clearZ() {
+ bitField0_ &= ~0x00000002;
+ z = 0F;
+ return this;
+ }
+
+ /**
+ * optional float z = 10;
+ * @return the z
+ */
+ public float getZ() {
+ return z;
+ }
+
+ /**
+ * optional float z = 10;
+ * @param value the z to set
+ * @return this
+ */
+ public Vector4 setZ(final float value) {
+ bitField0_ |= 0x00000002;
+ z = value;
+ return this;
+ }
+
+ /**
+ * optional float y = 11;
+ * @return whether the y field is set
+ */
+ public boolean hasY() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional float y = 11;
+ * @return this
+ */
+ public Vector4 clearY() {
+ bitField0_ &= ~0x00000004;
+ y = 0F;
+ return this;
+ }
+
+ /**
+ * optional float y = 11;
+ * @return the y
+ */
+ public float getY() {
+ return y;
+ }
+
+ /**
+ * optional float y = 11;
+ * @param value the y to set
+ * @return this
+ */
+ public Vector4 setY(final float value) {
+ bitField0_ |= 0x00000004;
+ y = value;
+ return this;
+ }
+
+ /**
+ * optional float w = 12;
* @return whether the w field is set
*/
public boolean hasW() {
@@ -676,7 +676,7 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional float w = 9;
+ * optional float w = 12;
* @return this
*/
public Vector4 clearW() {
@@ -686,7 +686,7 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional float w = 9;
+ * optional float w = 12;
* @return the w
*/
public float getW() {
@@ -694,7 +694,7 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional float w = 9;
+ * optional float w = 12;
* @param value the w to set
* @return this
*/
@@ -709,9 +709,9 @@ public final class RotateMapCsReqOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
+ x = other.x;
z = other.z;
y = other.y;
- x = other.x;
w = other.w;
}
return this;
@@ -723,15 +723,15 @@ public final class RotateMapCsReqOuterClass {
return this;
}
cachedSize = -1;
+ if (other.hasX()) {
+ setX(other.x);
+ }
if (other.hasZ()) {
setZ(other.z);
}
if (other.hasY()) {
setY(other.y);
}
- if (other.hasX()) {
- setX(other.x);
- }
if (other.hasW()) {
setW(other.w);
}
@@ -745,9 +745,9 @@ public final class RotateMapCsReqOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
+ x = 0F;
z = 0F;
y = 0F;
- x = 0F;
w = 0F;
return this;
}
@@ -772,28 +772,28 @@ public final class RotateMapCsReqOuterClass {
}
Vector4 other = (Vector4) o;
return bitField0_ == other.bitField0_
+ && (!hasX() || ProtoUtil.isEqual(x, other.x))
&& (!hasZ() || ProtoUtil.isEqual(z, other.z))
&& (!hasY() || ProtoUtil.isEqual(y, other.y))
- && (!hasX() || ProtoUtil.isEqual(x, other.x))
&& (!hasW() || ProtoUtil.isEqual(w, other.w));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 13);
- output.writeFloatNoTag(z);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 29);
- output.writeFloatNoTag(y);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 53);
+ output.writeRawByte((byte) 69);
output.writeFloatNoTag(x);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 85);
+ output.writeFloatNoTag(z);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 93);
+ output.writeFloatNoTag(y);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 77);
+ output.writeRawByte((byte) 101);
output.writeFloatNoTag(w);
}
}
@@ -823,34 +823,34 @@ public final class RotateMapCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 13: {
- // z
- z = input.readFloat();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 29) {
- break;
- }
- }
- case 29: {
- // y
- y = input.readFloat();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 53) {
- break;
- }
- }
- case 53: {
+ case 69: {
// x
x = input.readFloat();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 77) {
+ if (tag != 85) {
break;
}
}
- case 77: {
+ case 85: {
+ // z
+ z = input.readFloat();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 93) {
+ break;
+ }
+ }
+ case 93: {
+ // y
+ y = input.readFloat();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 101) {
+ break;
+ }
+ }
+ case 101: {
// w
w = input.readFloat();
bitField0_ |= 0x00000008;
@@ -877,13 +877,13 @@ public final class RotateMapCsReqOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeFloat(FieldNames.z, z);
+ output.writeFloat(FieldNames.x, x);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeFloat(FieldNames.y, y);
+ output.writeFloat(FieldNames.z, z);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeFloat(FieldNames.x, x);
+ output.writeFloat(FieldNames.y, y);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeFloat(FieldNames.w, w);
@@ -898,11 +898,22 @@ public final class RotateMapCsReqOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
+ case 120: {
+ if (input.isAtField(FieldNames.x)) {
+ if (!input.trySkipNullValue()) {
+ x = input.readFloat();
+ bitField0_ |= 0x00000001;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case 122: {
if (input.isAtField(FieldNames.z)) {
if (!input.trySkipNullValue()) {
z = input.readFloat();
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
}
} else {
input.skipUnknownField();
@@ -913,17 +924,6 @@ public final class RotateMapCsReqOuterClass {
if (input.isAtField(FieldNames.y)) {
if (!input.trySkipNullValue()) {
y = input.readFloat();
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 120: {
- if (input.isAtField(FieldNames.x)) {
- if (!input.trySkipNullValue()) {
- x = input.readFloat();
bitField0_ |= 0x00000004;
}
} else {
@@ -994,12 +994,12 @@ public final class RotateMapCsReqOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
+ static final FieldName x = FieldName.forField("x");
+
static final FieldName z = FieldName.forField("z");
static final FieldName y = FieldName.forField("y");
- static final FieldName x = FieldName.forField("x");
-
static final FieldName w = FieldName.forField("w");
}
}
@@ -1011,12 +1011,12 @@ public final class RotateMapCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .Vector vector3 = 1;
+ * optional .Vector vector3 = 2;
*/
private final VectorOuterClass.Vector vector3 = VectorOuterClass.Vector.newInstance();
/**
- * optional .RotateMapCsReq.Vector4 vector4 = 9;
+ * optional .RotateMapCsReq.Vector4 vector4 = 10;
*/
private final Vector4 vector4 = Vector4.newInstance();
@@ -1031,7 +1031,7 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional .Vector vector3 = 1;
+ * optional .Vector vector3 = 2;
* @return whether the vector3 field is set
*/
public boolean hasVector3() {
@@ -1039,7 +1039,7 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional .Vector vector3 = 1;
+ * optional .Vector vector3 = 2;
* @return this
*/
public NewMapRot clearVector3() {
@@ -1049,7 +1049,7 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional .Vector vector3 = 1;
+ * optional .Vector vector3 = 2;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -1063,7 +1063,7 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional .Vector vector3 = 1;
+ * optional .Vector vector3 = 2;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -1077,7 +1077,7 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional .Vector vector3 = 1;
+ * optional .Vector vector3 = 2;
* @param value the vector3 to set
* @return this
*/
@@ -1088,7 +1088,7 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional .RotateMapCsReq.Vector4 vector4 = 9;
+ * optional .RotateMapCsReq.Vector4 vector4 = 10;
* @return whether the vector4 field is set
*/
public boolean hasVector4() {
@@ -1096,7 +1096,7 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional .RotateMapCsReq.Vector4 vector4 = 9;
+ * optional .RotateMapCsReq.Vector4 vector4 = 10;
* @return this
*/
public NewMapRot clearVector4() {
@@ -1106,7 +1106,7 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional .RotateMapCsReq.Vector4 vector4 = 9;
+ * optional .RotateMapCsReq.Vector4 vector4 = 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.
@@ -1120,7 +1120,7 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional .RotateMapCsReq.Vector4 vector4 = 9;
+ * optional .RotateMapCsReq.Vector4 vector4 = 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
@@ -1134,7 +1134,7 @@ public final class RotateMapCsReqOuterClass {
}
/**
- * optional .RotateMapCsReq.Vector4 vector4 = 9;
+ * optional .RotateMapCsReq.Vector4 vector4 = 10;
* @param value the vector4 to set
* @return this
*/
@@ -1211,11 +1211,11 @@ public final class RotateMapCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 10);
+ output.writeRawByte((byte) 18);
output.writeMessageNoTag(vector3);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 74);
+ output.writeRawByte((byte) 82);
output.writeMessageNoTag(vector4);
}
}
@@ -1239,16 +1239,16 @@ public final class RotateMapCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 10: {
+ case 18: {
// vector3
input.readMessage(vector3);
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 74) {
+ if (tag != 82) {
break;
}
}
- case 74: {
+ case 82: {
// vector4
input.readMessage(vector4);
bitField0_ |= 0x00000002;
@@ -1387,9 +1387,9 @@ public final class RotateMapCsReqOuterClass {
static final FieldName unkInt = FieldName.forField("unkInt", "unk_int");
- static final FieldName motion = FieldName.forField("motion");
-
static final FieldName rogueMap = FieldName.forField("rogueMap", "rogue_map");
+
+ static final FieldName motion = FieldName.forField("motion");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/RotateMapScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/RotateMapScRspOuterClass.java
index 21b82e9..aaabb47 100644
--- a/src/generated/main/emu/lunarcore/proto/RotateMapScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RotateMapScRspOuterClass.java
@@ -19,17 +19,17 @@ public final class RotateMapScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 13;
*/
private int retcode;
/**
- * optional uint32 client_pos_version = 10;
+ * optional uint32 client_pos_version = 15;
*/
private int clientPosVersion;
/**
- * optional .MotionInfo motion = 8;
+ * optional .MotionInfo motion = 10;
*/
private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance();
@@ -44,7 +44,7 @@ public final class RotateMapScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 13;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -52,7 +52,7 @@ public final class RotateMapScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 13;
* @return this
*/
public RotateMapScRsp clearRetcode() {
@@ -62,7 +62,7 @@ public final class RotateMapScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 13;
* @return the retcode
*/
public int getRetcode() {
@@ -70,7 +70,7 @@ public final class RotateMapScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 13;
* @param value the retcode to set
* @return this
*/
@@ -81,7 +81,7 @@ public final class RotateMapScRspOuterClass {
}
/**
- * optional uint32 client_pos_version = 10;
+ * optional uint32 client_pos_version = 15;
* @return whether the clientPosVersion field is set
*/
public boolean hasClientPosVersion() {
@@ -89,7 +89,7 @@ public final class RotateMapScRspOuterClass {
}
/**
- * optional uint32 client_pos_version = 10;
+ * optional uint32 client_pos_version = 15;
* @return this
*/
public RotateMapScRsp clearClientPosVersion() {
@@ -99,7 +99,7 @@ public final class RotateMapScRspOuterClass {
}
/**
- * optional uint32 client_pos_version = 10;
+ * optional uint32 client_pos_version = 15;
* @return the clientPosVersion
*/
public int getClientPosVersion() {
@@ -107,7 +107,7 @@ public final class RotateMapScRspOuterClass {
}
/**
- * optional uint32 client_pos_version = 10;
+ * optional uint32 client_pos_version = 15;
* @param value the clientPosVersion to set
* @return this
*/
@@ -118,7 +118,7 @@ public final class RotateMapScRspOuterClass {
}
/**
- * optional .MotionInfo motion = 8;
+ * optional .MotionInfo motion = 10;
* @return whether the motion field is set
*/
public boolean hasMotion() {
@@ -126,7 +126,7 @@ public final class RotateMapScRspOuterClass {
}
/**
- * optional .MotionInfo motion = 8;
+ * optional .MotionInfo motion = 10;
* @return this
*/
public RotateMapScRsp clearMotion() {
@@ -136,7 +136,7 @@ public final class RotateMapScRspOuterClass {
}
/**
- * optional .MotionInfo motion = 8;
+ * optional .MotionInfo motion = 10;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -150,7 +150,7 @@ public final class RotateMapScRspOuterClass {
}
/**
- * optional .MotionInfo motion = 8;
+ * optional .MotionInfo motion = 10;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -164,7 +164,7 @@ public final class RotateMapScRspOuterClass {
}
/**
- * optional .MotionInfo motion = 8;
+ * optional .MotionInfo motion = 10;
* @param value the motion to set
* @return this
*/
@@ -246,15 +246,15 @@ public final class RotateMapScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 104);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(clientPosVersion);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 66);
+ output.writeRawByte((byte) 82);
output.writeMessageNoTag(motion);
}
}
@@ -281,25 +281,25 @@ public final class RotateMapScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
+ case 104: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 80) {
+ if (tag != 120) {
break;
}
}
- case 80: {
+ case 120: {
// clientPosVersion
clientPosVersion = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 66) {
+ if (tag != 82) {
break;
}
}
- case 66: {
+ case 82: {
// motion
input.readMessage(motion);
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/RotaterDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RotaterDataOuterClass.java
index 0f4daa1..4420db2 100644
--- a/src/generated/main/emu/lunarcore/proto/RotaterDataOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RotaterDataOuterClass.java
@@ -20,17 +20,17 @@ public final class RotaterDataOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional float APDIFCCFAGG = 6;
+ * optional float APDIFCCFAGG = 8;
*/
private float aPDIFCCFAGG;
/**
- * optional uint32 group_id = 2;
+ * optional uint32 group_id = 4;
*/
private int groupId;
/**
- * optional uint32 unk_int = 12;
+ * optional uint32 unk_int = 15;
*/
private int unkInt;
@@ -45,7 +45,7 @@ public final class RotaterDataOuterClass {
}
/**
- * optional float APDIFCCFAGG = 6;
+ * optional float APDIFCCFAGG = 8;
* @return whether the aPDIFCCFAGG field is set
*/
public boolean hasAPDIFCCFAGG() {
@@ -53,7 +53,7 @@ public final class RotaterDataOuterClass {
}
/**
- * optional float APDIFCCFAGG = 6;
+ * optional float APDIFCCFAGG = 8;
* @return this
*/
public RotaterData clearAPDIFCCFAGG() {
@@ -63,7 +63,7 @@ public final class RotaterDataOuterClass {
}
/**
- * optional float APDIFCCFAGG = 6;
+ * optional float APDIFCCFAGG = 8;
* @return the aPDIFCCFAGG
*/
public float getAPDIFCCFAGG() {
@@ -71,7 +71,7 @@ public final class RotaterDataOuterClass {
}
/**
- * optional float APDIFCCFAGG = 6;
+ * optional float APDIFCCFAGG = 8;
* @param value the aPDIFCCFAGG to set
* @return this
*/
@@ -82,7 +82,7 @@ public final class RotaterDataOuterClass {
}
/**
- * optional uint32 group_id = 2;
+ * optional uint32 group_id = 4;
* @return whether the groupId field is set
*/
public boolean hasGroupId() {
@@ -90,7 +90,7 @@ public final class RotaterDataOuterClass {
}
/**
- * optional uint32 group_id = 2;
+ * optional uint32 group_id = 4;
* @return this
*/
public RotaterData clearGroupId() {
@@ -100,7 +100,7 @@ public final class RotaterDataOuterClass {
}
/**
- * optional uint32 group_id = 2;
+ * optional uint32 group_id = 4;
* @return the groupId
*/
public int getGroupId() {
@@ -108,7 +108,7 @@ public final class RotaterDataOuterClass {
}
/**
- * optional uint32 group_id = 2;
+ * optional uint32 group_id = 4;
* @param value the groupId to set
* @return this
*/
@@ -119,7 +119,7 @@ public final class RotaterDataOuterClass {
}
/**
- * optional uint32 unk_int = 12;
+ * optional uint32 unk_int = 15;
* @return whether the unkInt field is set
*/
public boolean hasUnkInt() {
@@ -127,7 +127,7 @@ public final class RotaterDataOuterClass {
}
/**
- * optional uint32 unk_int = 12;
+ * optional uint32 unk_int = 15;
* @return this
*/
public RotaterData clearUnkInt() {
@@ -137,7 +137,7 @@ public final class RotaterDataOuterClass {
}
/**
- * optional uint32 unk_int = 12;
+ * optional uint32 unk_int = 15;
* @return the unkInt
*/
public int getUnkInt() {
@@ -145,7 +145,7 @@ public final class RotaterDataOuterClass {
}
/**
- * optional uint32 unk_int = 12;
+ * optional uint32 unk_int = 15;
* @param value the unkInt to set
* @return this
*/
@@ -226,15 +226,15 @@ public final class RotaterDataOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 53);
+ output.writeRawByte((byte) 69);
output.writeFloatNoTag(aPDIFCCFAGG);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(groupId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 120);
output.writeUInt32NoTag(unkInt);
}
}
@@ -261,25 +261,25 @@ public final class RotaterDataOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 53: {
+ case 69: {
// aPDIFCCFAGG
aPDIFCCFAGG = input.readFloat();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 16) {
+ if (tag != 32) {
break;
}
}
- case 16: {
+ case 32: {
// groupId
groupId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 120) {
break;
}
}
- case 96: {
+ case 120: {
// unkInt
unkInt = input.readUInt32();
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/RotatorEnergyInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RotatorEnergyInfoOuterClass.java
index 2e368b0..98cf638 100644
--- a/src/generated/main/emu/lunarcore/proto/RotatorEnergyInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RotatorEnergyInfoOuterClass.java
@@ -19,15 +19,15 @@ public final class RotatorEnergyInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 cur_num = 2;
- */
- private int curNum;
-
- /**
- * optional uint32 max_num = 6;
+ * optional uint32 max_num = 3;
*/
private int maxNum;
+ /**
+ * optional uint32 cur_num = 7;
+ */
+ private int curNum;
+
private RotatorEnergyInfo() {
}
@@ -39,62 +39,25 @@ public final class RotatorEnergyInfoOuterClass {
}
/**
- * optional uint32 cur_num = 2;
- * @return whether the curNum field is set
+ * optional uint32 max_num = 3;
+ * @return whether the maxNum field is set
*/
- public boolean hasCurNum() {
+ public boolean hasMaxNum() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 cur_num = 2;
- * @return this
- */
- public RotatorEnergyInfo clearCurNum() {
- bitField0_ &= ~0x00000001;
- curNum = 0;
- return this;
- }
-
- /**
- * optional uint32 cur_num = 2;
- * @return the curNum
- */
- public int getCurNum() {
- return curNum;
- }
-
- /**
- * optional uint32 cur_num = 2;
- * @param value the curNum to set
- * @return this
- */
- public RotatorEnergyInfo setCurNum(final int value) {
- bitField0_ |= 0x00000001;
- curNum = value;
- return this;
- }
-
- /**
- * optional uint32 max_num = 6;
- * @return whether the maxNum field is set
- */
- public boolean hasMaxNum() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 max_num = 6;
+ * optional uint32 max_num = 3;
* @return this
*/
public RotatorEnergyInfo clearMaxNum() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
maxNum = 0;
return this;
}
/**
- * optional uint32 max_num = 6;
+ * optional uint32 max_num = 3;
* @return the maxNum
*/
public int getMaxNum() {
@@ -102,23 +65,60 @@ public final class RotatorEnergyInfoOuterClass {
}
/**
- * optional uint32 max_num = 6;
+ * optional uint32 max_num = 3;
* @param value the maxNum to set
* @return this
*/
public RotatorEnergyInfo setMaxNum(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
maxNum = value;
return this;
}
+ /**
+ * optional uint32 cur_num = 7;
+ * @return whether the curNum field is set
+ */
+ public boolean hasCurNum() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 cur_num = 7;
+ * @return this
+ */
+ public RotatorEnergyInfo clearCurNum() {
+ bitField0_ &= ~0x00000002;
+ curNum = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 cur_num = 7;
+ * @return the curNum
+ */
+ public int getCurNum() {
+ return curNum;
+ }
+
+ /**
+ * optional uint32 cur_num = 7;
+ * @param value the curNum to set
+ * @return this
+ */
+ public RotatorEnergyInfo setCurNum(final int value) {
+ bitField0_ |= 0x00000002;
+ curNum = value;
+ return this;
+ }
+
@Override
public RotatorEnergyInfo copyFrom(final RotatorEnergyInfo other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- curNum = other.curNum;
maxNum = other.maxNum;
+ curNum = other.curNum;
}
return this;
}
@@ -129,12 +129,12 @@ public final class RotatorEnergyInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasCurNum()) {
- setCurNum(other.curNum);
- }
if (other.hasMaxNum()) {
setMaxNum(other.maxNum);
}
+ if (other.hasCurNum()) {
+ setCurNum(other.curNum);
+ }
return this;
}
@@ -145,8 +145,8 @@ public final class RotatorEnergyInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- curNum = 0;
maxNum = 0;
+ curNum = 0;
return this;
}
@@ -170,19 +170,19 @@ public final class RotatorEnergyInfoOuterClass {
}
RotatorEnergyInfo other = (RotatorEnergyInfo) o;
return bitField0_ == other.bitField0_
- && (!hasCurNum() || curNum == other.curNum)
- && (!hasMaxNum() || maxNum == other.maxNum);
+ && (!hasMaxNum() || maxNum == other.maxNum)
+ && (!hasCurNum() || curNum == other.curNum);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(curNum);
+ output.writeRawByte((byte) 24);
+ output.writeUInt32NoTag(maxNum);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 48);
- output.writeUInt32NoTag(maxNum);
+ output.writeRawByte((byte) 56);
+ output.writeUInt32NoTag(curNum);
}
}
@@ -190,10 +190,10 @@ public final class RotatorEnergyInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(curNum);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(maxNum);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(maxNum);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(curNum);
}
return size;
}
@@ -205,18 +205,18 @@ public final class RotatorEnergyInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
- // curNum
- curNum = input.readUInt32();
+ case 24: {
+ // maxNum
+ maxNum = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 48) {
+ if (tag != 56) {
break;
}
}
- case 48: {
- // maxNum
- maxNum = input.readUInt32();
+ case 56: {
+ // curNum
+ curNum = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
@@ -241,10 +241,10 @@ public final class RotatorEnergyInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.curNum, curNum);
+ output.writeUInt32(FieldNames.maxNum, maxNum);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.maxNum, maxNum);
+ output.writeUInt32(FieldNames.curNum, curNum);
}
output.endObject();
}
@@ -256,11 +256,11 @@ public final class RotatorEnergyInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1349154522:
- case 1126382855: {
- if (input.isAtField(FieldNames.curNum)) {
+ case -1081154686:
+ case 844443179: {
+ if (input.isAtField(FieldNames.maxNum)) {
if (!input.trySkipNullValue()) {
- curNum = input.readUInt32();
+ maxNum = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -268,11 +268,11 @@ public final class RotatorEnergyInfoOuterClass {
}
break;
}
- case -1081154686:
- case 844443179: {
- if (input.isAtField(FieldNames.maxNum)) {
+ case -1349154522:
+ case 1126382855: {
+ if (input.isAtField(FieldNames.curNum)) {
if (!input.trySkipNullValue()) {
- maxNum = input.readUInt32();
+ curNum = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -333,9 +333,9 @@ public final class RotatorEnergyInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName curNum = FieldName.forField("curNum", "cur_num");
-
static final FieldName maxNum = FieldName.forField("maxNum", "max_num");
+
+ static final FieldName curNum = FieldName.forField("curNum", "cur_num");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/SceneActorInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneActorInfoOuterClass.java
index 5a192f6..6a87987 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneActorInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneActorInfoOuterClass.java
@@ -19,22 +19,22 @@ public final class SceneActorInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 uid = 2;
- */
- private int uid;
-
- /**
- * optional uint32 base_avatar_id = 6;
- */
- private int baseAvatarId;
-
- /**
- * optional uint32 map_layer = 14;
+ * optional uint32 map_layer = 6;
*/
private int mapLayer;
/**
- * optional .AvatarType avatar_type = 12;
+ * optional uint32 base_avatar_id = 14;
+ */
+ private int baseAvatarId;
+
+ /**
+ * optional uint32 uid = 15;
+ */
+ private int uid;
+
+ /**
+ * optional .AvatarType avatar_type = 8;
*/
private int avatarType;
@@ -49,44 +49,44 @@ public final class SceneActorInfoOuterClass {
}
/**
- * optional uint32 uid = 2;
- * @return whether the uid field is set
+ * optional uint32 map_layer = 6;
+ * @return whether the mapLayer field is set
*/
- public boolean hasUid() {
+ public boolean hasMapLayer() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 uid = 2;
+ * optional uint32 map_layer = 6;
* @return this
*/
- public SceneActorInfo clearUid() {
+ public SceneActorInfo clearMapLayer() {
bitField0_ &= ~0x00000001;
- uid = 0;
+ mapLayer = 0;
return this;
}
/**
- * optional uint32 uid = 2;
- * @return the uid
+ * optional uint32 map_layer = 6;
+ * @return the mapLayer
*/
- public int getUid() {
- return uid;
+ public int getMapLayer() {
+ return mapLayer;
}
/**
- * optional uint32 uid = 2;
- * @param value the uid to set
+ * optional uint32 map_layer = 6;
+ * @param value the mapLayer to set
* @return this
*/
- public SceneActorInfo setUid(final int value) {
+ public SceneActorInfo setMapLayer(final int value) {
bitField0_ |= 0x00000001;
- uid = value;
+ mapLayer = value;
return this;
}
/**
- * optional uint32 base_avatar_id = 6;
+ * optional uint32 base_avatar_id = 14;
* @return whether the baseAvatarId field is set
*/
public boolean hasBaseAvatarId() {
@@ -94,7 +94,7 @@ public final class SceneActorInfoOuterClass {
}
/**
- * optional uint32 base_avatar_id = 6;
+ * optional uint32 base_avatar_id = 14;
* @return this
*/
public SceneActorInfo clearBaseAvatarId() {
@@ -104,7 +104,7 @@ public final class SceneActorInfoOuterClass {
}
/**
- * optional uint32 base_avatar_id = 6;
+ * optional uint32 base_avatar_id = 14;
* @return the baseAvatarId
*/
public int getBaseAvatarId() {
@@ -112,7 +112,7 @@ public final class SceneActorInfoOuterClass {
}
/**
- * optional uint32 base_avatar_id = 6;
+ * optional uint32 base_avatar_id = 14;
* @param value the baseAvatarId to set
* @return this
*/
@@ -123,44 +123,44 @@ public final class SceneActorInfoOuterClass {
}
/**
- * optional uint32 map_layer = 14;
- * @return whether the mapLayer field is set
+ * optional uint32 uid = 15;
+ * @return whether the uid field is set
*/
- public boolean hasMapLayer() {
+ public boolean hasUid() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 map_layer = 14;
+ * optional uint32 uid = 15;
* @return this
*/
- public SceneActorInfo clearMapLayer() {
+ public SceneActorInfo clearUid() {
bitField0_ &= ~0x00000004;
- mapLayer = 0;
+ uid = 0;
return this;
}
/**
- * optional uint32 map_layer = 14;
- * @return the mapLayer
+ * optional uint32 uid = 15;
+ * @return the uid
*/
- public int getMapLayer() {
- return mapLayer;
+ public int getUid() {
+ return uid;
}
/**
- * optional uint32 map_layer = 14;
- * @param value the mapLayer to set
+ * optional uint32 uid = 15;
+ * @param value the uid to set
* @return this
*/
- public SceneActorInfo setMapLayer(final int value) {
+ public SceneActorInfo setUid(final int value) {
bitField0_ |= 0x00000004;
- mapLayer = value;
+ uid = value;
return this;
}
/**
- * optional .AvatarType avatar_type = 12;
+ * optional .AvatarType avatar_type = 8;
* @return whether the avatarType field is set
*/
public boolean hasAvatarType() {
@@ -168,7 +168,7 @@ public final class SceneActorInfoOuterClass {
}
/**
- * optional .AvatarType avatar_type = 12;
+ * optional .AvatarType avatar_type = 8;
* @return this
*/
public SceneActorInfo clearAvatarType() {
@@ -178,7 +178,7 @@ public final class SceneActorInfoOuterClass {
}
/**
- * optional .AvatarType avatar_type = 12;
+ * optional .AvatarType avatar_type = 8;
* @return the avatarType
*/
public AvatarTypeOuterClass.AvatarType getAvatarType() {
@@ -211,7 +211,7 @@ public final class SceneActorInfoOuterClass {
}
/**
- * optional .AvatarType avatar_type = 12;
+ * optional .AvatarType avatar_type = 8;
* @param value the avatarType to set
* @return this
*/
@@ -226,9 +226,9 @@ public final class SceneActorInfoOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- uid = other.uid;
- baseAvatarId = other.baseAvatarId;
mapLayer = other.mapLayer;
+ baseAvatarId = other.baseAvatarId;
+ uid = other.uid;
avatarType = other.avatarType;
}
return this;
@@ -240,14 +240,14 @@ public final class SceneActorInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasUid()) {
- setUid(other.uid);
+ if (other.hasMapLayer()) {
+ setMapLayer(other.mapLayer);
}
if (other.hasBaseAvatarId()) {
setBaseAvatarId(other.baseAvatarId);
}
- if (other.hasMapLayer()) {
- setMapLayer(other.mapLayer);
+ if (other.hasUid()) {
+ setUid(other.uid);
}
if (other.hasAvatarType()) {
setAvatarTypeValue(other.avatarType);
@@ -262,9 +262,9 @@ public final class SceneActorInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- uid = 0;
- baseAvatarId = 0;
mapLayer = 0;
+ baseAvatarId = 0;
+ uid = 0;
avatarType = 0;
return this;
}
@@ -289,28 +289,28 @@ public final class SceneActorInfoOuterClass {
}
SceneActorInfo other = (SceneActorInfo) o;
return bitField0_ == other.bitField0_
- && (!hasUid() || uid == other.uid)
- && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
&& (!hasMapLayer() || mapLayer == other.mapLayer)
+ && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
+ && (!hasUid() || uid == other.uid)
&& (!hasAvatarType() || avatarType == other.avatarType);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(uid);
+ output.writeRawByte((byte) 48);
+ output.writeUInt32NoTag(mapLayer);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 112);
output.writeUInt32NoTag(baseAvatarId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 112);
- output.writeUInt32NoTag(mapLayer);
+ output.writeRawByte((byte) 120);
+ output.writeUInt32NoTag(uid);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 64);
output.writeEnumNoTag(avatarType);
}
}
@@ -319,13 +319,13 @@ public final class SceneActorInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(uid);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(mapLayer);
}
if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(mapLayer);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(uid);
}
if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType);
@@ -340,34 +340,34 @@ public final class SceneActorInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
- // uid
- uid = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 48) {
- break;
- }
- }
case 48: {
- // baseAvatarId
- baseAvatarId = input.readUInt32();
- bitField0_ |= 0x00000002;
+ // mapLayer
+ mapLayer = input.readUInt32();
+ bitField0_ |= 0x00000001;
tag = input.readTag();
if (tag != 112) {
break;
}
}
case 112: {
- // mapLayer
- mapLayer = input.readUInt32();
- bitField0_ |= 0x00000004;
+ // baseAvatarId
+ baseAvatarId = input.readUInt32();
+ bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 120) {
break;
}
}
- case 96: {
+ case 120: {
+ // uid
+ uid = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 64) {
+ break;
+ }
+ }
+ case 64: {
// avatarType
final int value = input.readInt32();
if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) {
@@ -397,13 +397,13 @@ public final class SceneActorInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.uid, uid);
+ output.writeUInt32(FieldNames.mapLayer, mapLayer);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.mapLayer, mapLayer);
+ output.writeUInt32(FieldNames.uid, uid);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter());
@@ -418,10 +418,11 @@ public final class SceneActorInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 115792: {
- if (input.isAtField(FieldNames.uid)) {
+ case 160971093:
+ case 1248553134: {
+ if (input.isAtField(FieldNames.mapLayer)) {
if (!input.trySkipNullValue()) {
- uid = input.readUInt32();
+ mapLayer = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -441,11 +442,10 @@ public final class SceneActorInfoOuterClass {
}
break;
}
- case 160971093:
- case 1248553134: {
- if (input.isAtField(FieldNames.mapLayer)) {
+ case 115792: {
+ if (input.isAtField(FieldNames.uid)) {
if (!input.trySkipNullValue()) {
- mapLayer = input.readUInt32();
+ uid = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -523,11 +523,11 @@ public final class SceneActorInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName uid = FieldName.forField("uid");
+ static final FieldName mapLayer = FieldName.forField("mapLayer", "map_layer");
static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
- static final FieldName mapLayer = FieldName.forField("mapLayer", "map_layer");
+ static final FieldName uid = FieldName.forField("uid");
static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type");
}
diff --git a/src/generated/main/emu/lunarcore/proto/SceneBattleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneBattleInfoOuterClass.java
index 9fd2808..8134a30 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneBattleInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneBattleInfoOuterClass.java
@@ -20,37 +20,32 @@ public final class SceneBattleInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 world_level = 1;
- */
- private int worldLevel;
-
- /**
- * optional uint32 logic_random_seed = 7;
- */
- private int logicRandomSeed;
-
- /**
- * optional uint32 stage_id = 9;
+ * optional uint32 stage_id = 1;
*/
private int stageId;
/**
- * optional uint32 rounds_limit = 13;
+ * optional uint32 world_level = 2;
*/
- private int roundsLimit;
+ private int worldLevel;
/**
- * optional uint32 battle_id = 14;
+ * optional uint32 battle_id = 3;
*/
private int battleId;
/**
- * repeated .BattleAvatar battle_avatar_list = 5;
+ * optional uint32 rounds_limit = 5;
*/
- private final RepeatedMessagerepeated .SceneMonsterWave monster_wave_list = 8;
+ * optional uint32 logic_random_seed = 9;
+ */
+ private int logicRandomSeed;
+
+ /**
+ * repeated .SceneMonsterWave monster_wave_list = 10;
*/
private final RepeatedMessagerepeated .BattleEventBattleInfo event_battle_info_list = 1395;
+ * repeated .BattleAvatar battle_avatar_list = 14;
+ */
+ private final RepeatedMessagerepeated .BattleEventBattleInfo event_battle_info_list = 1179;
*/
private final RepeatedMessagerepeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1498;
+ * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1433;
*/
private final RepeatedMessageoptional uint32 world_level = 1;
- * @return whether the worldLevel field is set
+ * optional uint32 stage_id = 1;
+ * @return whether the stageId field is set
*/
- public boolean hasWorldLevel() {
+ public boolean hasStageId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 world_level = 1;
- * @return this
- */
- public SceneBattleInfo clearWorldLevel() {
- bitField0_ &= ~0x00000001;
- worldLevel = 0;
- return this;
- }
-
- /**
- * optional uint32 world_level = 1;
- * @return the worldLevel
- */
- public int getWorldLevel() {
- return worldLevel;
- }
-
- /**
- * optional uint32 world_level = 1;
- * @param value the worldLevel to set
- * @return this
- */
- public SceneBattleInfo setWorldLevel(final int value) {
- bitField0_ |= 0x00000001;
- worldLevel = value;
- return this;
- }
-
- /**
- * optional uint32 logic_random_seed = 7;
- * @return whether the logicRandomSeed field is set
- */
- public boolean hasLogicRandomSeed() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 logic_random_seed = 7;
- * @return this
- */
- public SceneBattleInfo clearLogicRandomSeed() {
- bitField0_ &= ~0x00000002;
- logicRandomSeed = 0;
- return this;
- }
-
- /**
- * optional uint32 logic_random_seed = 7;
- * @return the logicRandomSeed
- */
- public int getLogicRandomSeed() {
- return logicRandomSeed;
- }
-
- /**
- * optional uint32 logic_random_seed = 7;
- * @param value the logicRandomSeed to set
- * @return this
- */
- public SceneBattleInfo setLogicRandomSeed(final int value) {
- bitField0_ |= 0x00000002;
- logicRandomSeed = value;
- return this;
- }
-
- /**
- * optional uint32 stage_id = 9;
- * @return whether the stageId field is set
- */
- public boolean hasStageId() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 stage_id = 9;
+ * optional uint32 stage_id = 1;
* @return this
*/
public SceneBattleInfo clearStageId() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000001;
stageId = 0;
return this;
}
/**
- * optional uint32 stage_id = 9;
+ * optional uint32 stage_id = 1;
* @return the stageId
*/
public int getStageId() {
@@ -180,18 +106,92 @@ public final class SceneBattleInfoOuterClass {
}
/**
- * optional uint32 stage_id = 9;
+ * optional uint32 stage_id = 1;
* @param value the stageId to set
* @return this
*/
public SceneBattleInfo setStageId(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
stageId = value;
return this;
}
/**
- * optional uint32 rounds_limit = 13;
+ * optional uint32 world_level = 2;
+ * @return whether the worldLevel field is set
+ */
+ public boolean hasWorldLevel() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 world_level = 2;
+ * @return this
+ */
+ public SceneBattleInfo clearWorldLevel() {
+ bitField0_ &= ~0x00000002;
+ worldLevel = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 world_level = 2;
+ * @return the worldLevel
+ */
+ public int getWorldLevel() {
+ return worldLevel;
+ }
+
+ /**
+ * optional uint32 world_level = 2;
+ * @param value the worldLevel to set
+ * @return this
+ */
+ public SceneBattleInfo setWorldLevel(final int value) {
+ bitField0_ |= 0x00000002;
+ worldLevel = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 battle_id = 3;
+ * @return whether the battleId field is set
+ */
+ public boolean hasBattleId() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 battle_id = 3;
+ * @return this
+ */
+ public SceneBattleInfo clearBattleId() {
+ bitField0_ &= ~0x00000004;
+ battleId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 battle_id = 3;
+ * @return the battleId
+ */
+ public int getBattleId() {
+ return battleId;
+ }
+
+ /**
+ * optional uint32 battle_id = 3;
+ * @param value the battleId to set
+ * @return this
+ */
+ public SceneBattleInfo setBattleId(final int value) {
+ bitField0_ |= 0x00000004;
+ battleId = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 rounds_limit = 5;
* @return whether the roundsLimit field is set
*/
public boolean hasRoundsLimit() {
@@ -199,7 +199,7 @@ public final class SceneBattleInfoOuterClass {
}
/**
- * optional uint32 rounds_limit = 13;
+ * optional uint32 rounds_limit = 5;
* @return this
*/
public SceneBattleInfo clearRoundsLimit() {
@@ -209,7 +209,7 @@ public final class SceneBattleInfoOuterClass {
}
/**
- * optional uint32 rounds_limit = 13;
+ * optional uint32 rounds_limit = 5;
* @return the roundsLimit
*/
public int getRoundsLimit() {
@@ -217,7 +217,7 @@ public final class SceneBattleInfoOuterClass {
}
/**
- * optional uint32 rounds_limit = 13;
+ * optional uint32 rounds_limit = 5;
* @param value the roundsLimit to set
* @return this
*/
@@ -228,131 +228,62 @@ public final class SceneBattleInfoOuterClass {
}
/**
- * optional uint32 battle_id = 14;
- * @return whether the battleId field is set
+ * optional uint32 logic_random_seed = 9;
+ * @return whether the logicRandomSeed field is set
*/
- public boolean hasBattleId() {
+ public boolean hasLogicRandomSeed() {
return (bitField0_ & 0x00000010) != 0;
}
/**
- * optional uint32 battle_id = 14;
+ * optional uint32 logic_random_seed = 9;
* @return this
*/
- public SceneBattleInfo clearBattleId() {
+ public SceneBattleInfo clearLogicRandomSeed() {
bitField0_ &= ~0x00000010;
- battleId = 0;
+ logicRandomSeed = 0;
return this;
}
/**
- * optional uint32 battle_id = 14;
- * @return the battleId
+ * optional uint32 logic_random_seed = 9;
+ * @return the logicRandomSeed
*/
- public int getBattleId() {
- return battleId;
+ public int getLogicRandomSeed() {
+ return logicRandomSeed;
}
/**
- * optional uint32 battle_id = 14;
- * @param value the battleId to set
+ * optional uint32 logic_random_seed = 9;
+ * @param value the logicRandomSeed to set
* @return this
*/
- public SceneBattleInfo setBattleId(final int value) {
+ public SceneBattleInfo setLogicRandomSeed(final int value) {
bitField0_ |= 0x00000010;
- battleId = value;
+ logicRandomSeed = value;
return this;
}
/**
- * repeated .BattleAvatar battle_avatar_list = 5;
- * @return whether the battleAvatarList field is set
+ * repeated .SceneMonsterWave monster_wave_list = 10;
+ * @return whether the monsterWaveList field is set
*/
- public boolean hasBattleAvatarList() {
+ public boolean hasMonsterWaveList() {
return (bitField0_ & 0x00000020) != 0;
}
/**
- * repeated .BattleAvatar battle_avatar_list = 5;
- * @return this
- */
- public SceneBattleInfo clearBattleAvatarList() {
- bitField0_ &= ~0x00000020;
- battleAvatarList.clear();
- return this;
- }
-
- /**
- * repeated .BattleAvatar battle_avatar_list = 5;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableBattleAvatarList()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedMessagerepeated .BattleAvatar battle_avatar_list = 5;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedMessagerepeated .BattleAvatar battle_avatar_list = 5;
- * @param value the battleAvatarList to add
- * @return this
- */
- public SceneBattleInfo addBattleAvatarList(final BattleAvatarOuterClass.BattleAvatar value) {
- bitField0_ |= 0x00000020;
- battleAvatarList.add(value);
- return this;
- }
-
- /**
- * repeated .BattleAvatar battle_avatar_list = 5;
- * @param values the battleAvatarList to add
- * @return this
- */
- public SceneBattleInfo addAllBattleAvatarList(
- final BattleAvatarOuterClass.BattleAvatar... values) {
- bitField0_ |= 0x00000020;
- battleAvatarList.addAll(values);
- return this;
- }
-
- /**
- * repeated .SceneMonsterWave monster_wave_list = 8;
- * @return whether the monsterWaveList field is set
- */
- public boolean hasMonsterWaveList() {
- return (bitField0_ & 0x00000040) != 0;
- }
-
- /**
- * repeated .SceneMonsterWave monster_wave_list = 8;
+ * repeated .SceneMonsterWave monster_wave_list = 10;
* @return this
*/
public SceneBattleInfo clearMonsterWaveList() {
- bitField0_ &= ~0x00000040;
+ bitField0_ &= ~0x00000020;
monsterWaveList.clear();
return this;
}
/**
- * repeated .SceneMonsterWave monster_wave_list = 8;
+ * repeated .SceneMonsterWave monster_wave_list = 10;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -366,7 +297,7 @@ public final class SceneBattleInfoOuterClass {
}
/**
- * repeated .SceneMonsterWave monster_wave_list = 8;
+ * repeated .SceneMonsterWave monster_wave_list = 10;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -376,30 +307,30 @@ public final class SceneBattleInfoOuterClass {
*/
public RepeatedMessagerepeated .SceneMonsterWave monster_wave_list = 8;
+ * repeated .SceneMonsterWave monster_wave_list = 10;
* @param value the monsterWaveList to add
* @return this
*/
public SceneBattleInfo addMonsterWaveList(
final SceneMonsterWaveOuterClass.SceneMonsterWave value) {
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000020;
monsterWaveList.add(value);
return this;
}
/**
- * repeated .SceneMonsterWave monster_wave_list = 8;
+ * repeated .SceneMonsterWave monster_wave_list = 10;
* @param values the monsterWaveList to add
* @return this
*/
public SceneBattleInfo addAllMonsterWaveList(
final SceneMonsterWaveOuterClass.SceneMonsterWave... values) {
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000020;
monsterWaveList.addAll(values);
return this;
}
@@ -409,7 +340,7 @@ public final class SceneBattleInfoOuterClass {
* @return whether the buffList field is set
*/
public boolean hasBuffList() {
- return (bitField0_ & 0x00000080) != 0;
+ return (bitField0_ & 0x00000040) != 0;
}
/**
@@ -417,7 +348,7 @@ public final class SceneBattleInfoOuterClass {
* @return this
*/
public SceneBattleInfo clearBuffList() {
- bitField0_ &= ~0x00000080;
+ bitField0_ &= ~0x00000040;
buffList.clear();
return this;
}
@@ -446,7 +377,7 @@ public final class SceneBattleInfoOuterClass {
* @return internal storage object for modifications
*/
public RepeatedMessagerepeated .BattleEventBattleInfo event_battle_info_list = 1395;
+ * repeated .BattleAvatar battle_avatar_list = 14;
+ * @return whether the battleAvatarList field is set
+ */
+ public boolean hasBattleAvatarList() {
+ return (bitField0_ & 0x00000080) != 0;
+ }
+
+ /**
+ * repeated .BattleAvatar battle_avatar_list = 14;
+ * @return this
+ */
+ public SceneBattleInfo clearBattleAvatarList() {
+ bitField0_ &= ~0x00000080;
+ battleAvatarList.clear();
+ return this;
+ }
+
+ /**
+ * repeated .BattleAvatar battle_avatar_list = 14;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableBattleAvatarList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedMessagerepeated .BattleAvatar battle_avatar_list = 14;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedMessagerepeated .BattleAvatar battle_avatar_list = 14;
+ * @param value the battleAvatarList to add
+ * @return this
+ */
+ public SceneBattleInfo addBattleAvatarList(final BattleAvatarOuterClass.BattleAvatar value) {
+ bitField0_ |= 0x00000080;
+ battleAvatarList.add(value);
+ return this;
+ }
+
+ /**
+ * repeated .BattleAvatar battle_avatar_list = 14;
+ * @param values the battleAvatarList to add
+ * @return this
+ */
+ public SceneBattleInfo addAllBattleAvatarList(
+ final BattleAvatarOuterClass.BattleAvatar... values) {
+ bitField0_ |= 0x00000080;
+ battleAvatarList.addAll(values);
+ return this;
+ }
+
+ /**
+ * repeated .BattleEventBattleInfo event_battle_info_list = 1179;
* @return whether the eventBattleInfoList field is set
*/
public boolean hasEventBattleInfoList() {
@@ -481,7 +481,7 @@ public final class SceneBattleInfoOuterClass {
}
/**
- * repeated .BattleEventBattleInfo event_battle_info_list = 1395;
+ * repeated .BattleEventBattleInfo event_battle_info_list = 1179;
* @return this
*/
public SceneBattleInfo clearEventBattleInfoList() {
@@ -491,7 +491,7 @@ public final class SceneBattleInfoOuterClass {
}
/**
- * repeated .BattleEventBattleInfo event_battle_info_list = 1395;
+ * repeated .BattleEventBattleInfo event_battle_info_list = 1179;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -506,7 +506,7 @@ public final class SceneBattleInfoOuterClass {
}
/**
- * repeated .BattleEventBattleInfo event_battle_info_list = 1395;
+ * repeated .BattleEventBattleInfo event_battle_info_list = 1179;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -521,7 +521,7 @@ public final class SceneBattleInfoOuterClass {
}
/**
- * repeated .BattleEventBattleInfo event_battle_info_list = 1395;
+ * repeated .BattleEventBattleInfo event_battle_info_list = 1179;
* @param value the eventBattleInfoList to add
* @return this
*/
@@ -533,7 +533,7 @@ public final class SceneBattleInfoOuterClass {
}
/**
- * repeated .BattleEventBattleInfo event_battle_info_list = 1395;
+ * repeated .BattleEventBattleInfo event_battle_info_list = 1179;
* @param values the eventBattleInfoList to add
* @return this
*/
@@ -545,7 +545,7 @@ public final class SceneBattleInfoOuterClass {
}
/**
- * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1498;
+ * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1433;
* @return whether the battleTargetInfo field is set
*/
public boolean hasBattleTargetInfo() {
@@ -553,7 +553,7 @@ public final class SceneBattleInfoOuterClass {
}
/**
- * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1498;
+ * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1433;
* @return this
*/
public SceneBattleInfo clearBattleTargetInfo() {
@@ -563,7 +563,7 @@ public final class SceneBattleInfoOuterClass {
}
/**
- * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1498;
+ * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1433;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -577,7 +577,7 @@ public final class SceneBattleInfoOuterClass {
}
/**
- * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1498;
+ * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1433;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -591,7 +591,7 @@ public final class SceneBattleInfoOuterClass {
}
/**
- * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1498;
+ * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1433;
* @param value the battleTargetInfo to add
* @return this
*/
@@ -602,7 +602,7 @@ public final class SceneBattleInfoOuterClass {
}
/**
- * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1498;
+ * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1433;
* @param values the battleTargetInfo to add
* @return this
*/
@@ -617,14 +617,14 @@ public final class SceneBattleInfoOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- worldLevel = other.worldLevel;
- logicRandomSeed = other.logicRandomSeed;
stageId = other.stageId;
- roundsLimit = other.roundsLimit;
+ worldLevel = other.worldLevel;
battleId = other.battleId;
- battleAvatarList.copyFrom(other.battleAvatarList);
+ roundsLimit = other.roundsLimit;
+ logicRandomSeed = other.logicRandomSeed;
monsterWaveList.copyFrom(other.monsterWaveList);
buffList.copyFrom(other.buffList);
+ battleAvatarList.copyFrom(other.battleAvatarList);
eventBattleInfoList.copyFrom(other.eventBattleInfoList);
battleTargetInfo.copyFrom(other.battleTargetInfo);
}
@@ -637,23 +637,20 @@ public final class SceneBattleInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasWorldLevel()) {
- setWorldLevel(other.worldLevel);
- }
- if (other.hasLogicRandomSeed()) {
- setLogicRandomSeed(other.logicRandomSeed);
- }
if (other.hasStageId()) {
setStageId(other.stageId);
}
- if (other.hasRoundsLimit()) {
- setRoundsLimit(other.roundsLimit);
+ if (other.hasWorldLevel()) {
+ setWorldLevel(other.worldLevel);
}
if (other.hasBattleId()) {
setBattleId(other.battleId);
}
- if (other.hasBattleAvatarList()) {
- getMutableBattleAvatarList().addAll(other.battleAvatarList);
+ if (other.hasRoundsLimit()) {
+ setRoundsLimit(other.roundsLimit);
+ }
+ if (other.hasLogicRandomSeed()) {
+ setLogicRandomSeed(other.logicRandomSeed);
}
if (other.hasMonsterWaveList()) {
getMutableMonsterWaveList().addAll(other.monsterWaveList);
@@ -661,6 +658,9 @@ public final class SceneBattleInfoOuterClass {
if (other.hasBuffList()) {
getMutableBuffList().addAll(other.buffList);
}
+ if (other.hasBattleAvatarList()) {
+ getMutableBattleAvatarList().addAll(other.battleAvatarList);
+ }
if (other.hasEventBattleInfoList()) {
getMutableEventBattleInfoList().addAll(other.eventBattleInfoList);
}
@@ -677,14 +677,14 @@ public final class SceneBattleInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- worldLevel = 0;
- logicRandomSeed = 0;
stageId = 0;
- roundsLimit = 0;
+ worldLevel = 0;
battleId = 0;
- battleAvatarList.clear();
+ roundsLimit = 0;
+ logicRandomSeed = 0;
monsterWaveList.clear();
buffList.clear();
+ battleAvatarList.clear();
eventBattleInfoList.clear();
battleTargetInfo.clear();
return this;
@@ -697,9 +697,9 @@ public final class SceneBattleInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- battleAvatarList.clearQuick();
monsterWaveList.clearQuick();
buffList.clearQuick();
+ battleAvatarList.clearQuick();
eventBattleInfoList.clearQuick();
battleTargetInfo.clearQuick();
return this;
@@ -715,14 +715,14 @@ public final class SceneBattleInfoOuterClass {
}
SceneBattleInfo other = (SceneBattleInfo) o;
return bitField0_ == other.bitField0_
- && (!hasWorldLevel() || worldLevel == other.worldLevel)
- && (!hasLogicRandomSeed() || logicRandomSeed == other.logicRandomSeed)
&& (!hasStageId() || stageId == other.stageId)
- && (!hasRoundsLimit() || roundsLimit == other.roundsLimit)
+ && (!hasWorldLevel() || worldLevel == other.worldLevel)
&& (!hasBattleId() || battleId == other.battleId)
- && (!hasBattleAvatarList() || battleAvatarList.equals(other.battleAvatarList))
+ && (!hasRoundsLimit() || roundsLimit == other.roundsLimit)
+ && (!hasLogicRandomSeed() || logicRandomSeed == other.logicRandomSeed)
&& (!hasMonsterWaveList() || monsterWaveList.equals(other.monsterWaveList))
&& (!hasBuffList() || buffList.equals(other.buffList))
+ && (!hasBattleAvatarList() || battleAvatarList.equals(other.battleAvatarList))
&& (!hasEventBattleInfoList() || eventBattleInfoList.equals(other.eventBattleInfoList))
&& (!hasBattleTargetInfo() || battleTargetInfo.equals(other.battleTargetInfo));
}
@@ -731,51 +731,51 @@ public final class SceneBattleInfoOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(worldLevel);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 56);
- output.writeUInt32NoTag(logicRandomSeed);
- }
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 72);
output.writeUInt32NoTag(stageId);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 16);
+ output.writeUInt32NoTag(worldLevel);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 24);
+ output.writeUInt32NoTag(battleId);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(roundsLimit);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 112);
- output.writeUInt32NoTag(battleId);
+ output.writeRawByte((byte) 72);
+ output.writeUInt32NoTag(logicRandomSeed);
}
if ((bitField0_ & 0x00000020) != 0) {
- for (int i = 0; i < battleAvatarList.length(); i++) {
- output.writeRawByte((byte) 42);
- output.writeMessageNoTag(battleAvatarList.get(i));
- }
- }
- if ((bitField0_ & 0x00000040) != 0) {
for (int i = 0; i < monsterWaveList.length(); i++) {
- output.writeRawByte((byte) 66);
+ output.writeRawByte((byte) 82);
output.writeMessageNoTag(monsterWaveList.get(i));
}
}
- if ((bitField0_ & 0x00000080) != 0) {
+ if ((bitField0_ & 0x00000040) != 0) {
for (int i = 0; i < buffList.length(); i++) {
output.writeRawByte((byte) 98);
output.writeMessageNoTag(buffList.get(i));
}
}
+ if ((bitField0_ & 0x00000080) != 0) {
+ for (int i = 0; i < battleAvatarList.length(); i++) {
+ output.writeRawByte((byte) 114);
+ output.writeMessageNoTag(battleAvatarList.get(i));
+ }
+ }
if ((bitField0_ & 0x00000100) != 0) {
for (int i = 0; i < eventBattleInfoList.length(); i++) {
- output.writeRawLittleEndian16((short) 22426);
+ output.writeRawLittleEndian16((short) 18906);
output.writeMessageNoTag(eventBattleInfoList.get(i));
}
}
if ((bitField0_ & 0x00000200) != 0) {
for (int i = 0; i < battleTargetInfo.length(); i++) {
- output.writeRawLittleEndian16((short) 24018);
+ output.writeRawLittleEndian16((short) 22986);
output.writeMessageNoTag(battleTargetInfo.get(i));
}
}
@@ -785,29 +785,29 @@ public final class SceneBattleInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(logicRandomSeed);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId);
}
if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(roundsLimit);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(logicRandomSeed);
}
if ((bitField0_ & 0x00000020) != 0) {
- size += (1 * battleAvatarList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleAvatarList);
- }
- if ((bitField0_ & 0x00000040) != 0) {
size += (1 * monsterWaveList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(monsterWaveList);
}
- if ((bitField0_ & 0x00000080) != 0) {
+ if ((bitField0_ & 0x00000040) != 0) {
size += (1 * buffList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(buffList);
}
+ if ((bitField0_ & 0x00000080) != 0) {
+ size += (1 * battleAvatarList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleAvatarList);
+ }
if ((bitField0_ & 0x00000100) != 0) {
size += (2 * eventBattleInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(eventBattleInfoList);
}
@@ -825,62 +825,54 @@ public final class SceneBattleInfoOuterClass {
while (true) {
switch (tag) {
case 8: {
- // worldLevel
- worldLevel = input.readUInt32();
+ // stageId
+ stageId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 56) {
+ if (tag != 16) {
break;
}
}
- case 56: {
- // logicRandomSeed
- logicRandomSeed = input.readUInt32();
+ case 16: {
+ // worldLevel
+ worldLevel = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
+ if (tag != 24) {
+ break;
+ }
+ }
+ case 24: {
+ // battleId
+ battleId = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 40) {
+ break;
+ }
+ }
+ case 40: {
+ // roundsLimit
+ roundsLimit = input.readUInt32();
+ bitField0_ |= 0x00000008;
+ tag = input.readTag();
if (tag != 72) {
break;
}
}
case 72: {
- // stageId
- stageId = input.readUInt32();
- bitField0_ |= 0x00000004;
- tag = input.readTag();
- if (tag != 104) {
- break;
- }
- }
- case 104: {
- // roundsLimit
- roundsLimit = input.readUInt32();
- bitField0_ |= 0x00000008;
- tag = input.readTag();
- if (tag != 112) {
- break;
- }
- }
- case 112: {
- // battleId
- battleId = input.readUInt32();
+ // logicRandomSeed
+ logicRandomSeed = input.readUInt32();
bitField0_ |= 0x00000010;
tag = input.readTag();
- if (tag != 42) {
+ if (tag != 82) {
break;
}
}
- case 42: {
- // battleAvatarList
- tag = input.readRepeatedMessage(battleAvatarList, tag);
- bitField0_ |= 0x00000020;
- if (tag != 66) {
- break;
- }
- }
- case 66: {
+ case 82: {
// monsterWaveList
tag = input.readRepeatedMessage(monsterWaveList, tag);
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000020;
if (tag != 98) {
break;
}
@@ -888,20 +880,28 @@ public final class SceneBattleInfoOuterClass {
case 98: {
// buffList
tag = input.readRepeatedMessage(buffList, tag);
- bitField0_ |= 0x00000080;
- if (tag != 11162) {
+ bitField0_ |= 0x00000040;
+ if (tag != 114) {
break;
}
}
- case 11162: {
+ case 114: {
+ // battleAvatarList
+ tag = input.readRepeatedMessage(battleAvatarList, tag);
+ bitField0_ |= 0x00000080;
+ if (tag != 9434) {
+ break;
+ }
+ }
+ case 9434: {
// eventBattleInfoList
tag = input.readRepeatedMessage(eventBattleInfoList, tag);
bitField0_ |= 0x00000100;
- if (tag != 11986) {
+ if (tag != 11466) {
break;
}
}
- case 11986: {
+ case 11466: {
// battleTargetInfo
tag = input.readRepeatedMessage(battleTargetInfo, tag);
bitField0_ |= 0x00000200;
@@ -927,29 +927,29 @@ public final class SceneBattleInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.worldLevel, worldLevel);
+ output.writeUInt32(FieldNames.stageId, stageId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.logicRandomSeed, logicRandomSeed);
+ output.writeUInt32(FieldNames.worldLevel, worldLevel);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.stageId, stageId);
+ output.writeUInt32(FieldNames.battleId, battleId);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeUInt32(FieldNames.roundsLimit, roundsLimit);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeUInt32(FieldNames.battleId, battleId);
+ output.writeUInt32(FieldNames.logicRandomSeed, logicRandomSeed);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRepeatedMessage(FieldNames.battleAvatarList, battleAvatarList);
- }
- if ((bitField0_ & 0x00000040) != 0) {
output.writeRepeatedMessage(FieldNames.monsterWaveList, monsterWaveList);
}
- if ((bitField0_ & 0x00000080) != 0) {
+ if ((bitField0_ & 0x00000040) != 0) {
output.writeRepeatedMessage(FieldNames.buffList, buffList);
}
+ if ((bitField0_ & 0x00000080) != 0) {
+ output.writeRepeatedMessage(FieldNames.battleAvatarList, battleAvatarList);
+ }
if ((bitField0_ & 0x00000100) != 0) {
output.writeRepeatedMessage(FieldNames.eventBattleInfoList, eventBattleInfoList);
}
@@ -966,11 +966,11 @@ public final class SceneBattleInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 440007442:
- case 1305257111: {
- if (input.isAtField(FieldNames.worldLevel)) {
+ case -1897528135:
+ case 1306191356: {
+ if (input.isAtField(FieldNames.stageId)) {
if (!input.trySkipNullValue()) {
- worldLevel = input.readUInt32();
+ stageId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -978,11 +978,11 @@ public final class SceneBattleInfoOuterClass {
}
break;
}
- case 141999058:
- case -1894951668: {
- if (input.isAtField(FieldNames.logicRandomSeed)) {
+ case 440007442:
+ case 1305257111: {
+ if (input.isAtField(FieldNames.worldLevel)) {
if (!input.trySkipNullValue()) {
- logicRandomSeed = input.readUInt32();
+ worldLevel = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -990,11 +990,11 @@ public final class SceneBattleInfoOuterClass {
}
break;
}
- case -1897528135:
- case 1306191356: {
- if (input.isAtField(FieldNames.stageId)) {
+ case -1678308365:
+ case -487930366: {
+ if (input.isAtField(FieldNames.battleId)) {
if (!input.trySkipNullValue()) {
- stageId = input.readUInt32();
+ battleId = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -1014,11 +1014,11 @@ public final class SceneBattleInfoOuterClass {
}
break;
}
- case -1678308365:
- case -487930366: {
- if (input.isAtField(FieldNames.battleId)) {
+ case 141999058:
+ case -1894951668: {
+ if (input.isAtField(FieldNames.logicRandomSeed)) {
if (!input.trySkipNullValue()) {
- battleId = input.readUInt32();
+ logicRandomSeed = input.readUInt32();
bitField0_ |= 0x00000010;
}
} else {
@@ -1026,24 +1026,12 @@ public final class SceneBattleInfoOuterClass {
}
break;
}
- case 768292975:
- case 328463037: {
- if (input.isAtField(FieldNames.battleAvatarList)) {
- if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(battleAvatarList);
- bitField0_ |= 0x00000020;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 697746737:
case -1492024321: {
if (input.isAtField(FieldNames.monsterWaveList)) {
if (!input.trySkipNullValue()) {
input.readRepeatedMessage(monsterWaveList);
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000020;
}
} else {
input.skipUnknownField();
@@ -1055,6 +1043,18 @@ public final class SceneBattleInfoOuterClass {
if (input.isAtField(FieldNames.buffList)) {
if (!input.trySkipNullValue()) {
input.readRepeatedMessage(buffList);
+ bitField0_ |= 0x00000040;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 768292975:
+ case 328463037: {
+ if (input.isAtField(FieldNames.battleAvatarList)) {
+ if (!input.trySkipNullValue()) {
+ input.readRepeatedMessage(battleAvatarList);
bitField0_ |= 0x00000080;
}
} else {
@@ -1486,22 +1486,22 @@ public final class SceneBattleInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level");
-
- static final FieldName logicRandomSeed = FieldName.forField("logicRandomSeed", "logic_random_seed");
-
static final FieldName stageId = FieldName.forField("stageId", "stage_id");
- static final FieldName roundsLimit = FieldName.forField("roundsLimit", "rounds_limit");
+ static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level");
static final FieldName battleId = FieldName.forField("battleId", "battle_id");
- static final FieldName battleAvatarList = FieldName.forField("battleAvatarList", "battle_avatar_list");
+ static final FieldName roundsLimit = FieldName.forField("roundsLimit", "rounds_limit");
+
+ static final FieldName logicRandomSeed = FieldName.forField("logicRandomSeed", "logic_random_seed");
static final FieldName monsterWaveList = FieldName.forField("monsterWaveList", "monster_wave_list");
static final FieldName buffList = FieldName.forField("buffList", "buff_list");
+ static final FieldName battleAvatarList = FieldName.forField("battleAvatarList", "battle_avatar_list");
+
static final FieldName eventBattleInfoList = FieldName.forField("eventBattleInfoList", "event_battle_info_list");
static final FieldName battleTargetInfo = FieldName.forField("battleTargetInfo", "battle_target_info");
diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java
index 3b6acd4..6413b53 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java
@@ -11,6 +11,7 @@ import us.hebi.quickbuf.ProtoMessage;
import us.hebi.quickbuf.ProtoSink;
import us.hebi.quickbuf.ProtoSource;
import us.hebi.quickbuf.RepeatedInt;
+import us.hebi.quickbuf.RepeatedMessage;
public final class SceneCastSkillCsReqOuterClass {
/**
@@ -20,35 +21,35 @@ public final class SceneCastSkillCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 skill_index = 1;
+ * optional uint32 skill_index = 4;
*/
private int skillIndex;
+ /**
+ * optional uint32 caster_id = 5;
+ */
+ private int casterId;
+
/**
* optional uint32 attacked_group_id = 8;
*/
private int attackedGroupId;
- /**
- * optional uint32 caster_id = 10;
- */
- private int casterId;
-
/**
* optional .MotionInfo target_motion = 2;
*/
private final MotionInfoOuterClass.MotionInfo targetMotion = MotionInfoOuterClass.MotionInfo.newInstance();
/**
- * repeated uint32 assist_monster_entity_id_list = 6;
- */
- private final RepeatedInt assistMonsterEntityIdList = RepeatedInt.newEmptyInstance();
-
- /**
- * repeated uint32 hit_target_entity_id_list = 9;
+ * repeated uint32 hit_target_entity_id_list = 13;
*/
private final RepeatedInt hitTargetEntityIdList = RepeatedInt.newEmptyInstance();
+ /**
+ * repeated .AssistMonsterWave assist_monster_wave_list = 6;
+ */
+ private final RepeatedMessageoptional uint32 skill_index = 1;
+ * optional uint32 skill_index = 4;
* @return whether the skillIndex field is set
*/
public boolean hasSkillIndex() {
@@ -68,7 +69,7 @@ public final class SceneCastSkillCsReqOuterClass {
}
/**
- * optional uint32 skill_index = 1;
+ * optional uint32 skill_index = 4;
* @return this
*/
public SceneCastSkillCsReq clearSkillIndex() {
@@ -78,7 +79,7 @@ public final class SceneCastSkillCsReqOuterClass {
}
/**
- * optional uint32 skill_index = 1;
+ * optional uint32 skill_index = 4;
* @return the skillIndex
*/
public int getSkillIndex() {
@@ -86,7 +87,7 @@ public final class SceneCastSkillCsReqOuterClass {
}
/**
- * optional uint32 skill_index = 1;
+ * optional uint32 skill_index = 4;
* @param value the skillIndex to set
* @return this
*/
@@ -96,12 +97,49 @@ public final class SceneCastSkillCsReqOuterClass {
return this;
}
+ /**
+ * optional uint32 caster_id = 5;
+ * @return whether the casterId field is set
+ */
+ public boolean hasCasterId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 caster_id = 5;
+ * @return this
+ */
+ public SceneCastSkillCsReq clearCasterId() {
+ bitField0_ &= ~0x00000002;
+ casterId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 caster_id = 5;
+ * @return the casterId
+ */
+ public int getCasterId() {
+ return casterId;
+ }
+
+ /**
+ * optional uint32 caster_id = 5;
+ * @param value the casterId to set
+ * @return this
+ */
+ public SceneCastSkillCsReq setCasterId(final int value) {
+ bitField0_ |= 0x00000002;
+ casterId = value;
+ return this;
+ }
+
/**
* optional uint32 attacked_group_id = 8;
* @return whether the attackedGroupId field is set
*/
public boolean hasAttackedGroupId() {
- return (bitField0_ & 0x00000002) != 0;
+ return (bitField0_ & 0x00000004) != 0;
}
/**
@@ -109,7 +147,7 @@ public final class SceneCastSkillCsReqOuterClass {
* @return this
*/
public SceneCastSkillCsReq clearAttackedGroupId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000004;
attackedGroupId = 0;
return this;
}
@@ -128,45 +166,8 @@ public final class SceneCastSkillCsReqOuterClass {
* @return this
*/
public SceneCastSkillCsReq setAttackedGroupId(final int value) {
- bitField0_ |= 0x00000002;
- attackedGroupId = value;
- return this;
- }
-
- /**
- * optional uint32 caster_id = 10;
- * @return whether the casterId field is set
- */
- public boolean hasCasterId() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 caster_id = 10;
- * @return this
- */
- public SceneCastSkillCsReq clearCasterId() {
- bitField0_ &= ~0x00000004;
- casterId = 0;
- return this;
- }
-
- /**
- * optional uint32 caster_id = 10;
- * @return the casterId
- */
- public int getCasterId() {
- return casterId;
- }
-
- /**
- * optional uint32 caster_id = 10;
- * @param value the casterId to set
- * @return this
- */
- public SceneCastSkillCsReq setCasterId(final int value) {
bitField0_ |= 0x00000004;
- casterId = value;
+ attackedGroupId = value;
return this;
}
@@ -228,93 +229,25 @@ public final class SceneCastSkillCsReqOuterClass {
}
/**
- * repeated uint32 assist_monster_entity_id_list = 6;
- * @return whether the assistMonsterEntityIdList field is set
+ * repeated uint32 hit_target_entity_id_list = 13;
+ * @return whether the hitTargetEntityIdList field is set
*/
- public boolean hasAssistMonsterEntityIdList() {
+ public boolean hasHitTargetEntityIdList() {
return (bitField0_ & 0x00000010) != 0;
}
/**
- * repeated uint32 assist_monster_entity_id_list = 6;
- * @return this
- */
- public SceneCastSkillCsReq clearAssistMonsterEntityIdList() {
- bitField0_ &= ~0x00000010;
- assistMonsterEntityIdList.clear();
- return this;
- }
-
- /**
- * repeated uint32 assist_monster_entity_id_list = 6;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableAssistMonsterEntityIdList()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedInt getAssistMonsterEntityIdList() {
- return assistMonsterEntityIdList;
- }
-
- /**
- * repeated uint32 assist_monster_entity_id_list = 6;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedInt getMutableAssistMonsterEntityIdList() {
- bitField0_ |= 0x00000010;
- return assistMonsterEntityIdList;
- }
-
- /**
- * repeated uint32 assist_monster_entity_id_list = 6;
- * @param value the assistMonsterEntityIdList to add
- * @return this
- */
- public SceneCastSkillCsReq addAssistMonsterEntityIdList(final int value) {
- bitField0_ |= 0x00000010;
- assistMonsterEntityIdList.add(value);
- return this;
- }
-
- /**
- * repeated uint32 assist_monster_entity_id_list = 6;
- * @param values the assistMonsterEntityIdList to add
- * @return this
- */
- public SceneCastSkillCsReq addAllAssistMonsterEntityIdList(final int... values) {
- bitField0_ |= 0x00000010;
- assistMonsterEntityIdList.addAll(values);
- return this;
- }
-
- /**
- * repeated uint32 hit_target_entity_id_list = 9;
- * @return whether the hitTargetEntityIdList field is set
- */
- public boolean hasHitTargetEntityIdList() {
- return (bitField0_ & 0x00000020) != 0;
- }
-
- /**
- * repeated uint32 hit_target_entity_id_list = 9;
+ * repeated uint32 hit_target_entity_id_list = 13;
* @return this
*/
public SceneCastSkillCsReq clearHitTargetEntityIdList() {
- bitField0_ &= ~0x00000020;
+ bitField0_ &= ~0x00000010;
hitTargetEntityIdList.clear();
return this;
}
/**
- * repeated uint32 hit_target_entity_id_list = 9;
+ * repeated uint32 hit_target_entity_id_list = 13;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -328,7 +261,7 @@ public final class SceneCastSkillCsReqOuterClass {
}
/**
- * repeated uint32 hit_target_entity_id_list = 9;
+ * repeated uint32 hit_target_entity_id_list = 13;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -337,43 +270,115 @@ public final class SceneCastSkillCsReqOuterClass {
* @return internal storage object for modifications
*/
public RepeatedInt getMutableHitTargetEntityIdList() {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
return hitTargetEntityIdList;
}
/**
- * repeated uint32 hit_target_entity_id_list = 9;
+ * repeated uint32 hit_target_entity_id_list = 13;
* @param value the hitTargetEntityIdList to add
* @return this
*/
public SceneCastSkillCsReq addHitTargetEntityIdList(final int value) {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
hitTargetEntityIdList.add(value);
return this;
}
/**
- * repeated uint32 hit_target_entity_id_list = 9;
+ * repeated uint32 hit_target_entity_id_list = 13;
* @param values the hitTargetEntityIdList to add
* @return this
*/
public SceneCastSkillCsReq addAllHitTargetEntityIdList(final int... values) {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
hitTargetEntityIdList.addAll(values);
return this;
}
+ /**
+ * repeated .AssistMonsterWave assist_monster_wave_list = 6;
+ * @return whether the assistMonsterWaveList field is set
+ */
+ public boolean hasAssistMonsterWaveList() {
+ return (bitField0_ & 0x00000020) != 0;
+ }
+
+ /**
+ * repeated .AssistMonsterWave assist_monster_wave_list = 6;
+ * @return this
+ */
+ public SceneCastSkillCsReq clearAssistMonsterWaveList() {
+ bitField0_ &= ~0x00000020;
+ assistMonsterWaveList.clear();
+ return this;
+ }
+
+ /**
+ * repeated .AssistMonsterWave assist_monster_wave_list = 6;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableAssistMonsterWaveList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedMessagerepeated .AssistMonsterWave assist_monster_wave_list = 6;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedMessagerepeated .AssistMonsterWave assist_monster_wave_list = 6;
+ * @param value the assistMonsterWaveList to add
+ * @return this
+ */
+ public SceneCastSkillCsReq addAssistMonsterWaveList(
+ final AssistMonsterWaveOuterClass.AssistMonsterWave value) {
+ bitField0_ |= 0x00000020;
+ assistMonsterWaveList.add(value);
+ return this;
+ }
+
+ /**
+ * repeated .AssistMonsterWave assist_monster_wave_list = 6;
+ * @param values the assistMonsterWaveList to add
+ * @return this
+ */
+ public SceneCastSkillCsReq addAllAssistMonsterWaveList(
+ final AssistMonsterWaveOuterClass.AssistMonsterWave... values) {
+ bitField0_ |= 0x00000020;
+ assistMonsterWaveList.addAll(values);
+ return this;
+ }
+
@Override
public SceneCastSkillCsReq copyFrom(final SceneCastSkillCsReq other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
skillIndex = other.skillIndex;
- attackedGroupId = other.attackedGroupId;
casterId = other.casterId;
+ attackedGroupId = other.attackedGroupId;
targetMotion.copyFrom(other.targetMotion);
- assistMonsterEntityIdList.copyFrom(other.assistMonsterEntityIdList);
hitTargetEntityIdList.copyFrom(other.hitTargetEntityIdList);
+ assistMonsterWaveList.copyFrom(other.assistMonsterWaveList);
}
return this;
}
@@ -387,21 +392,21 @@ public final class SceneCastSkillCsReqOuterClass {
if (other.hasSkillIndex()) {
setSkillIndex(other.skillIndex);
}
- if (other.hasAttackedGroupId()) {
- setAttackedGroupId(other.attackedGroupId);
- }
if (other.hasCasterId()) {
setCasterId(other.casterId);
}
+ if (other.hasAttackedGroupId()) {
+ setAttackedGroupId(other.attackedGroupId);
+ }
if (other.hasTargetMotion()) {
getMutableTargetMotion().mergeFrom(other.targetMotion);
}
- if (other.hasAssistMonsterEntityIdList()) {
- getMutableAssistMonsterEntityIdList().addAll(other.assistMonsterEntityIdList);
- }
if (other.hasHitTargetEntityIdList()) {
getMutableHitTargetEntityIdList().addAll(other.hitTargetEntityIdList);
}
+ if (other.hasAssistMonsterWaveList()) {
+ getMutableAssistMonsterWaveList().addAll(other.assistMonsterWaveList);
+ }
return this;
}
@@ -413,11 +418,11 @@ public final class SceneCastSkillCsReqOuterClass {
cachedSize = -1;
bitField0_ = 0;
skillIndex = 0;
- attackedGroupId = 0;
casterId = 0;
+ attackedGroupId = 0;
targetMotion.clear();
- assistMonsterEntityIdList.clear();
hitTargetEntityIdList.clear();
+ assistMonsterWaveList.clear();
return this;
}
@@ -429,8 +434,8 @@ public final class SceneCastSkillCsReqOuterClass {
cachedSize = -1;
bitField0_ = 0;
targetMotion.clearQuick();
- assistMonsterEntityIdList.clear();
hitTargetEntityIdList.clear();
+ assistMonsterWaveList.clearQuick();
return this;
}
@@ -445,41 +450,41 @@ public final class SceneCastSkillCsReqOuterClass {
SceneCastSkillCsReq other = (SceneCastSkillCsReq) o;
return bitField0_ == other.bitField0_
&& (!hasSkillIndex() || skillIndex == other.skillIndex)
- && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId)
&& (!hasCasterId() || casterId == other.casterId)
+ && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId)
&& (!hasTargetMotion() || targetMotion.equals(other.targetMotion))
- && (!hasAssistMonsterEntityIdList() || assistMonsterEntityIdList.equals(other.assistMonsterEntityIdList))
- && (!hasHitTargetEntityIdList() || hitTargetEntityIdList.equals(other.hitTargetEntityIdList));
+ && (!hasHitTargetEntityIdList() || hitTargetEntityIdList.equals(other.hitTargetEntityIdList))
+ && (!hasAssistMonsterWaveList() || assistMonsterWaveList.equals(other.assistMonsterWaveList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(skillIndex);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 64);
- output.writeUInt32NoTag(attackedGroupId);
+ output.writeRawByte((byte) 40);
+ output.writeUInt32NoTag(casterId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(casterId);
+ output.writeRawByte((byte) 64);
+ output.writeUInt32NoTag(attackedGroupId);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeRawByte((byte) 18);
output.writeMessageNoTag(targetMotion);
}
if ((bitField0_ & 0x00000010) != 0) {
- for (int i = 0; i < assistMonsterEntityIdList.length(); i++) {
- output.writeRawByte((byte) 48);
- output.writeUInt32NoTag(assistMonsterEntityIdList.array()[i]);
+ for (int i = 0; i < hitTargetEntityIdList.length(); i++) {
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(hitTargetEntityIdList.array()[i]);
}
}
if ((bitField0_ & 0x00000020) != 0) {
- for (int i = 0; i < hitTargetEntityIdList.length(); i++) {
- output.writeRawByte((byte) 72);
- output.writeUInt32NoTag(hitTargetEntityIdList.array()[i]);
+ for (int i = 0; i < assistMonsterWaveList.length(); i++) {
+ output.writeRawByte((byte) 50);
+ output.writeMessageNoTag(assistMonsterWaveList.get(i));
}
}
}
@@ -491,19 +496,19 @@ public final class SceneCastSkillCsReqOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(skillIndex);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(casterId);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(casterId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId);
}
if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(targetMotion);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += (1 * assistMonsterEntityIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(assistMonsterEntityIdList);
+ size += (1 * hitTargetEntityIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(hitTargetEntityIdList);
}
if ((bitField0_ & 0x00000020) != 0) {
- size += (1 * hitTargetEntityIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(hitTargetEntityIdList);
+ size += (1 * assistMonsterWaveList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(assistMonsterWaveList);
}
return size;
}
@@ -515,11 +520,20 @@ public final class SceneCastSkillCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 32: {
// skillIndex
skillIndex = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
+ if (tag != 40) {
+ break;
+ }
+ }
+ case 40: {
+ // casterId
+ casterId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
if (tag != 64) {
break;
}
@@ -527,15 +541,6 @@ public final class SceneCastSkillCsReqOuterClass {
case 64: {
// attackedGroupId
attackedGroupId = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 80) {
- break;
- }
- }
- case 80: {
- // casterId
- casterId = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 18) {
@@ -547,24 +552,23 @@ public final class SceneCastSkillCsReqOuterClass {
input.readMessage(targetMotion);
bitField0_ |= 0x00000008;
tag = input.readTag();
+ if (tag != 106) {
+ break;
+ }
+ }
+ case 106: {
+ // hitTargetEntityIdList [packed=true]
+ input.readPackedUInt32(hitTargetEntityIdList, tag);
+ bitField0_ |= 0x00000010;
+ tag = input.readTag();
if (tag != 50) {
break;
}
}
case 50: {
- // assistMonsterEntityIdList [packed=true]
- input.readPackedUInt32(assistMonsterEntityIdList, tag);
- bitField0_ |= 0x00000010;
- tag = input.readTag();
- if (tag != 74) {
- break;
- }
- }
- case 74: {
- // hitTargetEntityIdList [packed=true]
- input.readPackedUInt32(hitTargetEntityIdList, tag);
+ // assistMonsterWaveList
+ tag = input.readRepeatedMessage(assistMonsterWaveList, tag);
bitField0_ |= 0x00000020;
- tag = input.readTag();
if (tag != 0) {
break;
}
@@ -579,16 +583,10 @@ public final class SceneCastSkillCsReqOuterClass {
tag = input.readTag();
break;
}
- case 48: {
- // assistMonsterEntityIdList [packed=false]
- tag = input.readRepeatedUInt32(assistMonsterEntityIdList, tag);
- bitField0_ |= 0x00000010;
- break;
- }
- case 72: {
+ case 104: {
// hitTargetEntityIdList [packed=false]
tag = input.readRepeatedUInt32(hitTargetEntityIdList, tag);
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000010;
break;
}
}
@@ -602,19 +600,19 @@ public final class SceneCastSkillCsReqOuterClass {
output.writeUInt32(FieldNames.skillIndex, skillIndex);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId);
+ output.writeUInt32(FieldNames.casterId, casterId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.casterId, casterId);
+ output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeMessage(FieldNames.targetMotion, targetMotion);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRepeatedUInt32(FieldNames.assistMonsterEntityIdList, assistMonsterEntityIdList);
+ output.writeRepeatedUInt32(FieldNames.hitTargetEntityIdList, hitTargetEntityIdList);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRepeatedUInt32(FieldNames.hitTargetEntityIdList, hitTargetEntityIdList);
+ output.writeRepeatedMessage(FieldNames.assistMonsterWaveList, assistMonsterWaveList);
}
output.endObject();
}
@@ -638,11 +636,11 @@ public final class SceneCastSkillCsReqOuterClass {
}
break;
}
- case -1725961965:
- case -715836621: {
- if (input.isAtField(FieldNames.attackedGroupId)) {
+ case 35676775:
+ case 1106001422: {
+ if (input.isAtField(FieldNames.casterId)) {
if (!input.trySkipNullValue()) {
- attackedGroupId = input.readUInt32();
+ casterId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -650,11 +648,11 @@ public final class SceneCastSkillCsReqOuterClass {
}
break;
}
- case 35676775:
- case 1106001422: {
- if (input.isAtField(FieldNames.casterId)) {
+ case -1725961965:
+ case -715836621: {
+ if (input.isAtField(FieldNames.attackedGroupId)) {
if (!input.trySkipNullValue()) {
- casterId = input.readUInt32();
+ attackedGroupId = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -674,11 +672,11 @@ public final class SceneCastSkillCsReqOuterClass {
}
break;
}
- case -1391993363:
- case -1507247487: {
- if (input.isAtField(FieldNames.assistMonsterEntityIdList)) {
+ case 1319168832:
+ case -35493464: {
+ if (input.isAtField(FieldNames.hitTargetEntityIdList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedUInt32(assistMonsterEntityIdList);
+ input.readRepeatedUInt32(hitTargetEntityIdList);
bitField0_ |= 0x00000010;
}
} else {
@@ -686,11 +684,11 @@ public final class SceneCastSkillCsReqOuterClass {
}
break;
}
- case 1319168832:
- case -35493464: {
- if (input.isAtField(FieldNames.hitTargetEntityIdList)) {
+ case 932756360:
+ case 1103792041: {
+ if (input.isAtField(FieldNames.assistMonsterWaveList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedUInt32(hitTargetEntityIdList);
+ input.readRepeatedMessage(assistMonsterWaveList);
bitField0_ |= 0x00000020;
}
} else {
@@ -753,15 +751,15 @@ public final class SceneCastSkillCsReqOuterClass {
static class FieldNames {
static final FieldName skillIndex = FieldName.forField("skillIndex", "skill_index");
- static final FieldName attackedGroupId = FieldName.forField("attackedGroupId", "attacked_group_id");
-
static final FieldName casterId = FieldName.forField("casterId", "caster_id");
+ static final FieldName attackedGroupId = FieldName.forField("attackedGroupId", "attacked_group_id");
+
static final FieldName targetMotion = FieldName.forField("targetMotion", "target_motion");
- static final FieldName assistMonsterEntityIdList = FieldName.forField("assistMonsterEntityIdList", "assist_monster_entity_id_list");
-
static final FieldName hitTargetEntityIdList = FieldName.forField("hitTargetEntityIdList", "hit_target_entity_id_list");
+
+ static final FieldName assistMonsterWaveList = FieldName.forField("assistMonsterWaveList", "assist_monster_wave_list");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillMpUpdateScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillMpUpdateScNotifyOuterClass.java
index b2147f5..a180af2 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneCastSkillMpUpdateScNotifyOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneCastSkillMpUpdateScNotifyOuterClass.java
@@ -19,15 +19,15 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 attacked_group_id = 5;
- */
- private int attackedGroupId;
-
- /**
- * optional uint32 mp = 11;
+ * optional uint32 mp = 10;
*/
private int mp;
+ /**
+ * optional uint32 attacked_group_id = 11;
+ */
+ private int attackedGroupId;
+
private SceneCastSkillMpUpdateScNotify() {
}
@@ -39,62 +39,25 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass {
}
/**
- * optional uint32 attacked_group_id = 5;
- * @return whether the attackedGroupId field is set
+ * optional uint32 mp = 10;
+ * @return whether the mp field is set
*/
- public boolean hasAttackedGroupId() {
+ public boolean hasMp() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 attacked_group_id = 5;
- * @return this
- */
- public SceneCastSkillMpUpdateScNotify clearAttackedGroupId() {
- bitField0_ &= ~0x00000001;
- attackedGroupId = 0;
- return this;
- }
-
- /**
- * optional uint32 attacked_group_id = 5;
- * @return the attackedGroupId
- */
- public int getAttackedGroupId() {
- return attackedGroupId;
- }
-
- /**
- * optional uint32 attacked_group_id = 5;
- * @param value the attackedGroupId to set
- * @return this
- */
- public SceneCastSkillMpUpdateScNotify setAttackedGroupId(final int value) {
- bitField0_ |= 0x00000001;
- attackedGroupId = value;
- return this;
- }
-
- /**
- * optional uint32 mp = 11;
- * @return whether the mp field is set
- */
- public boolean hasMp() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 mp = 11;
+ * optional uint32 mp = 10;
* @return this
*/
public SceneCastSkillMpUpdateScNotify clearMp() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
mp = 0;
return this;
}
/**
- * optional uint32 mp = 11;
+ * optional uint32 mp = 10;
* @return the mp
*/
public int getMp() {
@@ -102,23 +65,60 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass {
}
/**
- * optional uint32 mp = 11;
+ * optional uint32 mp = 10;
* @param value the mp to set
* @return this
*/
public SceneCastSkillMpUpdateScNotify setMp(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
mp = value;
return this;
}
+ /**
+ * optional uint32 attacked_group_id = 11;
+ * @return whether the attackedGroupId field is set
+ */
+ public boolean hasAttackedGroupId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 attacked_group_id = 11;
+ * @return this
+ */
+ public SceneCastSkillMpUpdateScNotify clearAttackedGroupId() {
+ bitField0_ &= ~0x00000002;
+ attackedGroupId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 attacked_group_id = 11;
+ * @return the attackedGroupId
+ */
+ public int getAttackedGroupId() {
+ return attackedGroupId;
+ }
+
+ /**
+ * optional uint32 attacked_group_id = 11;
+ * @param value the attackedGroupId to set
+ * @return this
+ */
+ public SceneCastSkillMpUpdateScNotify setAttackedGroupId(final int value) {
+ bitField0_ |= 0x00000002;
+ attackedGroupId = value;
+ return this;
+ }
+
@Override
public SceneCastSkillMpUpdateScNotify copyFrom(final SceneCastSkillMpUpdateScNotify other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- attackedGroupId = other.attackedGroupId;
mp = other.mp;
+ attackedGroupId = other.attackedGroupId;
}
return this;
}
@@ -129,12 +129,12 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasAttackedGroupId()) {
- setAttackedGroupId(other.attackedGroupId);
- }
if (other.hasMp()) {
setMp(other.mp);
}
+ if (other.hasAttackedGroupId()) {
+ setAttackedGroupId(other.attackedGroupId);
+ }
return this;
}
@@ -145,8 +145,8 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- attackedGroupId = 0;
mp = 0;
+ attackedGroupId = 0;
return this;
}
@@ -170,19 +170,19 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass {
}
SceneCastSkillMpUpdateScNotify other = (SceneCastSkillMpUpdateScNotify) o;
return bitField0_ == other.bitField0_
- && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId)
- && (!hasMp() || mp == other.mp);
+ && (!hasMp() || mp == other.mp)
+ && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
- output.writeUInt32NoTag(attackedGroupId);
+ output.writeRawByte((byte) 80);
+ output.writeUInt32NoTag(mp);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 88);
- output.writeUInt32NoTag(mp);
+ output.writeUInt32NoTag(attackedGroupId);
}
}
@@ -190,10 +190,10 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(mp);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(mp);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId);
}
return size;
}
@@ -205,9 +205,9 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
- // attackedGroupId
- attackedGroupId = input.readUInt32();
+ case 80: {
+ // mp
+ mp = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
if (tag != 88) {
@@ -215,8 +215,8 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass {
}
}
case 88: {
- // mp
- mp = input.readUInt32();
+ // attackedGroupId
+ attackedGroupId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 0) {
@@ -241,10 +241,10 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId);
+ output.writeUInt32(FieldNames.mp, mp);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.mp, mp);
+ output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId);
}
output.endObject();
}
@@ -256,11 +256,10 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1725961965:
- case -715836621: {
- if (input.isAtField(FieldNames.attackedGroupId)) {
+ case 3491: {
+ if (input.isAtField(FieldNames.mp)) {
if (!input.trySkipNullValue()) {
- attackedGroupId = input.readUInt32();
+ mp = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -268,10 +267,11 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass {
}
break;
}
- case 3491: {
- if (input.isAtField(FieldNames.mp)) {
+ case -1725961965:
+ case -715836621: {
+ if (input.isAtField(FieldNames.attackedGroupId)) {
if (!input.trySkipNullValue()) {
- mp = input.readUInt32();
+ attackedGroupId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -334,9 +334,9 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName attackedGroupId = FieldName.forField("attackedGroupId", "attacked_group_id");
-
static final FieldName mp = FieldName.forField("mp");
+
+ static final FieldName attackedGroupId = FieldName.forField("attackedGroupId", "attacked_group_id");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillScRspOuterClass.java
index d79d74d..66a7261 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneCastSkillScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneCastSkillScRspOuterClass.java
@@ -19,17 +19,17 @@ public final class SceneCastSkillScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 3;
- */
- private int retcode;
-
- /**
- * optional uint32 attacked_group_id = 15;
+ * optional uint32 attacked_group_id = 3;
*/
private int attackedGroupId;
/**
- * optional .SceneBattleInfo battle_info = 8;
+ * optional uint32 retcode = 6;
+ */
+ private int retcode;
+
+ /**
+ * optional .SceneBattleInfo battle_info = 7;
*/
private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance();
@@ -44,62 +44,25 @@ public final class SceneCastSkillScRspOuterClass {
}
/**
- * optional uint32 retcode = 3;
- * @return whether the retcode field is set
+ * optional uint32 attacked_group_id = 3;
+ * @return whether the attackedGroupId field is set
*/
- public boolean hasRetcode() {
+ public boolean hasAttackedGroupId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 retcode = 3;
- * @return this
- */
- public SceneCastSkillScRsp clearRetcode() {
- bitField0_ &= ~0x00000001;
- retcode = 0;
- return this;
- }
-
- /**
- * optional uint32 retcode = 3;
- * @return the retcode
- */
- public int getRetcode() {
- return retcode;
- }
-
- /**
- * optional uint32 retcode = 3;
- * @param value the retcode to set
- * @return this
- */
- public SceneCastSkillScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000001;
- retcode = value;
- return this;
- }
-
- /**
- * optional uint32 attacked_group_id = 15;
- * @return whether the attackedGroupId field is set
- */
- public boolean hasAttackedGroupId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 attacked_group_id = 15;
+ * optional uint32 attacked_group_id = 3;
* @return this
*/
public SceneCastSkillScRsp clearAttackedGroupId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
attackedGroupId = 0;
return this;
}
/**
- * optional uint32 attacked_group_id = 15;
+ * optional uint32 attacked_group_id = 3;
* @return the attackedGroupId
*/
public int getAttackedGroupId() {
@@ -107,18 +70,55 @@ public final class SceneCastSkillScRspOuterClass {
}
/**
- * optional uint32 attacked_group_id = 15;
+ * optional uint32 attacked_group_id = 3;
* @param value the attackedGroupId to set
* @return this
*/
public SceneCastSkillScRsp setAttackedGroupId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
attackedGroupId = value;
return this;
}
/**
- * optional .SceneBattleInfo battle_info = 8;
+ * optional uint32 retcode = 6;
+ * @return whether the retcode field is set
+ */
+ public boolean hasRetcode() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 retcode = 6;
+ * @return this
+ */
+ public SceneCastSkillScRsp clearRetcode() {
+ bitField0_ &= ~0x00000002;
+ retcode = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 retcode = 6;
+ * @return the retcode
+ */
+ public int getRetcode() {
+ return retcode;
+ }
+
+ /**
+ * optional uint32 retcode = 6;
+ * @param value the retcode to set
+ * @return this
+ */
+ public SceneCastSkillScRsp setRetcode(final int value) {
+ bitField0_ |= 0x00000002;
+ retcode = value;
+ return this;
+ }
+
+ /**
+ * optional .SceneBattleInfo battle_info = 7;
* @return whether the battleInfo field is set
*/
public boolean hasBattleInfo() {
@@ -126,7 +126,7 @@ public final class SceneCastSkillScRspOuterClass {
}
/**
- * optional .SceneBattleInfo battle_info = 8;
+ * optional .SceneBattleInfo battle_info = 7;
* @return this
*/
public SceneCastSkillScRsp clearBattleInfo() {
@@ -136,7 +136,7 @@ public final class SceneCastSkillScRspOuterClass {
}
/**
- * optional .SceneBattleInfo battle_info = 8;
+ * optional .SceneBattleInfo battle_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.
@@ -150,7 +150,7 @@ public final class SceneCastSkillScRspOuterClass {
}
/**
- * optional .SceneBattleInfo battle_info = 8;
+ * optional .SceneBattleInfo battle_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
@@ -164,7 +164,7 @@ public final class SceneCastSkillScRspOuterClass {
}
/**
- * optional .SceneBattleInfo battle_info = 8;
+ * optional .SceneBattleInfo battle_info = 7;
* @param value the battleInfo to set
* @return this
*/
@@ -180,8 +180,8 @@ public final class SceneCastSkillScRspOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- retcode = other.retcode;
attackedGroupId = other.attackedGroupId;
+ retcode = other.retcode;
battleInfo.copyFrom(other.battleInfo);
}
return this;
@@ -193,12 +193,12 @@ public final class SceneCastSkillScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasRetcode()) {
- setRetcode(other.retcode);
- }
if (other.hasAttackedGroupId()) {
setAttackedGroupId(other.attackedGroupId);
}
+ if (other.hasRetcode()) {
+ setRetcode(other.retcode);
+ }
if (other.hasBattleInfo()) {
getMutableBattleInfo().mergeFrom(other.battleInfo);
}
@@ -212,8 +212,8 @@ public final class SceneCastSkillScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- retcode = 0;
attackedGroupId = 0;
+ retcode = 0;
battleInfo.clear();
return this;
}
@@ -239,8 +239,8 @@ public final class SceneCastSkillScRspOuterClass {
}
SceneCastSkillScRsp other = (SceneCastSkillScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasRetcode() || retcode == other.retcode)
&& (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId)
+ && (!hasRetcode() || retcode == other.retcode)
&& (!hasBattleInfo() || battleInfo.equals(other.battleInfo));
}
@@ -248,14 +248,14 @@ public final class SceneCastSkillScRspOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(retcode);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 120);
output.writeUInt32NoTag(attackedGroupId);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 48);
+ output.writeUInt32NoTag(retcode);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 66);
+ output.writeRawByte((byte) 58);
output.writeMessageNoTag(battleInfo);
}
}
@@ -264,10 +264,10 @@ public final class SceneCastSkillScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(battleInfo);
@@ -283,24 +283,24 @@ public final class SceneCastSkillScRspOuterClass {
while (true) {
switch (tag) {
case 24: {
- // retcode
- retcode = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 120) {
- break;
- }
- }
- case 120: {
// attackedGroupId
attackedGroupId = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 66) {
+ if (tag != 48) {
break;
}
}
- case 66: {
+ case 48: {
+ // retcode
+ retcode = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 58) {
+ break;
+ }
+ }
+ case 58: {
// battleInfo
input.readMessage(battleInfo);
bitField0_ |= 0x00000004;
@@ -327,10 +327,10 @@ public final class SceneCastSkillScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeMessage(FieldNames.battleInfo, battleInfo);
@@ -345,10 +345,11 @@ public final class SceneCastSkillScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case -1725961965:
+ case -715836621: {
+ if (input.isAtField(FieldNames.attackedGroupId)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ attackedGroupId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -356,11 +357,10 @@ public final class SceneCastSkillScRspOuterClass {
}
break;
}
- case -1725961965:
- case -715836621: {
- if (input.isAtField(FieldNames.attackedGroupId)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- attackedGroupId = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -433,10 +433,10 @@ public final class SceneCastSkillScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName retcode = FieldName.forField("retcode");
-
static final FieldName attackedGroupId = FieldName.forField("attackedGroupId", "attacked_group_id");
+ static final FieldName retcode = FieldName.forField("retcode");
+
static final FieldName battleInfo = FieldName.forField("battleInfo", "battle_info");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/SceneEnterStageCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEnterStageCsReqOuterClass.java
index 5750310..69d412d 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneEnterStageCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneEnterStageCsReqOuterClass.java
@@ -19,7 +19,7 @@ public final class SceneEnterStageCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 stage_id = 1;
+ * optional uint32 stage_id = 5;
*/
private int stageId;
@@ -34,7 +34,7 @@ public final class SceneEnterStageCsReqOuterClass {
}
/**
- * optional uint32 stage_id = 1;
+ * optional uint32 stage_id = 5;
* @return whether the stageId field is set
*/
public boolean hasStageId() {
@@ -42,7 +42,7 @@ public final class SceneEnterStageCsReqOuterClass {
}
/**
- * optional uint32 stage_id = 1;
+ * optional uint32 stage_id = 5;
* @return this
*/
public SceneEnterStageCsReq clearStageId() {
@@ -52,7 +52,7 @@ public final class SceneEnterStageCsReqOuterClass {
}
/**
- * optional uint32 stage_id = 1;
+ * optional uint32 stage_id = 5;
* @return the stageId
*/
public int getStageId() {
@@ -60,7 +60,7 @@ public final class SceneEnterStageCsReqOuterClass {
}
/**
- * optional uint32 stage_id = 1;
+ * optional uint32 stage_id = 5;
* @param value the stageId to set
* @return this
*/
@@ -129,7 +129,7 @@ public final class SceneEnterStageCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(stageId);
}
}
@@ -150,7 +150,7 @@ public final class SceneEnterStageCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
+ case 40: {
// stageId
stageId = input.readUInt32();
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/SceneEnterStageScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEnterStageScRspOuterClass.java
index c1b53ed..3208f58 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneEnterStageScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneEnterStageScRspOuterClass.java
@@ -19,12 +19,12 @@ public final class SceneEnterStageScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 2;
*/
private int retcode;
/**
- * optional .SceneBattleInfo battle_info = 12;
+ * optional .SceneBattleInfo battle_info = 6;
*/
private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance();
@@ -39,7 +39,7 @@ public final class SceneEnterStageScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 2;
* @return whether the retcode field is set
*/
public boolean hasRetcode() {
@@ -47,7 +47,7 @@ public final class SceneEnterStageScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 2;
* @return this
*/
public SceneEnterStageScRsp clearRetcode() {
@@ -57,7 +57,7 @@ public final class SceneEnterStageScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 2;
* @return the retcode
*/
public int getRetcode() {
@@ -65,7 +65,7 @@ public final class SceneEnterStageScRspOuterClass {
}
/**
- * optional uint32 retcode = 7;
+ * optional uint32 retcode = 2;
* @param value the retcode to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class SceneEnterStageScRspOuterClass {
}
/**
- * optional .SceneBattleInfo battle_info = 12;
+ * optional .SceneBattleInfo battle_info = 6;
* @return whether the battleInfo field is set
*/
public boolean hasBattleInfo() {
@@ -84,7 +84,7 @@ public final class SceneEnterStageScRspOuterClass {
}
/**
- * optional .SceneBattleInfo battle_info = 12;
+ * optional .SceneBattleInfo battle_info = 6;
* @return this
*/
public SceneEnterStageScRsp clearBattleInfo() {
@@ -94,7 +94,7 @@ public final class SceneEnterStageScRspOuterClass {
}
/**
- * optional .SceneBattleInfo battle_info = 12;
+ * optional .SceneBattleInfo battle_info = 6;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class SceneEnterStageScRspOuterClass {
}
/**
- * optional .SceneBattleInfo battle_info = 12;
+ * optional .SceneBattleInfo battle_info = 6;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class SceneEnterStageScRspOuterClass {
}
/**
- * optional .SceneBattleInfo battle_info = 12;
+ * optional .SceneBattleInfo battle_info = 6;
* @param value the battleInfo to set
* @return this
*/
@@ -199,11 +199,11 @@ public final class SceneEnterStageScRspOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(retcode);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 98);
+ output.writeRawByte((byte) 50);
output.writeMessageNoTag(battleInfo);
}
}
@@ -227,16 +227,16 @@ public final class SceneEnterStageScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
+ case 16: {
// retcode
retcode = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 98) {
+ if (tag != 50) {
break;
}
}
- case 98: {
+ case 50: {
// battleInfo
input.readMessage(battleInfo);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityGroupInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityGroupInfoOuterClass.java
index 979dd03..708d011 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneEntityGroupInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneEntityGroupInfoOuterClass.java
@@ -20,17 +20,17 @@ public final class SceneEntityGroupInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 state = 7;
- */
- private int state;
-
- /**
- * optional uint32 group_id = 8;
+ * optional uint32 group_id = 4;
*/
private int groupId;
/**
- * repeated .SceneEntityInfo entity_list = 12;
+ * optional uint32 state = 6;
+ */
+ private int state;
+
+ /**
+ * repeated .SceneEntityInfo entity_list = 7;
*/
private final RepeatedMessageoptional uint32 state = 7;
- * @return whether the state field is set
+ * optional uint32 group_id = 4;
+ * @return whether the groupId field is set
*/
- public boolean hasState() {
+ public boolean hasGroupId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 state = 7;
- * @return this
- */
- public SceneEntityGroupInfo clearState() {
- bitField0_ &= ~0x00000001;
- state = 0;
- return this;
- }
-
- /**
- * optional uint32 state = 7;
- * @return the state
- */
- public int getState() {
- return state;
- }
-
- /**
- * optional uint32 state = 7;
- * @param value the state to set
- * @return this
- */
- public SceneEntityGroupInfo setState(final int value) {
- bitField0_ |= 0x00000001;
- state = value;
- return this;
- }
-
- /**
- * optional uint32 group_id = 8;
- * @return whether the groupId field is set
- */
- public boolean hasGroupId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 group_id = 8;
+ * optional uint32 group_id = 4;
* @return this
*/
public SceneEntityGroupInfo clearGroupId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
groupId = 0;
return this;
}
/**
- * optional uint32 group_id = 8;
+ * optional uint32 group_id = 4;
* @return the groupId
*/
public int getGroupId() {
@@ -108,18 +71,55 @@ public final class SceneEntityGroupInfoOuterClass {
}
/**
- * optional uint32 group_id = 8;
+ * optional uint32 group_id = 4;
* @param value the groupId to set
* @return this
*/
public SceneEntityGroupInfo setGroupId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
groupId = value;
return this;
}
/**
- * repeated .SceneEntityInfo entity_list = 12;
+ * optional uint32 state = 6;
+ * @return whether the state field is set
+ */
+ public boolean hasState() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 state = 6;
+ * @return this
+ */
+ public SceneEntityGroupInfo clearState() {
+ bitField0_ &= ~0x00000002;
+ state = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 state = 6;
+ * @return the state
+ */
+ public int getState() {
+ return state;
+ }
+
+ /**
+ * optional uint32 state = 6;
+ * @param value the state to set
+ * @return this
+ */
+ public SceneEntityGroupInfo setState(final int value) {
+ bitField0_ |= 0x00000002;
+ state = value;
+ return this;
+ }
+
+ /**
+ * repeated .SceneEntityInfo entity_list = 7;
* @return whether the entityList field is set
*/
public boolean hasEntityList() {
@@ -127,7 +127,7 @@ public final class SceneEntityGroupInfoOuterClass {
}
/**
- * repeated .SceneEntityInfo entity_list = 12;
+ * repeated .SceneEntityInfo entity_list = 7;
* @return this
*/
public SceneEntityGroupInfo clearEntityList() {
@@ -137,7 +137,7 @@ public final class SceneEntityGroupInfoOuterClass {
}
/**
- * repeated .SceneEntityInfo entity_list = 12;
+ * repeated .SceneEntityInfo entity_list = 7;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -151,7 +151,7 @@ public final class SceneEntityGroupInfoOuterClass {
}
/**
- * repeated .SceneEntityInfo entity_list = 12;
+ * repeated .SceneEntityInfo entity_list = 7;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -165,7 +165,7 @@ public final class SceneEntityGroupInfoOuterClass {
}
/**
- * repeated .SceneEntityInfo entity_list = 12;
+ * repeated .SceneEntityInfo entity_list = 7;
* @param value the entityList to add
* @return this
*/
@@ -177,7 +177,7 @@ public final class SceneEntityGroupInfoOuterClass {
}
/**
- * repeated .SceneEntityInfo entity_list = 12;
+ * repeated .SceneEntityInfo entity_list = 7;
* @param values the entityList to add
* @return this
*/
@@ -193,8 +193,8 @@ public final class SceneEntityGroupInfoOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- state = other.state;
groupId = other.groupId;
+ state = other.state;
entityList.copyFrom(other.entityList);
}
return this;
@@ -206,12 +206,12 @@ public final class SceneEntityGroupInfoOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasState()) {
- setState(other.state);
- }
if (other.hasGroupId()) {
setGroupId(other.groupId);
}
+ if (other.hasState()) {
+ setState(other.state);
+ }
if (other.hasEntityList()) {
getMutableEntityList().addAll(other.entityList);
}
@@ -225,8 +225,8 @@ public final class SceneEntityGroupInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- state = 0;
groupId = 0;
+ state = 0;
entityList.clear();
return this;
}
@@ -252,24 +252,24 @@ public final class SceneEntityGroupInfoOuterClass {
}
SceneEntityGroupInfo other = (SceneEntityGroupInfo) o;
return bitField0_ == other.bitField0_
- && (!hasState() || state == other.state)
&& (!hasGroupId() || groupId == other.groupId)
+ && (!hasState() || state == other.state)
&& (!hasEntityList() || entityList.equals(other.entityList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 56);
- output.writeUInt32NoTag(state);
+ output.writeRawByte((byte) 32);
+ output.writeUInt32NoTag(groupId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 64);
- output.writeUInt32NoTag(groupId);
+ output.writeRawByte((byte) 48);
+ output.writeUInt32NoTag(state);
}
if ((bitField0_ & 0x00000004) != 0) {
for (int i = 0; i < entityList.length(); i++) {
- output.writeRawByte((byte) 98);
+ output.writeRawByte((byte) 58);
output.writeMessageNoTag(entityList.get(i));
}
}
@@ -279,10 +279,10 @@ public final class SceneEntityGroupInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(state);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(state);
}
if ((bitField0_ & 0x00000004) != 0) {
size += (1 * entityList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityList);
@@ -297,25 +297,25 @@ public final class SceneEntityGroupInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 56: {
- // state
- state = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 64) {
- break;
- }
- }
- case 64: {
+ case 32: {
// groupId
groupId = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 98) {
+ if (tag != 48) {
break;
}
}
- case 98: {
+ case 48: {
+ // state
+ state = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 58) {
+ break;
+ }
+ }
+ case 58: {
// entityList
tag = input.readRepeatedMessage(entityList, tag);
bitField0_ |= 0x00000004;
@@ -341,10 +341,10 @@ public final class SceneEntityGroupInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.state, state);
+ output.writeUInt32(FieldNames.groupId, groupId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.groupId, groupId);
+ output.writeUInt32(FieldNames.state, state);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRepeatedMessage(FieldNames.entityList, entityList);
@@ -359,10 +359,11 @@ public final class SceneEntityGroupInfoOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 109757585: {
- if (input.isAtField(FieldNames.state)) {
+ case 293428218:
+ case 506361563: {
+ if (input.isAtField(FieldNames.groupId)) {
if (!input.trySkipNullValue()) {
- state = input.readUInt32();
+ groupId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -370,11 +371,10 @@ public final class SceneEntityGroupInfoOuterClass {
}
break;
}
- case 293428218:
- case 506361563: {
- if (input.isAtField(FieldNames.groupId)) {
+ case 109757585: {
+ if (input.isAtField(FieldNames.state)) {
if (!input.trySkipNullValue()) {
- groupId = input.readUInt32();
+ state = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -447,10 +447,10 @@ public final class SceneEntityGroupInfoOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName state = FieldName.forField("state");
-
static final FieldName groupId = FieldName.forField("groupId", "group_id");
+ static final FieldName state = FieldName.forField("state");
+
static final FieldName entityList = FieldName.forField("entityList", "entity_list");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityInfoOuterClass.java
index 8e67262..a4cff4b 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneEntityInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneEntityInfoOuterClass.java
@@ -19,50 +19,50 @@ public final class SceneEntityInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 inst_id = 3;
+ * optional uint32 inst_id = 1;
*/
private int instId;
/**
- * optional uint32 group_id = 5;
+ * optional uint32 group_id = 2;
*/
private int groupId;
/**
- * optional uint32 entity_id = 13;
+ * optional uint32 entity_id = 12;
*/
private int entityId;
/**
- * optional .MotionInfo motion = 4;
- */
- private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance();
-
- /**
- * optional .SceneNpcInfo npc = 8;
+ * optional .SceneNpcInfo npc = 3;
*/
private final SceneNpcInfoOuterClass.SceneNpcInfo npc = SceneNpcInfoOuterClass.SceneNpcInfo.newInstance();
/**
- * optional .SceneSummonUnitInfo summon_unit = 9;
+ * optional .MotionInfo motion = 5;
*/
- private final SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo summonUnit = SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo.newInstance();
+ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance();
/**
- * optional .ScenePropInfo prop = 10;
- */
- private final ScenePropInfoOuterClass.ScenePropInfo prop = ScenePropInfoOuterClass.ScenePropInfo.newInstance();
-
- /**
- * optional .SceneActorInfo actor = 11;
+ * optional .SceneActorInfo actor = 8;
*/
private final SceneActorInfoOuterClass.SceneActorInfo actor = SceneActorInfoOuterClass.SceneActorInfo.newInstance();
/**
- * optional .SceneNpcMonsterInfo npc_monster = 12;
+ * optional .SceneNpcMonsterInfo npc_monster = 10;
*/
private final SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo npcMonster = SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo.newInstance();
+ /**
+ * optional .ScenePropInfo prop = 13;
+ */
+ private final ScenePropInfoOuterClass.ScenePropInfo prop = ScenePropInfoOuterClass.ScenePropInfo.newInstance();
+
+ /**
+ * optional .SceneSummonUnitInfo summon_unit = 14;
+ */
+ private final SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo summonUnit = SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo.newInstance();
+
private SceneEntityInfo() {
}
@@ -74,7 +74,7 @@ public final class SceneEntityInfoOuterClass {
}
/**
- * optional uint32 inst_id = 3;
+ * optional uint32 inst_id = 1;
* @return whether the instId field is set
*/
public boolean hasInstId() {
@@ -82,7 +82,7 @@ public final class SceneEntityInfoOuterClass {
}
/**
- * optional uint32 inst_id = 3;
+ * optional uint32 inst_id = 1;
* @return this
*/
public SceneEntityInfo clearInstId() {
@@ -92,7 +92,7 @@ public final class SceneEntityInfoOuterClass {
}
/**
- * optional uint32 inst_id = 3;
+ * optional uint32 inst_id = 1;
* @return the instId
*/
public int getInstId() {
@@ -100,7 +100,7 @@ public final class SceneEntityInfoOuterClass {
}
/**
- * optional uint32 inst_id = 3;
+ * optional uint32 inst_id = 1;
* @param value the instId to set
* @return this
*/
@@ -111,7 +111,7 @@ public final class SceneEntityInfoOuterClass {
}
/**
- * optional uint32 group_id = 5;
+ * optional uint32 group_id = 2;
* @return whether the groupId field is set
*/
public boolean hasGroupId() {
@@ -119,7 +119,7 @@ public final class SceneEntityInfoOuterClass {
}
/**
- * optional uint32 group_id = 5;
+ * optional uint32 group_id = 2;
* @return this
*/
public SceneEntityInfo clearGroupId() {
@@ -129,7 +129,7 @@ public final class SceneEntityInfoOuterClass {
}
/**
- * optional uint32 group_id = 5;
+ * optional uint32 group_id = 2;
* @return the groupId
*/
public int getGroupId() {
@@ -137,7 +137,7 @@ public final class SceneEntityInfoOuterClass {
}
/**
- * optional uint32 group_id = 5;
+ * optional uint32 group_id = 2;
* @param value the groupId to set
* @return this
*/
@@ -148,7 +148,7 @@ public final class SceneEntityInfoOuterClass {
}
/**
- * optional uint32 entity_id = 13;
+ * optional uint32 entity_id = 12;
* @return whether the entityId field is set
*/
public boolean hasEntityId() {
@@ -156,7 +156,7 @@ public final class SceneEntityInfoOuterClass {
}
/**
- * optional uint32 entity_id = 13;
+ * optional uint32 entity_id = 12;
* @return this
*/
public SceneEntityInfo clearEntityId() {
@@ -166,7 +166,7 @@ public final class SceneEntityInfoOuterClass {
}
/**
- * optional uint32 entity_id = 13;
+ * optional uint32 entity_id = 12;
* @return the entityId
*/
public int getEntityId() {
@@ -174,7 +174,7 @@ public final class SceneEntityInfoOuterClass {
}
/**
- * optional uint32 entity_id = 13;
+ * optional uint32 entity_id = 12;
* @param value the entityId to set
* @return this
*/
@@ -185,82 +185,25 @@ public final class SceneEntityInfoOuterClass {
}
/**
- * optional .MotionInfo motion = 4;
- * @return whether the motion field is set
+ * optional .SceneNpcInfo npc = 3;
+ * @return whether the npc field is set
*/
- public boolean hasMotion() {
+ public boolean hasNpc() {
return (bitField0_ & 0x00000008) != 0;
}
/**
- * optional .MotionInfo motion = 4;
- * @return this
- */
- public SceneEntityInfo clearMotion() {
- bitField0_ &= ~0x00000008;
- motion.clear();
- return this;
- }
-
- /**
- * optional .MotionInfo motion = 4;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableMotion()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public MotionInfoOuterClass.MotionInfo getMotion() {
- return motion;
- }
-
- /**
- * optional .MotionInfo motion = 4;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public MotionInfoOuterClass.MotionInfo getMutableMotion() {
- bitField0_ |= 0x00000008;
- return motion;
- }
-
- /**
- * optional .MotionInfo motion = 4;
- * @param value the motion to set
- * @return this
- */
- public SceneEntityInfo setMotion(final MotionInfoOuterClass.MotionInfo value) {
- bitField0_ |= 0x00000008;
- motion.copyFrom(value);
- return this;
- }
-
- /**
- * optional .SceneNpcInfo npc = 8;
- * @return whether the npc field is set
- */
- public boolean hasNpc() {
- return (bitField0_ & 0x00000010) != 0;
- }
-
- /**
- * optional .SceneNpcInfo npc = 8;
+ * optional .SceneNpcInfo npc = 3;
* @return this
*/
public SceneEntityInfo clearNpc() {
- bitField0_ &= ~0x00000010;
+ bitField0_ &= ~0x00000008;
npc.clear();
return this;
}
/**
- * optional .SceneNpcInfo npc = 8;
+ * optional .SceneNpcInfo npc = 3;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -274,7 +217,7 @@ public final class SceneEntityInfoOuterClass {
}
/**
- * optional .SceneNpcInfo npc = 8;
+ * optional .SceneNpcInfo npc = 3;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -283,156 +226,98 @@ public final class SceneEntityInfoOuterClass {
* @return internal storage object for modifications
*/
public SceneNpcInfoOuterClass.SceneNpcInfo getMutableNpc() {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
return npc;
}
/**
- * optional .SceneNpcInfo npc = 8;
+ * optional .SceneNpcInfo npc = 3;
* @param value the npc to set
* @return this
*/
public SceneEntityInfo setNpc(final SceneNpcInfoOuterClass.SceneNpcInfo value) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
npc.copyFrom(value);
return this;
}
/**
- * optional .SceneSummonUnitInfo summon_unit = 9;
- * @return whether the summonUnit field is set
+ * optional .MotionInfo motion = 5;
+ * @return whether the motion field is set
*/
- public boolean hasSummonUnit() {
+ public boolean hasMotion() {
+ return (bitField0_ & 0x00000010) != 0;
+ }
+
+ /**
+ * optional .MotionInfo motion = 5;
+ * @return this
+ */
+ public SceneEntityInfo clearMotion() {
+ bitField0_ &= ~0x00000010;
+ motion.clear();
+ return this;
+ }
+
+ /**
+ * optional .MotionInfo motion = 5;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableMotion()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public MotionInfoOuterClass.MotionInfo getMotion() {
+ return motion;
+ }
+
+ /**
+ * optional .MotionInfo motion = 5;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public MotionInfoOuterClass.MotionInfo getMutableMotion() {
+ bitField0_ |= 0x00000010;
+ return motion;
+ }
+
+ /**
+ * optional .MotionInfo motion = 5;
+ * @param value the motion to set
+ * @return this
+ */
+ public SceneEntityInfo setMotion(final MotionInfoOuterClass.MotionInfo value) {
+ bitField0_ |= 0x00000010;
+ motion.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional .SceneActorInfo actor = 8;
+ * @return whether the actor field is set
+ */
+ public boolean hasActor() {
return (bitField0_ & 0x00000020) != 0;
}
/**
- * optional .SceneSummonUnitInfo summon_unit = 9;
- * @return this
- */
- public SceneEntityInfo clearSummonUnit() {
- bitField0_ &= ~0x00000020;
- summonUnit.clear();
- return this;
- }
-
- /**
- * optional .SceneSummonUnitInfo summon_unit = 9;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableSummonUnit()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo getSummonUnit() {
- return summonUnit;
- }
-
- /**
- * optional .SceneSummonUnitInfo summon_unit = 9;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo getMutableSummonUnit() {
- bitField0_ |= 0x00000020;
- return summonUnit;
- }
-
- /**
- * optional .SceneSummonUnitInfo summon_unit = 9;
- * @param value the summonUnit to set
- * @return this
- */
- public SceneEntityInfo setSummonUnit(
- final SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo value) {
- bitField0_ |= 0x00000020;
- summonUnit.copyFrom(value);
- return this;
- }
-
- /**
- * optional .ScenePropInfo prop = 10;
- * @return whether the prop field is set
- */
- public boolean hasProp() {
- return (bitField0_ & 0x00000040) != 0;
- }
-
- /**
- * optional .ScenePropInfo prop = 10;
- * @return this
- */
- public SceneEntityInfo clearProp() {
- bitField0_ &= ~0x00000040;
- prop.clear();
- return this;
- }
-
- /**
- * optional .ScenePropInfo prop = 10;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableProp()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public ScenePropInfoOuterClass.ScenePropInfo getProp() {
- return prop;
- }
-
- /**
- * optional .ScenePropInfo prop = 10;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public ScenePropInfoOuterClass.ScenePropInfo getMutableProp() {
- bitField0_ |= 0x00000040;
- return prop;
- }
-
- /**
- * optional .ScenePropInfo prop = 10;
- * @param value the prop to set
- * @return this
- */
- public SceneEntityInfo setProp(final ScenePropInfoOuterClass.ScenePropInfo value) {
- bitField0_ |= 0x00000040;
- prop.copyFrom(value);
- return this;
- }
-
- /**
- * optional .SceneActorInfo actor = 11;
- * @return whether the actor field is set
- */
- public boolean hasActor() {
- return (bitField0_ & 0x00000080) != 0;
- }
-
- /**
- * optional .SceneActorInfo actor = 11;
+ * optional .SceneActorInfo actor = 8;
* @return this
*/
public SceneEntityInfo clearActor() {
- bitField0_ &= ~0x00000080;
+ bitField0_ &= ~0x00000020;
actor.clear();
return this;
}
/**
- * optional .SceneActorInfo actor = 11;
+ * optional .SceneActorInfo actor = 8;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -446,7 +331,7 @@ public final class SceneEntityInfoOuterClass {
}
/**
- * optional .SceneActorInfo actor = 11;
+ * optional .SceneActorInfo actor = 8;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -455,41 +340,41 @@ public final class SceneEntityInfoOuterClass {
* @return internal storage object for modifications
*/
public SceneActorInfoOuterClass.SceneActorInfo getMutableActor() {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000020;
return actor;
}
/**
- * optional .SceneActorInfo actor = 11;
+ * optional .SceneActorInfo actor = 8;
* @param value the actor to set
* @return this
*/
public SceneEntityInfo setActor(final SceneActorInfoOuterClass.SceneActorInfo value) {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000020;
actor.copyFrom(value);
return this;
}
/**
- * optional .SceneNpcMonsterInfo npc_monster = 12;
+ * optional .SceneNpcMonsterInfo npc_monster = 10;
* @return whether the npcMonster field is set
*/
public boolean hasNpcMonster() {
- return (bitField0_ & 0x00000100) != 0;
+ return (bitField0_ & 0x00000040) != 0;
}
/**
- * optional .SceneNpcMonsterInfo npc_monster = 12;
+ * optional .SceneNpcMonsterInfo npc_monster = 10;
* @return this
*/
public SceneEntityInfo clearNpcMonster() {
- bitField0_ &= ~0x00000100;
+ bitField0_ &= ~0x00000040;
npcMonster.clear();
return this;
}
/**
- * optional .SceneNpcMonsterInfo npc_monster = 12;
+ * optional .SceneNpcMonsterInfo npc_monster = 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.
@@ -503,7 +388,7 @@ public final class SceneEntityInfoOuterClass {
}
/**
- * optional .SceneNpcMonsterInfo npc_monster = 12;
+ * optional .SceneNpcMonsterInfo npc_monster = 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
@@ -512,22 +397,137 @@ public final class SceneEntityInfoOuterClass {
* @return internal storage object for modifications
*/
public SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo getMutableNpcMonster() {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000040;
return npcMonster;
}
/**
- * optional .SceneNpcMonsterInfo npc_monster = 12;
+ * optional .SceneNpcMonsterInfo npc_monster = 10;
* @param value the npcMonster to set
* @return this
*/
public SceneEntityInfo setNpcMonster(
final SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo value) {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000040;
npcMonster.copyFrom(value);
return this;
}
+ /**
+ * optional .ScenePropInfo prop = 13;
+ * @return whether the prop field is set
+ */
+ public boolean hasProp() {
+ return (bitField0_ & 0x00000080) != 0;
+ }
+
+ /**
+ * optional .ScenePropInfo prop = 13;
+ * @return this
+ */
+ public SceneEntityInfo clearProp() {
+ bitField0_ &= ~0x00000080;
+ prop.clear();
+ return this;
+ }
+
+ /**
+ * optional .ScenePropInfo prop = 13;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableProp()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public ScenePropInfoOuterClass.ScenePropInfo getProp() {
+ return prop;
+ }
+
+ /**
+ * optional .ScenePropInfo prop = 13;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public ScenePropInfoOuterClass.ScenePropInfo getMutableProp() {
+ bitField0_ |= 0x00000080;
+ return prop;
+ }
+
+ /**
+ * optional .ScenePropInfo prop = 13;
+ * @param value the prop to set
+ * @return this
+ */
+ public SceneEntityInfo setProp(final ScenePropInfoOuterClass.ScenePropInfo value) {
+ bitField0_ |= 0x00000080;
+ prop.copyFrom(value);
+ return this;
+ }
+
+ /**
+ * optional .SceneSummonUnitInfo summon_unit = 14;
+ * @return whether the summonUnit field is set
+ */
+ public boolean hasSummonUnit() {
+ return (bitField0_ & 0x00000100) != 0;
+ }
+
+ /**
+ * optional .SceneSummonUnitInfo summon_unit = 14;
+ * @return this
+ */
+ public SceneEntityInfo clearSummonUnit() {
+ bitField0_ &= ~0x00000100;
+ summonUnit.clear();
+ return this;
+ }
+
+ /**
+ * optional .SceneSummonUnitInfo summon_unit = 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 #getMutableSummonUnit()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo getSummonUnit() {
+ return summonUnit;
+ }
+
+ /**
+ * optional .SceneSummonUnitInfo summon_unit = 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 SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo getMutableSummonUnit() {
+ bitField0_ |= 0x00000100;
+ return summonUnit;
+ }
+
+ /**
+ * optional .SceneSummonUnitInfo summon_unit = 14;
+ * @param value the summonUnit to set
+ * @return this
+ */
+ public SceneEntityInfo setSummonUnit(
+ final SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo value) {
+ bitField0_ |= 0x00000100;
+ summonUnit.copyFrom(value);
+ return this;
+ }
+
@Override
public SceneEntityInfo copyFrom(final SceneEntityInfo other) {
cachedSize = other.cachedSize;
@@ -536,12 +536,12 @@ public final class SceneEntityInfoOuterClass {
instId = other.instId;
groupId = other.groupId;
entityId = other.entityId;
- motion.copyFrom(other.motion);
npc.copyFrom(other.npc);
- summonUnit.copyFrom(other.summonUnit);
- prop.copyFrom(other.prop);
+ motion.copyFrom(other.motion);
actor.copyFrom(other.actor);
npcMonster.copyFrom(other.npcMonster);
+ prop.copyFrom(other.prop);
+ summonUnit.copyFrom(other.summonUnit);
}
return this;
}
@@ -561,17 +561,11 @@ public final class SceneEntityInfoOuterClass {
if (other.hasEntityId()) {
setEntityId(other.entityId);
}
- if (other.hasMotion()) {
- getMutableMotion().mergeFrom(other.motion);
- }
if (other.hasNpc()) {
getMutableNpc().mergeFrom(other.npc);
}
- if (other.hasSummonUnit()) {
- getMutableSummonUnit().mergeFrom(other.summonUnit);
- }
- if (other.hasProp()) {
- getMutableProp().mergeFrom(other.prop);
+ if (other.hasMotion()) {
+ getMutableMotion().mergeFrom(other.motion);
}
if (other.hasActor()) {
getMutableActor().mergeFrom(other.actor);
@@ -579,6 +573,12 @@ public final class SceneEntityInfoOuterClass {
if (other.hasNpcMonster()) {
getMutableNpcMonster().mergeFrom(other.npcMonster);
}
+ if (other.hasProp()) {
+ getMutableProp().mergeFrom(other.prop);
+ }
+ if (other.hasSummonUnit()) {
+ getMutableSummonUnit().mergeFrom(other.summonUnit);
+ }
return this;
}
@@ -592,12 +592,12 @@ public final class SceneEntityInfoOuterClass {
instId = 0;
groupId = 0;
entityId = 0;
- motion.clear();
npc.clear();
- summonUnit.clear();
- prop.clear();
+ motion.clear();
actor.clear();
npcMonster.clear();
+ prop.clear();
+ summonUnit.clear();
return this;
}
@@ -608,12 +608,12 @@ public final class SceneEntityInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- motion.clearQuick();
npc.clearQuick();
- summonUnit.clearQuick();
- prop.clearQuick();
+ motion.clearQuick();
actor.clearQuick();
npcMonster.clearQuick();
+ prop.clearQuick();
+ summonUnit.clearQuick();
return this;
}
@@ -630,51 +630,51 @@ public final class SceneEntityInfoOuterClass {
&& (!hasInstId() || instId == other.instId)
&& (!hasGroupId() || groupId == other.groupId)
&& (!hasEntityId() || entityId == other.entityId)
- && (!hasMotion() || motion.equals(other.motion))
&& (!hasNpc() || npc.equals(other.npc))
- && (!hasSummonUnit() || summonUnit.equals(other.summonUnit))
- && (!hasProp() || prop.equals(other.prop))
+ && (!hasMotion() || motion.equals(other.motion))
&& (!hasActor() || actor.equals(other.actor))
- && (!hasNpcMonster() || npcMonster.equals(other.npcMonster));
+ && (!hasNpcMonster() || npcMonster.equals(other.npcMonster))
+ && (!hasProp() || prop.equals(other.prop))
+ && (!hasSummonUnit() || summonUnit.equals(other.summonUnit));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(instId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(groupId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(entityId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 34);
- output.writeMessageNoTag(motion);
- }
- if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 66);
+ output.writeRawByte((byte) 26);
output.writeMessageNoTag(npc);
}
+ if ((bitField0_ & 0x00000010) != 0) {
+ output.writeRawByte((byte) 42);
+ output.writeMessageNoTag(motion);
+ }
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 74);
- output.writeMessageNoTag(summonUnit);
+ output.writeRawByte((byte) 66);
+ output.writeMessageNoTag(actor);
}
if ((bitField0_ & 0x00000040) != 0) {
output.writeRawByte((byte) 82);
- output.writeMessageNoTag(prop);
+ output.writeMessageNoTag(npcMonster);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRawByte((byte) 90);
- output.writeMessageNoTag(actor);
+ output.writeRawByte((byte) 106);
+ output.writeMessageNoTag(prop);
}
if ((bitField0_ & 0x00000100) != 0) {
- output.writeRawByte((byte) 98);
- output.writeMessageNoTag(npcMonster);
+ output.writeRawByte((byte) 114);
+ output.writeMessageNoTag(summonUnit);
}
}
@@ -691,23 +691,23 @@ public final class SceneEntityInfoOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(motion);
- }
- if ((bitField0_ & 0x00000010) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(npc);
}
+ if ((bitField0_ & 0x00000010) != 0) {
+ size += 1 + ProtoSink.computeMessageSizeNoTag(motion);
+ }
if ((bitField0_ & 0x00000020) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(summonUnit);
- }
- if ((bitField0_ & 0x00000040) != 0) {
- size += 1 + ProtoSink.computeMessageSizeNoTag(prop);
- }
- if ((bitField0_ & 0x00000080) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(actor);
}
- if ((bitField0_ & 0x00000100) != 0) {
+ if ((bitField0_ & 0x00000040) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(npcMonster);
}
+ if ((bitField0_ & 0x00000080) != 0) {
+ size += 1 + ProtoSink.computeMessageSizeNoTag(prop);
+ }
+ if ((bitField0_ & 0x00000100) != 0) {
+ size += 1 + ProtoSink.computeMessageSizeNoTag(summonUnit);
+ }
return size;
}
@@ -718,54 +718,54 @@ public final class SceneEntityInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
+ case 8: {
// instId
instId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 40) {
+ if (tag != 16) {
break;
}
}
- case 40: {
+ case 16: {
// groupId
groupId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 104) {
+ if (tag != 96) {
break;
}
}
- case 104: {
+ case 96: {
// entityId
entityId = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 34) {
+ if (tag != 26) {
break;
}
}
- case 34: {
+ case 26: {
+ // npc
+ input.readMessage(npc);
+ bitField0_ |= 0x00000008;
+ tag = input.readTag();
+ if (tag != 42) {
+ break;
+ }
+ }
+ case 42: {
// motion
input.readMessage(motion);
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000010;
tag = input.readTag();
if (tag != 66) {
break;
}
}
case 66: {
- // npc
- input.readMessage(npc);
- bitField0_ |= 0x00000010;
- tag = input.readTag();
- if (tag != 74) {
- break;
- }
- }
- case 74: {
- // summonUnit
- input.readMessage(summonUnit);
+ // actor
+ input.readMessage(actor);
bitField0_ |= 0x00000020;
tag = input.readTag();
if (tag != 82) {
@@ -773,26 +773,26 @@ public final class SceneEntityInfoOuterClass {
}
}
case 82: {
- // prop
- input.readMessage(prop);
- bitField0_ |= 0x00000040;
- tag = input.readTag();
- if (tag != 90) {
- break;
- }
- }
- case 90: {
- // actor
- input.readMessage(actor);
- bitField0_ |= 0x00000080;
- tag = input.readTag();
- if (tag != 98) {
- break;
- }
- }
- case 98: {
// npcMonster
input.readMessage(npcMonster);
+ bitField0_ |= 0x00000040;
+ tag = input.readTag();
+ if (tag != 106) {
+ break;
+ }
+ }
+ case 106: {
+ // prop
+ input.readMessage(prop);
+ bitField0_ |= 0x00000080;
+ tag = input.readTag();
+ if (tag != 114) {
+ break;
+ }
+ }
+ case 114: {
+ // summonUnit
+ input.readMessage(summonUnit);
bitField0_ |= 0x00000100;
tag = input.readTag();
if (tag != 0) {
@@ -826,23 +826,23 @@ public final class SceneEntityInfoOuterClass {
output.writeUInt32(FieldNames.entityId, entityId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeMessage(FieldNames.motion, motion);
- }
- if ((bitField0_ & 0x00000010) != 0) {
output.writeMessage(FieldNames.npc, npc);
}
+ if ((bitField0_ & 0x00000010) != 0) {
+ output.writeMessage(FieldNames.motion, motion);
+ }
if ((bitField0_ & 0x00000020) != 0) {
- output.writeMessage(FieldNames.summonUnit, summonUnit);
- }
- if ((bitField0_ & 0x00000040) != 0) {
- output.writeMessage(FieldNames.prop, prop);
- }
- if ((bitField0_ & 0x00000080) != 0) {
output.writeMessage(FieldNames.actor, actor);
}
- if ((bitField0_ & 0x00000100) != 0) {
+ if ((bitField0_ & 0x00000040) != 0) {
output.writeMessage(FieldNames.npcMonster, npcMonster);
}
+ if ((bitField0_ & 0x00000080) != 0) {
+ output.writeMessage(FieldNames.prop, prop);
+ }
+ if ((bitField0_ & 0x00000100) != 0) {
+ output.writeMessage(FieldNames.summonUnit, summonUnit);
+ }
output.endObject();
}
@@ -889,10 +889,10 @@ public final class SceneEntityInfoOuterClass {
}
break;
}
- case -1068318794: {
- if (input.isAtField(FieldNames.motion)) {
+ case 109281: {
+ if (input.isAtField(FieldNames.npc)) {
if (!input.trySkipNullValue()) {
- input.readMessage(motion);
+ input.readMessage(npc);
bitField0_ |= 0x00000008;
}
} else {
@@ -900,10 +900,10 @@ public final class SceneEntityInfoOuterClass {
}
break;
}
- case 109281: {
- if (input.isAtField(FieldNames.npc)) {
+ case -1068318794: {
+ if (input.isAtField(FieldNames.motion)) {
if (!input.trySkipNullValue()) {
- input.readMessage(npc);
+ input.readMessage(motion);
bitField0_ |= 0x00000010;
}
} else {
@@ -911,34 +911,11 @@ public final class SceneEntityInfoOuterClass {
}
break;
}
- case 80492037:
- case -1790265822: {
- if (input.isAtField(FieldNames.summonUnit)) {
- if (!input.trySkipNullValue()) {
- input.readMessage(summonUnit);
- bitField0_ |= 0x00000020;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 3449699: {
- if (input.isAtField(FieldNames.prop)) {
- if (!input.trySkipNullValue()) {
- input.readMessage(prop);
- bitField0_ |= 0x00000040;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 92645877: {
if (input.isAtField(FieldNames.actor)) {
if (!input.trySkipNullValue()) {
input.readMessage(actor);
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000020;
}
} else {
input.skipUnknownField();
@@ -950,6 +927,29 @@ public final class SceneEntityInfoOuterClass {
if (input.isAtField(FieldNames.npcMonster)) {
if (!input.trySkipNullValue()) {
input.readMessage(npcMonster);
+ bitField0_ |= 0x00000040;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 3449699: {
+ if (input.isAtField(FieldNames.prop)) {
+ if (!input.trySkipNullValue()) {
+ input.readMessage(prop);
+ bitField0_ |= 0x00000080;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 80492037:
+ case -1790265822: {
+ if (input.isAtField(FieldNames.summonUnit)) {
+ if (!input.trySkipNullValue()) {
+ input.readMessage(summonUnit);
bitField0_ |= 0x00000100;
}
} else {
@@ -1016,17 +1016,17 @@ public final class SceneEntityInfoOuterClass {
static final FieldName entityId = FieldName.forField("entityId", "entity_id");
- static final FieldName motion = FieldName.forField("motion");
-
static final FieldName npc = FieldName.forField("npc");
- static final FieldName summonUnit = FieldName.forField("summonUnit", "summon_unit");
-
- static final FieldName prop = FieldName.forField("prop");
+ static final FieldName motion = FieldName.forField("motion");
static final FieldName actor = FieldName.forField("actor");
static final FieldName npcMonster = FieldName.forField("npcMonster", "npc_monster");
+
+ static final FieldName prop = FieldName.forField("prop");
+
+ static final FieldName summonUnit = FieldName.forField("summonUnit", "summon_unit");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityMoveCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityMoveCsReqOuterClass.java
index 38a71ff..451e3db 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneEntityMoveCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneEntityMoveCsReqOuterClass.java
@@ -20,12 +20,12 @@ public final class SceneEntityMoveCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 entry_id = 5;
+ * optional uint32 entry_id = 9;
*/
private int entryId;
/**
- * repeated .EntityMotion entity_motion_list = 1;
+ * repeated .EntityMotion entity_motion_list = 11;
*/
private final RepeatedMessageoptional uint32 entry_id = 5;
+ * optional uint32 entry_id = 9;
* @return whether the entryId field is set
*/
public boolean hasEntryId() {
@@ -48,7 +48,7 @@ public final class SceneEntityMoveCsReqOuterClass {
}
/**
- * optional uint32 entry_id = 5;
+ * optional uint32 entry_id = 9;
* @return this
*/
public SceneEntityMoveCsReq clearEntryId() {
@@ -58,7 +58,7 @@ public final class SceneEntityMoveCsReqOuterClass {
}
/**
- * optional uint32 entry_id = 5;
+ * optional uint32 entry_id = 9;
* @return the entryId
*/
public int getEntryId() {
@@ -66,7 +66,7 @@ public final class SceneEntityMoveCsReqOuterClass {
}
/**
- * optional uint32 entry_id = 5;
+ * optional uint32 entry_id = 9;
* @param value the entryId to set
* @return this
*/
@@ -77,7 +77,7 @@ public final class SceneEntityMoveCsReqOuterClass {
}
/**
- * repeated .EntityMotion entity_motion_list = 1;
+ * repeated .EntityMotion entity_motion_list = 11;
* @return whether the entityMotionList field is set
*/
public boolean hasEntityMotionList() {
@@ -85,7 +85,7 @@ public final class SceneEntityMoveCsReqOuterClass {
}
/**
- * repeated .EntityMotion entity_motion_list = 1;
+ * repeated .EntityMotion entity_motion_list = 11;
* @return this
*/
public SceneEntityMoveCsReq clearEntityMotionList() {
@@ -95,7 +95,7 @@ public final class SceneEntityMoveCsReqOuterClass {
}
/**
- * repeated .EntityMotion entity_motion_list = 1;
+ * repeated .EntityMotion entity_motion_list = 11;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class SceneEntityMoveCsReqOuterClass {
}
/**
- * repeated .EntityMotion entity_motion_list = 1;
+ * repeated .EntityMotion entity_motion_list = 11;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public final class SceneEntityMoveCsReqOuterClass {
}
/**
- * repeated .EntityMotion entity_motion_list = 1;
+ * repeated .EntityMotion entity_motion_list = 11;
* @param value the entityMotionList to add
* @return this
*/
@@ -135,7 +135,7 @@ public final class SceneEntityMoveCsReqOuterClass {
}
/**
- * repeated .EntityMotion entity_motion_list = 1;
+ * repeated .EntityMotion entity_motion_list = 11;
* @param values the entityMotionList to add
* @return this
*/
@@ -212,12 +212,12 @@ public final class SceneEntityMoveCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 72);
output.writeUInt32NoTag(entryId);
}
if ((bitField0_ & 0x00000002) != 0) {
for (int i = 0; i < entityMotionList.length(); i++) {
- output.writeRawByte((byte) 10);
+ output.writeRawByte((byte) 90);
output.writeMessageNoTag(entityMotionList.get(i));
}
}
@@ -242,16 +242,16 @@ public final class SceneEntityMoveCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
+ case 72: {
// entryId
entryId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 10) {
+ if (tag != 90) {
break;
}
}
- case 10: {
+ case 90: {
// entityMotionList
tag = input.readRepeatedMessage(entityMotionList, tag);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityMoveScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityMoveScNotifyOuterClass.java
index 9b403ed..fa021a2 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneEntityMoveScNotifyOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneEntityMoveScNotifyOuterClass.java
@@ -19,22 +19,22 @@ public final class SceneEntityMoveScNotifyOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 entity_id = 1;
- */
- private int entityId;
-
- /**
- * optional uint32 client_pos_version = 6;
+ * optional uint32 client_pos_version = 8;
*/
private int clientPosVersion;
/**
- * optional uint32 entry_id = 8;
+ * optional uint32 entry_id = 13;
*/
private int entryId;
/**
- * optional .MotionInfo motion = 10;
+ * optional uint32 entity_id = 15;
+ */
+ private int entityId;
+
+ /**
+ * optional .MotionInfo motion = 12;
*/
private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance();
@@ -49,62 +49,25 @@ public final class SceneEntityMoveScNotifyOuterClass {
}
/**
- * optional uint32 entity_id = 1;
- * @return whether the entityId field is set
+ * optional uint32 client_pos_version = 8;
+ * @return whether the clientPosVersion field is set
*/
- public boolean hasEntityId() {
+ public boolean hasClientPosVersion() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 entity_id = 1;
- * @return this
- */
- public SceneEntityMoveScNotify clearEntityId() {
- bitField0_ &= ~0x00000001;
- entityId = 0;
- return this;
- }
-
- /**
- * optional uint32 entity_id = 1;
- * @return the entityId
- */
- public int getEntityId() {
- return entityId;
- }
-
- /**
- * optional uint32 entity_id = 1;
- * @param value the entityId to set
- * @return this
- */
- public SceneEntityMoveScNotify setEntityId(final int value) {
- bitField0_ |= 0x00000001;
- entityId = value;
- return this;
- }
-
- /**
- * optional uint32 client_pos_version = 6;
- * @return whether the clientPosVersion field is set
- */
- public boolean hasClientPosVersion() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 client_pos_version = 6;
+ * optional uint32 client_pos_version = 8;
* @return this
*/
public SceneEntityMoveScNotify clearClientPosVersion() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
clientPosVersion = 0;
return this;
}
/**
- * optional uint32 client_pos_version = 6;
+ * optional uint32 client_pos_version = 8;
* @return the clientPosVersion
*/
public int getClientPosVersion() {
@@ -112,36 +75,36 @@ public final class SceneEntityMoveScNotifyOuterClass {
}
/**
- * optional uint32 client_pos_version = 6;
+ * optional uint32 client_pos_version = 8;
* @param value the clientPosVersion to set
* @return this
*/
public SceneEntityMoveScNotify setClientPosVersion(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
clientPosVersion = value;
return this;
}
/**
- * optional uint32 entry_id = 8;
+ * optional uint32 entry_id = 13;
* @return whether the entryId field is set
*/
public boolean hasEntryId() {
- return (bitField0_ & 0x00000004) != 0;
+ return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 entry_id = 8;
+ * optional uint32 entry_id = 13;
* @return this
*/
public SceneEntityMoveScNotify clearEntryId() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
entryId = 0;
return this;
}
/**
- * optional uint32 entry_id = 8;
+ * optional uint32 entry_id = 13;
* @return the entryId
*/
public int getEntryId() {
@@ -149,18 +112,55 @@ public final class SceneEntityMoveScNotifyOuterClass {
}
/**
- * optional uint32 entry_id = 8;
+ * optional uint32 entry_id = 13;
* @param value the entryId to set
* @return this
*/
public SceneEntityMoveScNotify setEntryId(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
entryId = value;
return this;
}
/**
- * optional .MotionInfo motion = 10;
+ * optional uint32 entity_id = 15;
+ * @return whether the entityId field is set
+ */
+ public boolean hasEntityId() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 entity_id = 15;
+ * @return this
+ */
+ public SceneEntityMoveScNotify clearEntityId() {
+ bitField0_ &= ~0x00000004;
+ entityId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 entity_id = 15;
+ * @return the entityId
+ */
+ public int getEntityId() {
+ return entityId;
+ }
+
+ /**
+ * optional uint32 entity_id = 15;
+ * @param value the entityId to set
+ * @return this
+ */
+ public SceneEntityMoveScNotify setEntityId(final int value) {
+ bitField0_ |= 0x00000004;
+ entityId = value;
+ return this;
+ }
+
+ /**
+ * optional .MotionInfo motion = 12;
* @return whether the motion field is set
*/
public boolean hasMotion() {
@@ -168,7 +168,7 @@ public final class SceneEntityMoveScNotifyOuterClass {
}
/**
- * optional .MotionInfo motion = 10;
+ * optional .MotionInfo motion = 12;
* @return this
*/
public SceneEntityMoveScNotify clearMotion() {
@@ -178,7 +178,7 @@ public final class SceneEntityMoveScNotifyOuterClass {
}
/**
- * optional .MotionInfo motion = 10;
+ * optional .MotionInfo motion = 12;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -192,7 +192,7 @@ public final class SceneEntityMoveScNotifyOuterClass {
}
/**
- * optional .MotionInfo motion = 10;
+ * optional .MotionInfo motion = 12;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -206,7 +206,7 @@ public final class SceneEntityMoveScNotifyOuterClass {
}
/**
- * optional .MotionInfo motion = 10;
+ * optional .MotionInfo motion = 12;
* @param value the motion to set
* @return this
*/
@@ -221,9 +221,9 @@ public final class SceneEntityMoveScNotifyOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- entityId = other.entityId;
clientPosVersion = other.clientPosVersion;
entryId = other.entryId;
+ entityId = other.entityId;
motion.copyFrom(other.motion);
}
return this;
@@ -235,15 +235,15 @@ public final class SceneEntityMoveScNotifyOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasEntityId()) {
- setEntityId(other.entityId);
- }
if (other.hasClientPosVersion()) {
setClientPosVersion(other.clientPosVersion);
}
if (other.hasEntryId()) {
setEntryId(other.entryId);
}
+ if (other.hasEntityId()) {
+ setEntityId(other.entityId);
+ }
if (other.hasMotion()) {
getMutableMotion().mergeFrom(other.motion);
}
@@ -257,9 +257,9 @@ public final class SceneEntityMoveScNotifyOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- entityId = 0;
clientPosVersion = 0;
entryId = 0;
+ entityId = 0;
motion.clear();
return this;
}
@@ -285,28 +285,28 @@ public final class SceneEntityMoveScNotifyOuterClass {
}
SceneEntityMoveScNotify other = (SceneEntityMoveScNotify) o;
return bitField0_ == other.bitField0_
- && (!hasEntityId() || entityId == other.entityId)
&& (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion)
&& (!hasEntryId() || entryId == other.entryId)
+ && (!hasEntityId() || entityId == other.entityId)
&& (!hasMotion() || motion.equals(other.motion));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 8);
- output.writeUInt32NoTag(entityId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(clientPosVersion);
}
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 64);
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 104);
output.writeUInt32NoTag(entryId);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeRawByte((byte) 120);
+ output.writeUInt32NoTag(entityId);
+ }
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 82);
+ output.writeRawByte((byte) 98);
output.writeMessageNoTag(motion);
}
}
@@ -315,14 +315,14 @@ public final class SceneEntityMoveScNotifyOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId);
+ }
if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(motion);
}
@@ -336,34 +336,34 @@ public final class SceneEntityMoveScNotifyOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 8: {
- // entityId
- entityId = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 48) {
- break;
- }
- }
- case 48: {
+ case 64: {
// clientPosVersion
clientPosVersion = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 64) {
+ if (tag != 104) {
break;
}
}
- case 64: {
+ case 104: {
// entryId
entryId = input.readUInt32();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 82) {
+ if (tag != 120) {
break;
}
}
- case 82: {
+ case 120: {
+ // entityId
+ entityId = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 98) {
+ break;
+ }
+ }
+ case 98: {
// motion
input.readMessage(motion);
bitField0_ |= 0x00000008;
@@ -390,14 +390,14 @@ public final class SceneEntityMoveScNotifyOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.entityId, entityId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion);
}
- if ((bitField0_ & 0x00000004) != 0) {
+ if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.entryId, entryId);
}
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeUInt32(FieldNames.entityId, entityId);
+ }
if ((bitField0_ & 0x00000008) != 0) {
output.writeMessage(FieldNames.motion, motion);
}
@@ -411,24 +411,12 @@ public final class SceneEntityMoveScNotifyOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -2102099874:
- case -740565257: {
- if (input.isAtField(FieldNames.entityId)) {
- if (!input.trySkipNullValue()) {
- entityId = input.readUInt32();
- bitField0_ |= 0x00000001;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 1787644431:
case 1278860153: {
if (input.isAtField(FieldNames.clientPosVersion)) {
if (!input.trySkipNullValue()) {
clientPosVersion = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
}
} else {
input.skipUnknownField();
@@ -440,6 +428,18 @@ public final class SceneEntityMoveScNotifyOuterClass {
if (input.isAtField(FieldNames.entryId)) {
if (!input.trySkipNullValue()) {
entryId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -2102099874:
+ case -740565257: {
+ if (input.isAtField(FieldNames.entityId)) {
+ if (!input.trySkipNullValue()) {
+ entityId = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -511,12 +511,12 @@ public final class SceneEntityMoveScNotifyOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName entityId = FieldName.forField("entityId", "entity_id");
-
static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version");
static final FieldName entryId = FieldName.forField("entryId", "entry_id");
+ static final FieldName entityId = FieldName.forField("entityId", "entity_id");
+
static final FieldName motion = FieldName.forField("motion");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityRefreshInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityRefreshInfoOuterClass.java
index a69f054..342f326 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneEntityRefreshInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneEntityRefreshInfoOuterClass.java
@@ -19,12 +19,12 @@ public final class SceneEntityRefreshInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 del_entity = 13;
+ * optional uint32 del_entity = 8;
*/
private int delEntity;
/**
- * optional .SceneEntityInfo add_entity = 8;
+ * optional .SceneEntityInfo add_entity = 3;
*/
private final SceneEntityInfoOuterClass.SceneEntityInfo addEntity = SceneEntityInfoOuterClass.SceneEntityInfo.newInstance();
@@ -39,7 +39,7 @@ public final class SceneEntityRefreshInfoOuterClass {
}
/**
- * optional uint32 del_entity = 13;
+ * optional uint32 del_entity = 8;
* @return whether the delEntity field is set
*/
public boolean hasDelEntity() {
@@ -47,7 +47,7 @@ public final class SceneEntityRefreshInfoOuterClass {
}
/**
- * optional uint32 del_entity = 13;
+ * optional uint32 del_entity = 8;
* @return this
*/
public SceneEntityRefreshInfo clearDelEntity() {
@@ -57,7 +57,7 @@ public final class SceneEntityRefreshInfoOuterClass {
}
/**
- * optional uint32 del_entity = 13;
+ * optional uint32 del_entity = 8;
* @return the delEntity
*/
public int getDelEntity() {
@@ -65,7 +65,7 @@ public final class SceneEntityRefreshInfoOuterClass {
}
/**
- * optional uint32 del_entity = 13;
+ * optional uint32 del_entity = 8;
* @param value the delEntity to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class SceneEntityRefreshInfoOuterClass {
}
/**
- * optional .SceneEntityInfo add_entity = 8;
+ * optional .SceneEntityInfo add_entity = 3;
* @return whether the addEntity field is set
*/
public boolean hasAddEntity() {
@@ -84,7 +84,7 @@ public final class SceneEntityRefreshInfoOuterClass {
}
/**
- * optional .SceneEntityInfo add_entity = 8;
+ * optional .SceneEntityInfo add_entity = 3;
* @return this
*/
public SceneEntityRefreshInfo clearAddEntity() {
@@ -94,7 +94,7 @@ public final class SceneEntityRefreshInfoOuterClass {
}
/**
- * optional .SceneEntityInfo add_entity = 8;
+ * optional .SceneEntityInfo add_entity = 3;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class SceneEntityRefreshInfoOuterClass {
}
/**
- * optional .SceneEntityInfo add_entity = 8;
+ * optional .SceneEntityInfo add_entity = 3;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class SceneEntityRefreshInfoOuterClass {
}
/**
- * optional .SceneEntityInfo add_entity = 8;
+ * optional .SceneEntityInfo add_entity = 3;
* @param value the addEntity to set
* @return this
*/
@@ -199,11 +199,11 @@ public final class SceneEntityRefreshInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(delEntity);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 66);
+ output.writeRawByte((byte) 26);
output.writeMessageNoTag(addEntity);
}
}
@@ -227,16 +227,16 @@ public final class SceneEntityRefreshInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 104: {
+ case 64: {
// delEntity
delEntity = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 66) {
+ if (tag != 26) {
break;
}
}
- case 66: {
+ case 26: {
// addEntity
input.readMessage(addEntity);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportCsReqOuterClass.java
index a68e0d2..f7d470b 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportCsReqOuterClass.java
@@ -19,12 +19,12 @@ public final class SceneEntityTeleportCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 entry_id = 10;
+ * optional uint32 entry_id = 2;
*/
private int entryId;
/**
- * optional .EntityMotion entity_motion = 3;
+ * optional .EntityMotion entity_motion = 7;
*/
private final EntityMotionOuterClass.EntityMotion entityMotion = EntityMotionOuterClass.EntityMotion.newInstance();
@@ -39,7 +39,7 @@ public final class SceneEntityTeleportCsReqOuterClass {
}
/**
- * optional uint32 entry_id = 10;
+ * optional uint32 entry_id = 2;
* @return whether the entryId field is set
*/
public boolean hasEntryId() {
@@ -47,7 +47,7 @@ public final class SceneEntityTeleportCsReqOuterClass {
}
/**
- * optional uint32 entry_id = 10;
+ * optional uint32 entry_id = 2;
* @return this
*/
public SceneEntityTeleportCsReq clearEntryId() {
@@ -57,7 +57,7 @@ public final class SceneEntityTeleportCsReqOuterClass {
}
/**
- * optional uint32 entry_id = 10;
+ * optional uint32 entry_id = 2;
* @return the entryId
*/
public int getEntryId() {
@@ -65,7 +65,7 @@ public final class SceneEntityTeleportCsReqOuterClass {
}
/**
- * optional uint32 entry_id = 10;
+ * optional uint32 entry_id = 2;
* @param value the entryId to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class SceneEntityTeleportCsReqOuterClass {
}
/**
- * optional .EntityMotion entity_motion = 3;
+ * optional .EntityMotion entity_motion = 7;
* @return whether the entityMotion field is set
*/
public boolean hasEntityMotion() {
@@ -84,7 +84,7 @@ public final class SceneEntityTeleportCsReqOuterClass {
}
/**
- * optional .EntityMotion entity_motion = 3;
+ * optional .EntityMotion entity_motion = 7;
* @return this
*/
public SceneEntityTeleportCsReq clearEntityMotion() {
@@ -94,7 +94,7 @@ public final class SceneEntityTeleportCsReqOuterClass {
}
/**
- * optional .EntityMotion entity_motion = 3;
+ * optional .EntityMotion entity_motion = 7;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class SceneEntityTeleportCsReqOuterClass {
}
/**
- * optional .EntityMotion entity_motion = 3;
+ * optional .EntityMotion entity_motion = 7;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class SceneEntityTeleportCsReqOuterClass {
}
/**
- * optional .EntityMotion entity_motion = 3;
+ * optional .EntityMotion entity_motion = 7;
* @param value the entityMotion to set
* @return this
*/
@@ -199,11 +199,11 @@ public final class SceneEntityTeleportCsReqOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 16);
output.writeUInt32NoTag(entryId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 26);
+ output.writeRawByte((byte) 58);
output.writeMessageNoTag(entityMotion);
}
}
@@ -227,16 +227,16 @@ public final class SceneEntityTeleportCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 80: {
+ case 16: {
// entryId
entryId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 26) {
+ if (tag != 58) {
break;
}
}
- case 26: {
+ case 58: {
// entityMotion
input.readMessage(entityMotion);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportScRspOuterClass.java
index abc3cb7..6d0b51b 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportScRspOuterClass.java
@@ -19,17 +19,17 @@ public final class SceneEntityTeleportScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 6;
- */
- private int retcode;
-
- /**
- * optional uint32 client_pos_version = 14;
+ * optional uint32 client_pos_version = 1;
*/
private int clientPosVersion;
/**
- * optional .EntityMotion entity_motion = 9;
+ * optional uint32 retcode = 9;
+ */
+ private int retcode;
+
+ /**
+ * optional .EntityMotion entity_motion = 7;
*/
private final EntityMotionOuterClass.EntityMotion entityMotion = EntityMotionOuterClass.EntityMotion.newInstance();
@@ -44,62 +44,25 @@ public final class SceneEntityTeleportScRspOuterClass {
}
/**
- * optional uint32 retcode = 6;
- * @return whether the retcode field is set
+ * optional uint32 client_pos_version = 1;
+ * @return whether the clientPosVersion field is set
*/
- public boolean hasRetcode() {
+ public boolean hasClientPosVersion() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 retcode = 6;
- * @return this
- */
- public SceneEntityTeleportScRsp clearRetcode() {
- bitField0_ &= ~0x00000001;
- retcode = 0;
- return this;
- }
-
- /**
- * optional uint32 retcode = 6;
- * @return the retcode
- */
- public int getRetcode() {
- return retcode;
- }
-
- /**
- * optional uint32 retcode = 6;
- * @param value the retcode to set
- * @return this
- */
- public SceneEntityTeleportScRsp setRetcode(final int value) {
- bitField0_ |= 0x00000001;
- retcode = value;
- return this;
- }
-
- /**
- * optional uint32 client_pos_version = 14;
- * @return whether the clientPosVersion field is set
- */
- public boolean hasClientPosVersion() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 client_pos_version = 14;
+ * optional uint32 client_pos_version = 1;
* @return this
*/
public SceneEntityTeleportScRsp clearClientPosVersion() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
clientPosVersion = 0;
return this;
}
/**
- * optional uint32 client_pos_version = 14;
+ * optional uint32 client_pos_version = 1;
* @return the clientPosVersion
*/
public int getClientPosVersion() {
@@ -107,18 +70,55 @@ public final class SceneEntityTeleportScRspOuterClass {
}
/**
- * optional uint32 client_pos_version = 14;
+ * optional uint32 client_pos_version = 1;
* @param value the clientPosVersion to set
* @return this
*/
public SceneEntityTeleportScRsp setClientPosVersion(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
clientPosVersion = value;
return this;
}
/**
- * optional .EntityMotion entity_motion = 9;
+ * optional uint32 retcode = 9;
+ * @return whether the retcode field is set
+ */
+ public boolean hasRetcode() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 retcode = 9;
+ * @return this
+ */
+ public SceneEntityTeleportScRsp clearRetcode() {
+ bitField0_ &= ~0x00000002;
+ retcode = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 retcode = 9;
+ * @return the retcode
+ */
+ public int getRetcode() {
+ return retcode;
+ }
+
+ /**
+ * optional uint32 retcode = 9;
+ * @param value the retcode to set
+ * @return this
+ */
+ public SceneEntityTeleportScRsp setRetcode(final int value) {
+ bitField0_ |= 0x00000002;
+ retcode = value;
+ return this;
+ }
+
+ /**
+ * optional .EntityMotion entity_motion = 7;
* @return whether the entityMotion field is set
*/
public boolean hasEntityMotion() {
@@ -126,7 +126,7 @@ public final class SceneEntityTeleportScRspOuterClass {
}
/**
- * optional .EntityMotion entity_motion = 9;
+ * optional .EntityMotion entity_motion = 7;
* @return this
*/
public SceneEntityTeleportScRsp clearEntityMotion() {
@@ -136,7 +136,7 @@ public final class SceneEntityTeleportScRspOuterClass {
}
/**
- * optional .EntityMotion entity_motion = 9;
+ * optional .EntityMotion entity_motion = 7;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -150,7 +150,7 @@ public final class SceneEntityTeleportScRspOuterClass {
}
/**
- * optional .EntityMotion entity_motion = 9;
+ * optional .EntityMotion entity_motion = 7;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -164,7 +164,7 @@ public final class SceneEntityTeleportScRspOuterClass {
}
/**
- * optional .EntityMotion entity_motion = 9;
+ * optional .EntityMotion entity_motion = 7;
* @param value the entityMotion to set
* @return this
*/
@@ -180,8 +180,8 @@ public final class SceneEntityTeleportScRspOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- retcode = other.retcode;
clientPosVersion = other.clientPosVersion;
+ retcode = other.retcode;
entityMotion.copyFrom(other.entityMotion);
}
return this;
@@ -193,12 +193,12 @@ public final class SceneEntityTeleportScRspOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasRetcode()) {
- setRetcode(other.retcode);
- }
if (other.hasClientPosVersion()) {
setClientPosVersion(other.clientPosVersion);
}
+ if (other.hasRetcode()) {
+ setRetcode(other.retcode);
+ }
if (other.hasEntityMotion()) {
getMutableEntityMotion().mergeFrom(other.entityMotion);
}
@@ -212,8 +212,8 @@ public final class SceneEntityTeleportScRspOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- retcode = 0;
clientPosVersion = 0;
+ retcode = 0;
entityMotion.clear();
return this;
}
@@ -239,23 +239,23 @@ public final class SceneEntityTeleportScRspOuterClass {
}
SceneEntityTeleportScRsp other = (SceneEntityTeleportScRsp) o;
return bitField0_ == other.bitField0_
- && (!hasRetcode() || retcode == other.retcode)
&& (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion)
+ && (!hasRetcode() || retcode == other.retcode)
&& (!hasEntityMotion() || entityMotion.equals(other.entityMotion));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 48);
- output.writeUInt32NoTag(retcode);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 112);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(clientPosVersion);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 72);
+ output.writeUInt32NoTag(retcode);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 74);
+ output.writeRawByte((byte) 58);
output.writeMessageNoTag(entityMotion);
}
}
@@ -264,10 +264,10 @@ public final class SceneEntityTeleportScRspOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(entityMotion);
@@ -282,25 +282,25 @@ public final class SceneEntityTeleportScRspOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 48: {
- // retcode
- retcode = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 112) {
- break;
- }
- }
- case 112: {
+ case 8: {
// clientPosVersion
clientPosVersion = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 74) {
+ if (tag != 72) {
break;
}
}
- case 74: {
+ case 72: {
+ // retcode
+ retcode = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 58) {
+ break;
+ }
+ }
+ case 58: {
// entityMotion
input.readMessage(entityMotion);
bitField0_ |= 0x00000004;
@@ -327,10 +327,10 @@ public final class SceneEntityTeleportScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.retcode, retcode);
+ output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion);
+ output.writeUInt32(FieldNames.retcode, retcode);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeMessage(FieldNames.entityMotion, entityMotion);
@@ -345,10 +345,11 @@ public final class SceneEntityTeleportScRspOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 1097936398: {
- if (input.isAtField(FieldNames.retcode)) {
+ case 1787644431:
+ case 1278860153: {
+ if (input.isAtField(FieldNames.clientPosVersion)) {
if (!input.trySkipNullValue()) {
- retcode = input.readUInt32();
+ clientPosVersion = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -356,11 +357,10 @@ public final class SceneEntityTeleportScRspOuterClass {
}
break;
}
- case 1787644431:
- case 1278860153: {
- if (input.isAtField(FieldNames.clientPosVersion)) {
+ case 1097936398: {
+ if (input.isAtField(FieldNames.retcode)) {
if (!input.trySkipNullValue()) {
- clientPosVersion = input.readUInt32();
+ retcode = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -433,10 +433,10 @@ public final class SceneEntityTeleportScRspOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName retcode = FieldName.forField("retcode");
-
static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version");
+ static final FieldName retcode = FieldName.forField("retcode");
+
static final FieldName entityMotion = FieldName.forField("entityMotion", "entity_motion");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshInfoOuterClass.java
index 8296139..af8c019 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshInfoOuterClass.java
@@ -20,22 +20,22 @@ public final class SceneGroupRefreshInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 group_id = 9;
+ * optional uint32 group_id = 1;
*/
private int groupId;
/**
- * optional uint32 state = 12;
+ * optional uint32 state = 4;
*/
private int state;
/**
- * optional .SceneGroupRefreshType refresh_type = 11;
+ * optional .SceneGroupRefreshType group_refresh_type = 7;
*/
- private int refreshType;
+ private int groupRefreshType;
/**
- * repeated .SceneEntityRefreshInfo refresh_entity = 10;
+ * repeated .SceneEntityRefreshInfo refresh_entity = 14;
*/
private final RepeatedMessageoptional uint32 group_id = 9;
+ * optional uint32 group_id = 1;
* @return whether the groupId field is set
*/
public boolean hasGroupId() {
@@ -58,7 +58,7 @@ public final class SceneGroupRefreshInfoOuterClass {
}
/**
- * optional uint32 group_id = 9;
+ * optional uint32 group_id = 1;
* @return this
*/
public SceneGroupRefreshInfo clearGroupId() {
@@ -68,7 +68,7 @@ public final class SceneGroupRefreshInfoOuterClass {
}
/**
- * optional uint32 group_id = 9;
+ * optional uint32 group_id = 1;
* @return the groupId
*/
public int getGroupId() {
@@ -76,7 +76,7 @@ public final class SceneGroupRefreshInfoOuterClass {
}
/**
- * optional uint32 group_id = 9;
+ * optional uint32 group_id = 1;
* @param value the groupId to set
* @return this
*/
@@ -87,7 +87,7 @@ public final class SceneGroupRefreshInfoOuterClass {
}
/**
- * optional uint32 state = 12;
+ * optional uint32 state = 4;
* @return whether the state field is set
*/
public boolean hasState() {
@@ -95,7 +95,7 @@ public final class SceneGroupRefreshInfoOuterClass {
}
/**
- * optional uint32 state = 12;
+ * optional uint32 state = 4;
* @return this
*/
public SceneGroupRefreshInfo clearState() {
@@ -105,7 +105,7 @@ public final class SceneGroupRefreshInfoOuterClass {
}
/**
- * optional uint32 state = 12;
+ * optional uint32 state = 4;
* @return the state
*/
public int getState() {
@@ -113,7 +113,7 @@ public final class SceneGroupRefreshInfoOuterClass {
}
/**
- * optional uint32 state = 12;
+ * optional uint32 state = 4;
* @param value the state to set
* @return this
*/
@@ -124,70 +124,70 @@ public final class SceneGroupRefreshInfoOuterClass {
}
/**
- * optional .SceneGroupRefreshType refresh_type = 11;
- * @return whether the refreshType field is set
+ * optional .SceneGroupRefreshType group_refresh_type = 7;
+ * @return whether the groupRefreshType field is set
*/
- public boolean hasRefreshType() {
+ public boolean hasGroupRefreshType() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional .SceneGroupRefreshType refresh_type = 11;
+ * optional .SceneGroupRefreshType group_refresh_type = 7;
* @return this
*/
- public SceneGroupRefreshInfo clearRefreshType() {
+ public SceneGroupRefreshInfo clearGroupRefreshType() {
bitField0_ &= ~0x00000004;
- refreshType = 0;
+ groupRefreshType = 0;
return this;
}
/**
- * optional .SceneGroupRefreshType refresh_type = 11;
- * @return the refreshType
+ * optional .SceneGroupRefreshType group_refresh_type = 7;
+ * @return the groupRefreshType
*/
- public SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType getRefreshType() {
- return SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType.forNumber(refreshType);
+ public SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType getGroupRefreshType() {
+ return SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType.forNumber(groupRefreshType);
}
/**
* Gets the value of the internal enum store. The result is
- * equivalent to {@link SceneGroupRefreshInfo#getRefreshType()}.getNumber().
+ * equivalent to {@link SceneGroupRefreshInfo#getGroupRefreshType()}.getNumber().
*
* @return numeric wire representation
*/
- public int getRefreshTypeValue() {
- return refreshType;
+ public int getGroupRefreshTypeValue() {
+ return groupRefreshType;
}
/**
* Sets the value of the internal enum store. This does not
* do any validity checks, so be sure to use appropriate value
* constants from {@link SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType}. Setting an invalid value
- * can cause {@link SceneGroupRefreshInfo#getRefreshType()} to return null
+ * can cause {@link SceneGroupRefreshInfo#getGroupRefreshType()} to return null
*
* @param value the numeric wire value to set
* @return this
*/
- public SceneGroupRefreshInfo setRefreshTypeValue(final int value) {
+ public SceneGroupRefreshInfo setGroupRefreshTypeValue(final int value) {
bitField0_ |= 0x00000004;
- refreshType = value;
+ groupRefreshType = value;
return this;
}
/**
- * optional .SceneGroupRefreshType refresh_type = 11;
- * @param value the refreshType to set
+ * optional .SceneGroupRefreshType group_refresh_type = 7;
+ * @param value the groupRefreshType to set
* @return this
*/
- public SceneGroupRefreshInfo setRefreshType(
+ public SceneGroupRefreshInfo setGroupRefreshType(
final SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType value) {
bitField0_ |= 0x00000004;
- refreshType = value.getNumber();
+ groupRefreshType = value.getNumber();
return this;
}
/**
- * repeated .SceneEntityRefreshInfo refresh_entity = 10;
+ * repeated .SceneEntityRefreshInfo refresh_entity = 14;
* @return whether the refreshEntity field is set
*/
public boolean hasRefreshEntity() {
@@ -195,7 +195,7 @@ public final class SceneGroupRefreshInfoOuterClass {
}
/**
- * repeated .SceneEntityRefreshInfo refresh_entity = 10;
+ * repeated .SceneEntityRefreshInfo refresh_entity = 14;
* @return this
*/
public SceneGroupRefreshInfo clearRefreshEntity() {
@@ -205,7 +205,7 @@ public final class SceneGroupRefreshInfoOuterClass {
}
/**
- * repeated .SceneEntityRefreshInfo refresh_entity = 10;
+ * repeated .SceneEntityRefreshInfo refresh_entity = 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.
@@ -220,7 +220,7 @@ public final class SceneGroupRefreshInfoOuterClass {
}
/**
- * repeated .SceneEntityRefreshInfo refresh_entity = 10;
+ * repeated .SceneEntityRefreshInfo refresh_entity = 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
@@ -235,7 +235,7 @@ public final class SceneGroupRefreshInfoOuterClass {
}
/**
- * repeated .SceneEntityRefreshInfo refresh_entity = 10;
+ * repeated .SceneEntityRefreshInfo refresh_entity = 14;
* @param value the refreshEntity to add
* @return this
*/
@@ -247,7 +247,7 @@ public final class SceneGroupRefreshInfoOuterClass {
}
/**
- * repeated .SceneEntityRefreshInfo refresh_entity = 10;
+ * repeated .SceneEntityRefreshInfo refresh_entity = 14;
* @param values the refreshEntity to add
* @return this
*/
@@ -265,7 +265,7 @@ public final class SceneGroupRefreshInfoOuterClass {
bitField0_ = other.bitField0_;
groupId = other.groupId;
state = other.state;
- refreshType = other.refreshType;
+ groupRefreshType = other.groupRefreshType;
refreshEntity.copyFrom(other.refreshEntity);
}
return this;
@@ -283,8 +283,8 @@ public final class SceneGroupRefreshInfoOuterClass {
if (other.hasState()) {
setState(other.state);
}
- if (other.hasRefreshType()) {
- setRefreshTypeValue(other.refreshType);
+ if (other.hasGroupRefreshType()) {
+ setGroupRefreshTypeValue(other.groupRefreshType);
}
if (other.hasRefreshEntity()) {
getMutableRefreshEntity().addAll(other.refreshEntity);
@@ -301,7 +301,7 @@ public final class SceneGroupRefreshInfoOuterClass {
bitField0_ = 0;
groupId = 0;
state = 0;
- refreshType = 0;
+ groupRefreshType = 0;
refreshEntity.clear();
return this;
}
@@ -329,27 +329,27 @@ public final class SceneGroupRefreshInfoOuterClass {
return bitField0_ == other.bitField0_
&& (!hasGroupId() || groupId == other.groupId)
&& (!hasState() || state == other.state)
- && (!hasRefreshType() || refreshType == other.refreshType)
+ && (!hasGroupRefreshType() || groupRefreshType == other.groupRefreshType)
&& (!hasRefreshEntity() || refreshEntity.equals(other.refreshEntity));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 72);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(groupId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 96);
+ output.writeRawByte((byte) 32);
output.writeUInt32NoTag(state);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 88);
- output.writeEnumNoTag(refreshType);
+ output.writeRawByte((byte) 56);
+ output.writeEnumNoTag(groupRefreshType);
}
if ((bitField0_ & 0x00000008) != 0) {
for (int i = 0; i < refreshEntity.length(); i++) {
- output.writeRawByte((byte) 82);
+ output.writeRawByte((byte) 114);
output.writeMessageNoTag(refreshEntity.get(i));
}
}
@@ -365,7 +365,7 @@ public final class SceneGroupRefreshInfoOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(state);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeEnumSizeNoTag(refreshType);
+ size += 1 + ProtoSink.computeEnumSizeNoTag(groupRefreshType);
}
if ((bitField0_ & 0x00000008) != 0) {
size += (1 * refreshEntity.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(refreshEntity);
@@ -380,37 +380,37 @@ public final class SceneGroupRefreshInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 72: {
+ case 8: {
// groupId
groupId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 96) {
+ if (tag != 32) {
break;
}
}
- case 96: {
+ case 32: {
// state
state = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 88) {
+ if (tag != 56) {
break;
}
}
- case 88: {
- // refreshType
+ case 56: {
+ // groupRefreshType
final int value = input.readInt32();
if (SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType.forNumber(value) != null) {
- refreshType = value;
+ groupRefreshType = value;
bitField0_ |= 0x00000004;
}
tag = input.readTag();
- if (tag != 82) {
+ if (tag != 114) {
break;
}
}
- case 82: {
+ case 114: {
// refreshEntity
tag = input.readRepeatedMessage(refreshEntity, tag);
bitField0_ |= 0x00000008;
@@ -442,7 +442,7 @@ public final class SceneGroupRefreshInfoOuterClass {
output.writeUInt32(FieldNames.state, state);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeEnum(FieldNames.refreshType, refreshType, SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType.converter());
+ output.writeEnum(FieldNames.groupRefreshType, groupRefreshType, SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType.converter());
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeRepeatedMessage(FieldNames.refreshEntity, refreshEntity);
@@ -480,13 +480,13 @@ public final class SceneGroupRefreshInfoOuterClass {
}
break;
}
- case -1387286347:
- case -46184930: {
- if (input.isAtField(FieldNames.refreshType)) {
+ case 618900662:
+ case 851738590: {
+ if (input.isAtField(FieldNames.groupRefreshType)) {
if (!input.trySkipNullValue()) {
final SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType value = input.readEnum(SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType.converter());
if (value != null) {
- refreshType = value.getNumber();
+ groupRefreshType = value.getNumber();
bitField0_ |= 0x00000004;
} else {
input.skipUnknownEnumValue();
@@ -566,7 +566,7 @@ public final class SceneGroupRefreshInfoOuterClass {
static final FieldName state = FieldName.forField("state");
- static final FieldName refreshType = FieldName.forField("refreshType", "refresh_type");
+ static final FieldName groupRefreshType = FieldName.forField("groupRefreshType", "group_refresh_type");
static final FieldName refreshEntity = FieldName.forField("refreshEntity", "refresh_entity");
}
diff --git a/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshScNotifyOuterClass.java
index a83656c..644c768 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshScNotifyOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshScNotifyOuterClass.java
@@ -20,7 +20,7 @@ public final class SceneGroupRefreshScNotifyOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated .SceneGroupRefreshInfo group_refresh_info = 11;
+ * repeated .SceneGroupRefreshInfo group_refresh_info = 14;
*/
private final RepeatedMessagerepeated .SceneGroupRefreshInfo group_refresh_info = 11;
+ * repeated .SceneGroupRefreshInfo group_refresh_info = 14;
* @return whether the groupRefreshInfo field is set
*/
public boolean hasGroupRefreshInfo() {
@@ -43,7 +43,7 @@ public final class SceneGroupRefreshScNotifyOuterClass {
}
/**
- * repeated .SceneGroupRefreshInfo group_refresh_info = 11;
+ * repeated .SceneGroupRefreshInfo group_refresh_info = 14;
* @return this
*/
public SceneGroupRefreshScNotify clearGroupRefreshInfo() {
@@ -53,7 +53,7 @@ public final class SceneGroupRefreshScNotifyOuterClass {
}
/**
- * repeated .SceneGroupRefreshInfo group_refresh_info = 11;
+ * repeated .SceneGroupRefreshInfo group_refresh_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.
@@ -68,7 +68,7 @@ public final class SceneGroupRefreshScNotifyOuterClass {
}
/**
- * repeated .SceneGroupRefreshInfo group_refresh_info = 11;
+ * repeated .SceneGroupRefreshInfo group_refresh_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
@@ -83,7 +83,7 @@ public final class SceneGroupRefreshScNotifyOuterClass {
}
/**
- * repeated .SceneGroupRefreshInfo group_refresh_info = 11;
+ * repeated .SceneGroupRefreshInfo group_refresh_info = 14;
* @param value the groupRefreshInfo to add
* @return this
*/
@@ -95,7 +95,7 @@ public final class SceneGroupRefreshScNotifyOuterClass {
}
/**
- * repeated .SceneGroupRefreshInfo group_refresh_info = 11;
+ * repeated .SceneGroupRefreshInfo group_refresh_info = 14;
* @param values the groupRefreshInfo to add
* @return this
*/
@@ -167,7 +167,7 @@ public final class SceneGroupRefreshScNotifyOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < groupRefreshInfo.length(); i++) {
- output.writeRawByte((byte) 90);
+ output.writeRawByte((byte) 114);
output.writeMessageNoTag(groupRefreshInfo.get(i));
}
}
@@ -189,7 +189,7 @@ public final class SceneGroupRefreshScNotifyOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 90: {
+ case 114: {
// groupRefreshInfo
tag = input.readRepeatedMessage(groupRefreshInfo, tag);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/SceneGroupStateOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneGroupStateOuterClass.java
index a09ef82..c183505 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneGroupStateOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneGroupStateOuterClass.java
@@ -19,17 +19,17 @@ public final class SceneGroupStateOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 state = 4;
+ * optional uint32 state = 8;
*/
private int state;
/**
- * optional uint32 group_id = 10;
+ * optional uint32 group_id = 11;
*/
private int groupId;
/**
- * optional bool is_default = 5;
+ * optional bool is_default = 10;
*/
private boolean isDefault;
@@ -44,7 +44,7 @@ public final class SceneGroupStateOuterClass {
}
/**
- * optional uint32 state = 4;
+ * optional uint32 state = 8;
* @return whether the state field is set
*/
public boolean hasState() {
@@ -52,7 +52,7 @@ public final class SceneGroupStateOuterClass {
}
/**
- * optional uint32 state = 4;
+ * optional uint32 state = 8;
* @return this
*/
public SceneGroupState clearState() {
@@ -62,7 +62,7 @@ public final class SceneGroupStateOuterClass {
}
/**
- * optional uint32 state = 4;
+ * optional uint32 state = 8;
* @return the state
*/
public int getState() {
@@ -70,7 +70,7 @@ public final class SceneGroupStateOuterClass {
}
/**
- * optional uint32 state = 4;
+ * optional uint32 state = 8;
* @param value the state to set
* @return this
*/
@@ -81,7 +81,7 @@ public final class SceneGroupStateOuterClass {
}
/**
- * optional uint32 group_id = 10;
+ * optional uint32 group_id = 11;
* @return whether the groupId field is set
*/
public boolean hasGroupId() {
@@ -89,7 +89,7 @@ public final class SceneGroupStateOuterClass {
}
/**
- * optional uint32 group_id = 10;
+ * optional uint32 group_id = 11;
* @return this
*/
public SceneGroupState clearGroupId() {
@@ -99,7 +99,7 @@ public final class SceneGroupStateOuterClass {
}
/**
- * optional uint32 group_id = 10;
+ * optional uint32 group_id = 11;
* @return the groupId
*/
public int getGroupId() {
@@ -107,7 +107,7 @@ public final class SceneGroupStateOuterClass {
}
/**
- * optional uint32 group_id = 10;
+ * optional uint32 group_id = 11;
* @param value the groupId to set
* @return this
*/
@@ -118,7 +118,7 @@ public final class SceneGroupStateOuterClass {
}
/**
- * optional bool is_default = 5;
+ * optional bool is_default = 10;
* @return whether the isDefault field is set
*/
public boolean hasIsDefault() {
@@ -126,7 +126,7 @@ public final class SceneGroupStateOuterClass {
}
/**
- * optional bool is_default = 5;
+ * optional bool is_default = 10;
* @return this
*/
public SceneGroupState clearIsDefault() {
@@ -136,7 +136,7 @@ public final class SceneGroupStateOuterClass {
}
/**
- * optional bool is_default = 5;
+ * optional bool is_default = 10;
* @return the isDefault
*/
public boolean getIsDefault() {
@@ -144,7 +144,7 @@ public final class SceneGroupStateOuterClass {
}
/**
- * optional bool is_default = 5;
+ * optional bool is_default = 10;
* @param value the isDefault to set
* @return this
*/
@@ -225,15 +225,15 @@ public final class SceneGroupStateOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(state);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 88);
output.writeUInt32NoTag(groupId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 80);
output.writeBoolNoTag(isDefault);
}
}
@@ -260,25 +260,25 @@ public final class SceneGroupStateOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
+ case 64: {
// state
state = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
+ if (tag != 88) {
+ break;
+ }
+ }
+ case 88: {
+ // groupId
+ groupId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
if (tag != 80) {
break;
}
}
case 80: {
- // groupId
- groupId = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 40) {
- break;
- }
- }
- case 40: {
// isDefault
isDefault = input.readBool();
bitField0_ |= 0x00000004;
diff --git a/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java
index 7c99a4a..add4f0d 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java
@@ -22,78 +22,70 @@ public final class SceneInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 game_mode_type = 2;
+ * optional uint32 game_mode_type = 1;
*/
private int gameModeType;
/**
- * optional uint32 entry_id = 5;
- */
- private int entryId;
-
- /**
- * optional uint32 client_pos_version = 7;
- */
- private int clientPosVersion;
-
- /**
- * optional uint32 plane_id = 8;
- */
- private int planeId;
-
- /**
- * optional uint32 floor_id = 10;
- */
- private int floorId;
-
- /**
- * - * ? - *- * - *
optional uint32 world_id = 11;
- */
- private int worldId;
-
- /**
- * - * ? - *- * - *
optional uint32 leader_entity_id = 14;
+ * optional uint32 leader_entity_id = 2;
*/
private int leaderEntityId;
/**
- * repeated uint32 lighten_section_list = 3;
+ * optional uint32 plane_id = 5;
*/
- private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance();
+ private int planeId;
/**
- * repeated uint32 group_id_list = 13;
+ * optional uint32 client_pos_version = 6;
+ */
+ private int clientPosVersion;
+
+ /**
+ * optional uint32 floor_id = 8;
+ */
+ private int floorId;
+
+ /**
+ * optional uint32 world_id = 12;
+ */
+ private int worldId;
+
+ /**
+ * optional uint32 entry_id = 15;
+ */
+ private int entryId;
+
+ /**
+ * repeated uint32 group_id_list = 3;
*/
private final RepeatedInt groupIdList = RepeatedInt.newEmptyInstance();
/**
- * repeated .SceneEntityInfo entity_list = 6;
+ * repeated uint32 lighten_section_list = 9;
+ */
+ private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance();
+
+ /**
+ * repeated .SceneEntityInfo entity_list = 10;
*/
private final RepeatedMessagerepeated .SceneInfo.ExtraDataEntry extra_data = 81;
+ * repeated .SceneEntityGroupInfo entity_group_list = 497;
+ */
+ private final RepeatedMessagerepeated .SceneInfo.ExtraDataEntry extra_data = 1331;
*/
private final RepeatedMessagerepeated .SceneGroupState group_state_list = 1244;
+ * repeated .SceneGroupState group_state_list = 1768;
*/
private final RepeatedMessagerepeated .SceneEntityGroupInfo entity_group_list = 1649;
- */
- private final RepeatedMessageoptional uint32 game_mode_type = 2;
+ * optional uint32 game_mode_type = 1;
* @return whether the gameModeType field is set
*/
public boolean hasGameModeType() {
@@ -113,7 +105,7 @@ public final class SceneInfoOuterClass {
}
/**
- * optional uint32 game_mode_type = 2;
+ * optional uint32 game_mode_type = 1;
* @return this
*/
public SceneInfo clearGameModeType() {
@@ -123,7 +115,7 @@ public final class SceneInfoOuterClass {
}
/**
- * optional uint32 game_mode_type = 2;
+ * optional uint32 game_mode_type = 1;
* @return the gameModeType
*/
public int getGameModeType() {
@@ -131,7 +123,7 @@ public final class SceneInfoOuterClass {
}
/**
- * optional uint32 game_mode_type = 2;
+ * optional uint32 game_mode_type = 1;
* @param value the gameModeType to set
* @return this
*/
@@ -142,99 +134,62 @@ public final class SceneInfoOuterClass {
}
/**
- * optional uint32 entry_id = 5;
- * @return whether the entryId field is set
+ * optional uint32 leader_entity_id = 2;
+ * @return whether the leaderEntityId field is set
*/
- public boolean hasEntryId() {
+ public boolean hasLeaderEntityId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 entry_id = 5;
+ * optional uint32 leader_entity_id = 2;
* @return this
*/
- public SceneInfo clearEntryId() {
+ public SceneInfo clearLeaderEntityId() {
bitField0_ &= ~0x00000002;
- entryId = 0;
+ leaderEntityId = 0;
return this;
}
/**
- * optional uint32 entry_id = 5;
- * @return the entryId
+ * optional uint32 leader_entity_id = 2;
+ * @return the leaderEntityId
*/
- public int getEntryId() {
- return entryId;
+ public int getLeaderEntityId() {
+ return leaderEntityId;
}
/**
- * optional uint32 entry_id = 5;
- * @param value the entryId to set
+ * optional uint32 leader_entity_id = 2;
+ * @param value the leaderEntityId to set
* @return this
*/
- public SceneInfo setEntryId(final int value) {
+ public SceneInfo setLeaderEntityId(final int value) {
bitField0_ |= 0x00000002;
- entryId = value;
+ leaderEntityId = value;
return this;
}
/**
- * optional uint32 client_pos_version = 7;
- * @return whether the clientPosVersion field is set
+ * optional uint32 plane_id = 5;
+ * @return whether the planeId field is set
*/
- public boolean hasClientPosVersion() {
+ public boolean hasPlaneId() {
return (bitField0_ & 0x00000004) != 0;
}
/**
- * optional uint32 client_pos_version = 7;
- * @return this
- */
- public SceneInfo clearClientPosVersion() {
- bitField0_ &= ~0x00000004;
- clientPosVersion = 0;
- return this;
- }
-
- /**
- * optional uint32 client_pos_version = 7;
- * @return the clientPosVersion
- */
- public int getClientPosVersion() {
- return clientPosVersion;
- }
-
- /**
- * optional uint32 client_pos_version = 7;
- * @param value the clientPosVersion to set
- * @return this
- */
- public SceneInfo setClientPosVersion(final int value) {
- bitField0_ |= 0x00000004;
- clientPosVersion = value;
- return this;
- }
-
- /**
- * optional uint32 plane_id = 8;
- * @return whether the planeId field is set
- */
- public boolean hasPlaneId() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional uint32 plane_id = 8;
+ * optional uint32 plane_id = 5;
* @return this
*/
public SceneInfo clearPlaneId() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000004;
planeId = 0;
return this;
}
/**
- * optional uint32 plane_id = 8;
+ * optional uint32 plane_id = 5;
* @return the planeId
*/
public int getPlaneId() {
@@ -242,18 +197,55 @@ public final class SceneInfoOuterClass {
}
/**
- * optional uint32 plane_id = 8;
+ * optional uint32 plane_id = 5;
* @param value the planeId to set
* @return this
*/
public SceneInfo setPlaneId(final int value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000004;
planeId = value;
return this;
}
/**
- * optional uint32 floor_id = 10;
+ * optional uint32 client_pos_version = 6;
+ * @return whether the clientPosVersion field is set
+ */
+ public boolean hasClientPosVersion() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional uint32 client_pos_version = 6;
+ * @return this
+ */
+ public SceneInfo clearClientPosVersion() {
+ bitField0_ &= ~0x00000008;
+ clientPosVersion = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 client_pos_version = 6;
+ * @return the clientPosVersion
+ */
+ public int getClientPosVersion() {
+ return clientPosVersion;
+ }
+
+ /**
+ * optional uint32 client_pos_version = 6;
+ * @param value the clientPosVersion to set
+ * @return this
+ */
+ public SceneInfo setClientPosVersion(final int value) {
+ bitField0_ |= 0x00000008;
+ clientPosVersion = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 floor_id = 8;
* @return whether the floorId field is set
*/
public boolean hasFloorId() {
@@ -261,7 +253,7 @@ public final class SceneInfoOuterClass {
}
/**
- * optional uint32 floor_id = 10;
+ * optional uint32 floor_id = 8;
* @return this
*/
public SceneInfo clearFloorId() {
@@ -271,7 +263,7 @@ public final class SceneInfoOuterClass {
}
/**
- * optional uint32 floor_id = 10;
+ * optional uint32 floor_id = 8;
* @return the floorId
*/
public int getFloorId() {
@@ -279,7 +271,7 @@ public final class SceneInfoOuterClass {
}
/**
- * optional uint32 floor_id = 10;
+ * optional uint32 floor_id = 8;
* @param value the floorId to set
* @return this
*/
@@ -290,11 +282,7 @@ public final class SceneInfoOuterClass {
}
/**
- * - * ? - *- * - *
optional uint32 world_id = 11;
+ * optional uint32 world_id = 12;
* @return whether the worldId field is set
*/
public boolean hasWorldId() {
@@ -302,11 +290,7 @@ public final class SceneInfoOuterClass {
}
/**
- * - * ? - *- * - *
optional uint32 world_id = 11;
+ * optional uint32 world_id = 12;
* @return this
*/
public SceneInfo clearWorldId() {
@@ -316,11 +300,7 @@ public final class SceneInfoOuterClass {
}
/**
- * - * ? - *- * - *
optional uint32 world_id = 11;
+ * optional uint32 world_id = 12;
* @return the worldId
*/
public int getWorldId() {
@@ -328,11 +308,7 @@ public final class SceneInfoOuterClass {
}
/**
- * - * ? - *- * - *
optional uint32 world_id = 11;
+ * optional uint32 world_id = 12;
* @param value the worldId to set
* @return this
*/
@@ -343,146 +319,62 @@ public final class SceneInfoOuterClass {
}
/**
- * - * ? - *- * - *
optional uint32 leader_entity_id = 14;
- * @return whether the leaderEntityId field is set
+ * optional uint32 entry_id = 15;
+ * @return whether the entryId field is set
*/
- public boolean hasLeaderEntityId() {
+ public boolean hasEntryId() {
return (bitField0_ & 0x00000040) != 0;
}
/**
- * - * ? - *- * - *
optional uint32 leader_entity_id = 14;
+ * optional uint32 entry_id = 15;
* @return this
*/
- public SceneInfo clearLeaderEntityId() {
+ public SceneInfo clearEntryId() {
bitField0_ &= ~0x00000040;
- leaderEntityId = 0;
+ entryId = 0;
return this;
}
/**
- * - * ? - *- * - *
optional uint32 leader_entity_id = 14;
- * @return the leaderEntityId
+ * optional uint32 entry_id = 15;
+ * @return the entryId
*/
- public int getLeaderEntityId() {
- return leaderEntityId;
+ public int getEntryId() {
+ return entryId;
}
/**
- * - * ? - *- * - *
optional uint32 leader_entity_id = 14;
- * @param value the leaderEntityId to set
+ * optional uint32 entry_id = 15;
+ * @param value the entryId to set
* @return this
*/
- public SceneInfo setLeaderEntityId(final int value) {
+ public SceneInfo setEntryId(final int value) {
bitField0_ |= 0x00000040;
- leaderEntityId = value;
+ entryId = value;
return this;
}
/**
- * repeated uint32 lighten_section_list = 3;
- * @return whether the lightenSectionList field is set
+ * repeated uint32 group_id_list = 3;
+ * @return whether the groupIdList field is set
*/
- public boolean hasLightenSectionList() {
+ public boolean hasGroupIdList() {
return (bitField0_ & 0x00000080) != 0;
}
/**
- * repeated uint32 lighten_section_list = 3;
- * @return this
- */
- public SceneInfo clearLightenSectionList() {
- bitField0_ &= ~0x00000080;
- lightenSectionList.clear();
- return this;
- }
-
- /**
- * repeated uint32 lighten_section_list = 3;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableLightenSectionList()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedInt getLightenSectionList() {
- return lightenSectionList;
- }
-
- /**
- * repeated uint32 lighten_section_list = 3;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedInt getMutableLightenSectionList() {
- bitField0_ |= 0x00000080;
- return lightenSectionList;
- }
-
- /**
- * repeated uint32 lighten_section_list = 3;
- * @param value the lightenSectionList to add
- * @return this
- */
- public SceneInfo addLightenSectionList(final int value) {
- bitField0_ |= 0x00000080;
- lightenSectionList.add(value);
- return this;
- }
-
- /**
- * repeated uint32 lighten_section_list = 3;
- * @param values the lightenSectionList to add
- * @return this
- */
- public SceneInfo addAllLightenSectionList(final int... values) {
- bitField0_ |= 0x00000080;
- lightenSectionList.addAll(values);
- return this;
- }
-
- /**
- * repeated uint32 group_id_list = 13;
- * @return whether the groupIdList field is set
- */
- public boolean hasGroupIdList() {
- return (bitField0_ & 0x00000100) != 0;
- }
-
- /**
- * repeated uint32 group_id_list = 13;
+ * repeated uint32 group_id_list = 3;
* @return this
*/
public SceneInfo clearGroupIdList() {
- bitField0_ &= ~0x00000100;
+ bitField0_ &= ~0x00000080;
groupIdList.clear();
return this;
}
/**
- * repeated uint32 group_id_list = 13;
+ * repeated uint32 group_id_list = 3;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -496,7 +388,7 @@ public final class SceneInfoOuterClass {
}
/**
- * repeated uint32 group_id_list = 13;
+ * repeated uint32 group_id_list = 3;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -505,34 +397,102 @@ public final class SceneInfoOuterClass {
* @return internal storage object for modifications
*/
public RepeatedInt getMutableGroupIdList() {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000080;
return groupIdList;
}
/**
- * repeated uint32 group_id_list = 13;
+ * repeated uint32 group_id_list = 3;
* @param value the groupIdList to add
* @return this
*/
public SceneInfo addGroupIdList(final int value) {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000080;
groupIdList.add(value);
return this;
}
/**
- * repeated uint32 group_id_list = 13;
+ * repeated uint32 group_id_list = 3;
* @param values the groupIdList to add
* @return this
*/
public SceneInfo addAllGroupIdList(final int... values) {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000080;
groupIdList.addAll(values);
return this;
}
/**
- * repeated .SceneEntityInfo entity_list = 6;
+ * repeated uint32 lighten_section_list = 9;
+ * @return whether the lightenSectionList field is set
+ */
+ public boolean hasLightenSectionList() {
+ return (bitField0_ & 0x00000100) != 0;
+ }
+
+ /**
+ * repeated uint32 lighten_section_list = 9;
+ * @return this
+ */
+ public SceneInfo clearLightenSectionList() {
+ bitField0_ &= ~0x00000100;
+ lightenSectionList.clear();
+ return this;
+ }
+
+ /**
+ * repeated uint32 lighten_section_list = 9;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableLightenSectionList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedInt getLightenSectionList() {
+ return lightenSectionList;
+ }
+
+ /**
+ * repeated uint32 lighten_section_list = 9;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedInt getMutableLightenSectionList() {
+ bitField0_ |= 0x00000100;
+ return lightenSectionList;
+ }
+
+ /**
+ * repeated uint32 lighten_section_list = 9;
+ * @param value the lightenSectionList to add
+ * @return this
+ */
+ public SceneInfo addLightenSectionList(final int value) {
+ bitField0_ |= 0x00000100;
+ lightenSectionList.add(value);
+ return this;
+ }
+
+ /**
+ * repeated uint32 lighten_section_list = 9;
+ * @param values the lightenSectionList to add
+ * @return this
+ */
+ public SceneInfo addAllLightenSectionList(final int... values) {
+ bitField0_ |= 0x00000100;
+ lightenSectionList.addAll(values);
+ return this;
+ }
+
+ /**
+ * repeated .SceneEntityInfo entity_list = 10;
* @return whether the entityList field is set
*/
public boolean hasEntityList() {
@@ -540,7 +500,7 @@ public final class SceneInfoOuterClass {
}
/**
- * repeated .SceneEntityInfo entity_list = 6;
+ * repeated .SceneEntityInfo entity_list = 10;
* @return this
*/
public SceneInfo clearEntityList() {
@@ -550,7 +510,7 @@ public final class SceneInfoOuterClass {
}
/**
- * repeated .SceneEntityInfo entity_list = 6;
+ * repeated .SceneEntityInfo entity_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.
@@ -564,7 +524,7 @@ public final class SceneInfoOuterClass {
}
/**
- * repeated .SceneEntityInfo entity_list = 6;
+ * repeated .SceneEntityInfo entity_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
@@ -578,7 +538,7 @@ public final class SceneInfoOuterClass {
}
/**
- * repeated .SceneEntityInfo entity_list = 6;
+ * repeated .SceneEntityInfo entity_list = 10;
* @param value the entityList to add
* @return this
*/
@@ -589,7 +549,7 @@ public final class SceneInfoOuterClass {
}
/**
- * repeated .SceneEntityInfo entity_list = 6;
+ * repeated .SceneEntityInfo entity_list = 10;
* @param values the entityList to add
* @return this
*/
@@ -600,162 +560,25 @@ public final class SceneInfoOuterClass {
}
/**
- * repeated .SceneInfo.ExtraDataEntry extra_data = 81;
- * @return whether the extraData field is set
+ * repeated .SceneEntityGroupInfo entity_group_list = 497;
+ * @return whether the entityGroupList field is set
*/
- public boolean hasExtraData() {
+ public boolean hasEntityGroupList() {
return (bitField0_ & 0x00000400) != 0;
}
/**
- * repeated .SceneInfo.ExtraDataEntry extra_data = 81;
- * @return this
- */
- public SceneInfo clearExtraData() {
- bitField0_ &= ~0x00000400;
- extraData.clear();
- return this;
- }
-
- /**
- * repeated .SceneInfo.ExtraDataEntry extra_data = 81;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableExtraData()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedMessagerepeated .SceneInfo.ExtraDataEntry extra_data = 81;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedMessagerepeated .SceneInfo.ExtraDataEntry extra_data = 81;
- * @param value the extraData to add
- * @return this
- */
- public SceneInfo addExtraData(final ExtraDataEntry value) {
- bitField0_ |= 0x00000400;
- extraData.add(value);
- return this;
- }
-
- /**
- * repeated .SceneInfo.ExtraDataEntry extra_data = 81;
- * @param values the extraData to add
- * @return this
- */
- public SceneInfo addAllExtraData(final ExtraDataEntry... values) {
- bitField0_ |= 0x00000400;
- extraData.addAll(values);
- return this;
- }
-
- /**
- * repeated .SceneGroupState group_state_list = 1244;
- * @return whether the groupStateList field is set
- */
- public boolean hasGroupStateList() {
- return (bitField0_ & 0x00000800) != 0;
- }
-
- /**
- * repeated .SceneGroupState group_state_list = 1244;
- * @return this
- */
- public SceneInfo clearGroupStateList() {
- bitField0_ &= ~0x00000800;
- groupStateList.clear();
- return this;
- }
-
- /**
- * repeated .SceneGroupState group_state_list = 1244;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableGroupStateList()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedMessagerepeated .SceneGroupState group_state_list = 1244;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedMessagerepeated .SceneGroupState group_state_list = 1244;
- * @param value the groupStateList to add
- * @return this
- */
- public SceneInfo addGroupStateList(final SceneGroupStateOuterClass.SceneGroupState value) {
- bitField0_ |= 0x00000800;
- groupStateList.add(value);
- return this;
- }
-
- /**
- * repeated .SceneGroupState group_state_list = 1244;
- * @param values the groupStateList to add
- * @return this
- */
- public SceneInfo addAllGroupStateList(
- final SceneGroupStateOuterClass.SceneGroupState... values) {
- bitField0_ |= 0x00000800;
- groupStateList.addAll(values);
- return this;
- }
-
- /**
- * repeated .SceneEntityGroupInfo entity_group_list = 1649;
- * @return whether the entityGroupList field is set
- */
- public boolean hasEntityGroupList() {
- return (bitField0_ & 0x00001000) != 0;
- }
-
- /**
- * repeated .SceneEntityGroupInfo entity_group_list = 1649;
+ * repeated .SceneEntityGroupInfo entity_group_list = 497;
* @return this
*/
public SceneInfo clearEntityGroupList() {
- bitField0_ &= ~0x00001000;
+ bitField0_ &= ~0x00000400;
entityGroupList.clear();
return this;
}
/**
- * repeated .SceneEntityGroupInfo entity_group_list = 1649;
+ * repeated .SceneEntityGroupInfo entity_group_list = 497;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -770,7 +593,7 @@ public final class SceneInfoOuterClass {
}
/**
- * repeated .SceneEntityGroupInfo entity_group_list = 1649;
+ * repeated .SceneEntityGroupInfo entity_group_list = 497;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -780,52 +603,189 @@ public final class SceneInfoOuterClass {
*/
public RepeatedMessagerepeated .SceneEntityGroupInfo entity_group_list = 1649;
+ * repeated .SceneEntityGroupInfo entity_group_list = 497;
* @param value the entityGroupList to add
* @return this
*/
public SceneInfo addEntityGroupList(
final SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo value) {
- bitField0_ |= 0x00001000;
+ bitField0_ |= 0x00000400;
entityGroupList.add(value);
return this;
}
/**
- * repeated .SceneEntityGroupInfo entity_group_list = 1649;
+ * repeated .SceneEntityGroupInfo entity_group_list = 497;
* @param values the entityGroupList to add
* @return this
*/
public SceneInfo addAllEntityGroupList(
final SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo... values) {
- bitField0_ |= 0x00001000;
+ bitField0_ |= 0x00000400;
entityGroupList.addAll(values);
return this;
}
+ /**
+ * repeated .SceneInfo.ExtraDataEntry extra_data = 1331;
+ * @return whether the extraData field is set
+ */
+ public boolean hasExtraData() {
+ return (bitField0_ & 0x00000800) != 0;
+ }
+
+ /**
+ * repeated .SceneInfo.ExtraDataEntry extra_data = 1331;
+ * @return this
+ */
+ public SceneInfo clearExtraData() {
+ bitField0_ &= ~0x00000800;
+ extraData.clear();
+ return this;
+ }
+
+ /**
+ * repeated .SceneInfo.ExtraDataEntry extra_data = 1331;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableExtraData()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedMessagerepeated .SceneInfo.ExtraDataEntry extra_data = 1331;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedMessagerepeated .SceneInfo.ExtraDataEntry extra_data = 1331;
+ * @param value the extraData to add
+ * @return this
+ */
+ public SceneInfo addExtraData(final ExtraDataEntry value) {
+ bitField0_ |= 0x00000800;
+ extraData.add(value);
+ return this;
+ }
+
+ /**
+ * repeated .SceneInfo.ExtraDataEntry extra_data = 1331;
+ * @param values the extraData to add
+ * @return this
+ */
+ public SceneInfo addAllExtraData(final ExtraDataEntry... values) {
+ bitField0_ |= 0x00000800;
+ extraData.addAll(values);
+ return this;
+ }
+
+ /**
+ * repeated .SceneGroupState group_state_list = 1768;
+ * @return whether the groupStateList field is set
+ */
+ public boolean hasGroupStateList() {
+ return (bitField0_ & 0x00001000) != 0;
+ }
+
+ /**
+ * repeated .SceneGroupState group_state_list = 1768;
+ * @return this
+ */
+ public SceneInfo clearGroupStateList() {
+ bitField0_ &= ~0x00001000;
+ groupStateList.clear();
+ return this;
+ }
+
+ /**
+ * repeated .SceneGroupState group_state_list = 1768;
+ *
+ * This method returns the internal storage object without modifying any has state.
+ * The returned object should not be modified and be treated as read-only.
+ *
+ * Use {@link #getMutableGroupStateList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedMessagerepeated .SceneGroupState group_state_list = 1768;
+ *
+ * This method returns the internal storage object and sets the corresponding
+ * has state. The returned object will become part of this message and its
+ * contents may be modified as long as the has state is not cleared.
+ *
+ * @return internal storage object for modifications
+ */
+ public RepeatedMessagerepeated .SceneGroupState group_state_list = 1768;
+ * @param value the groupStateList to add
+ * @return this
+ */
+ public SceneInfo addGroupStateList(final SceneGroupStateOuterClass.SceneGroupState value) {
+ bitField0_ |= 0x00001000;
+ groupStateList.add(value);
+ return this;
+ }
+
+ /**
+ * repeated .SceneGroupState group_state_list = 1768;
+ * @param values the groupStateList to add
+ * @return this
+ */
+ public SceneInfo addAllGroupStateList(
+ final SceneGroupStateOuterClass.SceneGroupState... values) {
+ bitField0_ |= 0x00001000;
+ groupStateList.addAll(values);
+ return this;
+ }
+
@Override
public SceneInfo copyFrom(final SceneInfo other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
gameModeType = other.gameModeType;
- entryId = other.entryId;
- clientPosVersion = other.clientPosVersion;
+ leaderEntityId = other.leaderEntityId;
planeId = other.planeId;
+ clientPosVersion = other.clientPosVersion;
floorId = other.floorId;
worldId = other.worldId;
- leaderEntityId = other.leaderEntityId;
- lightenSectionList.copyFrom(other.lightenSectionList);
+ entryId = other.entryId;
groupIdList.copyFrom(other.groupIdList);
+ lightenSectionList.copyFrom(other.lightenSectionList);
entityList.copyFrom(other.entityList);
+ entityGroupList.copyFrom(other.entityGroupList);
extraData.copyFrom(other.extraData);
groupStateList.copyFrom(other.groupStateList);
- entityGroupList.copyFrom(other.entityGroupList);
}
return this;
}
@@ -839,42 +799,42 @@ public final class SceneInfoOuterClass {
if (other.hasGameModeType()) {
setGameModeType(other.gameModeType);
}
- if (other.hasEntryId()) {
- setEntryId(other.entryId);
- }
- if (other.hasClientPosVersion()) {
- setClientPosVersion(other.clientPosVersion);
+ if (other.hasLeaderEntityId()) {
+ setLeaderEntityId(other.leaderEntityId);
}
if (other.hasPlaneId()) {
setPlaneId(other.planeId);
}
+ if (other.hasClientPosVersion()) {
+ setClientPosVersion(other.clientPosVersion);
+ }
if (other.hasFloorId()) {
setFloorId(other.floorId);
}
if (other.hasWorldId()) {
setWorldId(other.worldId);
}
- if (other.hasLeaderEntityId()) {
- setLeaderEntityId(other.leaderEntityId);
- }
- if (other.hasLightenSectionList()) {
- getMutableLightenSectionList().addAll(other.lightenSectionList);
+ if (other.hasEntryId()) {
+ setEntryId(other.entryId);
}
if (other.hasGroupIdList()) {
getMutableGroupIdList().addAll(other.groupIdList);
}
+ if (other.hasLightenSectionList()) {
+ getMutableLightenSectionList().addAll(other.lightenSectionList);
+ }
if (other.hasEntityList()) {
getMutableEntityList().addAll(other.entityList);
}
+ if (other.hasEntityGroupList()) {
+ getMutableEntityGroupList().addAll(other.entityGroupList);
+ }
if (other.hasExtraData()) {
getMutableExtraData().addAll(other.extraData);
}
if (other.hasGroupStateList()) {
getMutableGroupStateList().addAll(other.groupStateList);
}
- if (other.hasEntityGroupList()) {
- getMutableEntityGroupList().addAll(other.entityGroupList);
- }
return this;
}
@@ -886,18 +846,18 @@ public final class SceneInfoOuterClass {
cachedSize = -1;
bitField0_ = 0;
gameModeType = 0;
- entryId = 0;
- clientPosVersion = 0;
+ leaderEntityId = 0;
planeId = 0;
+ clientPosVersion = 0;
floorId = 0;
worldId = 0;
- leaderEntityId = 0;
- lightenSectionList.clear();
+ entryId = 0;
groupIdList.clear();
+ lightenSectionList.clear();
entityList.clear();
+ entityGroupList.clear();
extraData.clear();
groupStateList.clear();
- entityGroupList.clear();
return this;
}
@@ -908,12 +868,12 @@ public final class SceneInfoOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- lightenSectionList.clear();
groupIdList.clear();
+ lightenSectionList.clear();
entityList.clearQuick();
+ entityGroupList.clearQuick();
extraData.clearQuick();
groupStateList.clearQuick();
- entityGroupList.clearQuick();
return this;
}
@@ -928,84 +888,84 @@ public final class SceneInfoOuterClass {
SceneInfo other = (SceneInfo) o;
return bitField0_ == other.bitField0_
&& (!hasGameModeType() || gameModeType == other.gameModeType)
- && (!hasEntryId() || entryId == other.entryId)
- && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion)
+ && (!hasLeaderEntityId() || leaderEntityId == other.leaderEntityId)
&& (!hasPlaneId() || planeId == other.planeId)
+ && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion)
&& (!hasFloorId() || floorId == other.floorId)
&& (!hasWorldId() || worldId == other.worldId)
- && (!hasLeaderEntityId() || leaderEntityId == other.leaderEntityId)
- && (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList))
+ && (!hasEntryId() || entryId == other.entryId)
&& (!hasGroupIdList() || groupIdList.equals(other.groupIdList))
+ && (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList))
&& (!hasEntityList() || entityList.equals(other.entityList))
+ && (!hasEntityGroupList() || entityGroupList.equals(other.entityGroupList))
&& (!hasExtraData() || extraData.equals(other.extraData))
- && (!hasGroupStateList() || groupStateList.equals(other.groupStateList))
- && (!hasEntityGroupList() || entityGroupList.equals(other.entityGroupList));
+ && (!hasGroupStateList() || groupStateList.equals(other.groupStateList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 16);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(gameModeType);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 40);
- output.writeUInt32NoTag(entryId);
+ output.writeRawByte((byte) 16);
+ output.writeUInt32NoTag(leaderEntityId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 56);
- output.writeUInt32NoTag(clientPosVersion);
- }
- if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 64);
+ output.writeRawByte((byte) 40);
output.writeUInt32NoTag(planeId);
}
+ if ((bitField0_ & 0x00000008) != 0) {
+ output.writeRawByte((byte) 48);
+ output.writeUInt32NoTag(clientPosVersion);
+ }
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 80);
+ output.writeRawByte((byte) 64);
output.writeUInt32NoTag(floorId);
}
if ((bitField0_ & 0x00000020) != 0) {
- output.writeRawByte((byte) 88);
+ output.writeRawByte((byte) 96);
output.writeUInt32NoTag(worldId);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeRawByte((byte) 112);
- output.writeUInt32NoTag(leaderEntityId);
+ output.writeRawByte((byte) 120);
+ output.writeUInt32NoTag(entryId);
}
if ((bitField0_ & 0x00000080) != 0) {
- for (int i = 0; i < lightenSectionList.length(); i++) {
+ for (int i = 0; i < groupIdList.length(); i++) {
output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(lightenSectionList.array()[i]);
+ output.writeUInt32NoTag(groupIdList.array()[i]);
}
}
if ((bitField0_ & 0x00000100) != 0) {
- for (int i = 0; i < groupIdList.length(); i++) {
- output.writeRawByte((byte) 104);
- output.writeUInt32NoTag(groupIdList.array()[i]);
+ for (int i = 0; i < lightenSectionList.length(); i++) {
+ output.writeRawByte((byte) 72);
+ output.writeUInt32NoTag(lightenSectionList.array()[i]);
}
}
if ((bitField0_ & 0x00000200) != 0) {
for (int i = 0; i < entityList.length(); i++) {
- output.writeRawByte((byte) 50);
+ output.writeRawByte((byte) 82);
output.writeMessageNoTag(entityList.get(i));
}
}
if ((bitField0_ & 0x00000400) != 0) {
- for (int i = 0; i < extraData.length(); i++) {
- output.writeRawLittleEndian16((short) 1418);
- output.writeMessageNoTag(extraData.get(i));
+ for (int i = 0; i < entityGroupList.length(); i++) {
+ output.writeRawLittleEndian16((short) 8074);
+ output.writeMessageNoTag(entityGroupList.get(i));
}
}
if ((bitField0_ & 0x00000800) != 0) {
- for (int i = 0; i < groupStateList.length(); i++) {
- output.writeRawLittleEndian16((short) 19938);
- output.writeMessageNoTag(groupStateList.get(i));
+ for (int i = 0; i < extraData.length(); i++) {
+ output.writeRawLittleEndian16((short) 21402);
+ output.writeMessageNoTag(extraData.get(i));
}
}
if ((bitField0_ & 0x00001000) != 0) {
- for (int i = 0; i < entityGroupList.length(); i++) {
- output.writeRawLittleEndian16((short) 26506);
- output.writeMessageNoTag(entityGroupList.get(i));
+ for (int i = 0; i < groupStateList.length(); i++) {
+ output.writeRawLittleEndian16((short) 28354);
+ output.writeMessageNoTag(groupStateList.get(i));
}
}
}
@@ -1017,13 +977,13 @@ public final class SceneInfoOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(gameModeType);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderEntityId);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion);
}
if ((bitField0_ & 0x00000010) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(floorId);
@@ -1032,25 +992,25 @@ public final class SceneInfoOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(worldId);
}
if ((bitField0_ & 0x00000040) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderEntityId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId);
}
if ((bitField0_ & 0x00000080) != 0) {
- size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList);
+ size += (1 * groupIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(groupIdList);
}
if ((bitField0_ & 0x00000100) != 0) {
- size += (1 * groupIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(groupIdList);
+ size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList);
}
if ((bitField0_ & 0x00000200) != 0) {
size += (1 * entityList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityList);
}
if ((bitField0_ & 0x00000400) != 0) {
- size += (2 * extraData.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(extraData);
+ size += (2 * entityGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityGroupList);
}
if ((bitField0_ & 0x00000800) != 0) {
- size += (2 * groupStateList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(groupStateList);
+ size += (2 * extraData.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(extraData);
}
if ((bitField0_ & 0x00001000) != 0) {
- size += (2 * entityGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityGroupList);
+ size += (2 * groupStateList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(groupStateList);
}
return size;
}
@@ -1062,63 +1022,63 @@ public final class SceneInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 16: {
+ case 8: {
// gameModeType
gameModeType = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
+ if (tag != 16) {
+ break;
+ }
+ }
+ case 16: {
+ // leaderEntityId
+ leaderEntityId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
if (tag != 40) {
break;
}
}
case 40: {
- // entryId
- entryId = input.readUInt32();
- bitField0_ |= 0x00000002;
+ // planeId
+ planeId = input.readUInt32();
+ bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 56) {
+ if (tag != 48) {
break;
}
}
- case 56: {
+ case 48: {
// clientPosVersion
clientPosVersion = input.readUInt32();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000008;
tag = input.readTag();
if (tag != 64) {
break;
}
}
case 64: {
- // planeId
- planeId = input.readUInt32();
- bitField0_ |= 0x00000008;
- tag = input.readTag();
- if (tag != 80) {
- break;
- }
- }
- case 80: {
// floorId
floorId = input.readUInt32();
bitField0_ |= 0x00000010;
tag = input.readTag();
- if (tag != 88) {
+ if (tag != 96) {
break;
}
}
- case 88: {
+ case 96: {
// worldId
worldId = input.readUInt32();
bitField0_ |= 0x00000020;
tag = input.readTag();
- if (tag != 112) {
+ if (tag != 120) {
break;
}
}
- case 112: {
- // leaderEntityId
- leaderEntityId = input.readUInt32();
+ case 120: {
+ // entryId
+ entryId = input.readUInt32();
bitField0_ |= 0x00000040;
tag = input.readTag();
if (tag != 26) {
@@ -1126,50 +1086,50 @@ public final class SceneInfoOuterClass {
}
}
case 26: {
- // lightenSectionList [packed=true]
- input.readPackedUInt32(lightenSectionList, tag);
- bitField0_ |= 0x00000080;
- tag = input.readTag();
- if (tag != 106) {
- break;
- }
- }
- case 106: {
// groupIdList [packed=true]
input.readPackedUInt32(groupIdList, tag);
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000080;
tag = input.readTag();
- if (tag != 50) {
+ if (tag != 74) {
break;
}
}
- case 50: {
+ case 74: {
+ // lightenSectionList [packed=true]
+ input.readPackedUInt32(lightenSectionList, tag);
+ bitField0_ |= 0x00000100;
+ tag = input.readTag();
+ if (tag != 82) {
+ break;
+ }
+ }
+ case 82: {
// entityList
tag = input.readRepeatedMessage(entityList, tag);
bitField0_ |= 0x00000200;
- if (tag != 650) {
+ if (tag != 3978) {
break;
}
}
- case 650: {
- // extraData
- tag = input.readRepeatedMessage(extraData, tag);
- bitField0_ |= 0x00000400;
- if (tag != 9954) {
- break;
- }
- }
- case 9954: {
- // groupStateList
- tag = input.readRepeatedMessage(groupStateList, tag);
- bitField0_ |= 0x00000800;
- if (tag != 13194) {
- break;
- }
- }
- case 13194: {
+ case 3978: {
// entityGroupList
tag = input.readRepeatedMessage(entityGroupList, tag);
+ bitField0_ |= 0x00000400;
+ if (tag != 10650) {
+ break;
+ }
+ }
+ case 10650: {
+ // extraData
+ tag = input.readRepeatedMessage(extraData, tag);
+ bitField0_ |= 0x00000800;
+ if (tag != 14146) {
+ break;
+ }
+ }
+ case 14146: {
+ // groupStateList
+ tag = input.readRepeatedMessage(groupStateList, tag);
bitField0_ |= 0x00001000;
if (tag != 0) {
break;
@@ -1186,14 +1146,14 @@ public final class SceneInfoOuterClass {
break;
}
case 24: {
- // lightenSectionList [packed=false]
- tag = input.readRepeatedUInt32(lightenSectionList, tag);
+ // groupIdList [packed=false]
+ tag = input.readRepeatedUInt32(groupIdList, tag);
bitField0_ |= 0x00000080;
break;
}
- case 104: {
- // groupIdList [packed=false]
- tag = input.readRepeatedUInt32(groupIdList, tag);
+ case 72: {
+ // lightenSectionList [packed=false]
+ tag = input.readRepeatedUInt32(lightenSectionList, tag);
bitField0_ |= 0x00000100;
break;
}
@@ -1208,13 +1168,13 @@ public final class SceneInfoOuterClass {
output.writeUInt32(FieldNames.gameModeType, gameModeType);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.entryId, entryId);
+ output.writeUInt32(FieldNames.leaderEntityId, leaderEntityId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion);
+ output.writeUInt32(FieldNames.planeId, planeId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.planeId, planeId);
+ output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion);
}
if ((bitField0_ & 0x00000010) != 0) {
output.writeUInt32(FieldNames.floorId, floorId);
@@ -1223,25 +1183,25 @@ public final class SceneInfoOuterClass {
output.writeUInt32(FieldNames.worldId, worldId);
}
if ((bitField0_ & 0x00000040) != 0) {
- output.writeUInt32(FieldNames.leaderEntityId, leaderEntityId);
+ output.writeUInt32(FieldNames.entryId, entryId);
}
if ((bitField0_ & 0x00000080) != 0) {
- output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList);
+ output.writeRepeatedUInt32(FieldNames.groupIdList, groupIdList);
}
if ((bitField0_ & 0x00000100) != 0) {
- output.writeRepeatedUInt32(FieldNames.groupIdList, groupIdList);
+ output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList);
}
if ((bitField0_ & 0x00000200) != 0) {
output.writeRepeatedMessage(FieldNames.entityList, entityList);
}
if ((bitField0_ & 0x00000400) != 0) {
- output.writeRepeatedMessage(FieldNames.extraData, extraData);
+ output.writeRepeatedMessage(FieldNames.entityGroupList, entityGroupList);
}
if ((bitField0_ & 0x00000800) != 0) {
- output.writeRepeatedMessage(FieldNames.groupStateList, groupStateList);
+ output.writeRepeatedMessage(FieldNames.extraData, extraData);
}
if ((bitField0_ & 0x00001000) != 0) {
- output.writeRepeatedMessage(FieldNames.entityGroupList, entityGroupList);
+ output.writeRepeatedMessage(FieldNames.groupStateList, groupStateList);
}
output.endObject();
}
@@ -1265,11 +1225,11 @@ public final class SceneInfoOuterClass {
}
break;
}
- case -1591558867:
- case -2093663224: {
- if (input.isAtField(FieldNames.entryId)) {
+ case 1693061255:
+ case 794634049: {
+ if (input.isAtField(FieldNames.leaderEntityId)) {
if (!input.trySkipNullValue()) {
- entryId = input.readUInt32();
+ leaderEntityId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -1277,23 +1237,23 @@ public final class SceneInfoOuterClass {
}
break;
}
- case 1787644431:
- case 1278860153: {
- if (input.isAtField(FieldNames.clientPosVersion)) {
- if (!input.trySkipNullValue()) {
- clientPosVersion = input.readUInt32();
- bitField0_ |= 0x00000004;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case -493896553:
case 1869097438: {
if (input.isAtField(FieldNames.planeId)) {
if (!input.trySkipNullValue()) {
planeId = input.readUInt32();
+ bitField0_ |= 0x00000004;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case 1787644431:
+ case 1278860153: {
+ if (input.isAtField(FieldNames.clientPosVersion)) {
+ if (!input.trySkipNullValue()) {
+ clientPosVersion = input.readUInt32();
bitField0_ |= 0x00000008;
}
} else {
@@ -1325,11 +1285,11 @@ public final class SceneInfoOuterClass {
}
break;
}
- case 1693061255:
- case 794634049: {
- if (input.isAtField(FieldNames.leaderEntityId)) {
+ case -1591558867:
+ case -2093663224: {
+ if (input.isAtField(FieldNames.entryId)) {
if (!input.trySkipNullValue()) {
- leaderEntityId = input.readUInt32();
+ entryId = input.readUInt32();
bitField0_ |= 0x00000040;
}
} else {
@@ -1337,23 +1297,23 @@ public final class SceneInfoOuterClass {
}
break;
}
- case -1942343836:
- case 1328850360: {
- if (input.isAtField(FieldNames.lightenSectionList)) {
- if (!input.trySkipNullValue()) {
- input.readRepeatedUInt32(lightenSectionList);
- bitField0_ |= 0x00000080;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 457110456:
case 1703805826: {
if (input.isAtField(FieldNames.groupIdList)) {
if (!input.trySkipNullValue()) {
input.readRepeatedUInt32(groupIdList);
+ bitField0_ |= 0x00000080;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
+ case -1942343836:
+ case 1328850360: {
+ if (input.isAtField(FieldNames.lightenSectionList)) {
+ if (!input.trySkipNullValue()) {
+ input.readRepeatedUInt32(lightenSectionList);
bitField0_ |= 0x00000100;
}
} else {
@@ -1373,12 +1333,24 @@ public final class SceneInfoOuterClass {
}
break;
}
+ case -914706662:
+ case 1589108794: {
+ if (input.isAtField(FieldNames.entityGroupList)) {
+ if (!input.trySkipNullValue()) {
+ input.readRepeatedMessage(entityGroupList);
+ bitField0_ |= 0x00000400;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case -253792294:
case 747380345: {
if (input.isAtField(FieldNames.extraData)) {
if (!input.trySkipNullValue()) {
input.readRepeatedMessage(extraData);
- bitField0_ |= 0x00000400;
+ bitField0_ |= 0x00000800;
}
} else {
input.skipUnknownField();
@@ -1390,18 +1362,6 @@ public final class SceneInfoOuterClass {
if (input.isAtField(FieldNames.groupStateList)) {
if (!input.trySkipNullValue()) {
input.readRepeatedMessage(groupStateList);
- bitField0_ |= 0x00000800;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case -914706662:
- case 1589108794: {
- if (input.isAtField(FieldNames.entityGroupList)) {
- if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(entityGroupList);
bitField0_ |= 0x00001000;
}
} else {
@@ -1455,7 +1415,7 @@ public final class SceneInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional int32 value = 2;
+ * optional sint32 value = 2;
*/
private int value_;
@@ -1475,7 +1435,7 @@ public final class SceneInfoOuterClass {
}
/**
- * optional int32 value = 2;
+ * optional sint32 value = 2;
* @return whether the value_ field is set
*/
public boolean hasValue() {
@@ -1483,7 +1443,7 @@ public final class SceneInfoOuterClass {
}
/**
- * optional int32 value = 2;
+ * optional sint32 value = 2;
* @return this
*/
public ExtraDataEntry clearValue() {
@@ -1493,7 +1453,7 @@ public final class SceneInfoOuterClass {
}
/**
- * optional int32 value = 2;
+ * optional sint32 value = 2;
* @return the value_
*/
public int getValue() {
@@ -1501,7 +1461,7 @@ public final class SceneInfoOuterClass {
}
/**
- * optional int32 value = 2;
+ * optional sint32 value = 2;
* @param value the value_ to set
* @return this
*/
@@ -1643,7 +1603,7 @@ public final class SceneInfoOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 16);
- output.writeInt32NoTag(value_);
+ output.writeSInt32NoTag(value_);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 10);
@@ -1655,7 +1615,7 @@ public final class SceneInfoOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeInt32SizeNoTag(value_);
+ size += 1 + ProtoSink.computeSInt32SizeNoTag(value_);
}
if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeStringSizeNoTag(key);
@@ -1672,7 +1632,7 @@ public final class SceneInfoOuterClass {
switch (tag) {
case 16: {
// value_
- value_ = input.readInt32();
+ value_ = input.readSInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
if (tag != 10) {
@@ -1706,7 +1666,7 @@ public final class SceneInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeInt32(FieldNames.value_, value_);
+ output.writeSInt32(FieldNames.value_, value_);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeString(FieldNames.key, key);
@@ -1724,7 +1684,7 @@ public final class SceneInfoOuterClass {
case 111972721: {
if (input.isAtField(FieldNames.value_)) {
if (!input.trySkipNullValue()) {
- value_ = input.readInt32();
+ value_ = input.readSInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -1817,29 +1777,29 @@ public final class SceneInfoOuterClass {
static class FieldNames {
static final FieldName gameModeType = FieldName.forField("gameModeType", "game_mode_type");
- static final FieldName entryId = FieldName.forField("entryId", "entry_id");
-
- static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version");
+ static final FieldName leaderEntityId = FieldName.forField("leaderEntityId", "leader_entity_id");
static final FieldName planeId = FieldName.forField("planeId", "plane_id");
+ static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version");
+
static final FieldName floorId = FieldName.forField("floorId", "floor_id");
static final FieldName worldId = FieldName.forField("worldId", "world_id");
- static final FieldName leaderEntityId = FieldName.forField("leaderEntityId", "leader_entity_id");
-
- static final FieldName lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_list");
+ static final FieldName entryId = FieldName.forField("entryId", "entry_id");
static final FieldName groupIdList = FieldName.forField("groupIdList", "group_id_list");
+ static final FieldName lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_list");
+
static final FieldName entityList = FieldName.forField("entityList", "entity_list");
+ static final FieldName entityGroupList = FieldName.forField("entityGroupList", "entity_group_list");
+
static final FieldName extraData = FieldName.forField("extraData", "extra_data");
static final FieldName groupStateList = FieldName.forField("groupStateList", "group_state_list");
-
- static final FieldName entityGroupList = FieldName.forField("entityGroupList", "entity_group_list");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/SceneMonsterOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneMonsterOuterClass.java
index e5e95e0..39ca78f 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneMonsterOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneMonsterOuterClass.java
@@ -19,20 +19,20 @@ public final class SceneMonsterOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 monster_id = 5;
+ * optional uint32 max_hp = 9;
+ */
+ private int maxHp;
+
+ /**
+ * optional uint32 monster_id = 12;
*/
private int monsterId;
/**
- * optional uint32 cur_hp = 6;
+ * optional uint32 cur_hp = 14;
*/
private int curHp;
- /**
- * optional uint32 max_hp = 10;
- */
- private int maxHp;
-
private SceneMonster() {
}
@@ -44,99 +44,25 @@ public final class SceneMonsterOuterClass {
}
/**
- * optional uint32 monster_id = 5;
- * @return whether the monsterId field is set
+ * optional uint32 max_hp = 9;
+ * @return whether the maxHp field is set
*/
- public boolean hasMonsterId() {
+ public boolean hasMaxHp() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 monster_id = 5;
- * @return this
- */
- public SceneMonster clearMonsterId() {
- bitField0_ &= ~0x00000001;
- monsterId = 0;
- return this;
- }
-
- /**
- * optional uint32 monster_id = 5;
- * @return the monsterId
- */
- public int getMonsterId() {
- return monsterId;
- }
-
- /**
- * optional uint32 monster_id = 5;
- * @param value the monsterId to set
- * @return this
- */
- public SceneMonster setMonsterId(final int value) {
- bitField0_ |= 0x00000001;
- monsterId = value;
- return this;
- }
-
- /**
- * optional uint32 cur_hp = 6;
- * @return whether the curHp field is set
- */
- public boolean hasCurHp() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 cur_hp = 6;
- * @return this
- */
- public SceneMonster clearCurHp() {
- bitField0_ &= ~0x00000002;
- curHp = 0;
- return this;
- }
-
- /**
- * optional uint32 cur_hp = 6;
- * @return the curHp
- */
- public int getCurHp() {
- return curHp;
- }
-
- /**
- * optional uint32 cur_hp = 6;
- * @param value the curHp to set
- * @return this
- */
- public SceneMonster setCurHp(final int value) {
- bitField0_ |= 0x00000002;
- curHp = value;
- return this;
- }
-
- /**
- * optional uint32 max_hp = 10;
- * @return whether the maxHp field is set
- */
- public boolean hasMaxHp() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 max_hp = 10;
+ * optional uint32 max_hp = 9;
* @return this
*/
public SceneMonster clearMaxHp() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000001;
maxHp = 0;
return this;
}
/**
- * optional uint32 max_hp = 10;
+ * optional uint32 max_hp = 9;
* @return the maxHp
*/
public int getMaxHp() {
@@ -144,24 +70,98 @@ public final class SceneMonsterOuterClass {
}
/**
- * optional uint32 max_hp = 10;
+ * optional uint32 max_hp = 9;
* @param value the maxHp to set
* @return this
*/
public SceneMonster setMaxHp(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
maxHp = value;
return this;
}
+ /**
+ * optional uint32 monster_id = 12;
+ * @return whether the monsterId field is set
+ */
+ public boolean hasMonsterId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 monster_id = 12;
+ * @return this
+ */
+ public SceneMonster clearMonsterId() {
+ bitField0_ &= ~0x00000002;
+ monsterId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 monster_id = 12;
+ * @return the monsterId
+ */
+ public int getMonsterId() {
+ return monsterId;
+ }
+
+ /**
+ * optional uint32 monster_id = 12;
+ * @param value the monsterId to set
+ * @return this
+ */
+ public SceneMonster setMonsterId(final int value) {
+ bitField0_ |= 0x00000002;
+ monsterId = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 cur_hp = 14;
+ * @return whether the curHp field is set
+ */
+ public boolean hasCurHp() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 cur_hp = 14;
+ * @return this
+ */
+ public SceneMonster clearCurHp() {
+ bitField0_ &= ~0x00000004;
+ curHp = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 cur_hp = 14;
+ * @return the curHp
+ */
+ public int getCurHp() {
+ return curHp;
+ }
+
+ /**
+ * optional uint32 cur_hp = 14;
+ * @param value the curHp to set
+ * @return this
+ */
+ public SceneMonster setCurHp(final int value) {
+ bitField0_ |= 0x00000004;
+ curHp = value;
+ return this;
+ }
+
@Override
public SceneMonster copyFrom(final SceneMonster other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
+ maxHp = other.maxHp;
monsterId = other.monsterId;
curHp = other.curHp;
- maxHp = other.maxHp;
}
return this;
}
@@ -172,15 +172,15 @@ public final class SceneMonsterOuterClass {
return this;
}
cachedSize = -1;
+ if (other.hasMaxHp()) {
+ setMaxHp(other.maxHp);
+ }
if (other.hasMonsterId()) {
setMonsterId(other.monsterId);
}
if (other.hasCurHp()) {
setCurHp(other.curHp);
}
- if (other.hasMaxHp()) {
- setMaxHp(other.maxHp);
- }
return this;
}
@@ -191,9 +191,9 @@ public final class SceneMonsterOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
+ maxHp = 0;
monsterId = 0;
curHp = 0;
- maxHp = 0;
return this;
}
@@ -217,24 +217,24 @@ public final class SceneMonsterOuterClass {
}
SceneMonster other = (SceneMonster) o;
return bitField0_ == other.bitField0_
+ && (!hasMaxHp() || maxHp == other.maxHp)
&& (!hasMonsterId() || monsterId == other.monsterId)
- && (!hasCurHp() || curHp == other.curHp)
- && (!hasMaxHp() || maxHp == other.maxHp);
+ && (!hasCurHp() || curHp == other.curHp);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
- output.writeUInt32NoTag(monsterId);
+ output.writeRawByte((byte) 72);
+ output.writeUInt32NoTag(maxHp);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 48);
- output.writeUInt32NoTag(curHp);
+ output.writeRawByte((byte) 96);
+ output.writeUInt32NoTag(monsterId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(maxHp);
+ output.writeRawByte((byte) 112);
+ output.writeUInt32NoTag(curHp);
}
}
@@ -242,13 +242,13 @@ public final class SceneMonsterOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(maxHp);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(curHp);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(maxHp);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(curHp);
}
return size;
}
@@ -260,27 +260,27 @@ public final class SceneMonsterOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
- // monsterId
- monsterId = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 48) {
- break;
- }
- }
- case 48: {
- // curHp
- curHp = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 80) {
- break;
- }
- }
- case 80: {
+ case 72: {
// maxHp
maxHp = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 96) {
+ break;
+ }
+ }
+ case 96: {
+ // monsterId
+ monsterId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 112) {
+ break;
+ }
+ }
+ case 112: {
+ // curHp
+ curHp = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 0) {
@@ -305,13 +305,13 @@ public final class SceneMonsterOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.monsterId, monsterId);
+ output.writeUInt32(FieldNames.maxHp, maxHp);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.curHp, curHp);
+ output.writeUInt32(FieldNames.monsterId, monsterId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.maxHp, maxHp);
+ output.writeUInt32(FieldNames.curHp, curHp);
}
output.endObject();
}
@@ -323,12 +323,24 @@ public final class SceneMonsterOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
+ case 103671180:
+ case -1081138749: {
+ if (input.isAtField(FieldNames.maxHp)) {
+ if (!input.trySkipNullValue()) {
+ maxHp = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case -1316830571:
case 2127946656: {
if (input.isAtField(FieldNames.monsterId)) {
if (!input.trySkipNullValue()) {
monsterId = input.readUInt32();
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
}
} else {
input.skipUnknownField();
@@ -340,18 +352,6 @@ public final class SceneMonsterOuterClass {
if (input.isAtField(FieldNames.curHp)) {
if (!input.trySkipNullValue()) {
curHp = input.readUInt32();
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 103671180:
- case -1081138749: {
- if (input.isAtField(FieldNames.maxHp)) {
- if (!input.trySkipNullValue()) {
- maxHp = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -411,11 +411,11 @@ public final class SceneMonsterOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
+ static final FieldName maxHp = FieldName.forField("maxHp", "max_hp");
+
static final FieldName monsterId = FieldName.forField("monsterId", "monster_id");
static final FieldName curHp = FieldName.forField("curHp", "cur_hp");
-
- static final FieldName maxHp = FieldName.forField("maxHp", "max_hp");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java
index d84e953..a621d62 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java
@@ -20,30 +20,30 @@ public final class SceneMonsterWaveOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 stage_id = 9;
- */
- private int stageId;
-
- /**
- * optional uint32 wave_id = 11;
+ * optional uint32 wave_id = 9;
*/
private int waveId;
/**
- * optional .SceneMonsterWaveParam wave_param = 5;
+ * optional uint32 stage_id = 14;
+ */
+ private int stageId;
+
+ /**
+ * optional .SceneMonsterWaveParam wave_param = 8;
*/
private final SceneMonsterWaveParamOuterClass.SceneMonsterWaveParam waveParam = SceneMonsterWaveParamOuterClass.SceneMonsterWaveParam.newInstance();
/**
- * repeated .ItemList drop_list = 6;
- */
- private final RepeatedMessagerepeated .SceneMonster monster_list = 8;
+ * repeated .SceneMonster monster_list = 2;
*/
private final RepeatedMessagerepeated .ItemList drop_list = 5;
+ */
+ private final RepeatedMessageoptional uint32 stage_id = 9;
- * @return whether the stageId field is set
+ * optional uint32 wave_id = 9;
+ * @return whether the waveId field is set
*/
- public boolean hasStageId() {
+ public boolean hasWaveId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 stage_id = 9;
- * @return this
- */
- public SceneMonsterWave clearStageId() {
- bitField0_ &= ~0x00000001;
- stageId = 0;
- return this;
- }
-
- /**
- * optional uint32 stage_id = 9;
- * @return the stageId
- */
- public int getStageId() {
- return stageId;
- }
-
- /**
- * optional uint32 stage_id = 9;
- * @param value the stageId to set
- * @return this
- */
- public SceneMonsterWave setStageId(final int value) {
- bitField0_ |= 0x00000001;
- stageId = value;
- return this;
- }
-
- /**
- * optional uint32 wave_id = 11;
- * @return whether the waveId field is set
- */
- public boolean hasWaveId() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 wave_id = 11;
+ * optional uint32 wave_id = 9;
* @return this
*/
public SceneMonsterWave clearWaveId() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
waveId = 0;
return this;
}
/**
- * optional uint32 wave_id = 11;
+ * optional uint32 wave_id = 9;
* @return the waveId
*/
public int getWaveId() {
@@ -118,18 +81,55 @@ public final class SceneMonsterWaveOuterClass {
}
/**
- * optional uint32 wave_id = 11;
+ * optional uint32 wave_id = 9;
* @param value the waveId to set
* @return this
*/
public SceneMonsterWave setWaveId(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
waveId = value;
return this;
}
/**
- * optional .SceneMonsterWaveParam wave_param = 5;
+ * optional uint32 stage_id = 14;
+ * @return whether the stageId field is set
+ */
+ public boolean hasStageId() {
+ return (bitField0_ & 0x00000002) != 0;
+ }
+
+ /**
+ * optional uint32 stage_id = 14;
+ * @return this
+ */
+ public SceneMonsterWave clearStageId() {
+ bitField0_ &= ~0x00000002;
+ stageId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 stage_id = 14;
+ * @return the stageId
+ */
+ public int getStageId() {
+ return stageId;
+ }
+
+ /**
+ * optional uint32 stage_id = 14;
+ * @param value the stageId to set
+ * @return this
+ */
+ public SceneMonsterWave setStageId(final int value) {
+ bitField0_ |= 0x00000002;
+ stageId = value;
+ return this;
+ }
+
+ /**
+ * optional .SceneMonsterWaveParam wave_param = 8;
* @return whether the waveParam field is set
*/
public boolean hasWaveParam() {
@@ -137,7 +137,7 @@ public final class SceneMonsterWaveOuterClass {
}
/**
- * optional .SceneMonsterWaveParam wave_param = 5;
+ * optional .SceneMonsterWaveParam wave_param = 8;
* @return this
*/
public SceneMonsterWave clearWaveParam() {
@@ -147,7 +147,7 @@ public final class SceneMonsterWaveOuterClass {
}
/**
- * optional .SceneMonsterWaveParam wave_param = 5;
+ * optional .SceneMonsterWaveParam wave_param = 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.
@@ -161,7 +161,7 @@ public final class SceneMonsterWaveOuterClass {
}
/**
- * optional .SceneMonsterWaveParam wave_param = 5;
+ * optional .SceneMonsterWaveParam wave_param = 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
@@ -175,7 +175,7 @@ public final class SceneMonsterWaveOuterClass {
}
/**
- * optional .SceneMonsterWaveParam wave_param = 5;
+ * optional .SceneMonsterWaveParam wave_param = 8;
* @param value the waveParam to set
* @return this
*/
@@ -187,93 +187,25 @@ public final class SceneMonsterWaveOuterClass {
}
/**
- * repeated .ItemList drop_list = 6;
- * @return whether the dropList field is set
+ * repeated .SceneMonster monster_list = 2;
+ * @return whether the monsterList field is set
*/
- public boolean hasDropList() {
+ public boolean hasMonsterList() {
return (bitField0_ & 0x00000008) != 0;
}
/**
- * repeated .ItemList drop_list = 6;
- * @return this
- */
- public SceneMonsterWave clearDropList() {
- bitField0_ &= ~0x00000008;
- dropList.clear();
- return this;
- }
-
- /**
- * repeated .ItemList drop_list = 6;
- *
- * This method returns the internal storage object without modifying any has state.
- * The returned object should not be modified and be treated as read-only.
- *
- * Use {@link #getMutableDropList()} if you want to modify it.
- *
- * @return internal storage object for reading
- */
- public RepeatedMessagerepeated .ItemList drop_list = 6;
- *
- * This method returns the internal storage object and sets the corresponding
- * has state. The returned object will become part of this message and its
- * contents may be modified as long as the has state is not cleared.
- *
- * @return internal storage object for modifications
- */
- public RepeatedMessagerepeated .ItemList drop_list = 6;
- * @param value the dropList to add
- * @return this
- */
- public SceneMonsterWave addDropList(final ItemListOuterClass.ItemList value) {
- bitField0_ |= 0x00000008;
- dropList.add(value);
- return this;
- }
-
- /**
- * repeated .ItemList drop_list = 6;
- * @param values the dropList to add
- * @return this
- */
- public SceneMonsterWave addAllDropList(final ItemListOuterClass.ItemList... values) {
- bitField0_ |= 0x00000008;
- dropList.addAll(values);
- return this;
- }
-
- /**
- * repeated .SceneMonster monster_list = 8;
- * @return whether the monsterList field is set
- */
- public boolean hasMonsterList() {
- return (bitField0_ & 0x00000010) != 0;
- }
-
- /**
- * repeated .SceneMonster monster_list = 8;
+ * repeated .SceneMonster monster_list = 2;
* @return this
*/
public SceneMonsterWave clearMonsterList() {
- bitField0_ &= ~0x00000010;
+ bitField0_ &= ~0x00000008;
monsterList.clear();
return this;
}
/**
- * repeated .SceneMonster monster_list = 8;
+ * repeated .SceneMonster monster_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.
@@ -287,7 +219,7 @@ public final class SceneMonsterWaveOuterClass {
}
/**
- * repeated .SceneMonster monster_list = 8;
+ * repeated .SceneMonster monster_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
@@ -296,42 +228,110 @@ public final class SceneMonsterWaveOuterClass {
* @return internal storage object for modifications
*/
public RepeatedMessagerepeated .SceneMonster monster_list = 8;
+ * repeated .SceneMonster monster_list = 2;
* @param value the monsterList to add
* @return this
*/
public SceneMonsterWave addMonsterList(final SceneMonsterOuterClass.SceneMonster value) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
monsterList.add(value);
return this;
}
/**
- * repeated .SceneMonster monster_list = 8;
+ * repeated .SceneMonster monster_list = 2;
* @param values the monsterList to add
* @return this
*/
public SceneMonsterWave addAllMonsterList(final SceneMonsterOuterClass.SceneMonster... values) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000008;
monsterList.addAll(values);
return this;
}
+ /**
+ * repeated .ItemList drop_list = 5;
+ * @return whether the dropList field is set
+ */
+ public boolean hasDropList() {
+ return (bitField0_ & 0x00000010) != 0;
+ }
+
+ /**
+ * repeated .ItemList drop_list = 5;
+ * @return this
+ */
+ public SceneMonsterWave clearDropList() {
+ bitField0_ &= ~0x00000010;
+ dropList.clear();
+ return this;
+ }
+
+ /**
+ * repeated .ItemList drop_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 #getMutableDropList()} if you want to modify it.
+ *
+ * @return internal storage object for reading
+ */
+ public RepeatedMessagerepeated .ItemList drop_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 RepeatedMessagerepeated .ItemList drop_list = 5;
+ * @param value the dropList to add
+ * @return this
+ */
+ public SceneMonsterWave addDropList(final ItemListOuterClass.ItemList value) {
+ bitField0_ |= 0x00000010;
+ dropList.add(value);
+ return this;
+ }
+
+ /**
+ * repeated .ItemList drop_list = 5;
+ * @param values the dropList to add
+ * @return this
+ */
+ public SceneMonsterWave addAllDropList(final ItemListOuterClass.ItemList... values) {
+ bitField0_ |= 0x00000010;
+ dropList.addAll(values);
+ return this;
+ }
+
@Override
public SceneMonsterWave copyFrom(final SceneMonsterWave other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- stageId = other.stageId;
waveId = other.waveId;
+ stageId = other.stageId;
waveParam.copyFrom(other.waveParam);
- dropList.copyFrom(other.dropList);
monsterList.copyFrom(other.monsterList);
+ dropList.copyFrom(other.dropList);
}
return this;
}
@@ -342,21 +342,21 @@ public final class SceneMonsterWaveOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasStageId()) {
- setStageId(other.stageId);
- }
if (other.hasWaveId()) {
setWaveId(other.waveId);
}
+ if (other.hasStageId()) {
+ setStageId(other.stageId);
+ }
if (other.hasWaveParam()) {
getMutableWaveParam().mergeFrom(other.waveParam);
}
- if (other.hasDropList()) {
- getMutableDropList().addAll(other.dropList);
- }
if (other.hasMonsterList()) {
getMutableMonsterList().addAll(other.monsterList);
}
+ if (other.hasDropList()) {
+ getMutableDropList().addAll(other.dropList);
+ }
return this;
}
@@ -367,11 +367,11 @@ public final class SceneMonsterWaveOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- stageId = 0;
waveId = 0;
+ stageId = 0;
waveParam.clear();
- dropList.clear();
monsterList.clear();
+ dropList.clear();
return this;
}
@@ -383,8 +383,8 @@ public final class SceneMonsterWaveOuterClass {
cachedSize = -1;
bitField0_ = 0;
waveParam.clearQuick();
- dropList.clearQuick();
monsterList.clearQuick();
+ dropList.clearQuick();
return this;
}
@@ -398,37 +398,37 @@ public final class SceneMonsterWaveOuterClass {
}
SceneMonsterWave other = (SceneMonsterWave) o;
return bitField0_ == other.bitField0_
- && (!hasStageId() || stageId == other.stageId)
&& (!hasWaveId() || waveId == other.waveId)
+ && (!hasStageId() || stageId == other.stageId)
&& (!hasWaveParam() || waveParam.equals(other.waveParam))
- && (!hasDropList() || dropList.equals(other.dropList))
- && (!hasMonsterList() || monsterList.equals(other.monsterList));
+ && (!hasMonsterList() || monsterList.equals(other.monsterList))
+ && (!hasDropList() || dropList.equals(other.dropList));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 72);
- output.writeUInt32NoTag(stageId);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 88);
output.writeUInt32NoTag(waveId);
}
+ if ((bitField0_ & 0x00000002) != 0) {
+ output.writeRawByte((byte) 112);
+ output.writeUInt32NoTag(stageId);
+ }
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 42);
+ output.writeRawByte((byte) 66);
output.writeMessageNoTag(waveParam);
}
if ((bitField0_ & 0x00000008) != 0) {
- for (int i = 0; i < dropList.length(); i++) {
- output.writeRawByte((byte) 50);
- output.writeMessageNoTag(dropList.get(i));
+ for (int i = 0; i < monsterList.length(); i++) {
+ output.writeRawByte((byte) 18);
+ output.writeMessageNoTag(monsterList.get(i));
}
}
if ((bitField0_ & 0x00000010) != 0) {
- for (int i = 0; i < monsterList.length(); i++) {
- output.writeRawByte((byte) 66);
- output.writeMessageNoTag(monsterList.get(i));
+ for (int i = 0; i < dropList.length(); i++) {
+ output.writeRawByte((byte) 42);
+ output.writeMessageNoTag(dropList.get(i));
}
}
}
@@ -437,19 +437,19 @@ public final class SceneMonsterWaveOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(waveId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(waveId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(waveParam);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += (1 * dropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dropList);
+ size += (1 * monsterList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(monsterList);
}
if ((bitField0_ & 0x00000010) != 0) {
- size += (1 * monsterList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(monsterList);
+ size += (1 * dropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dropList);
}
return size;
}
@@ -462,43 +462,43 @@ public final class SceneMonsterWaveOuterClass {
while (true) {
switch (tag) {
case 72: {
- // stageId
- stageId = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 88) {
- break;
- }
- }
- case 88: {
// waveId
waveId = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 112) {
+ break;
+ }
+ }
+ case 112: {
+ // stageId
+ stageId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 42) {
- break;
- }
- }
- case 42: {
- // waveParam
- input.readMessage(waveParam);
- bitField0_ |= 0x00000004;
- tag = input.readTag();
- if (tag != 50) {
- break;
- }
- }
- case 50: {
- // dropList
- tag = input.readRepeatedMessage(dropList, tag);
- bitField0_ |= 0x00000008;
if (tag != 66) {
break;
}
}
case 66: {
+ // waveParam
+ input.readMessage(waveParam);
+ bitField0_ |= 0x00000004;
+ tag = input.readTag();
+ if (tag != 18) {
+ break;
+ }
+ }
+ case 18: {
// monsterList
tag = input.readRepeatedMessage(monsterList, tag);
+ bitField0_ |= 0x00000008;
+ if (tag != 42) {
+ break;
+ }
+ }
+ case 42: {
+ // dropList
+ tag = input.readRepeatedMessage(dropList, tag);
bitField0_ |= 0x00000010;
if (tag != 0) {
break;
@@ -522,19 +522,19 @@ public final class SceneMonsterWaveOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.stageId, stageId);
+ output.writeUInt32(FieldNames.waveId, waveId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.waveId, waveId);
+ output.writeUInt32(FieldNames.stageId, stageId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeMessage(FieldNames.waveParam, waveParam);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRepeatedMessage(FieldNames.dropList, dropList);
+ output.writeRepeatedMessage(FieldNames.monsterList, monsterList);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRepeatedMessage(FieldNames.monsterList, monsterList);
+ output.writeRepeatedMessage(FieldNames.dropList, dropList);
}
output.endObject();
}
@@ -546,11 +546,11 @@ public final class SceneMonsterWaveOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1897528135:
- case 1306191356: {
- if (input.isAtField(FieldNames.stageId)) {
+ case -794902028:
+ case 1127862305: {
+ if (input.isAtField(FieldNames.waveId)) {
if (!input.trySkipNullValue()) {
- stageId = input.readUInt32();
+ waveId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -558,11 +558,11 @@ public final class SceneMonsterWaveOuterClass {
}
break;
}
- case -794902028:
- case 1127862305: {
- if (input.isAtField(FieldNames.waveId)) {
+ case -1897528135:
+ case 1306191356: {
+ if (input.isAtField(FieldNames.stageId)) {
if (!input.trySkipNullValue()) {
- waveId = input.readUInt32();
+ stageId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -582,11 +582,11 @@ public final class SceneMonsterWaveOuterClass {
}
break;
}
- case -432782291:
- case -513722386: {
- if (input.isAtField(FieldNames.dropList)) {
+ case 1541271448:
+ case 552401379: {
+ if (input.isAtField(FieldNames.monsterList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(dropList);
+ input.readRepeatedMessage(monsterList);
bitField0_ |= 0x00000008;
}
} else {
@@ -594,11 +594,11 @@ public final class SceneMonsterWaveOuterClass {
}
break;
}
- case 1541271448:
- case 552401379: {
- if (input.isAtField(FieldNames.monsterList)) {
+ case -432782291:
+ case -513722386: {
+ if (input.isAtField(FieldNames.dropList)) {
if (!input.trySkipNullValue()) {
- input.readRepeatedMessage(monsterList);
+ input.readRepeatedMessage(dropList);
bitField0_ |= 0x00000010;
}
} else {
@@ -659,15 +659,15 @@ public final class SceneMonsterWaveOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName stageId = FieldName.forField("stageId", "stage_id");
-
static final FieldName waveId = FieldName.forField("waveId", "wave_id");
+ static final FieldName stageId = FieldName.forField("stageId", "stage_id");
+
static final FieldName waveParam = FieldName.forField("waveParam", "wave_param");
- static final FieldName dropList = FieldName.forField("dropList", "drop_list");
-
static final FieldName monsterList = FieldName.forField("monsterList", "monster_list");
+
+ static final FieldName dropList = FieldName.forField("dropList", "drop_list");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveParamOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveParamOuterClass.java
index e85c40f..ac7c9a9 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveParamOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveParamOuterClass.java
@@ -19,20 +19,10 @@ public final class SceneMonsterWaveParamOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 hard_level_group = 4;
- */
- private int hardLevelGroup;
-
- /**
- * optional uint32 level = 6;
+ * optional uint32 level = 7;
*/
private int level;
- /**
- * optional uint32 elite_group = 10;
- */
- private int eliteGroup;
-
private SceneMonsterWaveParam() {
}
@@ -44,62 +34,25 @@ public final class SceneMonsterWaveParamOuterClass {
}
/**
- * optional uint32 hard_level_group = 4;
- * @return whether the hardLevelGroup field is set
+ * optional uint32 level = 7;
+ * @return whether the level field is set
*/
- public boolean hasHardLevelGroup() {
+ public boolean hasLevel() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 hard_level_group = 4;
- * @return this
- */
- public SceneMonsterWaveParam clearHardLevelGroup() {
- bitField0_ &= ~0x00000001;
- hardLevelGroup = 0;
- return this;
- }
-
- /**
- * optional uint32 hard_level_group = 4;
- * @return the hardLevelGroup
- */
- public int getHardLevelGroup() {
- return hardLevelGroup;
- }
-
- /**
- * optional uint32 hard_level_group = 4;
- * @param value the hardLevelGroup to set
- * @return this
- */
- public SceneMonsterWaveParam setHardLevelGroup(final int value) {
- bitField0_ |= 0x00000001;
- hardLevelGroup = value;
- return this;
- }
-
- /**
- * optional uint32 level = 6;
- * @return whether the level field is set
- */
- public boolean hasLevel() {
- return (bitField0_ & 0x00000002) != 0;
- }
-
- /**
- * optional uint32 level = 6;
+ * optional uint32 level = 7;
* @return this
*/
public SceneMonsterWaveParam clearLevel() {
- bitField0_ &= ~0x00000002;
+ bitField0_ &= ~0x00000001;
level = 0;
return this;
}
/**
- * optional uint32 level = 6;
+ * optional uint32 level = 7;
* @return the level
*/
public int getLevel() {
@@ -107,61 +60,22 @@ public final class SceneMonsterWaveParamOuterClass {
}
/**
- * optional uint32 level = 6;
+ * optional uint32 level = 7;
* @param value the level to set
* @return this
*/
public SceneMonsterWaveParam setLevel(final int value) {
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000001;
level = value;
return this;
}
- /**
- * optional uint32 elite_group = 10;
- * @return whether the eliteGroup field is set
- */
- public boolean hasEliteGroup() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 elite_group = 10;
- * @return this
- */
- public SceneMonsterWaveParam clearEliteGroup() {
- bitField0_ &= ~0x00000004;
- eliteGroup = 0;
- return this;
- }
-
- /**
- * optional uint32 elite_group = 10;
- * @return the eliteGroup
- */
- public int getEliteGroup() {
- return eliteGroup;
- }
-
- /**
- * optional uint32 elite_group = 10;
- * @param value the eliteGroup to set
- * @return this
- */
- public SceneMonsterWaveParam setEliteGroup(final int value) {
- bitField0_ |= 0x00000004;
- eliteGroup = value;
- return this;
- }
-
@Override
public SceneMonsterWaveParam copyFrom(final SceneMonsterWaveParam other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- hardLevelGroup = other.hardLevelGroup;
level = other.level;
- eliteGroup = other.eliteGroup;
}
return this;
}
@@ -172,15 +86,9 @@ public final class SceneMonsterWaveParamOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasHardLevelGroup()) {
- setHardLevelGroup(other.hardLevelGroup);
- }
if (other.hasLevel()) {
setLevel(other.level);
}
- if (other.hasEliteGroup()) {
- setEliteGroup(other.eliteGroup);
- }
return this;
}
@@ -191,9 +99,7 @@ public final class SceneMonsterWaveParamOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- hardLevelGroup = 0;
level = 0;
- eliteGroup = 0;
return this;
}
@@ -217,39 +123,23 @@ public final class SceneMonsterWaveParamOuterClass {
}
SceneMonsterWaveParam other = (SceneMonsterWaveParam) o;
return bitField0_ == other.bitField0_
- && (!hasHardLevelGroup() || hardLevelGroup == other.hardLevelGroup)
- && (!hasLevel() || level == other.level)
- && (!hasEliteGroup() || eliteGroup == other.eliteGroup);
+ && (!hasLevel() || level == other.level);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 32);
- output.writeUInt32NoTag(hardLevelGroup);
- }
- if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 56);
output.writeUInt32NoTag(level);
}
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(eliteGroup);
- }
}
@Override
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(hardLevelGroup);
- }
- if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
}
- if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(eliteGroup);
- }
return size;
}
@@ -260,28 +150,10 @@ public final class SceneMonsterWaveParamOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 32: {
- // hardLevelGroup
- hardLevelGroup = input.readUInt32();
- bitField0_ |= 0x00000001;
- tag = input.readTag();
- if (tag != 48) {
- break;
- }
- }
- case 48: {
+ case 56: {
// level
level = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 80) {
- break;
- }
- }
- case 80: {
- // eliteGroup
- eliteGroup = input.readUInt32();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
tag = input.readTag();
if (tag != 0) {
break;
@@ -305,14 +177,8 @@ public final class SceneMonsterWaveParamOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.hardLevelGroup, hardLevelGroup);
- }
- if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.level, level);
}
- if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.eliteGroup, eliteGroup);
- }
output.endObject();
}
@@ -323,35 +189,11 @@ public final class SceneMonsterWaveParamOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 973582502:
- case -935765840: {
- if (input.isAtField(FieldNames.hardLevelGroup)) {
- if (!input.trySkipNullValue()) {
- hardLevelGroup = input.readUInt32();
- bitField0_ |= 0x00000001;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
case 102865796: {
if (input.isAtField(FieldNames.level)) {
if (!input.trySkipNullValue()) {
level = input.readUInt32();
- bitField0_ |= 0x00000002;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case 838742956:
- case 908252627: {
- if (input.isAtField(FieldNames.eliteGroup)) {
- if (!input.trySkipNullValue()) {
- eliteGroup = input.readUInt32();
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000001;
}
} else {
input.skipUnknownField();
@@ -411,11 +253,7 @@ public final class SceneMonsterWaveParamOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName hardLevelGroup = FieldName.forField("hardLevelGroup", "hard_level_group");
-
static final FieldName level = FieldName.forField("level");
-
- static final FieldName eliteGroup = FieldName.forField("eliteGroup", "elite_group");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/SceneNpcInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneNpcInfoOuterClass.java
index 9c5175c..ded02fb 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneNpcInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneNpcInfoOuterClass.java
@@ -19,12 +19,12 @@ public final class SceneNpcInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 npc_id = 6;
+ * optional uint32 npc_id = 13;
*/
private int npcId;
/**
- * optional .NpcExtraInfo extra_info = 1;
+ * optional .NpcExtraInfo extra_info = 4;
*/
private final NpcExtraInfoOuterClass.NpcExtraInfo extraInfo = NpcExtraInfoOuterClass.NpcExtraInfo.newInstance();
@@ -39,7 +39,7 @@ public final class SceneNpcInfoOuterClass {
}
/**
- * optional uint32 npc_id = 6;
+ * optional uint32 npc_id = 13;
* @return whether the npcId field is set
*/
public boolean hasNpcId() {
@@ -47,7 +47,7 @@ public final class SceneNpcInfoOuterClass {
}
/**
- * optional uint32 npc_id = 6;
+ * optional uint32 npc_id = 13;
* @return this
*/
public SceneNpcInfo clearNpcId() {
@@ -57,7 +57,7 @@ public final class SceneNpcInfoOuterClass {
}
/**
- * optional uint32 npc_id = 6;
+ * optional uint32 npc_id = 13;
* @return the npcId
*/
public int getNpcId() {
@@ -65,7 +65,7 @@ public final class SceneNpcInfoOuterClass {
}
/**
- * optional uint32 npc_id = 6;
+ * optional uint32 npc_id = 13;
* @param value the npcId to set
* @return this
*/
@@ -76,7 +76,7 @@ public final class SceneNpcInfoOuterClass {
}
/**
- * optional .NpcExtraInfo extra_info = 1;
+ * optional .NpcExtraInfo extra_info = 4;
* @return whether the extraInfo field is set
*/
public boolean hasExtraInfo() {
@@ -84,7 +84,7 @@ public final class SceneNpcInfoOuterClass {
}
/**
- * optional .NpcExtraInfo extra_info = 1;
+ * optional .NpcExtraInfo extra_info = 4;
* @return this
*/
public SceneNpcInfo clearExtraInfo() {
@@ -94,7 +94,7 @@ public final class SceneNpcInfoOuterClass {
}
/**
- * optional .NpcExtraInfo extra_info = 1;
+ * optional .NpcExtraInfo extra_info = 4;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class SceneNpcInfoOuterClass {
}
/**
- * optional .NpcExtraInfo extra_info = 1;
+ * optional .NpcExtraInfo extra_info = 4;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class SceneNpcInfoOuterClass {
}
/**
- * optional .NpcExtraInfo extra_info = 1;
+ * optional .NpcExtraInfo extra_info = 4;
* @param value the extraInfo to set
* @return this
*/
@@ -198,11 +198,11 @@ public final class SceneNpcInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 48);
+ output.writeRawByte((byte) 104);
output.writeUInt32NoTag(npcId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 10);
+ output.writeRawByte((byte) 34);
output.writeMessageNoTag(extraInfo);
}
}
@@ -226,16 +226,16 @@ public final class SceneNpcInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 48: {
+ case 104: {
// npcId
npcId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 10) {
+ if (tag != 34) {
break;
}
}
- case 10: {
+ case 34: {
// extraInfo
input.readMessage(extraInfo);
bitField0_ |= 0x00000002;
diff --git a/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java
index 3bd3f09..223d1b5 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java
@@ -19,20 +19,20 @@ public final class SceneNpcMonsterInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 world_level = 3;
+ * optional uint32 world_level = 6;
*/
private int worldLevel;
/**
- * optional uint32 monster_id = 11;
- */
- private int monsterId;
-
- /**
- * optional uint32 event_id = 14;
+ * optional uint32 event_id = 8;
*/
private int eventId;
+ /**
+ * optional uint32 monster_id = 12;
+ */
+ private int monsterId;
+
private SceneNpcMonsterInfo() {
}
@@ -44,7 +44,7 @@ public final class SceneNpcMonsterInfoOuterClass {
}
/**
- * optional uint32 world_level = 3;
+ * optional uint32 world_level = 6;
* @return whether the worldLevel field is set
*/
public boolean hasWorldLevel() {
@@ -52,7 +52,7 @@ public final class SceneNpcMonsterInfoOuterClass {
}
/**
- * optional uint32 world_level = 3;
+ * optional uint32 world_level = 6;
* @return this
*/
public SceneNpcMonsterInfo clearWorldLevel() {
@@ -62,7 +62,7 @@ public final class SceneNpcMonsterInfoOuterClass {
}
/**
- * optional uint32 world_level = 3;
+ * optional uint32 world_level = 6;
* @return the worldLevel
*/
public int getWorldLevel() {
@@ -70,7 +70,7 @@ public final class SceneNpcMonsterInfoOuterClass {
}
/**
- * optional uint32 world_level = 3;
+ * optional uint32 world_level = 6;
* @param value the worldLevel to set
* @return this
*/
@@ -81,62 +81,25 @@ public final class SceneNpcMonsterInfoOuterClass {
}
/**
- * optional uint32 monster_id = 11;
- * @return whether the monsterId field is set
+ * optional uint32 event_id = 8;
+ * @return whether the eventId field is set
*/
- public boolean hasMonsterId() {
+ public boolean hasEventId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 monster_id = 11;
- * @return this
- */
- public SceneNpcMonsterInfo clearMonsterId() {
- bitField0_ &= ~0x00000002;
- monsterId = 0;
- return this;
- }
-
- /**
- * optional uint32 monster_id = 11;
- * @return the monsterId
- */
- public int getMonsterId() {
- return monsterId;
- }
-
- /**
- * optional uint32 monster_id = 11;
- * @param value the monsterId to set
- * @return this
- */
- public SceneNpcMonsterInfo setMonsterId(final int value) {
- bitField0_ |= 0x00000002;
- monsterId = value;
- return this;
- }
-
- /**
- * optional uint32 event_id = 14;
- * @return whether the eventId field is set
- */
- public boolean hasEventId() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 event_id = 14;
+ * optional uint32 event_id = 8;
* @return this
*/
public SceneNpcMonsterInfo clearEventId() {
- bitField0_ &= ~0x00000004;
+ bitField0_ &= ~0x00000002;
eventId = 0;
return this;
}
/**
- * optional uint32 event_id = 14;
+ * optional uint32 event_id = 8;
* @return the eventId
*/
public int getEventId() {
@@ -144,24 +107,61 @@ public final class SceneNpcMonsterInfoOuterClass {
}
/**
- * optional uint32 event_id = 14;
+ * optional uint32 event_id = 8;
* @param value the eventId to set
* @return this
*/
public SceneNpcMonsterInfo setEventId(final int value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000002;
eventId = value;
return this;
}
+ /**
+ * optional uint32 monster_id = 12;
+ * @return whether the monsterId field is set
+ */
+ public boolean hasMonsterId() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 monster_id = 12;
+ * @return this
+ */
+ public SceneNpcMonsterInfo clearMonsterId() {
+ bitField0_ &= ~0x00000004;
+ monsterId = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 monster_id = 12;
+ * @return the monsterId
+ */
+ public int getMonsterId() {
+ return monsterId;
+ }
+
+ /**
+ * optional uint32 monster_id = 12;
+ * @param value the monsterId to set
+ * @return this
+ */
+ public SceneNpcMonsterInfo setMonsterId(final int value) {
+ bitField0_ |= 0x00000004;
+ monsterId = value;
+ return this;
+ }
+
@Override
public SceneNpcMonsterInfo copyFrom(final SceneNpcMonsterInfo other) {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
worldLevel = other.worldLevel;
- monsterId = other.monsterId;
eventId = other.eventId;
+ monsterId = other.monsterId;
}
return this;
}
@@ -175,12 +175,12 @@ public final class SceneNpcMonsterInfoOuterClass {
if (other.hasWorldLevel()) {
setWorldLevel(other.worldLevel);
}
- if (other.hasMonsterId()) {
- setMonsterId(other.monsterId);
- }
if (other.hasEventId()) {
setEventId(other.eventId);
}
+ if (other.hasMonsterId()) {
+ setMonsterId(other.monsterId);
+ }
return this;
}
@@ -192,8 +192,8 @@ public final class SceneNpcMonsterInfoOuterClass {
cachedSize = -1;
bitField0_ = 0;
worldLevel = 0;
- monsterId = 0;
eventId = 0;
+ monsterId = 0;
return this;
}
@@ -218,23 +218,23 @@ public final class SceneNpcMonsterInfoOuterClass {
SceneNpcMonsterInfo other = (SceneNpcMonsterInfo) o;
return bitField0_ == other.bitField0_
&& (!hasWorldLevel() || worldLevel == other.worldLevel)
- && (!hasMonsterId() || monsterId == other.monsterId)
- && (!hasEventId() || eventId == other.eventId);
+ && (!hasEventId() || eventId == other.eventId)
+ && (!hasMonsterId() || monsterId == other.monsterId);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 24);
+ output.writeRawByte((byte) 48);
output.writeUInt32NoTag(worldLevel);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 88);
- output.writeUInt32NoTag(monsterId);
+ output.writeRawByte((byte) 64);
+ output.writeUInt32NoTag(eventId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 112);
- output.writeUInt32NoTag(eventId);
+ output.writeRawByte((byte) 96);
+ output.writeUInt32NoTag(monsterId);
}
}
@@ -245,10 +245,10 @@ public final class SceneNpcMonsterInfoOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId);
}
return size;
}
@@ -260,27 +260,27 @@ public final class SceneNpcMonsterInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 24: {
+ case 48: {
// worldLevel
worldLevel = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 88) {
+ if (tag != 64) {
break;
}
}
- case 88: {
- // monsterId
- monsterId = input.readUInt32();
- bitField0_ |= 0x00000002;
- tag = input.readTag();
- if (tag != 112) {
- break;
- }
- }
- case 112: {
+ case 64: {
// eventId
eventId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ tag = input.readTag();
+ if (tag != 96) {
+ break;
+ }
+ }
+ case 96: {
+ // monsterId
+ monsterId = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 0) {
@@ -308,10 +308,10 @@ public final class SceneNpcMonsterInfoOuterClass {
output.writeUInt32(FieldNames.worldLevel, worldLevel);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.monsterId, monsterId);
+ output.writeUInt32(FieldNames.eventId, eventId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.eventId, eventId);
+ output.writeUInt32(FieldNames.monsterId, monsterId);
}
output.endObject();
}
@@ -335,11 +335,11 @@ public final class SceneNpcMonsterInfoOuterClass {
}
break;
}
- case -1316830571:
- case 2127946656: {
- if (input.isAtField(FieldNames.monsterId)) {
+ case -1376502443:
+ case 278118624: {
+ if (input.isAtField(FieldNames.eventId)) {
if (!input.trySkipNullValue()) {
- monsterId = input.readUInt32();
+ eventId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -347,11 +347,11 @@ public final class SceneNpcMonsterInfoOuterClass {
}
break;
}
- case -1376502443:
- case 278118624: {
- if (input.isAtField(FieldNames.eventId)) {
+ case -1316830571:
+ case 2127946656: {
+ if (input.isAtField(FieldNames.monsterId)) {
if (!input.trySkipNullValue()) {
- eventId = input.readUInt32();
+ monsterId = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
@@ -414,9 +414,9 @@ public final class SceneNpcMonsterInfoOuterClass {
static class FieldNames {
static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level");
- static final FieldName monsterId = FieldName.forField("monsterId", "monster_id");
-
static final FieldName eventId = FieldName.forField("eventId", "event_id");
+
+ static final FieldName monsterId = FieldName.forField("monsterId", "monster_id");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/ScenePlaneEventScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/ScenePlaneEventScNotifyOuterClass.java
index 280b221..bf90150 100644
--- a/src/generated/main/emu/lunarcore/proto/ScenePlaneEventScNotifyOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ScenePlaneEventScNotifyOuterClass.java
@@ -19,7 +19,7 @@ public final class ScenePlaneEventScNotifyOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional .ItemList get_item_list = 3;
+ * optional .ItemList get_item_list = 1;
*/
private final ItemListOuterClass.ItemList getItemList = ItemListOuterClass.ItemList.newInstance();
@@ -34,7 +34,7 @@ public final class ScenePlaneEventScNotifyOuterClass {
}
/**
- * optional .ItemList get_item_list = 3;
+ * optional .ItemList get_item_list = 1;
* @return whether the getItemList field is set
*/
public boolean hasGetItemList() {
@@ -42,7 +42,7 @@ public final class ScenePlaneEventScNotifyOuterClass {
}
/**
- * optional .ItemList get_item_list = 3;
+ * optional .ItemList get_item_list = 1;
* @return this
*/
public ScenePlaneEventScNotify clearGetItemList() {
@@ -52,7 +52,7 @@ public final class ScenePlaneEventScNotifyOuterClass {
}
/**
- * optional .ItemList get_item_list = 3;
+ * optional .ItemList get_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.
@@ -66,7 +66,7 @@ public final class ScenePlaneEventScNotifyOuterClass {
}
/**
- * optional .ItemList get_item_list = 3;
+ * optional .ItemList get_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
@@ -80,7 +80,7 @@ public final class ScenePlaneEventScNotifyOuterClass {
}
/**
- * optional .ItemList get_item_list = 3;
+ * optional .ItemList get_item_list = 1;
* @param value the getItemList to set
* @return this
*/
@@ -150,7 +150,7 @@ public final class ScenePlaneEventScNotifyOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 26);
+ output.writeRawByte((byte) 10);
output.writeMessageNoTag(getItemList);
}
}
@@ -171,7 +171,7 @@ public final class ScenePlaneEventScNotifyOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 26: {
+ case 10: {
// getItemList
input.readMessage(getItemList);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/ScenePropInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ScenePropInfoOuterClass.java
index c450bf0..d00ba89 100644
--- a/src/generated/main/emu/lunarcore/proto/ScenePropInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ScenePropInfoOuterClass.java
@@ -19,27 +19,27 @@ public final class ScenePropInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint64 create_time_ms = 5;
+ * optional uint64 create_time_ms = 11;
*/
private long createTimeMs;
/**
- * optional uint32 life_time_ms = 2;
- */
- private int lifeTimeMs;
-
- /**
- * optional uint32 prop_state = 3;
- */
- private int propState;
-
- /**
- * optional uint32 prop_id = 10;
+ * optional uint32 prop_id = 4;
*/
private int propId;
/**
- * optional .PropExtraInfo extra_info = 13;
+ * optional uint32 life_time_ms = 7;
+ */
+ private int lifeTimeMs;
+
+ /**
+ * optional uint32 prop_state = 10;
+ */
+ private int propState;
+
+ /**
+ * optional .PropExtraInfo extra_info = 3;
*/
private final PropExtraInfoOuterClass.PropExtraInfo extraInfo = PropExtraInfoOuterClass.PropExtraInfo.newInstance();
@@ -54,7 +54,7 @@ public final class ScenePropInfoOuterClass {
}
/**
- * optional uint64 create_time_ms = 5;
+ * optional uint64 create_time_ms = 11;
* @return whether the createTimeMs field is set
*/
public boolean hasCreateTimeMs() {
@@ -62,7 +62,7 @@ public final class ScenePropInfoOuterClass {
}
/**
- * optional uint64 create_time_ms = 5;
+ * optional uint64 create_time_ms = 11;
* @return this
*/
public ScenePropInfo clearCreateTimeMs() {
@@ -72,7 +72,7 @@ public final class ScenePropInfoOuterClass {
}
/**
- * optional uint64 create_time_ms = 5;
+ * optional uint64 create_time_ms = 11;
* @return the createTimeMs
*/
public long getCreateTimeMs() {
@@ -80,7 +80,7 @@ public final class ScenePropInfoOuterClass {
}
/**
- * optional uint64 create_time_ms = 5;
+ * optional uint64 create_time_ms = 11;
* @param value the createTimeMs to set
* @return this
*/
@@ -91,99 +91,25 @@ public final class ScenePropInfoOuterClass {
}
/**
- * optional uint32 life_time_ms = 2;
- * @return whether the lifeTimeMs field is set
+ * optional uint32 prop_id = 4;
+ * @return whether the propId field is set
*/
- public boolean hasLifeTimeMs() {
+ public boolean hasPropId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 life_time_ms = 2;
- * @return this
- */
- public ScenePropInfo clearLifeTimeMs() {
- bitField0_ &= ~0x00000002;
- lifeTimeMs = 0;
- return this;
- }
-
- /**
- * optional uint32 life_time_ms = 2;
- * @return the lifeTimeMs
- */
- public int getLifeTimeMs() {
- return lifeTimeMs;
- }
-
- /**
- * optional uint32 life_time_ms = 2;
- * @param value the lifeTimeMs to set
- * @return this
- */
- public ScenePropInfo setLifeTimeMs(final int value) {
- bitField0_ |= 0x00000002;
- lifeTimeMs = value;
- return this;
- }
-
- /**
- * optional uint32 prop_state = 3;
- * @return whether the propState field is set
- */
- public boolean hasPropState() {
- return (bitField0_ & 0x00000004) != 0;
- }
-
- /**
- * optional uint32 prop_state = 3;
- * @return this
- */
- public ScenePropInfo clearPropState() {
- bitField0_ &= ~0x00000004;
- propState = 0;
- return this;
- }
-
- /**
- * optional uint32 prop_state = 3;
- * @return the propState
- */
- public int getPropState() {
- return propState;
- }
-
- /**
- * optional uint32 prop_state = 3;
- * @param value the propState to set
- * @return this
- */
- public ScenePropInfo setPropState(final int value) {
- bitField0_ |= 0x00000004;
- propState = value;
- return this;
- }
-
- /**
- * optional uint32 prop_id = 10;
- * @return whether the propId field is set
- */
- public boolean hasPropId() {
- return (bitField0_ & 0x00000008) != 0;
- }
-
- /**
- * optional uint32 prop_id = 10;
+ * optional uint32 prop_id = 4;
* @return this
*/
public ScenePropInfo clearPropId() {
- bitField0_ &= ~0x00000008;
+ bitField0_ &= ~0x00000002;
propId = 0;
return this;
}
/**
- * optional uint32 prop_id = 10;
+ * optional uint32 prop_id = 4;
* @return the propId
*/
public int getPropId() {
@@ -191,18 +117,92 @@ public final class ScenePropInfoOuterClass {
}
/**
- * optional uint32 prop_id = 10;
+ * optional uint32 prop_id = 4;
* @param value the propId to set
* @return this
*/
public ScenePropInfo setPropId(final int value) {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000002;
propId = value;
return this;
}
/**
- * optional .PropExtraInfo extra_info = 13;
+ * optional uint32 life_time_ms = 7;
+ * @return whether the lifeTimeMs field is set
+ */
+ public boolean hasLifeTimeMs() {
+ return (bitField0_ & 0x00000004) != 0;
+ }
+
+ /**
+ * optional uint32 life_time_ms = 7;
+ * @return this
+ */
+ public ScenePropInfo clearLifeTimeMs() {
+ bitField0_ &= ~0x00000004;
+ lifeTimeMs = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 life_time_ms = 7;
+ * @return the lifeTimeMs
+ */
+ public int getLifeTimeMs() {
+ return lifeTimeMs;
+ }
+
+ /**
+ * optional uint32 life_time_ms = 7;
+ * @param value the lifeTimeMs to set
+ * @return this
+ */
+ public ScenePropInfo setLifeTimeMs(final int value) {
+ bitField0_ |= 0x00000004;
+ lifeTimeMs = value;
+ return this;
+ }
+
+ /**
+ * optional uint32 prop_state = 10;
+ * @return whether the propState field is set
+ */
+ public boolean hasPropState() {
+ return (bitField0_ & 0x00000008) != 0;
+ }
+
+ /**
+ * optional uint32 prop_state = 10;
+ * @return this
+ */
+ public ScenePropInfo clearPropState() {
+ bitField0_ &= ~0x00000008;
+ propState = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 prop_state = 10;
+ * @return the propState
+ */
+ public int getPropState() {
+ return propState;
+ }
+
+ /**
+ * optional uint32 prop_state = 10;
+ * @param value the propState to set
+ * @return this
+ */
+ public ScenePropInfo setPropState(final int value) {
+ bitField0_ |= 0x00000008;
+ propState = value;
+ return this;
+ }
+
+ /**
+ * optional .PropExtraInfo extra_info = 3;
* @return whether the extraInfo field is set
*/
public boolean hasExtraInfo() {
@@ -210,7 +210,7 @@ public final class ScenePropInfoOuterClass {
}
/**
- * optional .PropExtraInfo extra_info = 13;
+ * optional .PropExtraInfo extra_info = 3;
* @return this
*/
public ScenePropInfo clearExtraInfo() {
@@ -220,7 +220,7 @@ public final class ScenePropInfoOuterClass {
}
/**
- * optional .PropExtraInfo extra_info = 13;
+ * optional .PropExtraInfo extra_info = 3;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -234,7 +234,7 @@ public final class ScenePropInfoOuterClass {
}
/**
- * optional .PropExtraInfo extra_info = 13;
+ * optional .PropExtraInfo extra_info = 3;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -248,7 +248,7 @@ public final class ScenePropInfoOuterClass {
}
/**
- * optional .PropExtraInfo extra_info = 13;
+ * optional .PropExtraInfo extra_info = 3;
* @param value the extraInfo to set
* @return this
*/
@@ -264,9 +264,9 @@ public final class ScenePropInfoOuterClass {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
createTimeMs = other.createTimeMs;
+ propId = other.propId;
lifeTimeMs = other.lifeTimeMs;
propState = other.propState;
- propId = other.propId;
extraInfo.copyFrom(other.extraInfo);
}
return this;
@@ -281,15 +281,15 @@ public final class ScenePropInfoOuterClass {
if (other.hasCreateTimeMs()) {
setCreateTimeMs(other.createTimeMs);
}
+ if (other.hasPropId()) {
+ setPropId(other.propId);
+ }
if (other.hasLifeTimeMs()) {
setLifeTimeMs(other.lifeTimeMs);
}
if (other.hasPropState()) {
setPropState(other.propState);
}
- if (other.hasPropId()) {
- setPropId(other.propId);
- }
if (other.hasExtraInfo()) {
getMutableExtraInfo().mergeFrom(other.extraInfo);
}
@@ -304,9 +304,9 @@ public final class ScenePropInfoOuterClass {
cachedSize = -1;
bitField0_ = 0;
createTimeMs = 0L;
+ propId = 0;
lifeTimeMs = 0;
propState = 0;
- propId = 0;
extraInfo.clear();
return this;
}
@@ -333,32 +333,32 @@ public final class ScenePropInfoOuterClass {
ScenePropInfo other = (ScenePropInfo) o;
return bitField0_ == other.bitField0_
&& (!hasCreateTimeMs() || createTimeMs == other.createTimeMs)
+ && (!hasPropId() || propId == other.propId)
&& (!hasLifeTimeMs() || lifeTimeMs == other.lifeTimeMs)
&& (!hasPropState() || propState == other.propState)
- && (!hasPropId() || propId == other.propId)
&& (!hasExtraInfo() || extraInfo.equals(other.extraInfo));
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 40);
+ output.writeRawByte((byte) 88);
output.writeUInt64NoTag(createTimeMs);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(lifeTimeMs);
+ output.writeRawByte((byte) 32);
+ output.writeUInt32NoTag(propId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(propState);
+ output.writeRawByte((byte) 56);
+ output.writeUInt32NoTag(lifeTimeMs);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeRawByte((byte) 80);
- output.writeUInt32NoTag(propId);
+ output.writeUInt32NoTag(propState);
}
if ((bitField0_ & 0x00000010) != 0) {
- output.writeRawByte((byte) 106);
+ output.writeRawByte((byte) 26);
output.writeMessageNoTag(extraInfo);
}
}
@@ -370,13 +370,13 @@ public final class ScenePropInfoOuterClass {
size += 1 + ProtoSink.computeUInt64SizeNoTag(createTimeMs);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(lifeTimeMs);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(propId);
}
if ((bitField0_ & 0x00000004) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(propState);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(lifeTimeMs);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(propId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(propState);
}
if ((bitField0_ & 0x00000010) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(extraInfo);
@@ -391,27 +391,27 @@ public final class ScenePropInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 40: {
+ case 88: {
// createTimeMs
createTimeMs = input.readUInt64();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 16) {
+ if (tag != 32) {
break;
}
}
- case 16: {
- // lifeTimeMs
- lifeTimeMs = input.readUInt32();
+ case 32: {
+ // propId
+ propId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
- if (tag != 24) {
+ if (tag != 56) {
break;
}
}
- case 24: {
- // propState
- propState = input.readUInt32();
+ case 56: {
+ // lifeTimeMs
+ lifeTimeMs = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 80) {
@@ -419,15 +419,15 @@ public final class ScenePropInfoOuterClass {
}
}
case 80: {
- // propId
- propId = input.readUInt32();
+ // propState
+ propState = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
- if (tag != 106) {
+ if (tag != 26) {
break;
}
}
- case 106: {
+ case 26: {
// extraInfo
input.readMessage(extraInfo);
bitField0_ |= 0x00000010;
@@ -457,13 +457,13 @@ public final class ScenePropInfoOuterClass {
output.writeUInt64(FieldNames.createTimeMs, createTimeMs);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.lifeTimeMs, lifeTimeMs);
+ output.writeUInt32(FieldNames.propId, propId);
}
if ((bitField0_ & 0x00000004) != 0) {
- output.writeUInt32(FieldNames.propState, propState);
+ output.writeUInt32(FieldNames.lifeTimeMs, lifeTimeMs);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.propId, propId);
+ output.writeUInt32(FieldNames.propState, propState);
}
if ((bitField0_ & 0x00000010) != 0) {
output.writeMessage(FieldNames.extraInfo, extraInfo);
@@ -490,12 +490,24 @@ public final class ScenePropInfoOuterClass {
}
break;
}
+ case -979804194:
+ case -309137545: {
+ if (input.isAtField(FieldNames.propId)) {
+ if (!input.trySkipNullValue()) {
+ propId = input.readUInt32();
+ bitField0_ |= 0x00000002;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
case -1226028177:
case 1665182229: {
if (input.isAtField(FieldNames.lifeTimeMs)) {
if (!input.trySkipNullValue()) {
lifeTimeMs = input.readUInt32();
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
}
} else {
input.skipUnknownField();
@@ -507,18 +519,6 @@ public final class ScenePropInfoOuterClass {
if (input.isAtField(FieldNames.propState)) {
if (!input.trySkipNullValue()) {
propState = input.readUInt32();
- bitField0_ |= 0x00000004;
- }
- } else {
- input.skipUnknownField();
- }
- break;
- }
- case -979804194:
- case -309137545: {
- if (input.isAtField(FieldNames.propId)) {
- if (!input.trySkipNullValue()) {
- propId = input.readUInt32();
bitField0_ |= 0x00000008;
}
} else {
@@ -592,12 +592,12 @@ public final class ScenePropInfoOuterClass {
static class FieldNames {
static final FieldName createTimeMs = FieldName.forField("createTimeMs", "create_time_ms");
+ static final FieldName propId = FieldName.forField("propId", "prop_id");
+
static final FieldName lifeTimeMs = FieldName.forField("lifeTimeMs", "life_time_ms");
static final FieldName propState = FieldName.forField("propState", "prop_state");
- static final FieldName propId = FieldName.forField("propId", "prop_id");
-
static final FieldName extraInfo = FieldName.forField("extraInfo", "extra_info");
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java
index 9cdd4d6..3defd98 100644
--- a/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java
@@ -20,24 +20,32 @@ public final class SceneSummonUnitInfoOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint64 create_time_ms = 13;
+ * optional uint64 create_time_ms = 12;
*/
private long createTimeMs;
/**
- * optional uint32 attach_entity_id = 2;
+ * optional uint32 summon_unit_id = 5;
*/
- private int attachEntityId;
+ private int summonUnitId;
/**
+ * + * attach_entity_id + *+ * *
optional uint32 caster_entity_id = 6;
*/
private int casterEntityId;
/**
- * optional uint32 summon_unit_id = 9;
+ * + * caster_entity_id + *+ * + *
optional uint32 attach_entity_id = 13;
*/
- private int summonUnitId;
+ private int attachEntityId;
/**
* optional sint32 life_time_ms = 3;
@@ -45,7 +53,7 @@ public final class SceneSummonUnitInfoOuterClass {
private int lifeTimeMs;
/**
- * repeated string trigger_name_list = 4;
+ * repeated string trigger_name_list = 2;
*/
private final RepeatedString triggerNameList = RepeatedString.newEmptyInstance();
@@ -60,7 +68,7 @@ public final class SceneSummonUnitInfoOuterClass {
}
/**
- * optional uint64 create_time_ms = 13;
+ * optional uint64 create_time_ms = 12;
* @return whether the createTimeMs field is set
*/
public boolean hasCreateTimeMs() {
@@ -68,7 +76,7 @@ public final class SceneSummonUnitInfoOuterClass {
}
/**
- * optional uint64 create_time_ms = 13;
+ * optional uint64 create_time_ms = 12;
* @return this
*/
public SceneSummonUnitInfo clearCreateTimeMs() {
@@ -78,7 +86,7 @@ public final class SceneSummonUnitInfoOuterClass {
}
/**
- * optional uint64 create_time_ms = 13;
+ * optional uint64 create_time_ms = 12;
* @return the createTimeMs
*/
public long getCreateTimeMs() {
@@ -86,7 +94,7 @@ public final class SceneSummonUnitInfoOuterClass {
}
/**
- * optional uint64 create_time_ms = 13;
+ * optional uint64 create_time_ms = 12;
* @param value the createTimeMs to set
* @return this
*/
@@ -97,43 +105,47 @@ public final class SceneSummonUnitInfoOuterClass {
}
/**
- * optional uint32 attach_entity_id = 2;
- * @return whether the attachEntityId field is set
+ * optional uint32 summon_unit_id = 5;
+ * @return whether the summonUnitId field is set
*/
- public boolean hasAttachEntityId() {
+ public boolean hasSummonUnitId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 attach_entity_id = 2;
+ * optional uint32 summon_unit_id = 5;
* @return this
*/
- public SceneSummonUnitInfo clearAttachEntityId() {
+ public SceneSummonUnitInfo clearSummonUnitId() {
bitField0_ &= ~0x00000002;
- attachEntityId = 0;
+ summonUnitId = 0;
return this;
}
/**
- * optional uint32 attach_entity_id = 2;
- * @return the attachEntityId
+ * optional uint32 summon_unit_id = 5;
+ * @return the summonUnitId
*/
- public int getAttachEntityId() {
- return attachEntityId;
+ public int getSummonUnitId() {
+ return summonUnitId;
}
/**
- * optional uint32 attach_entity_id = 2;
- * @param value the attachEntityId to set
+ * optional uint32 summon_unit_id = 5;
+ * @param value the summonUnitId to set
* @return this
*/
- public SceneSummonUnitInfo setAttachEntityId(final int value) {
+ public SceneSummonUnitInfo setSummonUnitId(final int value) {
bitField0_ |= 0x00000002;
- attachEntityId = value;
+ summonUnitId = value;
return this;
}
/**
+ * + * attach_entity_id + *+ * *
optional uint32 caster_entity_id = 6;
* @return whether the casterEntityId field is set
*/
@@ -142,6 +154,10 @@ public final class SceneSummonUnitInfoOuterClass {
}
/**
+ * + * attach_entity_id + *+ * *
optional uint32 caster_entity_id = 6;
* @return this
*/
@@ -152,6 +168,10 @@ public final class SceneSummonUnitInfoOuterClass {
}
/**
+ * + * attach_entity_id + *+ * *
optional uint32 caster_entity_id = 6;
* @return the casterEntityId
*/
@@ -160,6 +180,10 @@ public final class SceneSummonUnitInfoOuterClass {
}
/**
+ * + * attach_entity_id + *+ * *
optional uint32 caster_entity_id = 6;
* @param value the casterEntityId to set
* @return this
@@ -171,39 +195,55 @@ public final class SceneSummonUnitInfoOuterClass {
}
/**
- * optional uint32 summon_unit_id = 9;
- * @return whether the summonUnitId field is set
+ * + * caster_entity_id + *+ * + *
optional uint32 attach_entity_id = 13;
+ * @return whether the attachEntityId field is set
*/
- public boolean hasSummonUnitId() {
+ public boolean hasAttachEntityId() {
return (bitField0_ & 0x00000008) != 0;
}
/**
- * optional uint32 summon_unit_id = 9;
+ * + * caster_entity_id + *+ * + *
optional uint32 attach_entity_id = 13;
* @return this
*/
- public SceneSummonUnitInfo clearSummonUnitId() {
+ public SceneSummonUnitInfo clearAttachEntityId() {
bitField0_ &= ~0x00000008;
- summonUnitId = 0;
+ attachEntityId = 0;
return this;
}
/**
- * optional uint32 summon_unit_id = 9;
- * @return the summonUnitId
+ * + * caster_entity_id + *+ * + *
optional uint32 attach_entity_id = 13;
+ * @return the attachEntityId
*/
- public int getSummonUnitId() {
- return summonUnitId;
+ public int getAttachEntityId() {
+ return attachEntityId;
}
/**
- * optional uint32 summon_unit_id = 9;
- * @param value the summonUnitId to set
+ * + * caster_entity_id + *+ * + *
optional uint32 attach_entity_id = 13;
+ * @param value the attachEntityId to set
* @return this
*/
- public SceneSummonUnitInfo setSummonUnitId(final int value) {
+ public SceneSummonUnitInfo setAttachEntityId(final int value) {
bitField0_ |= 0x00000008;
- summonUnitId = value;
+ attachEntityId = value;
return this;
}
@@ -245,7 +285,7 @@ public final class SceneSummonUnitInfoOuterClass {
}
/**
- * repeated string trigger_name_list = 4;
+ * repeated string trigger_name_list = 2;
* @return whether the triggerNameList field is set
*/
public boolean hasTriggerNameList() {
@@ -253,7 +293,7 @@ public final class SceneSummonUnitInfoOuterClass {
}
/**
- * repeated string trigger_name_list = 4;
+ * repeated string trigger_name_list = 2;
* @return this
*/
public SceneSummonUnitInfo clearTriggerNameList() {
@@ -263,7 +303,7 @@ public final class SceneSummonUnitInfoOuterClass {
}
/**
- * repeated string trigger_name_list = 4;
+ * repeated string trigger_name_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.
@@ -277,7 +317,7 @@ public final class SceneSummonUnitInfoOuterClass {
}
/**
- * repeated string trigger_name_list = 4;
+ * repeated string trigger_name_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
@@ -291,7 +331,7 @@ public final class SceneSummonUnitInfoOuterClass {
}
/**
- * repeated string trigger_name_list = 4;
+ * repeated string trigger_name_list = 2;
* @param value the triggerNameList to add
* @return this
*/
@@ -302,7 +342,7 @@ public final class SceneSummonUnitInfoOuterClass {
}
/**
- * repeated string trigger_name_list = 4;
+ * repeated string trigger_name_list = 2;
* @param values the triggerNameList to add
* @return this
*/
@@ -318,9 +358,9 @@ public final class SceneSummonUnitInfoOuterClass {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
createTimeMs = other.createTimeMs;
- attachEntityId = other.attachEntityId;
- casterEntityId = other.casterEntityId;
summonUnitId = other.summonUnitId;
+ casterEntityId = other.casterEntityId;
+ attachEntityId = other.attachEntityId;
lifeTimeMs = other.lifeTimeMs;
triggerNameList.copyFrom(other.triggerNameList);
}
@@ -336,14 +376,14 @@ public final class SceneSummonUnitInfoOuterClass {
if (other.hasCreateTimeMs()) {
setCreateTimeMs(other.createTimeMs);
}
- if (other.hasAttachEntityId()) {
- setAttachEntityId(other.attachEntityId);
+ if (other.hasSummonUnitId()) {
+ setSummonUnitId(other.summonUnitId);
}
if (other.hasCasterEntityId()) {
setCasterEntityId(other.casterEntityId);
}
- if (other.hasSummonUnitId()) {
- setSummonUnitId(other.summonUnitId);
+ if (other.hasAttachEntityId()) {
+ setAttachEntityId(other.attachEntityId);
}
if (other.hasLifeTimeMs()) {
setLifeTimeMs(other.lifeTimeMs);
@@ -362,9 +402,9 @@ public final class SceneSummonUnitInfoOuterClass {
cachedSize = -1;
bitField0_ = 0;
createTimeMs = 0L;
- attachEntityId = 0;
- casterEntityId = 0;
summonUnitId = 0;
+ casterEntityId = 0;
+ attachEntityId = 0;
lifeTimeMs = 0;
triggerNameList.clear();
return this;
@@ -392,9 +432,9 @@ public final class SceneSummonUnitInfoOuterClass {
SceneSummonUnitInfo other = (SceneSummonUnitInfo) o;
return bitField0_ == other.bitField0_
&& (!hasCreateTimeMs() || createTimeMs == other.createTimeMs)
- && (!hasAttachEntityId() || attachEntityId == other.attachEntityId)
- && (!hasCasterEntityId() || casterEntityId == other.casterEntityId)
&& (!hasSummonUnitId() || summonUnitId == other.summonUnitId)
+ && (!hasCasterEntityId() || casterEntityId == other.casterEntityId)
+ && (!hasAttachEntityId() || attachEntityId == other.attachEntityId)
&& (!hasLifeTimeMs() || lifeTimeMs == other.lifeTimeMs)
&& (!hasTriggerNameList() || triggerNameList.equals(other.triggerNameList));
}
@@ -402,20 +442,20 @@ public final class SceneSummonUnitInfoOuterClass {
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 96);
output.writeUInt64NoTag(createTimeMs);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeRawByte((byte) 16);
- output.writeUInt32NoTag(attachEntityId);
+ output.writeRawByte((byte) 40);
+ output.writeUInt32NoTag(summonUnitId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 48);
output.writeUInt32NoTag(casterEntityId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeRawByte((byte) 72);
- output.writeUInt32NoTag(summonUnitId);
+ output.writeRawByte((byte) 104);
+ output.writeUInt32NoTag(attachEntityId);
}
if ((bitField0_ & 0x00000010) != 0) {
output.writeRawByte((byte) 24);
@@ -423,7 +463,7 @@ public final class SceneSummonUnitInfoOuterClass {
}
if ((bitField0_ & 0x00000020) != 0) {
for (int i = 0; i < triggerNameList.length(); i++) {
- output.writeRawByte((byte) 34);
+ output.writeRawByte((byte) 18);
output.writeStringNoTag(triggerNameList.get(i));
}
}
@@ -436,13 +476,13 @@ public final class SceneSummonUnitInfoOuterClass {
size += 1 + ProtoSink.computeUInt64SizeNoTag(createTimeMs);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(attachEntityId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(summonUnitId);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(casterEntityId);
}
if ((bitField0_ & 0x00000008) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(summonUnitId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(attachEntityId);
}
if ((bitField0_ & 0x00000010) != 0) {
size += 1 + ProtoSink.computeSInt32SizeNoTag(lifeTimeMs);
@@ -460,18 +500,18 @@ public final class SceneSummonUnitInfoOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 104: {
+ case 96: {
// createTimeMs
createTimeMs = input.readUInt64();
bitField0_ |= 0x00000001;
tag = input.readTag();
- if (tag != 16) {
+ if (tag != 40) {
break;
}
}
- case 16: {
- // attachEntityId
- attachEntityId = input.readUInt32();
+ case 40: {
+ // summonUnitId
+ summonUnitId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 48) {
@@ -483,13 +523,13 @@ public final class SceneSummonUnitInfoOuterClass {
casterEntityId = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
- if (tag != 72) {
+ if (tag != 104) {
break;
}
}
- case 72: {
- // summonUnitId
- summonUnitId = input.readUInt32();
+ case 104: {
+ // attachEntityId
+ attachEntityId = input.readUInt32();
bitField0_ |= 0x00000008;
tag = input.readTag();
if (tag != 24) {
@@ -501,11 +541,11 @@ public final class SceneSummonUnitInfoOuterClass {
lifeTimeMs = input.readSInt32();
bitField0_ |= 0x00000010;
tag = input.readTag();
- if (tag != 34) {
+ if (tag != 18) {
break;
}
}
- case 34: {
+ case 18: {
// triggerNameList
tag = input.readRepeatedString(triggerNameList, tag);
bitField0_ |= 0x00000020;
@@ -534,13 +574,13 @@ public final class SceneSummonUnitInfoOuterClass {
output.writeUInt64(FieldNames.createTimeMs, createTimeMs);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.attachEntityId, attachEntityId);
+ output.writeUInt32(FieldNames.summonUnitId, summonUnitId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.casterEntityId, casterEntityId);
}
if ((bitField0_ & 0x00000008) != 0) {
- output.writeUInt32(FieldNames.summonUnitId, summonUnitId);
+ output.writeUInt32(FieldNames.attachEntityId, attachEntityId);
}
if ((bitField0_ & 0x00000010) != 0) {
output.writeSInt32(FieldNames.lifeTimeMs, lifeTimeMs);
@@ -570,11 +610,11 @@ public final class SceneSummonUnitInfoOuterClass {
}
break;
}
- case -900612669:
- case -644975235: {
- if (input.isAtField(FieldNames.attachEntityId)) {
+ case 43438592:
+ case 1094873176: {
+ if (input.isAtField(FieldNames.summonUnitId)) {
if (!input.trySkipNullValue()) {
- attachEntityId = input.readUInt32();
+ summonUnitId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -594,11 +634,11 @@ public final class SceneSummonUnitInfoOuterClass {
}
break;
}
- case 43438592:
- case 1094873176: {
- if (input.isAtField(FieldNames.summonUnitId)) {
+ case -900612669:
+ case -644975235: {
+ if (input.isAtField(FieldNames.attachEntityId)) {
if (!input.trySkipNullValue()) {
- summonUnitId = input.readUInt32();
+ attachEntityId = input.readUInt32();
bitField0_ |= 0x00000008;
}
} else {
@@ -685,11 +725,11 @@ public final class SceneSummonUnitInfoOuterClass {
static class FieldNames {
static final FieldName createTimeMs = FieldName.forField("createTimeMs", "create_time_ms");
- static final FieldName attachEntityId = FieldName.forField("attachEntityId", "attach_entity_id");
+ static final FieldName summonUnitId = FieldName.forField("summonUnitId", "summon_unit_id");
static final FieldName casterEntityId = FieldName.forField("casterEntityId", "caster_entity_id");
- static final FieldName summonUnitId = FieldName.forField("summonUnitId", "summon_unit_id");
+ static final FieldName attachEntityId = FieldName.forField("attachEntityId", "attach_entity_id");
static final FieldName lifeTimeMs = FieldName.forField("lifeTimeMs", "life_time_ms");
diff --git a/src/generated/main/emu/lunarcore/proto/SearchPlayerCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SearchPlayerCsReqOuterClass.java
index 76187ed..17e274a 100644
--- a/src/generated/main/emu/lunarcore/proto/SearchPlayerCsReqOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SearchPlayerCsReqOuterClass.java
@@ -20,7 +20,7 @@ public final class SearchPlayerCsReqOuterClass {
private static final long serialVersionUID = 0L;
/**
- * repeated uint32 search_uid_list = 13;
+ * repeated uint32 search_uid_list = 1;
*/
private final RepeatedInt searchUidList = RepeatedInt.newEmptyInstance();
@@ -35,7 +35,7 @@ public final class SearchPlayerCsReqOuterClass {
}
/**
- * repeated uint32 search_uid_list = 13;
+ * repeated uint32 search_uid_list = 1;
* @return whether the searchUidList field is set
*/
public boolean hasSearchUidList() {
@@ -43,7 +43,7 @@ public final class SearchPlayerCsReqOuterClass {
}
/**
- * repeated uint32 search_uid_list = 13;
+ * repeated uint32 search_uid_list = 1;
* @return this
*/
public SearchPlayerCsReq clearSearchUidList() {
@@ -53,7 +53,7 @@ public final class SearchPlayerCsReqOuterClass {
}
/**
- * repeated uint32 search_uid_list = 13;
+ * repeated uint32 search_uid_list = 1;
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class SearchPlayerCsReqOuterClass {
}
/**
- * repeated uint32 search_uid_list = 13;
+ * repeated uint32 search_uid_list = 1;
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class SearchPlayerCsReqOuterClass {
}
/**
- * repeated uint32 search_uid_list = 13;
+ * repeated uint32 search_uid_list = 1;
* @param value the searchUidList to add
* @return this
*/
@@ -92,7 +92,7 @@ public final class SearchPlayerCsReqOuterClass {
}
/**
- * repeated uint32 search_uid_list = 13;
+ * repeated uint32 search_uid_list = 1;
* @param values the searchUidList to add
* @return this
*/
@@ -163,7 +163,7 @@ public final class SearchPlayerCsReqOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
for (int i = 0; i < searchUidList.length(); i++) {
- output.writeRawByte((byte) 104);
+ output.writeRawByte((byte) 8);
output.writeUInt32NoTag(searchUidList.array()[i]);
}
}
@@ -185,7 +185,7 @@ public final class SearchPlayerCsReqOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
- case 106: {
+ case 10: {
// searchUidList [packed=true]
input.readPackedUInt32(searchUidList, tag);
bitField0_ |= 0x00000001;
@@ -204,7 +204,7 @@ public final class SearchPlayerCsReqOuterClass {
tag = input.readTag();
break;
}
- case 104: {
+ case 8: {
// searchUidList [packed=false]
tag = input.readRepeatedUInt32(searchUidList, tag);
bitField0_ |= 0x00000001;
diff --git a/src/generated/main/emu/lunarcore/proto/SearchPlayerScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SearchPlayerScRspOuterClass.java
index d912a49..6783f5d 100644
--- a/src/generated/main/emu/lunarcore/proto/SearchPlayerScRspOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SearchPlayerScRspOuterClass.java
@@ -20,12 +20,12 @@ public final class SearchPlayerScRspOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 retcode = 11;
+ * optional uint32 retcode = 7;
*/
private int retcode;
/**
- * repeated .SimpleInfo search_result_list = 2;
+ * repeated .SimpleInfo search_result_list = 14;
*/
private final RepeatedMessage