Mirror/LunarCore
1
0
Fork 0
mirror of https://github.com/Melledy/LunarCore.git synced 2025-12-13 13:54:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix SU blessing selector and menu

Browse Source
This commit is contained in:
Melledy
2024-06-24 03:23:42 -07:00
parent ca1542e37f
commit b4addcc7dd
10 changed files with 640 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

300
src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java
View File

@@ -22,37 +22,37 @@ public final class BuffInfoOuterClass {
private static final long serialVersionUID = 0L; private static final long serialVersionUID = 0L;
/** /**
* <code>optional uint64 add_time_ms = 8;</code> * <code>optional uint64 add_time_ms = 1;</code>
*/ */
private long addTimeMs; private long addTimeMs;
/** /**
* <code>optional float life_time = 9;</code> * <code>optional float life_time = 3;</code>
*/ */
private float lifeTime; private float lifeTime;
/** /**
* <code>optional uint32 count = 1;</code> * <code>optional uint32 buff_id = 4;</code>
*/
private int count;
/**
* <code>optional uint32 buff_id = 5;</code>
*/ */
private int buffId; private int buffId;
/** /**
* <code>optional uint32 base_avatar_id = 11;</code> * <code>optional uint32 base_avatar_id = 9;</code>
*/ */
private int baseAvatarId; private int baseAvatarId;
/** /**
* <code>optional uint32 level = 14;</code> * <code>optional uint32 level = 12;</code>
*/ */
private int level; private int level;
/** /**
* <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4;</code> * <code>optional uint32 count = 13;</code>
*/
private int count;
/**
* <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 5;</code>
*/ */
private final RepeatedMessage<DynamicValuesEntry> dynamicValues = RepeatedMessage.newEmptyInstance(DynamicValuesEntry.getFactory()); private final RepeatedMessage<DynamicValuesEntry> dynamicValues = RepeatedMessage.newEmptyInstance(DynamicValuesEntry.getFactory());
@@ -67,7 +67,7 @@ public final class BuffInfoOuterClass {
} }
/** /**
* <code>optional uint64 add_time_ms = 8;</code> * <code>optional uint64 add_time_ms = 1;</code>
* @return whether the addTimeMs field is set * @return whether the addTimeMs field is set
*/ */
public boolean hasAddTimeMs() { public boolean hasAddTimeMs() {
@@ -75,7 +75,7 @@ public final class BuffInfoOuterClass {
} }
/** /**
* <code>optional uint64 add_time_ms = 8;</code> * <code>optional uint64 add_time_ms = 1;</code>
* @return this * @return this
*/ */
public BuffInfo clearAddTimeMs() { public BuffInfo clearAddTimeMs() {
@@ -85,7 +85,7 @@ public final class BuffInfoOuterClass {
} }
/** /**
* <code>optional uint64 add_time_ms = 8;</code> * <code>optional uint64 add_time_ms = 1;</code>
* @return the addTimeMs * @return the addTimeMs
*/ */
public long getAddTimeMs() { public long getAddTimeMs() {
@@ -93,7 +93,7 @@ public final class BuffInfoOuterClass {
} }
/** /**
* <code>optional uint64 add_time_ms = 8;</code> * <code>optional uint64 add_time_ms = 1;</code>
* @param value the addTimeMs to set * @param value the addTimeMs to set
* @return this * @return this
*/ */
@@ -104,7 +104,7 @@ public final class BuffInfoOuterClass {
} }
/** /**
* <code>optional float life_time = 9;</code> * <code>optional float life_time = 3;</code>
* @return whether the lifeTime field is set * @return whether the lifeTime field is set
*/ */
public boolean hasLifeTime() { public boolean hasLifeTime() {
@@ -112,7 +112,7 @@ public final class BuffInfoOuterClass {
} }
/** /**
* <code>optional float life_time = 9;</code> * <code>optional float life_time = 3;</code>
* @return this * @return this
*/ */
public BuffInfo clearLifeTime() { public BuffInfo clearLifeTime() {
@@ -122,7 +122,7 @@ public final class BuffInfoOuterClass {
} }
/** /**
* <code>optional float life_time = 9;</code> * <code>optional float life_time = 3;</code>
* @return the lifeTime * @return the lifeTime
*/ */
public float getLifeTime() { public float getLifeTime() {
@@ -130,7 +130,7 @@ public final class BuffInfoOuterClass {
} }
/** /**
* <code>optional float life_time = 9;</code> * <code>optional float life_time = 3;</code>
* @param value the lifeTime to set * @param value the lifeTime to set
* @return this * @return this
*/ */
@@ -141,62 +141,25 @@ public final class BuffInfoOuterClass {
} }
/** /**
* <code>optional uint32 count = 1;</code> * <code>optional uint32 buff_id = 4;</code>
* @return whether the count field is set * @return whether the buffId field is set
*/ */
public boolean hasCount() { public boolean hasBuffId() {
return (bitField0_ & 0x00000004) != 0; return (bitField0_ & 0x00000004) != 0;
} }
/** /**
* <code>optional uint32 count = 1;</code> * <code>optional uint32 buff_id = 4;</code>
* @return this
*/
public BuffInfo clearCount() {
bitField0_ &= ~0x00000004;
count = 0;
return this;
}
/**
* <code>optional uint32 count = 1;</code>
* @return the count
*/
public int getCount() {
return count;
}
/**
* <code>optional uint32 count = 1;</code>
* @param value the count to set
* @return this
*/
public BuffInfo setCount(final int value) {
bitField0_ |= 0x00000004;
count = value;
return this;
}
/**
* <code>optional uint32 buff_id = 5;</code>
* @return whether the buffId field is set
*/
public boolean hasBuffId() {
return (bitField0_ & 0x00000008) != 0;
}
/**
* <code>optional uint32 buff_id = 5;</code>
* @return this * @return this
*/ */
public BuffInfo clearBuffId() { public BuffInfo clearBuffId() {
bitField0_ &= ~0x00000008; bitField0_ &= ~0x00000004;
buffId = 0; buffId = 0;
return this; return this;
} }
/** /**
* <code>optional uint32 buff_id = 5;</code> * <code>optional uint32 buff_id = 4;</code>
* @return the buffId * @return the buffId
*/ */
public int getBuffId() { public int getBuffId() {
@@ -204,36 +167,36 @@ public final class BuffInfoOuterClass {
} }
/** /**
* <code>optional uint32 buff_id = 5;</code> * <code>optional uint32 buff_id = 4;</code>
* @param value the buffId to set * @param value the buffId to set
* @return this * @return this
*/ */
public BuffInfo setBuffId(final int value) { public BuffInfo setBuffId(final int value) {
bitField0_ |= 0x00000008; bitField0_ |= 0x00000004;
buffId = value; buffId = value;
return this; return this;
} }
/** /**
* <code>optional uint32 base_avatar_id = 11;</code> * <code>optional uint32 base_avatar_id = 9;</code>
* @return whether the baseAvatarId field is set * @return whether the baseAvatarId field is set
*/ */
public boolean hasBaseAvatarId() { public boolean hasBaseAvatarId() {
return (bitField0_ & 0x00000010) != 0; return (bitField0_ & 0x00000008) != 0;
} }
/** /**
* <code>optional uint32 base_avatar_id = 11;</code> * <code>optional uint32 base_avatar_id = 9;</code>
* @return this * @return this
*/ */
public BuffInfo clearBaseAvatarId() { public BuffInfo clearBaseAvatarId() {
bitField0_ &= ~0x00000010; bitField0_ &= ~0x00000008;
baseAvatarId = 0; baseAvatarId = 0;
return this; return this;
} }
/** /**
* <code>optional uint32 base_avatar_id = 11;</code> * <code>optional uint32 base_avatar_id = 9;</code>
* @return the baseAvatarId * @return the baseAvatarId
*/ */
public int getBaseAvatarId() { public int getBaseAvatarId() {
@@ -241,36 +204,36 @@ public final class BuffInfoOuterClass {
} }
/** /**
* <code>optional uint32 base_avatar_id = 11;</code> * <code>optional uint32 base_avatar_id = 9;</code>
* @param value the baseAvatarId to set * @param value the baseAvatarId to set
* @return this * @return this
*/ */
public BuffInfo setBaseAvatarId(final int value) { public BuffInfo setBaseAvatarId(final int value) {
bitField0_ |= 0x00000010; bitField0_ |= 0x00000008;
baseAvatarId = value; baseAvatarId = value;
return this; return this;
} }
/** /**
* <code>optional uint32 level = 14;</code> * <code>optional uint32 level = 12;</code>
* @return whether the level field is set * @return whether the level field is set
*/ */
public boolean hasLevel() { public boolean hasLevel() {
return (bitField0_ & 0x00000020) != 0; return (bitField0_ & 0x00000010) != 0;
} }
/** /**
* <code>optional uint32 level = 14;</code> * <code>optional uint32 level = 12;</code>
* @return this * @return this
*/ */
public BuffInfo clearLevel() { public BuffInfo clearLevel() {
bitField0_ &= ~0x00000020; bitField0_ &= ~0x00000010;
level = 0; level = 0;
return this; return this;
} }
/** /**
* <code>optional uint32 level = 14;</code> * <code>optional uint32 level = 12;</code>
* @return the level * @return the level
*/ */
public int getLevel() { public int getLevel() {
@@ -278,18 +241,55 @@ public final class BuffInfoOuterClass {
} }
/** /**
* <code>optional uint32 level = 14;</code> * <code>optional uint32 level = 12;</code>
* @param value the level to set * @param value the level to set
* @return this * @return this
*/ */
public BuffInfo setLevel(final int value) { public BuffInfo setLevel(final int value) {
bitField0_ |= 0x00000020; bitField0_ |= 0x00000010;
level = value; level = value;
return this; return this;
} }
/** /**
* <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4;</code> * <code>optional uint32 count = 13;</code>
* @return whether the count field is set
*/
public boolean hasCount() {
return (bitField0_ & 0x00000020) != 0;
}
/**
* <code>optional uint32 count = 13;</code>
* @return this
*/
public BuffInfo clearCount() {
bitField0_ &= ~0x00000020;
count = 0;
return this;
}
/**
* <code>optional uint32 count = 13;</code>
* @return the count
*/
public int getCount() {
return count;
}
/**
* <code>optional uint32 count = 13;</code>
* @param value the count to set
* @return this
*/
public BuffInfo setCount(final int value) {
bitField0_ |= 0x00000020;
count = value;
return this;
}
/**
* <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 5;</code>
* @return whether the dynamicValues field is set * @return whether the dynamicValues field is set
*/ */
public boolean hasDynamicValues() { public boolean hasDynamicValues() {
@@ -297,7 +297,7 @@ public final class BuffInfoOuterClass {
} }
/** /**
* <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4;</code> * <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 5;</code>
* @return this * @return this
*/ */
public BuffInfo clearDynamicValues() { public BuffInfo clearDynamicValues() {
@@ -307,7 +307,7 @@ public final class BuffInfoOuterClass {
} }
/** /**
* <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4;</code> * <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 5;</code>
* *
* This method returns the internal storage object without modifying any has state. * This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only. * The returned object should not be modified and be treated as read-only.
@@ -321,7 +321,7 @@ public final class BuffInfoOuterClass {
} }
/** /**
* <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4;</code> * <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 5;</code>
* *
* This method returns the internal storage object and sets the corresponding * This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its * has state. The returned object will become part of this message and its
@@ -335,7 +335,7 @@ public final class BuffInfoOuterClass {
} }
/** /**
* <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4;</code> * <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 5;</code>
* @param value the dynamicValues to add * @param value the dynamicValues to add
* @return this * @return this
*/ */
@@ -346,7 +346,7 @@ public final class BuffInfoOuterClass {
} }
/** /**
* <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4;</code> * <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 5;</code>
* @param values the dynamicValues to add * @param values the dynamicValues to add
* @return this * @return this
*/ */
@@ -363,10 +363,10 @@ public final class BuffInfoOuterClass {
bitField0_ = other.bitField0_; bitField0_ = other.bitField0_;
addTimeMs = other.addTimeMs; addTimeMs = other.addTimeMs;
lifeTime = other.lifeTime; lifeTime = other.lifeTime;
count = other.count;
buffId = other.buffId; buffId = other.buffId;
baseAvatarId = other.baseAvatarId; baseAvatarId = other.baseAvatarId;
level = other.level; level = other.level;
count = other.count;
dynamicValues.copyFrom(other.dynamicValues); dynamicValues.copyFrom(other.dynamicValues);
} }
return this; return this;
@@ -384,9 +384,6 @@ public final class BuffInfoOuterClass {
if (other.hasLifeTime()) { if (other.hasLifeTime()) {
setLifeTime(other.lifeTime); setLifeTime(other.lifeTime);
} }
if (other.hasCount()) {
setCount(other.count);
}
if (other.hasBuffId()) { if (other.hasBuffId()) {
setBuffId(other.buffId); setBuffId(other.buffId);
} }
@@ -396,6 +393,9 @@ public final class BuffInfoOuterClass {
if (other.hasLevel()) { if (other.hasLevel()) {
setLevel(other.level); setLevel(other.level);
} }
if (other.hasCount()) {
setCount(other.count);
}
if (other.hasDynamicValues()) { if (other.hasDynamicValues()) {
getMutableDynamicValues().addAll(other.dynamicValues); getMutableDynamicValues().addAll(other.dynamicValues);
} }
@@ -411,10 +411,10 @@ public final class BuffInfoOuterClass {
bitField0_ = 0; bitField0_ = 0;
addTimeMs = 0L; addTimeMs = 0L;
lifeTime = 0F; lifeTime = 0F;
count = 0;
buffId = 0; buffId = 0;
baseAvatarId = 0; baseAvatarId = 0;
level = 0; level = 0;
count = 0;
dynamicValues.clear(); dynamicValues.clear();
return this; return this;
} }
@@ -442,42 +442,42 @@ public final class BuffInfoOuterClass {
return bitField0_ == other.bitField0_ return bitField0_ == other.bitField0_
&& (!hasAddTimeMs() || addTimeMs == other.addTimeMs) && (!hasAddTimeMs() || addTimeMs == other.addTimeMs)
&& (!hasLifeTime() || ProtoUtil.isEqual(lifeTime, other.lifeTime)) && (!hasLifeTime() || ProtoUtil.isEqual(lifeTime, other.lifeTime))
&& (!hasCount() || count == other.count)
&& (!hasBuffId() || buffId == other.buffId) && (!hasBuffId() || buffId == other.buffId)
&& (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
&& (!hasLevel() || level == other.level) && (!hasLevel() || level == other.level)
&& (!hasCount() || count == other.count)
&& (!hasDynamicValues() || dynamicValues.equals(other.dynamicValues)); && (!hasDynamicValues() || dynamicValues.equals(other.dynamicValues));
} }
@Override @Override
public void writeTo(final ProtoSink output) throws IOException { public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) { if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 64); output.writeRawByte((byte) 8);
output.writeUInt64NoTag(addTimeMs); output.writeUInt64NoTag(addTimeMs);
} }
if ((bitField0_ & 0x00000002) != 0) { if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 77); output.writeRawByte((byte) 29);
output.writeFloatNoTag(lifeTime); output.writeFloatNoTag(lifeTime);
} }
if ((bitField0_ & 0x00000004) != 0) { if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 8); output.writeRawByte((byte) 32);
output.writeUInt32NoTag(count);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeRawByte((byte) 40);
output.writeUInt32NoTag(buffId); output.writeUInt32NoTag(buffId);
} }
if ((bitField0_ & 0x00000010) != 0) { if ((bitField0_ & 0x00000008) != 0) {
output.writeRawByte((byte) 88); output.writeRawByte((byte) 72);
output.writeUInt32NoTag(baseAvatarId); output.writeUInt32NoTag(baseAvatarId);
} }
if ((bitField0_ & 0x00000020) != 0) { if ((bitField0_ & 0x00000010) != 0) {
output.writeRawByte((byte) 112); output.writeRawByte((byte) 96);
output.writeUInt32NoTag(level); output.writeUInt32NoTag(level);
} }
if ((bitField0_ & 0x00000020) != 0) {
output.writeRawByte((byte) 104);
output.writeUInt32NoTag(count);
}
if ((bitField0_ & 0x00000040) != 0) { if ((bitField0_ & 0x00000040) != 0) {
for (int i = 0; i < dynamicValues.length(); i++) { for (int i = 0; i < dynamicValues.length(); i++) {
output.writeRawByte((byte) 34); output.writeRawByte((byte) 42);
output.writeMessageNoTag(dynamicValues.get(i)); output.writeMessageNoTag(dynamicValues.get(i));
} }
} }
@@ -493,17 +493,17 @@ public final class BuffInfoOuterClass {
size += 5; size += 5;
} }
if ((bitField0_ & 0x00000004) != 0) { if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(count);
}
if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId);
} }
if ((bitField0_ & 0x00000010) != 0) { if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
} }
if ((bitField0_ & 0x00000020) != 0) { if ((bitField0_ & 0x00000010) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(level); size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
} }
if ((bitField0_ & 0x00000020) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(count);
}
if ((bitField0_ & 0x00000040) != 0) { if ((bitField0_ & 0x00000040) != 0) {
size += (1 * dynamicValues.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dynamicValues); size += (1 * dynamicValues.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dynamicValues);
} }
@@ -517,61 +517,61 @@ public final class BuffInfoOuterClass {
int tag = input.readTag(); int tag = input.readTag();
while (true) { while (true) {
switch (tag) { switch (tag) {
case 64: { case 8: {
// addTimeMs // addTimeMs
addTimeMs = input.readUInt64(); addTimeMs = input.readUInt64();
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
tag = input.readTag(); tag = input.readTag();
if (tag != 77) { if (tag != 29) {
break; break;
} }
} }
case 77: { case 29: {
// lifeTime // lifeTime
lifeTime = input.readFloat(); lifeTime = input.readFloat();
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
tag = input.readTag(); tag = input.readTag();
if (tag != 8) { if (tag != 32) {
break; break;
} }
} }
case 8: { case 32: {
// count
count = input.readUInt32();
bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 40) {
break;
}
}
case 40: {
// buffId // buffId
buffId = input.readUInt32(); buffId = input.readUInt32();
bitField0_ |= 0x00000008; bitField0_ |= 0x00000004;
tag = input.readTag(); tag = input.readTag();
if (tag != 88) { if (tag != 72) {
break; break;
} }
} }
case 88: { case 72: {
// baseAvatarId // baseAvatarId
baseAvatarId = input.readUInt32(); baseAvatarId = input.readUInt32();
bitField0_ |= 0x00000010; bitField0_ |= 0x00000008;
tag = input.readTag(); tag = input.readTag();
if (tag != 112) { if (tag != 96) {
break; break;
} }
} }
case 112: { case 96: {
// level // level
level = input.readUInt32(); level = input.readUInt32();
bitField0_ |= 0x00000020; bitField0_ |= 0x00000010;
tag = input.readTag(); tag = input.readTag();
if (tag != 34) { if (tag != 104) {
break; break;
} }
} }
case 34: { case 104: {
// count
count = input.readUInt32();
bitField0_ |= 0x00000020;
tag = input.readTag();
if (tag != 42) {
break;
}
}
case 42: {
// dynamicValues // dynamicValues
tag = input.readRepeatedMessage(dynamicValues, tag); tag = input.readRepeatedMessage(dynamicValues, tag);
bitField0_ |= 0x00000040; bitField0_ |= 0x00000040;
@@ -603,17 +603,17 @@ public final class BuffInfoOuterClass {
output.writeFloat(FieldNames.lifeTime, lifeTime); output.writeFloat(FieldNames.lifeTime, lifeTime);
} }
if ((bitField0_ & 0x00000004) != 0) { if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.count, count);
}
if ((bitField0_ & 0x00000008) != 0) {
output.writeUInt32(FieldNames.buffId, buffId); output.writeUInt32(FieldNames.buffId, buffId);
} }
if ((bitField0_ & 0x00000010) != 0) { if ((bitField0_ & 0x00000008) != 0) {
output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
} }
if ((bitField0_ & 0x00000020) != 0) { if ((bitField0_ & 0x00000010) != 0) {
output.writeUInt32(FieldNames.level, level); output.writeUInt32(FieldNames.level, level);
} }
if ((bitField0_ & 0x00000020) != 0) {
output.writeUInt32(FieldNames.count, count);
}
if ((bitField0_ & 0x00000040) != 0) { if ((bitField0_ & 0x00000040) != 0) {
output.writeRepeatedMessage(FieldNames.dynamicValues, dynamicValues); output.writeRepeatedMessage(FieldNames.dynamicValues, dynamicValues);
} }
@@ -651,23 +651,12 @@ public final class BuffInfoOuterClass {
} }
break; break;
} }
case 94851343: {
if (input.isAtField(FieldNames.count)) {
if (!input.trySkipNullValue()) {
count = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
input.skipUnknownField();
}
break;
}
case -1378119474: case -1378119474:
case 227990663: { case 227990663: {
if (input.isAtField(FieldNames.buffId)) { if (input.isAtField(FieldNames.buffId)) {
if (!input.trySkipNullValue()) { if (!input.trySkipNullValue()) {
buffId = input.readUInt32(); buffId = input.readUInt32();
bitField0_ |= 0x00000008; bitField0_ |= 0x00000004;
} }
} else { } else {
input.skipUnknownField(); input.skipUnknownField();
@@ -679,7 +668,7 @@ public final class BuffInfoOuterClass {
if (input.isAtField(FieldNames.baseAvatarId)) { if (input.isAtField(FieldNames.baseAvatarId)) {
if (!input.trySkipNullValue()) { if (!input.trySkipNullValue()) {
baseAvatarId = input.readUInt32(); baseAvatarId = input.readUInt32();
bitField0_ |= 0x00000010; bitField0_ |= 0x00000008;
} }
} else { } else {
input.skipUnknownField(); input.skipUnknownField();
@@ -690,6 +679,17 @@ public final class BuffInfoOuterClass {
if (input.isAtField(FieldNames.level)) { if (input.isAtField(FieldNames.level)) {
if (!input.trySkipNullValue()) { if (!input.trySkipNullValue()) {
level = input.readUInt32(); level = input.readUInt32();
bitField0_ |= 0x00000010;
}
} else {
input.skipUnknownField();
}
break;
}
case 94851343: {
if (input.isAtField(FieldNames.count)) {
if (!input.trySkipNullValue()) {
count = input.readUInt32();
bitField0_ |= 0x00000020; bitField0_ |= 0x00000020;
} }
} else { } else {
@@ -1119,14 +1119,14 @@ public final class BuffInfoOuterClass {
static final FieldName lifeTime = FieldName.forField("lifeTime", "life_time"); static final FieldName lifeTime = FieldName.forField("lifeTime", "life_time");
static final FieldName count = FieldName.forField("count");
static final FieldName buffId = FieldName.forField("buffId", "buff_id"); static final FieldName buffId = FieldName.forField("buffId", "buff_id");
static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
static final FieldName level = FieldName.forField("level"); static final FieldName level = FieldName.forField("level");
static final FieldName count = FieldName.forField("count");
static final FieldName dynamicValues = FieldName.forField("dynamicValues", "dynamic_values"); static final FieldName dynamicValues = FieldName.forField("dynamicValues", "dynamic_values");
} }
} }

228
src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionCsReqOuterClass.java
View File

@@ -19,24 +19,24 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
private static final long serialVersionUID = 0L; private static final long serialVersionUID = 0L;
/** /**
* <code>optional .RogueBuffRollInfo roll_buff = 308;</code> * <code>optional .RogueCommonBuffSelectResult buff_select_result = 744;</code>
*/ */
private final RogueBuffRollInfoOuterClass.RogueBuffRollInfo rollBuff = RogueBuffRollInfoOuterClass.RogueBuffRollInfo.newInstance(); private final RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult buffSelectResult = RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult.newInstance();
/** /**
* <code>optional .RogueBonusSelectResult bonus_select_result = 1156;</code> * <code>optional .RogueBonusSelectResult bonus_select_result = 1047;</code>
*/ */
private final RogueBonusSelectResultOuterClass.RogueBonusSelectResult bonusSelectResult = RogueBonusSelectResultOuterClass.RogueBonusSelectResult.newInstance(); private final RogueBonusSelectResultOuterClass.RogueBonusSelectResult bonusSelectResult = RogueBonusSelectResultOuterClass.RogueBonusSelectResult.newInstance();
/** /**
* <code>optional .RogueMiracleSelectResult miracle_select_result = 1209;</code> * <code>optional .RogueMiracleSelectResult miracle_select_result = 1741;</code>
*/ */
private final RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult miracleSelectResult = RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult.newInstance(); private final RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult miracleSelectResult = RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult.newInstance();
/** /**
* <code>optional .RogueCommonBuffSelectResult buff_select_result = 1586;</code> * <code>optional .RogueBuffRollInfo roll_buff = 2038;</code>
*/ */
private final RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult buffSelectResult = RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult.newInstance(); private final RogueBuffRollInfoOuterClass.RogueBuffRollInfo rollBuff = RogueBuffRollInfoOuterClass.RogueBuffRollInfo.newInstance();
private HandleRogueCommonPendingActionCsReq() { private HandleRogueCommonPendingActionCsReq() {
} }
@@ -54,80 +54,80 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
public HandleRogueCommonPendingActionCsReq clearPendingAction() { public HandleRogueCommonPendingActionCsReq clearPendingAction() {
if (hasPendingAction()) { if (hasPendingAction()) {
clearRollBuff(); clearBuffSelectResult();
clearBonusSelectResult(); clearBonusSelectResult();
clearMiracleSelectResult(); clearMiracleSelectResult();
clearBuffSelectResult(); clearRollBuff();
} }
return this; return this;
} }
private void clearPendingActionOtherRollBuff() { private void clearPendingActionOtherBuffSelectResult() {
if ((((bitField0_ & 0x0000000e)) != 0)) { if ((((bitField0_ & 0x0000000e)) != 0)) {
clearBonusSelectResult(); clearBonusSelectResult();
clearMiracleSelectResult(); clearMiracleSelectResult();
clearBuffSelectResult(); clearRollBuff();
} }
} }
private void clearPendingActionOtherBonusSelectResult() { private void clearPendingActionOtherBonusSelectResult() {
if ((((bitField0_ & 0x0000000d)) != 0)) { if ((((bitField0_ & 0x0000000d)) != 0)) {
clearRollBuff();
clearMiracleSelectResult();
clearBuffSelectResult(); clearBuffSelectResult();
clearMiracleSelectResult();
clearRollBuff();
} }
} }
private void clearPendingActionOtherMiracleSelectResult() { private void clearPendingActionOtherMiracleSelectResult() {
if ((((bitField0_ & 0x0000000b)) != 0)) { if ((((bitField0_ & 0x0000000b)) != 0)) {
clearRollBuff();
clearBonusSelectResult();
clearBuffSelectResult(); clearBuffSelectResult();
clearBonusSelectResult();
clearRollBuff();
} }
} }
private void clearPendingActionOtherBuffSelectResult() { private void clearPendingActionOtherRollBuff() {
if ((((bitField0_ & 0x00000007)) != 0)) { if ((((bitField0_ & 0x00000007)) != 0)) {
clearRollBuff(); clearBuffSelectResult();
clearBonusSelectResult(); clearBonusSelectResult();
clearMiracleSelectResult(); clearMiracleSelectResult();
} }
} }
/** /**
* <code>optional .RogueBuffRollInfo roll_buff = 308;</code> * <code>optional .RogueCommonBuffSelectResult buff_select_result = 744;</code>
* @return whether the rollBuff field is set * @return whether the buffSelectResult field is set
*/ */
public boolean hasRollBuff() { public boolean hasBuffSelectResult() {
return (bitField0_ & 0x00000001) != 0; return (bitField0_ & 0x00000001) != 0;
} }
/** /**
* <code>optional .RogueBuffRollInfo roll_buff = 308;</code> * <code>optional .RogueCommonBuffSelectResult buff_select_result = 744;</code>
* @return this * @return this
*/ */
public HandleRogueCommonPendingActionCsReq clearRollBuff() { public HandleRogueCommonPendingActionCsReq clearBuffSelectResult() {
bitField0_ &= ~0x00000001; bitField0_ &= ~0x00000001;
rollBuff.clear(); buffSelectResult.clear();
return this; return this;
} }
/** /**
* <code>optional .RogueBuffRollInfo roll_buff = 308;</code> * <code>optional .RogueCommonBuffSelectResult buff_select_result = 744;</code>
* *
* This method returns the internal storage object without modifying any has state. * This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only. * The returned object should not be modified and be treated as read-only.
* *
* Use {@link #getMutableRollBuff()} if you want to modify it. * Use {@link #getMutableBuffSelectResult()} if you want to modify it.
* *
* @return internal storage object for reading * @return internal storage object for reading
*/ */
public RogueBuffRollInfoOuterClass.RogueBuffRollInfo getRollBuff() { public RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult getBuffSelectResult() {
return rollBuff; return buffSelectResult;
} }
/** /**
* <code>optional .RogueBuffRollInfo roll_buff = 308;</code> * <code>optional .RogueCommonBuffSelectResult buff_select_result = 744;</code>
* *
* This method returns the internal storage object and sets the corresponding * This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its * has state. The returned object will become part of this message and its
@@ -135,27 +135,28 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
* *
* @return internal storage object for modifications * @return internal storage object for modifications
*/ */
public RogueBuffRollInfoOuterClass.RogueBuffRollInfo getMutableRollBuff() { public RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult getMutableBuffSelectResult(
clearPendingActionOtherRollBuff(); ) {
clearPendingActionOtherBuffSelectResult();
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
return rollBuff; return buffSelectResult;
} }
/** /**
* <code>optional .RogueBuffRollInfo roll_buff = 308;</code> * <code>optional .RogueCommonBuffSelectResult buff_select_result = 744;</code>
* @param value the rollBuff to set * @param value the buffSelectResult to set
* @return this * @return this
*/ */
public HandleRogueCommonPendingActionCsReq setRollBuff( public HandleRogueCommonPendingActionCsReq setBuffSelectResult(
final RogueBuffRollInfoOuterClass.RogueBuffRollInfo value) { final RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult value) {
clearPendingActionOtherRollBuff(); clearPendingActionOtherBuffSelectResult();
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
rollBuff.copyFrom(value); buffSelectResult.copyFrom(value);
return this; return this;
} }
/** /**
* <code>optional .RogueBonusSelectResult bonus_select_result = 1156;</code> * <code>optional .RogueBonusSelectResult bonus_select_result = 1047;</code>
* @return whether the bonusSelectResult field is set * @return whether the bonusSelectResult field is set
*/ */
public boolean hasBonusSelectResult() { public boolean hasBonusSelectResult() {
@@ -163,7 +164,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
} }
/** /**
* <code>optional .RogueBonusSelectResult bonus_select_result = 1156;</code> * <code>optional .RogueBonusSelectResult bonus_select_result = 1047;</code>
* @return this * @return this
*/ */
public HandleRogueCommonPendingActionCsReq clearBonusSelectResult() { public HandleRogueCommonPendingActionCsReq clearBonusSelectResult() {
@@ -173,7 +174,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
} }
/** /**
* <code>optional .RogueBonusSelectResult bonus_select_result = 1156;</code> * <code>optional .RogueBonusSelectResult bonus_select_result = 1047;</code>
* *
* This method returns the internal storage object without modifying any has state. * This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only. * The returned object should not be modified and be treated as read-only.
@@ -187,7 +188,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
} }
/** /**
* <code>optional .RogueBonusSelectResult bonus_select_result = 1156;</code> * <code>optional .RogueBonusSelectResult bonus_select_result = 1047;</code>
* *
* This method returns the internal storage object and sets the corresponding * This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its * has state. The returned object will become part of this message and its
@@ -202,7 +203,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
} }
/** /**
* <code>optional .RogueBonusSelectResult bonus_select_result = 1156;</code> * <code>optional .RogueBonusSelectResult bonus_select_result = 1047;</code>
* @param value the bonusSelectResult to set * @param value the bonusSelectResult to set
* @return this * @return this
*/ */
@@ -215,7 +216,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
} }
/** /**
* <code>optional .RogueMiracleSelectResult miracle_select_result = 1209;</code> * <code>optional .RogueMiracleSelectResult miracle_select_result = 1741;</code>
* @return whether the miracleSelectResult field is set * @return whether the miracleSelectResult field is set
*/ */
public boolean hasMiracleSelectResult() { public boolean hasMiracleSelectResult() {
@@ -223,7 +224,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
} }
/** /**
* <code>optional .RogueMiracleSelectResult miracle_select_result = 1209;</code> * <code>optional .RogueMiracleSelectResult miracle_select_result = 1741;</code>
* @return this * @return this
*/ */
public HandleRogueCommonPendingActionCsReq clearMiracleSelectResult() { public HandleRogueCommonPendingActionCsReq clearMiracleSelectResult() {
@@ -233,7 +234,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
} }
/** /**
* <code>optional .RogueMiracleSelectResult miracle_select_result = 1209;</code> * <code>optional .RogueMiracleSelectResult miracle_select_result = 1741;</code>
* *
* This method returns the internal storage object without modifying any has state. * This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only. * The returned object should not be modified and be treated as read-only.
@@ -247,7 +248,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
} }
/** /**
* <code>optional .RogueMiracleSelectResult miracle_select_result = 1209;</code> * <code>optional .RogueMiracleSelectResult miracle_select_result = 1741;</code>
* *
* This method returns the internal storage object and sets the corresponding * This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its * has state. The returned object will become part of this message and its
@@ -263,7 +264,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
} }
/** /**
* <code>optional .RogueMiracleSelectResult miracle_select_result = 1209;</code> * <code>optional .RogueMiracleSelectResult miracle_select_result = 1741;</code>
* @param value the miracleSelectResult to set * @param value the miracleSelectResult to set
* @return this * @return this
*/ */
@@ -276,39 +277,39 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
} }
/** /**
* <code>optional .RogueCommonBuffSelectResult buff_select_result = 1586;</code> * <code>optional .RogueBuffRollInfo roll_buff = 2038;</code>
* @return whether the buffSelectResult field is set * @return whether the rollBuff field is set
*/ */
public boolean hasBuffSelectResult() { public boolean hasRollBuff() {
return (bitField0_ & 0x00000008) != 0; return (bitField0_ & 0x00000008) != 0;
} }
/** /**
* <code>optional .RogueCommonBuffSelectResult buff_select_result = 1586;</code> * <code>optional .RogueBuffRollInfo roll_buff = 2038;</code>
* @return this * @return this
*/ */
public HandleRogueCommonPendingActionCsReq clearBuffSelectResult() { public HandleRogueCommonPendingActionCsReq clearRollBuff() {
bitField0_ &= ~0x00000008; bitField0_ &= ~0x00000008;
buffSelectResult.clear(); rollBuff.clear();
return this; return this;
} }
/** /**
* <code>optional .RogueCommonBuffSelectResult buff_select_result = 1586;</code> * <code>optional .RogueBuffRollInfo roll_buff = 2038;</code>
* *
* This method returns the internal storage object without modifying any has state. * This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only. * The returned object should not be modified and be treated as read-only.
* *
* Use {@link #getMutableBuffSelectResult()} if you want to modify it. * Use {@link #getMutableRollBuff()} if you want to modify it.
* *
* @return internal storage object for reading * @return internal storage object for reading
*/ */
public RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult getBuffSelectResult() { public RogueBuffRollInfoOuterClass.RogueBuffRollInfo getRollBuff() {
return buffSelectResult; return rollBuff;
} }
/** /**
* <code>optional .RogueCommonBuffSelectResult buff_select_result = 1586;</code> * <code>optional .RogueBuffRollInfo roll_buff = 2038;</code>
* *
* This method returns the internal storage object and sets the corresponding * This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its * has state. The returned object will become part of this message and its
@@ -316,23 +317,22 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
* *
* @return internal storage object for modifications * @return internal storage object for modifications
*/ */
public RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult getMutableBuffSelectResult( public RogueBuffRollInfoOuterClass.RogueBuffRollInfo getMutableRollBuff() {
) { clearPendingActionOtherRollBuff();
clearPendingActionOtherBuffSelectResult();
bitField0_ |= 0x00000008; bitField0_ |= 0x00000008;
return buffSelectResult; return rollBuff;
} }
/** /**
* <code>optional .RogueCommonBuffSelectResult buff_select_result = 1586;</code> * <code>optional .RogueBuffRollInfo roll_buff = 2038;</code>
* @param value the buffSelectResult to set * @param value the rollBuff to set
* @return this * @return this
*/ */
public HandleRogueCommonPendingActionCsReq setBuffSelectResult( public HandleRogueCommonPendingActionCsReq setRollBuff(
final RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult value) { final RogueBuffRollInfoOuterClass.RogueBuffRollInfo value) {
clearPendingActionOtherBuffSelectResult(); clearPendingActionOtherRollBuff();
bitField0_ |= 0x00000008; bitField0_ |= 0x00000008;
buffSelectResult.copyFrom(value); rollBuff.copyFrom(value);
return this; return this;
} }
@@ -342,10 +342,10 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
cachedSize = other.cachedSize; cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) { if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_; bitField0_ = other.bitField0_;
rollBuff.copyFrom(other.rollBuff); buffSelectResult.copyFrom(other.buffSelectResult);
bonusSelectResult.copyFrom(other.bonusSelectResult); bonusSelectResult.copyFrom(other.bonusSelectResult);
miracleSelectResult.copyFrom(other.miracleSelectResult); miracleSelectResult.copyFrom(other.miracleSelectResult);
buffSelectResult.copyFrom(other.buffSelectResult); rollBuff.copyFrom(other.rollBuff);
} }
return this; return this;
} }
@@ -357,8 +357,8 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
return this; return this;
} }
cachedSize = -1; cachedSize = -1;
if (other.hasRollBuff()) { if (other.hasBuffSelectResult()) {
getMutableRollBuff().mergeFrom(other.rollBuff); getMutableBuffSelectResult().mergeFrom(other.buffSelectResult);
} }
if (other.hasBonusSelectResult()) { if (other.hasBonusSelectResult()) {
getMutableBonusSelectResult().mergeFrom(other.bonusSelectResult); getMutableBonusSelectResult().mergeFrom(other.bonusSelectResult);
@@ -366,8 +366,8 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
if (other.hasMiracleSelectResult()) { if (other.hasMiracleSelectResult()) {
getMutableMiracleSelectResult().mergeFrom(other.miracleSelectResult); getMutableMiracleSelectResult().mergeFrom(other.miracleSelectResult);
} }
if (other.hasBuffSelectResult()) { if (other.hasRollBuff()) {
getMutableBuffSelectResult().mergeFrom(other.buffSelectResult); getMutableRollBuff().mergeFrom(other.rollBuff);
} }
return this; return this;
} }
@@ -379,10 +379,10 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
} }
cachedSize = -1; cachedSize = -1;
bitField0_ = 0; bitField0_ = 0;
rollBuff.clear(); buffSelectResult.clear();
bonusSelectResult.clear(); bonusSelectResult.clear();
miracleSelectResult.clear(); miracleSelectResult.clear();
buffSelectResult.clear(); rollBuff.clear();
return this; return this;
} }
@@ -393,10 +393,10 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
} }
cachedSize = -1; cachedSize = -1;
bitField0_ = 0; bitField0_ = 0;
rollBuff.clearQuick(); buffSelectResult.clearQuick();
bonusSelectResult.clearQuick(); bonusSelectResult.clearQuick();
miracleSelectResult.clearQuick(); miracleSelectResult.clearQuick();
buffSelectResult.clearQuick(); rollBuff.clearQuick();
return this; return this;
} }
@@ -410,29 +410,29 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
} }
HandleRogueCommonPendingActionCsReq other = (HandleRogueCommonPendingActionCsReq) o; HandleRogueCommonPendingActionCsReq other = (HandleRogueCommonPendingActionCsReq) o;
return bitField0_ == other.bitField0_ return bitField0_ == other.bitField0_
&& (!hasRollBuff() || rollBuff.equals(other.rollBuff)) && (!hasBuffSelectResult() || buffSelectResult.equals(other.buffSelectResult))
&& (!hasBonusSelectResult() || bonusSelectResult.equals(other.bonusSelectResult)) && (!hasBonusSelectResult() || bonusSelectResult.equals(other.bonusSelectResult))
&& (!hasMiracleSelectResult() || miracleSelectResult.equals(other.miracleSelectResult)) && (!hasMiracleSelectResult() || miracleSelectResult.equals(other.miracleSelectResult))
&& (!hasBuffSelectResult() || buffSelectResult.equals(other.buffSelectResult)); && (!hasRollBuff() || rollBuff.equals(other.rollBuff));
} }
@Override @Override
public void writeTo(final ProtoSink output) throws IOException { public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) { if ((bitField0_ & 0x00000001) != 0) {
output.writeRawLittleEndian16((short) 5026); output.writeRawLittleEndian16((short) 11970);
output.writeMessageNoTag(rollBuff); output.writeMessageNoTag(buffSelectResult);
} }
if ((bitField0_ & 0x00000002) != 0) { if ((bitField0_ & 0x00000002) != 0) {
output.writeRawLittleEndian16((short) 18594); output.writeRawLittleEndian16((short) 16826);
output.writeMessageNoTag(bonusSelectResult); output.writeMessageNoTag(bonusSelectResult);
} }
if ((bitField0_ & 0x00000004) != 0) { if ((bitField0_ & 0x00000004) != 0) {
output.writeRawLittleEndian16((short) 19402); output.writeRawLittleEndian16((short) 27882);
output.writeMessageNoTag(miracleSelectResult); output.writeMessageNoTag(miracleSelectResult);
} }
if ((bitField0_ & 0x00000008) != 0) { if ((bitField0_ & 0x00000008) != 0) {
output.writeRawLittleEndian16((short) 25490); output.writeRawLittleEndian16((short) 32690);
output.writeMessageNoTag(buffSelectResult); output.writeMessageNoTag(rollBuff);
} }
} }
@@ -440,7 +440,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
protected int computeSerializedSize() { protected int computeSerializedSize() {
int size = 0; int size = 0;
if ((bitField0_ & 0x00000001) != 0) { if ((bitField0_ & 0x00000001) != 0) {
size += 2 + ProtoSink.computeMessageSizeNoTag(rollBuff); size += 2 + ProtoSink.computeMessageSizeNoTag(buffSelectResult);
} }
if ((bitField0_ & 0x00000002) != 0) { if ((bitField0_ & 0x00000002) != 0) {
size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelectResult); size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelectResult);
@@ -449,7 +449,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelectResult); size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelectResult);
} }
if ((bitField0_ & 0x00000008) != 0) { if ((bitField0_ & 0x00000008) != 0) {
size += 2 + ProtoSink.computeMessageSizeNoTag(buffSelectResult); size += 2 + ProtoSink.computeMessageSizeNoTag(rollBuff);
} }
return size; return size;
} }
@@ -462,40 +462,40 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
int tag = input.readTag(); int tag = input.readTag();
while (true) { while (true) {
switch (tag) { switch (tag) {
case 2466: { case 5954: {
// rollBuff // buffSelectResult
clearPendingActionOtherRollBuff(); clearPendingActionOtherBuffSelectResult();
input.readMessage(rollBuff); input.readMessage(buffSelectResult);
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
tag = input.readTag(); tag = input.readTag();
if (tag != 9250) { if (tag != 8378) {
break; break;
} }
} }
case 9250: { case 8378: {
// bonusSelectResult // bonusSelectResult
clearPendingActionOtherBonusSelectResult(); clearPendingActionOtherBonusSelectResult();
input.readMessage(bonusSelectResult); input.readMessage(bonusSelectResult);
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
tag = input.readTag(); tag = input.readTag();
if (tag != 9674) { if (tag != 13930) {
break; break;
} }
} }
case 9674: { case 13930: {
// miracleSelectResult // miracleSelectResult
clearPendingActionOtherMiracleSelectResult(); clearPendingActionOtherMiracleSelectResult();
input.readMessage(miracleSelectResult); input.readMessage(miracleSelectResult);
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
tag = input.readTag(); tag = input.readTag();
if (tag != 12690) { if (tag != 16306) {
break; break;
} }
} }
case 12690: { case 16306: {
// buffSelectResult // rollBuff
clearPendingActionOtherBuffSelectResult(); clearPendingActionOtherRollBuff();
input.readMessage(buffSelectResult); input.readMessage(rollBuff);
bitField0_ |= 0x00000008; bitField0_ |= 0x00000008;
tag = input.readTag(); tag = input.readTag();
if (tag != 0) { if (tag != 0) {
@@ -520,7 +520,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
public void writeTo(final JsonSink output) throws IOException { public void writeTo(final JsonSink output) throws IOException {
output.beginObject(); output.beginObject();
if ((bitField0_ & 0x00000001) != 0) { if ((bitField0_ & 0x00000001) != 0) {
output.writeMessage(FieldNames.rollBuff, rollBuff); output.writeMessage(FieldNames.buffSelectResult, buffSelectResult);
} }
if ((bitField0_ & 0x00000002) != 0) { if ((bitField0_ & 0x00000002) != 0) {
output.writeMessage(FieldNames.bonusSelectResult, bonusSelectResult); output.writeMessage(FieldNames.bonusSelectResult, bonusSelectResult);
@@ -529,7 +529,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
output.writeMessage(FieldNames.miracleSelectResult, miracleSelectResult); output.writeMessage(FieldNames.miracleSelectResult, miracleSelectResult);
} }
if ((bitField0_ & 0x00000008) != 0) { if ((bitField0_ & 0x00000008) != 0) {
output.writeMessage(FieldNames.buffSelectResult, buffSelectResult); output.writeMessage(FieldNames.rollBuff, rollBuff);
} }
output.endObject(); output.endObject();
} }
@@ -542,12 +542,12 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
} }
while (!input.isAtEnd()) { while (!input.isAtEnd()) {
switch (input.readFieldHash()) { switch (input.readFieldHash()) {
case -260653456: case -224789460:
case 535908053: { case -839396908: {
if (input.isAtField(FieldNames.rollBuff)) { if (input.isAtField(FieldNames.buffSelectResult)) {
if (!input.trySkipNullValue()) { if (!input.trySkipNullValue()) {
clearPendingActionOtherRollBuff(); clearPendingActionOtherBuffSelectResult();
input.readMessage(rollBuff); input.readMessage(buffSelectResult);
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
} }
} else { } else {
@@ -581,12 +581,12 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
} }
break; break;
} }
case -224789460: case -260653456:
case -839396908: { case 535908053: {
if (input.isAtField(FieldNames.buffSelectResult)) { if (input.isAtField(FieldNames.rollBuff)) {
if (!input.trySkipNullValue()) { if (!input.trySkipNullValue()) {
clearPendingActionOtherBuffSelectResult(); clearPendingActionOtherRollBuff();
input.readMessage(buffSelectResult); input.readMessage(rollBuff);
bitField0_ |= 0x00000008; bitField0_ |= 0x00000008;
} }
} else { } else {
@@ -649,13 +649,13 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass {
* Contains name constants used for serializing JSON * Contains name constants used for serializing JSON
*/ */
static class FieldNames { static class FieldNames {
static final FieldName rollBuff = FieldName.forField("rollBuff", "roll_buff"); static final FieldName buffSelectResult = FieldName.forField("buffSelectResult", "buff_select_result");
static final FieldName bonusSelectResult = FieldName.forField("bonusSelectResult", "bonus_select_result"); static final FieldName bonusSelectResult = FieldName.forField("bonusSelectResult", "bonus_select_result");
static final FieldName miracleSelectResult = FieldName.forField("miracleSelectResult", "miracle_select_result"); static final FieldName miracleSelectResult = FieldName.forField("miracleSelectResult", "miracle_select_result");
static final FieldName buffSelectResult = FieldName.forField("buffSelectResult", "buff_select_result"); static final FieldName rollBuff = FieldName.forField("rollBuff", "roll_buff");
} }
} }
} }

423
src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionScRspOuterClass.java
View File

@@ -19,37 +19,32 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
private static final long serialVersionUID = 0L; private static final long serialVersionUID = 0L;
/** /**
* <code>optional uint32 times = 7;</code> * <code>optional uint32 action_unique_id = 1;</code>
*/ */
private int times; private int actionUniqueId;
/** /**
* <code>optional uint32 retcode = 9;</code> * <code>optional uint32 retcode = 15;</code>
*/ */
private int retcode; private int retcode;
/** /**
* <code>optional uint32 times2 = 14;</code> * <code>optional .RogueBonusSelect bonus_select = 59;</code>
*/
private int times2;
/**
* <code>optional .RogueRerollBuff rogue_reroll_buff = 126;</code>
*/
private final RogueRerollBuffOuterClass.RogueRerollBuff rogueRerollBuff = RogueRerollBuffOuterClass.RogueRerollBuff.newInstance();
/**
* <code>optional .RogueBonusSelect bonus_select = 392;</code>
*/ */
private final RogueBonusSelectOuterClass.RogueBonusSelect bonusSelect = RogueBonusSelectOuterClass.RogueBonusSelect.newInstance(); private final RogueBonusSelectOuterClass.RogueBonusSelect bonusSelect = RogueBonusSelectOuterClass.RogueBonusSelect.newInstance();
/** /**
* <code>optional .RogueBuffSelect rogue_buff_select = 1087;</code> * <code>optional .RogueRerollBuff rogue_reroll_buff = 523;</code>
*/
private final RogueRerollBuffOuterClass.RogueRerollBuff rogueRerollBuff = RogueRerollBuffOuterClass.RogueRerollBuff.newInstance();
/**
* <code>optional .RogueBuffSelect rogue_buff_select = 688;</code>
*/ */
private final RogueBuffSelectOuterClass.RogueBuffSelect rogueBuffSelect = RogueBuffSelectOuterClass.RogueBuffSelect.newInstance(); private final RogueBuffSelectOuterClass.RogueBuffSelect rogueBuffSelect = RogueBuffSelectOuterClass.RogueBuffSelect.newInstance();
/** /**
* <code>optional .RogueMiracleSelect miracle_select = 2029;</code> * <code>optional .RogueMiracleSelect miracle_select = 741;</code>
*/ */
private final RogueMiracleSelectOuterClass.RogueMiracleSelect miracleSelect = RogueMiracleSelectOuterClass.RogueMiracleSelect.newInstance(); private final RogueMiracleSelectOuterClass.RogueMiracleSelect miracleSelect = RogueMiracleSelectOuterClass.RogueMiracleSelect.newInstance();
@@ -64,44 +59,44 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
} }
/** /**
* <code>optional uint32 times = 7;</code> * <code>optional uint32 action_unique_id = 1;</code>
* @return whether the times field is set * @return whether the actionUniqueId field is set
*/ */
public boolean hasTimes() { public boolean hasActionUniqueId() {
return (bitField0_ & 0x00000001) != 0; return (bitField0_ & 0x00000001) != 0;
} }
/** /**
* <code>optional uint32 times = 7;</code> * <code>optional uint32 action_unique_id = 1;</code>
* @return this * @return this
*/ */
public HandleRogueCommonPendingActionScRsp clearTimes() { public HandleRogueCommonPendingActionScRsp clearActionUniqueId() {
bitField0_ &= ~0x00000001; bitField0_ &= ~0x00000001;
times = 0; actionUniqueId = 0;
return this; return this;
} }
/** /**
* <code>optional uint32 times = 7;</code> * <code>optional uint32 action_unique_id = 1;</code>
* @return the times * @return the actionUniqueId
*/ */
public int getTimes() { public int getActionUniqueId() {
return times; return actionUniqueId;
} }
/** /**
* <code>optional uint32 times = 7;</code> * <code>optional uint32 action_unique_id = 1;</code>
* @param value the times to set * @param value the actionUniqueId to set
* @return this * @return this
*/ */
public HandleRogueCommonPendingActionScRsp setTimes(final int value) { public HandleRogueCommonPendingActionScRsp setActionUniqueId(final int value) {
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
times = value; actionUniqueId = value;
return this; return this;
} }
/** /**
* <code>optional uint32 retcode = 9;</code> * <code>optional uint32 retcode = 15;</code>
* @return whether the retcode field is set * @return whether the retcode field is set
*/ */
public boolean hasRetcode() { public boolean hasRetcode() {
@@ -109,7 +104,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
} }
/** /**
* <code>optional uint32 retcode = 9;</code> * <code>optional uint32 retcode = 15;</code>
* @return this * @return this
*/ */
public HandleRogueCommonPendingActionScRsp clearRetcode() { public HandleRogueCommonPendingActionScRsp clearRetcode() {
@@ -119,7 +114,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
} }
/** /**
* <code>optional uint32 retcode = 9;</code> * <code>optional uint32 retcode = 15;</code>
* @return the retcode * @return the retcode
*/ */
public int getRetcode() { public int getRetcode() {
@@ -127,7 +122,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
} }
/** /**
* <code>optional uint32 retcode = 9;</code> * <code>optional uint32 retcode = 15;</code>
* @param value the retcode to set * @param value the retcode to set
* @return this * @return this
*/ */
@@ -138,120 +133,25 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
} }
/** /**
* <code>optional uint32 times2 = 14;</code> * <code>optional .RogueBonusSelect bonus_select = 59;</code>
* @return whether the times2 field is set * @return whether the bonusSelect field is set
*/ */
public boolean hasTimes2() { public boolean hasBonusSelect() {
return (bitField0_ & 0x00000004) != 0; return (bitField0_ & 0x00000004) != 0;
} }
/** /**
* <code>optional uint32 times2 = 14;</code> * <code>optional .RogueBonusSelect bonus_select = 59;</code>
* @return this
*/
public HandleRogueCommonPendingActionScRsp clearTimes2() {
bitField0_ &= ~0x00000004;
times2 = 0;
return this;
}
/**
* <code>optional uint32 times2 = 14;</code>
* @return the times2
*/
public int getTimes2() {
return times2;
}
/**
* <code>optional uint32 times2 = 14;</code>
* @param value the times2 to set
* @return this
*/
public HandleRogueCommonPendingActionScRsp setTimes2(final int value) {
bitField0_ |= 0x00000004;
times2 = value;
return this;
}
/**
* <code>optional .RogueRerollBuff rogue_reroll_buff = 126;</code>
* @return whether the rogueRerollBuff field is set
*/
public boolean hasRogueRerollBuff() {
return (bitField0_ & 0x00000008) != 0;
}
/**
* <code>optional .RogueRerollBuff rogue_reroll_buff = 126;</code>
* @return this
*/
public HandleRogueCommonPendingActionScRsp clearRogueRerollBuff() {
bitField0_ &= ~0x00000008;
rogueRerollBuff.clear();
return this;
}
/**
* <code>optional .RogueRerollBuff rogue_reroll_buff = 126;</code>
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
*
* Use {@link #getMutableRogueRerollBuff()} if you want to modify it.
*
* @return internal storage object for reading
*/
public RogueRerollBuffOuterClass.RogueRerollBuff getRogueRerollBuff() {
return rogueRerollBuff;
}
/**
* <code>optional .RogueRerollBuff rogue_reroll_buff = 126;</code>
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
* contents may be modified as long as the has state is not cleared.
*
* @return internal storage object for modifications
*/
public RogueRerollBuffOuterClass.RogueRerollBuff getMutableRogueRerollBuff() {
bitField0_ |= 0x00000008;
return rogueRerollBuff;
}
/**
* <code>optional .RogueRerollBuff rogue_reroll_buff = 126;</code>
* @param value the rogueRerollBuff to set
* @return this
*/
public HandleRogueCommonPendingActionScRsp setRogueRerollBuff(
final RogueRerollBuffOuterClass.RogueRerollBuff value) {
bitField0_ |= 0x00000008;
rogueRerollBuff.copyFrom(value);
return this;
}
/**
* <code>optional .RogueBonusSelect bonus_select = 392;</code>
* @return whether the bonusSelect field is set
*/
public boolean hasBonusSelect() {
return (bitField0_ & 0x00000010) != 0;
}
/**
* <code>optional .RogueBonusSelect bonus_select = 392;</code>
* @return this * @return this
*/ */
public HandleRogueCommonPendingActionScRsp clearBonusSelect() { public HandleRogueCommonPendingActionScRsp clearBonusSelect() {
bitField0_ &= ~0x00000010; bitField0_ &= ~0x00000004;
bonusSelect.clear(); bonusSelect.clear();
return this; return this;
} }
/** /**
* <code>optional .RogueBonusSelect bonus_select = 392;</code> * <code>optional .RogueBonusSelect bonus_select = 59;</code>
* *
* This method returns the internal storage object without modifying any has state. * This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only. * The returned object should not be modified and be treated as read-only.
@@ -265,7 +165,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
} }
/** /**
* <code>optional .RogueBonusSelect bonus_select = 392;</code> * <code>optional .RogueBonusSelect bonus_select = 59;</code>
* *
* This method returns the internal storage object and sets the corresponding * This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its * has state. The returned object will become part of this message and its
@@ -274,42 +174,100 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
* @return internal storage object for modifications * @return internal storage object for modifications
*/ */
public RogueBonusSelectOuterClass.RogueBonusSelect getMutableBonusSelect() { public RogueBonusSelectOuterClass.RogueBonusSelect getMutableBonusSelect() {
bitField0_ |= 0x00000010; bitField0_ |= 0x00000004;
return bonusSelect; return bonusSelect;
} }
/** /**
* <code>optional .RogueBonusSelect bonus_select = 392;</code> * <code>optional .RogueBonusSelect bonus_select = 59;</code>
* @param value the bonusSelect to set * @param value the bonusSelect to set
* @return this * @return this
*/ */
public HandleRogueCommonPendingActionScRsp setBonusSelect( public HandleRogueCommonPendingActionScRsp setBonusSelect(
final RogueBonusSelectOuterClass.RogueBonusSelect value) { final RogueBonusSelectOuterClass.RogueBonusSelect value) {
bitField0_ |= 0x00000010; bitField0_ |= 0x00000004;
bonusSelect.copyFrom(value); bonusSelect.copyFrom(value);
return this; return this;
} }
/** /**
* <code>optional .RogueBuffSelect rogue_buff_select = 1087;</code> * <code>optional .RogueRerollBuff rogue_reroll_buff = 523;</code>
* @return whether the rogueBuffSelect field is set * @return whether the rogueRerollBuff field is set
*/ */
public boolean hasRogueBuffSelect() { public boolean hasRogueRerollBuff() {
return (bitField0_ & 0x00000020) != 0; return (bitField0_ & 0x00000008) != 0;
} }
/** /**
* <code>optional .RogueBuffSelect rogue_buff_select = 1087;</code> * <code>optional .RogueRerollBuff rogue_reroll_buff = 523;</code>
* @return this
*/
public HandleRogueCommonPendingActionScRsp clearRogueRerollBuff() {
bitField0_ &= ~0x00000008;
rogueRerollBuff.clear();
return this;
}
/**
* <code>optional .RogueRerollBuff rogue_reroll_buff = 523;</code>
*
* This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only.
*
* Use {@link #getMutableRogueRerollBuff()} if you want to modify it.
*
* @return internal storage object for reading
*/
public RogueRerollBuffOuterClass.RogueRerollBuff getRogueRerollBuff() {
return rogueRerollBuff;
}
/**
* <code>optional .RogueRerollBuff rogue_reroll_buff = 523;</code>
*
* This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its
* contents may be modified as long as the has state is not cleared.
*
* @return internal storage object for modifications
*/
public RogueRerollBuffOuterClass.RogueRerollBuff getMutableRogueRerollBuff() {
bitField0_ |= 0x00000008;
return rogueRerollBuff;
}
/**
* <code>optional .RogueRerollBuff rogue_reroll_buff = 523;</code>
* @param value the rogueRerollBuff to set
* @return this
*/
public HandleRogueCommonPendingActionScRsp setRogueRerollBuff(
final RogueRerollBuffOuterClass.RogueRerollBuff value) {
bitField0_ |= 0x00000008;
rogueRerollBuff.copyFrom(value);
return this;
}
/**
* <code>optional .RogueBuffSelect rogue_buff_select = 688;</code>
* @return whether the rogueBuffSelect field is set
*/
public boolean hasRogueBuffSelect() {
return (bitField0_ & 0x00000010) != 0;
}
/**
* <code>optional .RogueBuffSelect rogue_buff_select = 688;</code>
* @return this * @return this
*/ */
public HandleRogueCommonPendingActionScRsp clearRogueBuffSelect() { public HandleRogueCommonPendingActionScRsp clearRogueBuffSelect() {
bitField0_ &= ~0x00000020; bitField0_ &= ~0x00000010;
rogueBuffSelect.clear(); rogueBuffSelect.clear();
return this; return this;
} }
/** /**
* <code>optional .RogueBuffSelect rogue_buff_select = 1087;</code> * <code>optional .RogueBuffSelect rogue_buff_select = 688;</code>
* *
* This method returns the internal storage object without modifying any has state. * This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only. * The returned object should not be modified and be treated as read-only.
@@ -323,7 +281,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
} }
/** /**
* <code>optional .RogueBuffSelect rogue_buff_select = 1087;</code> * <code>optional .RogueBuffSelect rogue_buff_select = 688;</code>
* *
* This method returns the internal storage object and sets the corresponding * This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its * has state. The returned object will become part of this message and its
@@ -332,42 +290,42 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
* @return internal storage object for modifications * @return internal storage object for modifications
*/ */
public RogueBuffSelectOuterClass.RogueBuffSelect getMutableRogueBuffSelect() { public RogueBuffSelectOuterClass.RogueBuffSelect getMutableRogueBuffSelect() {
bitField0_ |= 0x00000020; bitField0_ |= 0x00000010;
return rogueBuffSelect; return rogueBuffSelect;
} }
/** /**
* <code>optional .RogueBuffSelect rogue_buff_select = 1087;</code> * <code>optional .RogueBuffSelect rogue_buff_select = 688;</code>
* @param value the rogueBuffSelect to set * @param value the rogueBuffSelect to set
* @return this * @return this
*/ */
public HandleRogueCommonPendingActionScRsp setRogueBuffSelect( public HandleRogueCommonPendingActionScRsp setRogueBuffSelect(
final RogueBuffSelectOuterClass.RogueBuffSelect value) { final RogueBuffSelectOuterClass.RogueBuffSelect value) {
bitField0_ |= 0x00000020; bitField0_ |= 0x00000010;
rogueBuffSelect.copyFrom(value); rogueBuffSelect.copyFrom(value);
return this; return this;
} }
/** /**
* <code>optional .RogueMiracleSelect miracle_select = 2029;</code> * <code>optional .RogueMiracleSelect miracle_select = 741;</code>
* @return whether the miracleSelect field is set * @return whether the miracleSelect field is set
*/ */
public boolean hasMiracleSelect() { public boolean hasMiracleSelect() {
return (bitField0_ & 0x00000040) != 0; return (bitField0_ & 0x00000020) != 0;
} }
/** /**
* <code>optional .RogueMiracleSelect miracle_select = 2029;</code> * <code>optional .RogueMiracleSelect miracle_select = 741;</code>
* @return this * @return this
*/ */
public HandleRogueCommonPendingActionScRsp clearMiracleSelect() { public HandleRogueCommonPendingActionScRsp clearMiracleSelect() {
bitField0_ &= ~0x00000040; bitField0_ &= ~0x00000020;
miracleSelect.clear(); miracleSelect.clear();
return this; return this;
} }
/** /**
* <code>optional .RogueMiracleSelect miracle_select = 2029;</code> * <code>optional .RogueMiracleSelect miracle_select = 741;</code>
* *
* This method returns the internal storage object without modifying any has state. * This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only. * The returned object should not be modified and be treated as read-only.
@@ -381,7 +339,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
} }
/** /**
* <code>optional .RogueMiracleSelect miracle_select = 2029;</code> * <code>optional .RogueMiracleSelect miracle_select = 741;</code>
* *
* This method returns the internal storage object and sets the corresponding * This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its * has state. The returned object will become part of this message and its
@@ -390,18 +348,18 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
* @return internal storage object for modifications * @return internal storage object for modifications
*/ */
public RogueMiracleSelectOuterClass.RogueMiracleSelect getMutableMiracleSelect() { public RogueMiracleSelectOuterClass.RogueMiracleSelect getMutableMiracleSelect() {
bitField0_ |= 0x00000040; bitField0_ |= 0x00000020;
return miracleSelect; return miracleSelect;
} }
/** /**
* <code>optional .RogueMiracleSelect miracle_select = 2029;</code> * <code>optional .RogueMiracleSelect miracle_select = 741;</code>
* @param value the miracleSelect to set * @param value the miracleSelect to set
* @return this * @return this
*/ */
public HandleRogueCommonPendingActionScRsp setMiracleSelect( public HandleRogueCommonPendingActionScRsp setMiracleSelect(
final RogueMiracleSelectOuterClass.RogueMiracleSelect value) { final RogueMiracleSelectOuterClass.RogueMiracleSelect value) {
bitField0_ |= 0x00000040; bitField0_ |= 0x00000020;
miracleSelect.copyFrom(value); miracleSelect.copyFrom(value);
return this; return this;
} }
@@ -412,11 +370,10 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
cachedSize = other.cachedSize; cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) { if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_; bitField0_ = other.bitField0_;
times = other.times; actionUniqueId = other.actionUniqueId;
retcode = other.retcode; retcode = other.retcode;
times2 = other.times2;
rogueRerollBuff.copyFrom(other.rogueRerollBuff);
bonusSelect.copyFrom(other.bonusSelect); bonusSelect.copyFrom(other.bonusSelect);
rogueRerollBuff.copyFrom(other.rogueRerollBuff);
rogueBuffSelect.copyFrom(other.rogueBuffSelect); rogueBuffSelect.copyFrom(other.rogueBuffSelect);
miracleSelect.copyFrom(other.miracleSelect); miracleSelect.copyFrom(other.miracleSelect);
} }
@@ -430,21 +387,18 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
return this; return this;
} }
cachedSize = -1; cachedSize = -1;
if (other.hasTimes()) { if (other.hasActionUniqueId()) {
setTimes(other.times); setActionUniqueId(other.actionUniqueId);
} }
if (other.hasRetcode()) { if (other.hasRetcode()) {
setRetcode(other.retcode); setRetcode(other.retcode);
} }
if (other.hasTimes2()) { if (other.hasBonusSelect()) {
setTimes2(other.times2); getMutableBonusSelect().mergeFrom(other.bonusSelect);
} }
if (other.hasRogueRerollBuff()) { if (other.hasRogueRerollBuff()) {
getMutableRogueRerollBuff().mergeFrom(other.rogueRerollBuff); getMutableRogueRerollBuff().mergeFrom(other.rogueRerollBuff);
} }
if (other.hasBonusSelect()) {
getMutableBonusSelect().mergeFrom(other.bonusSelect);
}
if (other.hasRogueBuffSelect()) { if (other.hasRogueBuffSelect()) {
getMutableRogueBuffSelect().mergeFrom(other.rogueBuffSelect); getMutableRogueBuffSelect().mergeFrom(other.rogueBuffSelect);
} }
@@ -461,11 +415,10 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
} }
cachedSize = -1; cachedSize = -1;
bitField0_ = 0; bitField0_ = 0;
times = 0; actionUniqueId = 0;
retcode = 0; retcode = 0;
times2 = 0;
rogueRerollBuff.clear();
bonusSelect.clear(); bonusSelect.clear();
rogueRerollBuff.clear();
rogueBuffSelect.clear(); rogueBuffSelect.clear();
miracleSelect.clear(); miracleSelect.clear();
return this; return this;
@@ -478,8 +431,8 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
} }
cachedSize = -1; cachedSize = -1;
bitField0_ = 0; bitField0_ = 0;
rogueRerollBuff.clearQuick();
bonusSelect.clearQuick(); bonusSelect.clearQuick();
rogueRerollBuff.clearQuick();
rogueBuffSelect.clearQuick(); rogueBuffSelect.clearQuick();
miracleSelect.clearQuick(); miracleSelect.clearQuick();
return this; return this;
@@ -495,11 +448,10 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
} }
HandleRogueCommonPendingActionScRsp other = (HandleRogueCommonPendingActionScRsp) o; HandleRogueCommonPendingActionScRsp other = (HandleRogueCommonPendingActionScRsp) o;
return bitField0_ == other.bitField0_ return bitField0_ == other.bitField0_
&& (!hasTimes() || times == other.times) && (!hasActionUniqueId() || actionUniqueId == other.actionUniqueId)
&& (!hasRetcode() || retcode == other.retcode) && (!hasRetcode() || retcode == other.retcode)
&& (!hasTimes2() || times2 == other.times2)
&& (!hasRogueRerollBuff() || rogueRerollBuff.equals(other.rogueRerollBuff))
&& (!hasBonusSelect() || bonusSelect.equals(other.bonusSelect)) && (!hasBonusSelect() || bonusSelect.equals(other.bonusSelect))
&& (!hasRogueRerollBuff() || rogueRerollBuff.equals(other.rogueRerollBuff))
&& (!hasRogueBuffSelect() || rogueBuffSelect.equals(other.rogueBuffSelect)) && (!hasRogueBuffSelect() || rogueBuffSelect.equals(other.rogueBuffSelect))
&& (!hasMiracleSelect() || miracleSelect.equals(other.miracleSelect)); && (!hasMiracleSelect() || miracleSelect.equals(other.miracleSelect));
} }
@@ -507,31 +459,27 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
@Override @Override
public void writeTo(final ProtoSink output) throws IOException { public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) { if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 56); output.writeRawByte((byte) 8);
output.writeUInt32NoTag(times); output.writeUInt32NoTag(actionUniqueId);
} }
if ((bitField0_ & 0x00000002) != 0) { if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 72); output.writeRawByte((byte) 120);
output.writeUInt32NoTag(retcode); output.writeUInt32NoTag(retcode);
} }
if ((bitField0_ & 0x00000004) != 0) { if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 112); output.writeRawLittleEndian16((short) 986);
output.writeUInt32NoTag(times2); output.writeMessageNoTag(bonusSelect);
} }
if ((bitField0_ & 0x00000008) != 0) { if ((bitField0_ & 0x00000008) != 0) {
output.writeRawLittleEndian16((short) 2034); output.writeRawLittleEndian16((short) 8410);
output.writeMessageNoTag(rogueRerollBuff); output.writeMessageNoTag(rogueRerollBuff);
} }
if ((bitField0_ & 0x00000010) != 0) { if ((bitField0_ & 0x00000010) != 0) {
output.writeRawLittleEndian16((short) 6338); output.writeRawLittleEndian16((short) 11138);
output.writeMessageNoTag(bonusSelect);
}
if ((bitField0_ & 0x00000020) != 0) {
output.writeRawLittleEndian16((short) 17402);
output.writeMessageNoTag(rogueBuffSelect); output.writeMessageNoTag(rogueBuffSelect);
} }
if ((bitField0_ & 0x00000040) != 0) { if ((bitField0_ & 0x00000020) != 0) {
output.writeRawLittleEndian16((short) 32490); output.writeRawLittleEndian16((short) 11946);
output.writeMessageNoTag(miracleSelect); output.writeMessageNoTag(miracleSelect);
} }
} }
@@ -540,24 +488,21 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
protected int computeSerializedSize() { protected int computeSerializedSize() {
int size = 0; int size = 0;
if ((bitField0_ & 0x00000001) != 0) { if ((bitField0_ & 0x00000001) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(times); size += 1 + ProtoSink.computeUInt32SizeNoTag(actionUniqueId);
} }
if ((bitField0_ & 0x00000002) != 0) { if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
} }
if ((bitField0_ & 0x00000004) != 0) { if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(times2); size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelect);
} }
if ((bitField0_ & 0x00000008) != 0) { if ((bitField0_ & 0x00000008) != 0) {
size += 2 + ProtoSink.computeMessageSizeNoTag(rogueRerollBuff); size += 2 + ProtoSink.computeMessageSizeNoTag(rogueRerollBuff);
} }
if ((bitField0_ & 0x00000010) != 0) { if ((bitField0_ & 0x00000010) != 0) {
size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelect);
}
if ((bitField0_ & 0x00000020) != 0) {
size += 2 + ProtoSink.computeMessageSizeNoTag(rogueBuffSelect); size += 2 + ProtoSink.computeMessageSizeNoTag(rogueBuffSelect);
} }
if ((bitField0_ & 0x00000040) != 0) { if ((bitField0_ & 0x00000020) != 0) {
size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelect); size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelect);
} }
return size; return size;
@@ -571,64 +516,55 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
int tag = input.readTag(); int tag = input.readTag();
while (true) { while (true) {
switch (tag) { switch (tag) {
case 56: { case 8: {
// times // actionUniqueId
times = input.readUInt32(); actionUniqueId = input.readUInt32();
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
tag = input.readTag(); tag = input.readTag();
if (tag != 72) { if (tag != 120) {
break; break;
} }
} }
case 72: { case 120: {
// retcode // retcode
retcode = input.readUInt32(); retcode = input.readUInt32();
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
tag = input.readTag(); tag = input.readTag();
if (tag != 112) { if (tag != 474) {
break; break;
} }
} }
case 112: { case 474: {
// times2 // bonusSelect
times2 = input.readUInt32(); input.readMessage(bonusSelect);
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
tag = input.readTag(); tag = input.readTag();
if (tag != 1010) { if (tag != 4186) {
break; break;
} }
} }
case 1010: { case 4186: {
// rogueRerollBuff // rogueRerollBuff
input.readMessage(rogueRerollBuff); input.readMessage(rogueRerollBuff);
bitField0_ |= 0x00000008; bitField0_ |= 0x00000008;
tag = input.readTag(); tag = input.readTag();
if (tag != 3138) { if (tag != 5506) {
break; break;
} }
} }
case 3138: { case 5506: {
// bonusSelect
input.readMessage(bonusSelect);
bitField0_ |= 0x00000010;
tag = input.readTag();
if (tag != 8698) {
break;
}
}
case 8698: {
// rogueBuffSelect // rogueBuffSelect
input.readMessage(rogueBuffSelect); input.readMessage(rogueBuffSelect);
bitField0_ |= 0x00000020; bitField0_ |= 0x00000010;
tag = input.readTag(); tag = input.readTag();
if (tag != 16234) { if (tag != 5930) {
break; break;
} }
} }
case 16234: { case 5930: {
// miracleSelect // miracleSelect
input.readMessage(miracleSelect); input.readMessage(miracleSelect);
bitField0_ |= 0x00000040; bitField0_ |= 0x00000020;
tag = input.readTag(); tag = input.readTag();
if (tag != 0) { if (tag != 0) {
break; break;
@@ -652,24 +588,21 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
public void writeTo(final JsonSink output) throws IOException { public void writeTo(final JsonSink output) throws IOException {
output.beginObject(); output.beginObject();
if ((bitField0_ & 0x00000001) != 0) { if ((bitField0_ & 0x00000001) != 0) {
output.writeUInt32(FieldNames.times, times); output.writeUInt32(FieldNames.actionUniqueId, actionUniqueId);
} }
if ((bitField0_ & 0x00000002) != 0) { if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.retcode, retcode); output.writeUInt32(FieldNames.retcode, retcode);
} }
if ((bitField0_ & 0x00000004) != 0) { if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.times2, times2); output.writeMessage(FieldNames.bonusSelect, bonusSelect);
} }
if ((bitField0_ & 0x00000008) != 0) { if ((bitField0_ & 0x00000008) != 0) {
output.writeMessage(FieldNames.rogueRerollBuff, rogueRerollBuff); output.writeMessage(FieldNames.rogueRerollBuff, rogueRerollBuff);
} }
if ((bitField0_ & 0x00000010) != 0) { if ((bitField0_ & 0x00000010) != 0) {
output.writeMessage(FieldNames.bonusSelect, bonusSelect);
}
if ((bitField0_ & 0x00000020) != 0) {
output.writeMessage(FieldNames.rogueBuffSelect, rogueBuffSelect); output.writeMessage(FieldNames.rogueBuffSelect, rogueBuffSelect);
} }
if ((bitField0_ & 0x00000040) != 0) { if ((bitField0_ & 0x00000020) != 0) {
output.writeMessage(FieldNames.miracleSelect, miracleSelect); output.writeMessage(FieldNames.miracleSelect, miracleSelect);
} }
output.endObject(); output.endObject();
@@ -683,10 +616,11 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
} }
while (!input.isAtEnd()) { while (!input.isAtEnd()) {
switch (input.readFieldHash()) { switch (input.readFieldHash()) {
case 110364486: { case -208785118:
if (input.isAtField(FieldNames.times)) { case 1003664768: {
if (input.isAtField(FieldNames.actionUniqueId)) {
if (!input.trySkipNullValue()) { if (!input.trySkipNullValue()) {
times = input.readUInt32(); actionUniqueId = input.readUInt32();
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
} }
} else { } else {
@@ -705,10 +639,11 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
} }
break; break;
} }
case -873668180: { case 1904635387:
if (input.isAtField(FieldNames.times2)) { case 1368817948: {
if (input.isAtField(FieldNames.bonusSelect)) {
if (!input.trySkipNullValue()) { if (!input.trySkipNullValue()) {
times2 = input.readUInt32(); input.readMessage(bonusSelect);
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
} }
} else { } else {
@@ -728,24 +663,12 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
} }
break; 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 -183502679:
case -1750117501: { case -1750117501: {
if (input.isAtField(FieldNames.rogueBuffSelect)) { if (input.isAtField(FieldNames.rogueBuffSelect)) {
if (!input.trySkipNullValue()) { if (!input.trySkipNullValue()) {
input.readMessage(rogueBuffSelect); input.readMessage(rogueBuffSelect);
bitField0_ |= 0x00000020; bitField0_ |= 0x00000010;
} }
} else { } else {
input.skipUnknownField(); input.skipUnknownField();
@@ -757,7 +680,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
if (input.isAtField(FieldNames.miracleSelect)) { if (input.isAtField(FieldNames.miracleSelect)) {
if (!input.trySkipNullValue()) { if (!input.trySkipNullValue()) {
input.readMessage(miracleSelect); input.readMessage(miracleSelect);
bitField0_ |= 0x00000040; bitField0_ |= 0x00000020;
} }
} else { } else {
input.skipUnknownField(); input.skipUnknownField();
@@ -819,16 +742,14 @@ public final class HandleRogueCommonPendingActionScRspOuterClass {
* Contains name constants used for serializing JSON * Contains name constants used for serializing JSON
*/ */
static class FieldNames { static class FieldNames {
static final FieldName times = FieldName.forField("times"); static final FieldName actionUniqueId = FieldName.forField("actionUniqueId", "action_unique_id");
static final FieldName retcode = FieldName.forField("retcode"); static final FieldName retcode = FieldName.forField("retcode");
static final FieldName times2 = FieldName.forField("times2"); static final FieldName bonusSelect = FieldName.forField("bonusSelect", "bonus_select");
static final FieldName rogueRerollBuff = FieldName.forField("rogueRerollBuff", "rogue_reroll_buff"); 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 rogueBuffSelect = FieldName.forField("rogueBuffSelect", "rogue_buff_select");
static final FieldName miracleSelect = FieldName.forField("miracleSelect", "miracle_select"); static final FieldName miracleSelect = FieldName.forField("miracleSelect", "miracle_select");

14
src/generated/main/emu/lunarcore/proto/RogueBonusSelectResultOuterClass.java
View File

@@ -19,7 +19,7 @@ public final class RogueBonusSelectResultOuterClass {
private static final long serialVersionUID = 0L; private static final long serialVersionUID = 0L;
/** /**
* <code>optional uint32 bonus_id = 14;</code> * <code>optional uint32 bonus_id = 2;</code>
*/ */
private int bonusId; private int bonusId;
@@ -34,7 +34,7 @@ public final class RogueBonusSelectResultOuterClass {
} }
/** /**
* <code>optional uint32 bonus_id = 14;</code> * <code>optional uint32 bonus_id = 2;</code>
* @return whether the bonusId field is set * @return whether the bonusId field is set
*/ */
public boolean hasBonusId() { public boolean hasBonusId() {
@@ -42,7 +42,7 @@ public final class RogueBonusSelectResultOuterClass {
} }
/** /**
* <code>optional uint32 bonus_id = 14;</code> * <code>optional uint32 bonus_id = 2;</code>
* @return this * @return this
*/ */
public RogueBonusSelectResult clearBonusId() { public RogueBonusSelectResult clearBonusId() {
@@ -52,7 +52,7 @@ public final class RogueBonusSelectResultOuterClass {
} }
/** /**
* <code>optional uint32 bonus_id = 14;</code> * <code>optional uint32 bonus_id = 2;</code>
* @return the bonusId * @return the bonusId
*/ */
public int getBonusId() { public int getBonusId() {
@@ -60,7 +60,7 @@ public final class RogueBonusSelectResultOuterClass {
} }
/** /**
* <code>optional uint32 bonus_id = 14;</code> * <code>optional uint32 bonus_id = 2;</code>
* @param value the bonusId to set * @param value the bonusId to set
* @return this * @return this
*/ */
@@ -129,7 +129,7 @@ public final class RogueBonusSelectResultOuterClass {
@Override @Override
public void writeTo(final ProtoSink output) throws IOException { public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) { if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 112); output.writeRawByte((byte) 16);
output.writeUInt32NoTag(bonusId); output.writeUInt32NoTag(bonusId);
} }
} }
@@ -150,7 +150,7 @@ public final class RogueBonusSelectResultOuterClass {
int tag = input.readTag(); int tag = input.readTag();
while (true) { while (true) {
switch (tag) { switch (tag) {
case 112: { case 16: {
// bonusId // bonusId
bonusId = input.readUInt32(); bonusId = input.readUInt32();
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;

14
src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectResultOuterClass.java
View File

@@ -19,7 +19,7 @@ public final class RogueCommonBuffSelectResultOuterClass {
private static final long serialVersionUID = 0L; private static final long serialVersionUID = 0L;
/** /**
* <code>optional uint32 buff_id = 4;</code> * <code>optional uint32 buff_id = 15;</code>
*/ */
private int buffId; private int buffId;
@@ -34,7 +34,7 @@ public final class RogueCommonBuffSelectResultOuterClass {
} }
/** /**
* <code>optional uint32 buff_id = 4;</code> * <code>optional uint32 buff_id = 15;</code>
* @return whether the buffId field is set * @return whether the buffId field is set
*/ */
public boolean hasBuffId() { public boolean hasBuffId() {
@@ -42,7 +42,7 @@ public final class RogueCommonBuffSelectResultOuterClass {
} }
/** /**
* <code>optional uint32 buff_id = 4;</code> * <code>optional uint32 buff_id = 15;</code>
* @return this * @return this
*/ */
public RogueCommonBuffSelectResult clearBuffId() { public RogueCommonBuffSelectResult clearBuffId() {
@@ -52,7 +52,7 @@ public final class RogueCommonBuffSelectResultOuterClass {
} }
/** /**
* <code>optional uint32 buff_id = 4;</code> * <code>optional uint32 buff_id = 15;</code>
* @return the buffId * @return the buffId
*/ */
public int getBuffId() { public int getBuffId() {
@@ -60,7 +60,7 @@ public final class RogueCommonBuffSelectResultOuterClass {
} }
/** /**
* <code>optional uint32 buff_id = 4;</code> * <code>optional uint32 buff_id = 15;</code>
* @param value the buffId to set * @param value the buffId to set
* @return this * @return this
*/ */
@@ -129,7 +129,7 @@ public final class RogueCommonBuffSelectResultOuterClass {
@Override @Override
public void writeTo(final ProtoSink output) throws IOException { public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) { if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 32); output.writeRawByte((byte) 120);
output.writeUInt32NoTag(buffId); output.writeUInt32NoTag(buffId);
} }
} }
@@ -150,7 +150,7 @@ public final class RogueCommonBuffSelectResultOuterClass {
int tag = input.readTag(); int tag = input.readTag();
while (true) { while (true) {
switch (tag) { switch (tag) {
case 32: { case 120: {
// buffId // buffId
buffId = input.readUInt32(); buffId = input.readUInt32();
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;

340
src/generated/main/emu/lunarcore/proto/RogueMapInfoOuterClass.java
View File

@@ -20,27 +20,27 @@ public final class RogueMapInfoOuterClass {
private static final long serialVersionUID = 0L; private static final long serialVersionUID = 0L;
/** /**
* <code>optional uint32 map_id = 2;</code> * <code>optional uint32 cur_room_id = 1;</code>
*/
private int mapId;
/**
* <code>optional uint32 cur_room_id = 4;</code>
*/ */
private int curRoomId; private int curRoomId;
/** /**
* <code>optional uint32 cur_site_id = 11;</code> * <code>optional uint32 map_id = 4;</code>
*/ */
private int curSiteId; private int mapId;
/** /**
* <code>optional uint32 area_id = 13;</code> * <code>optional uint32 area_id = 8;</code>
*/ */
private int areaId; private int areaId;
/** /**
* <code>repeated .RogueRoom room_list = 3;</code> * <code>optional uint32 cur_site_id = 13;</code>
*/
private int curSiteId;
/**
* <code>repeated .RogueRoom room_list = 15;</code>
*/ */
private final RepeatedMessage<RogueRoomOuterClass.RogueRoom> roomList = RepeatedMessage.newEmptyInstance(RogueRoomOuterClass.RogueRoom.getFactory()); private final RepeatedMessage<RogueRoomOuterClass.RogueRoom> roomList = RepeatedMessage.newEmptyInstance(RogueRoomOuterClass.RogueRoom.getFactory());
@@ -55,62 +55,25 @@ public final class RogueMapInfoOuterClass {
} }
/** /**
* <code>optional uint32 map_id = 2;</code> * <code>optional uint32 cur_room_id = 1;</code>
* @return whether the mapId field is set * @return whether the curRoomId field is set
*/ */
public boolean hasMapId() { public boolean hasCurRoomId() {
return (bitField0_ & 0x00000001) != 0; return (bitField0_ & 0x00000001) != 0;
} }
/** /**
* <code>optional uint32 map_id = 2;</code> * <code>optional uint32 cur_room_id = 1;</code>
* @return this
*/
public RogueMapInfo clearMapId() {
bitField0_ &= ~0x00000001;
mapId = 0;
return this;
}
/**
* <code>optional uint32 map_id = 2;</code>
* @return the mapId
*/
public int getMapId() {
return mapId;
}
/**
* <code>optional uint32 map_id = 2;</code>
* @param value the mapId to set
* @return this
*/
public RogueMapInfo setMapId(final int value) {
bitField0_ |= 0x00000001;
mapId = value;
return this;
}
/**
* <code>optional uint32 cur_room_id = 4;</code>
* @return whether the curRoomId field is set
*/
public boolean hasCurRoomId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
* <code>optional uint32 cur_room_id = 4;</code>
* @return this * @return this
*/ */
public RogueMapInfo clearCurRoomId() { public RogueMapInfo clearCurRoomId() {
bitField0_ &= ~0x00000002; bitField0_ &= ~0x00000001;
curRoomId = 0; curRoomId = 0;
return this; return this;
} }
/** /**
* <code>optional uint32 cur_room_id = 4;</code> * <code>optional uint32 cur_room_id = 1;</code>
* @return the curRoomId * @return the curRoomId
*/ */
public int getCurRoomId() { public int getCurRoomId() {
@@ -118,73 +81,73 @@ public final class RogueMapInfoOuterClass {
} }
/** /**
* <code>optional uint32 cur_room_id = 4;</code> * <code>optional uint32 cur_room_id = 1;</code>
* @param value the curRoomId to set * @param value the curRoomId to set
* @return this * @return this
*/ */
public RogueMapInfo setCurRoomId(final int value) { public RogueMapInfo setCurRoomId(final int value) {
bitField0_ |= 0x00000002; bitField0_ |= 0x00000001;
curRoomId = value; curRoomId = value;
return this; return this;
} }
/** /**
* <code>optional uint32 cur_site_id = 11;</code> * <code>optional uint32 map_id = 4;</code>
* @return whether the curSiteId field is set * @return whether the mapId field is set
*/ */
public boolean hasCurSiteId() { public boolean hasMapId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
* <code>optional uint32 map_id = 4;</code>
* @return this
*/
public RogueMapInfo clearMapId() {
bitField0_ &= ~0x00000002;
mapId = 0;
return this;
}
/**
* <code>optional uint32 map_id = 4;</code>
* @return the mapId
*/
public int getMapId() {
return mapId;
}
/**
* <code>optional uint32 map_id = 4;</code>
* @param value the mapId to set
* @return this
*/
public RogueMapInfo setMapId(final int value) {
bitField0_ |= 0x00000002;
mapId = value;
return this;
}
/**
* <code>optional uint32 area_id = 8;</code>
* @return whether the areaId field is set
*/
public boolean hasAreaId() {
return (bitField0_ & 0x00000004) != 0; return (bitField0_ & 0x00000004) != 0;
} }
/** /**
* <code>optional uint32 cur_site_id = 11;</code> * <code>optional uint32 area_id = 8;</code>
* @return this
*/
public RogueMapInfo clearCurSiteId() {
bitField0_ &= ~0x00000004;
curSiteId = 0;
return this;
}
/**
* <code>optional uint32 cur_site_id = 11;</code>
* @return the curSiteId
*/
public int getCurSiteId() {
return curSiteId;
}
/**
* <code>optional uint32 cur_site_id = 11;</code>
* @param value the curSiteId to set
* @return this
*/
public RogueMapInfo setCurSiteId(final int value) {
bitField0_ |= 0x00000004;
curSiteId = value;
return this;
}
/**
* <code>optional uint32 area_id = 13;</code>
* @return whether the areaId field is set
*/
public boolean hasAreaId() {
return (bitField0_ & 0x00000008) != 0;
}
/**
* <code>optional uint32 area_id = 13;</code>
* @return this * @return this
*/ */
public RogueMapInfo clearAreaId() { public RogueMapInfo clearAreaId() {
bitField0_ &= ~0x00000008; bitField0_ &= ~0x00000004;
areaId = 0; areaId = 0;
return this; return this;
} }
/** /**
* <code>optional uint32 area_id = 13;</code> * <code>optional uint32 area_id = 8;</code>
* @return the areaId * @return the areaId
*/ */
public int getAreaId() { public int getAreaId() {
@@ -192,18 +155,55 @@ public final class RogueMapInfoOuterClass {
} }
/** /**
* <code>optional uint32 area_id = 13;</code> * <code>optional uint32 area_id = 8;</code>
* @param value the areaId to set * @param value the areaId to set
* @return this * @return this
*/ */
public RogueMapInfo setAreaId(final int value) { public RogueMapInfo setAreaId(final int value) {
bitField0_ |= 0x00000008; bitField0_ |= 0x00000004;
areaId = value; areaId = value;
return this; return this;
} }
/** /**
* <code>repeated .RogueRoom room_list = 3;</code> * <code>optional uint32 cur_site_id = 13;</code>
* @return whether the curSiteId field is set
*/
public boolean hasCurSiteId() {
return (bitField0_ & 0x00000008) != 0;
}
/**
* <code>optional uint32 cur_site_id = 13;</code>
* @return this
*/
public RogueMapInfo clearCurSiteId() {
bitField0_ &= ~0x00000008;
curSiteId = 0;
return this;
}
/**
* <code>optional uint32 cur_site_id = 13;</code>
* @return the curSiteId
*/
public int getCurSiteId() {
return curSiteId;
}
/**
* <code>optional uint32 cur_site_id = 13;</code>
* @param value the curSiteId to set
* @return this
*/
public RogueMapInfo setCurSiteId(final int value) {
bitField0_ |= 0x00000008;
curSiteId = value;
return this;
}
/**
* <code>repeated .RogueRoom room_list = 15;</code>
* @return whether the roomList field is set * @return whether the roomList field is set
*/ */
public boolean hasRoomList() { public boolean hasRoomList() {
@@ -211,7 +211,7 @@ public final class RogueMapInfoOuterClass {
} }
/** /**
* <code>repeated .RogueRoom room_list = 3;</code> * <code>repeated .RogueRoom room_list = 15;</code>
* @return this * @return this
*/ */
public RogueMapInfo clearRoomList() { public RogueMapInfo clearRoomList() {
@@ -221,7 +221,7 @@ public final class RogueMapInfoOuterClass {
} }
/** /**
* <code>repeated .RogueRoom room_list = 3;</code> * <code>repeated .RogueRoom room_list = 15;</code>
* *
* This method returns the internal storage object without modifying any has state. * This method returns the internal storage object without modifying any has state.
* The returned object should not be modified and be treated as read-only. * The returned object should not be modified and be treated as read-only.
@@ -235,7 +235,7 @@ public final class RogueMapInfoOuterClass {
} }
/** /**
* <code>repeated .RogueRoom room_list = 3;</code> * <code>repeated .RogueRoom room_list = 15;</code>
* *
* This method returns the internal storage object and sets the corresponding * This method returns the internal storage object and sets the corresponding
* has state. The returned object will become part of this message and its * has state. The returned object will become part of this message and its
@@ -249,7 +249,7 @@ public final class RogueMapInfoOuterClass {
} }
/** /**
* <code>repeated .RogueRoom room_list = 3;</code> * <code>repeated .RogueRoom room_list = 15;</code>
* @param value the roomList to add * @param value the roomList to add
* @return this * @return this
*/ */
@@ -260,7 +260,7 @@ public final class RogueMapInfoOuterClass {
} }
/** /**
* <code>repeated .RogueRoom room_list = 3;</code> * <code>repeated .RogueRoom room_list = 15;</code>
* @param values the roomList to add * @param values the roomList to add
* @return this * @return this
*/ */
@@ -275,10 +275,10 @@ public final class RogueMapInfoOuterClass {
cachedSize = other.cachedSize; cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) { if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_; bitField0_ = other.bitField0_;
mapId = other.mapId;
curRoomId = other.curRoomId; curRoomId = other.curRoomId;
curSiteId = other.curSiteId; mapId = other.mapId;
areaId = other.areaId; areaId = other.areaId;
curSiteId = other.curSiteId;
roomList.copyFrom(other.roomList); roomList.copyFrom(other.roomList);
} }
return this; return this;
@@ -290,18 +290,18 @@ public final class RogueMapInfoOuterClass {
return this; return this;
} }
cachedSize = -1; cachedSize = -1;
if (other.hasMapId()) {
setMapId(other.mapId);
}
if (other.hasCurRoomId()) { if (other.hasCurRoomId()) {
setCurRoomId(other.curRoomId); setCurRoomId(other.curRoomId);
} }
if (other.hasCurSiteId()) { if (other.hasMapId()) {
setCurSiteId(other.curSiteId); setMapId(other.mapId);
} }
if (other.hasAreaId()) { if (other.hasAreaId()) {
setAreaId(other.areaId); setAreaId(other.areaId);
} }
if (other.hasCurSiteId()) {
setCurSiteId(other.curSiteId);
}
if (other.hasRoomList()) { if (other.hasRoomList()) {
getMutableRoomList().addAll(other.roomList); getMutableRoomList().addAll(other.roomList);
} }
@@ -315,10 +315,10 @@ public final class RogueMapInfoOuterClass {
} }
cachedSize = -1; cachedSize = -1;
bitField0_ = 0; bitField0_ = 0;
mapId = 0;
curRoomId = 0; curRoomId = 0;
curSiteId = 0; mapId = 0;
areaId = 0; areaId = 0;
curSiteId = 0;
roomList.clear(); roomList.clear();
return this; return this;
} }
@@ -344,34 +344,34 @@ public final class RogueMapInfoOuterClass {
} }
RogueMapInfo other = (RogueMapInfo) o; RogueMapInfo other = (RogueMapInfo) o;
return bitField0_ == other.bitField0_ return bitField0_ == other.bitField0_
&& (!hasMapId() || mapId == other.mapId)
&& (!hasCurRoomId() || curRoomId == other.curRoomId) && (!hasCurRoomId() || curRoomId == other.curRoomId)
&& (!hasCurSiteId() || curSiteId == other.curSiteId) && (!hasMapId() || mapId == other.mapId)
&& (!hasAreaId() || areaId == other.areaId) && (!hasAreaId() || areaId == other.areaId)
&& (!hasCurSiteId() || curSiteId == other.curSiteId)
&& (!hasRoomList() || roomList.equals(other.roomList)); && (!hasRoomList() || roomList.equals(other.roomList));
} }
@Override @Override
public void writeTo(final ProtoSink output) throws IOException { public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) { if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 16); output.writeRawByte((byte) 8);
output.writeUInt32NoTag(mapId); output.writeUInt32NoTag(curRoomId);
} }
if ((bitField0_ & 0x00000002) != 0) { if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 32); output.writeRawByte((byte) 32);
output.writeUInt32NoTag(curRoomId); output.writeUInt32NoTag(mapId);
} }
if ((bitField0_ & 0x00000004) != 0) { if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 88); output.writeRawByte((byte) 64);
output.writeUInt32NoTag(curSiteId); output.writeUInt32NoTag(areaId);
} }
if ((bitField0_ & 0x00000008) != 0) { if ((bitField0_ & 0x00000008) != 0) {
output.writeRawByte((byte) 104); output.writeRawByte((byte) 104);
output.writeUInt32NoTag(areaId); output.writeUInt32NoTag(curSiteId);
} }
if ((bitField0_ & 0x00000010) != 0) { if ((bitField0_ & 0x00000010) != 0) {
for (int i = 0; i < roomList.length(); i++) { for (int i = 0; i < roomList.length(); i++) {
output.writeRawByte((byte) 26); output.writeRawByte((byte) 122);
output.writeMessageNoTag(roomList.get(i)); output.writeMessageNoTag(roomList.get(i));
} }
} }
@@ -381,16 +381,16 @@ public final class RogueMapInfoOuterClass {
protected int computeSerializedSize() { protected int computeSerializedSize() {
int size = 0; int size = 0;
if ((bitField0_ & 0x00000001) != 0) { if ((bitField0_ & 0x00000001) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(mapId);
}
if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(curRoomId); size += 1 + ProtoSink.computeUInt32SizeNoTag(curRoomId);
} }
if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(mapId);
}
if ((bitField0_ & 0x00000004) != 0) { if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(curSiteId); size += 1 + ProtoSink.computeUInt32SizeNoTag(areaId);
} }
if ((bitField0_ & 0x00000008) != 0) { if ((bitField0_ & 0x00000008) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(areaId); size += 1 + ProtoSink.computeUInt32SizeNoTag(curSiteId);
} }
if ((bitField0_ & 0x00000010) != 0) { if ((bitField0_ & 0x00000010) != 0) {
size += (1 * roomList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(roomList); size += (1 * roomList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(roomList);
@@ -405,9 +405,9 @@ public final class RogueMapInfoOuterClass {
int tag = input.readTag(); int tag = input.readTag();
while (true) { while (true) {
switch (tag) { switch (tag) {
case 16: { case 8: {
// mapId // curRoomId
mapId = input.readUInt32(); curRoomId = input.readUInt32();
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
tag = input.readTag(); tag = input.readTag();
if (tag != 32) { if (tag != 32) {
@@ -415,17 +415,17 @@ public final class RogueMapInfoOuterClass {
} }
} }
case 32: { case 32: {
// curRoomId // mapId
curRoomId = input.readUInt32(); mapId = input.readUInt32();
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
tag = input.readTag(); tag = input.readTag();
if (tag != 88) { if (tag != 64) {
break; break;
} }
} }
case 88: { case 64: {
// curSiteId // areaId
curSiteId = input.readUInt32(); areaId = input.readUInt32();
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
tag = input.readTag(); tag = input.readTag();
if (tag != 104) { if (tag != 104) {
@@ -433,15 +433,15 @@ public final class RogueMapInfoOuterClass {
} }
} }
case 104: { case 104: {
// areaId // curSiteId
areaId = input.readUInt32(); curSiteId = input.readUInt32();
bitField0_ |= 0x00000008; bitField0_ |= 0x00000008;
tag = input.readTag(); tag = input.readTag();
if (tag != 26) { if (tag != 122) {
break; break;
} }
} }
case 26: { case 122: {
// roomList // roomList
tag = input.readRepeatedMessage(roomList, tag); tag = input.readRepeatedMessage(roomList, tag);
bitField0_ |= 0x00000010; bitField0_ |= 0x00000010;
@@ -467,16 +467,16 @@ public final class RogueMapInfoOuterClass {
public void writeTo(final JsonSink output) throws IOException { public void writeTo(final JsonSink output) throws IOException {
output.beginObject(); output.beginObject();
if ((bitField0_ & 0x00000001) != 0) { if ((bitField0_ & 0x00000001) != 0) {
output.writeUInt32(FieldNames.mapId, mapId);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.curRoomId, curRoomId); output.writeUInt32(FieldNames.curRoomId, curRoomId);
} }
if ((bitField0_ & 0x00000002) != 0) {
output.writeUInt32(FieldNames.mapId, mapId);
}
if ((bitField0_ & 0x00000004) != 0) { if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.curSiteId, curSiteId); output.writeUInt32(FieldNames.areaId, areaId);
} }
if ((bitField0_ & 0x00000008) != 0) { if ((bitField0_ & 0x00000008) != 0) {
output.writeUInt32(FieldNames.areaId, areaId); output.writeUInt32(FieldNames.curSiteId, curSiteId);
} }
if ((bitField0_ & 0x00000010) != 0) { if ((bitField0_ & 0x00000010) != 0) {
output.writeRepeatedMessage(FieldNames.roomList, roomList); output.writeRepeatedMessage(FieldNames.roomList, roomList);
@@ -491,11 +491,11 @@ public final class RogueMapInfoOuterClass {
} }
while (!input.isAtEnd()) { while (!input.isAtEnd()) {
switch (input.readFieldHash()) { switch (input.readFieldHash()) {
case 103663511: case -249266762:
case -1081377058: { case 524969984: {
if (input.isAtField(FieldNames.mapId)) { if (input.isAtField(FieldNames.curRoomId)) {
if (!input.trySkipNullValue()) { if (!input.trySkipNullValue()) {
mapId = input.readUInt32(); curRoomId = input.readUInt32();
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
} }
} else { } else {
@@ -503,11 +503,11 @@ public final class RogueMapInfoOuterClass {
} }
break; break;
} }
case -249266762: case 103663511:
case 524969984: { case -1081377058: {
if (input.isAtField(FieldNames.curRoomId)) { if (input.isAtField(FieldNames.mapId)) {
if (!input.trySkipNullValue()) { if (!input.trySkipNullValue()) {
curRoomId = input.readUInt32(); mapId = input.readUInt32();
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
} }
} else { } else {
@@ -515,23 +515,23 @@ public final class RogueMapInfoOuterClass {
} }
break; break;
} }
case -226037470:
case 1245078036: {
if (input.isAtField(FieldNames.curSiteId)) {
if (!input.trySkipNullValue()) {
curSiteId = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
input.skipUnknownField();
}
break;
}
case -1409553784: case -1409553784:
case -746472947: { case -746472947: {
if (input.isAtField(FieldNames.areaId)) { if (input.isAtField(FieldNames.areaId)) {
if (!input.trySkipNullValue()) { if (!input.trySkipNullValue()) {
areaId = input.readUInt32(); areaId = input.readUInt32();
bitField0_ |= 0x00000004;
}
} else {
input.skipUnknownField();
}
break;
}
case -226037470:
case 1245078036: {
if (input.isAtField(FieldNames.curSiteId)) {
if (!input.trySkipNullValue()) {
curSiteId = input.readUInt32();
bitField0_ |= 0x00000008; bitField0_ |= 0x00000008;
} }
} else { } else {
@@ -603,14 +603,14 @@ public final class RogueMapInfoOuterClass {
* Contains name constants used for serializing JSON * Contains name constants used for serializing JSON
*/ */
static class FieldNames { 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 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 areaId = FieldName.forField("areaId", "area_id");
static final FieldName curSiteId = FieldName.forField("curSiteId", "cur_site_id");
static final FieldName roomList = FieldName.forField("roomList", "room_list"); static final FieldName roomList = FieldName.forField("roomList", "room_list");
} }
} }

14
src/generated/main/emu/lunarcore/proto/RogueMiracleSelectResultOuterClass.java
View File

@@ -19,7 +19,7 @@ public final class RogueMiracleSelectResultOuterClass {
private static final long serialVersionUID = 0L; private static final long serialVersionUID = 0L;
/** /**
* <code>optional uint32 miracle_id = 9;</code> * <code>optional uint32 miracle_id = 1;</code>
*/ */
private int miracleId; private int miracleId;
@@ -34,7 +34,7 @@ public final class RogueMiracleSelectResultOuterClass {
} }
/** /**
* <code>optional uint32 miracle_id = 9;</code> * <code>optional uint32 miracle_id = 1;</code>
* @return whether the miracleId field is set * @return whether the miracleId field is set
*/ */
public boolean hasMiracleId() { public boolean hasMiracleId() {
@@ -42,7 +42,7 @@ public final class RogueMiracleSelectResultOuterClass {
} }
/** /**
* <code>optional uint32 miracle_id = 9;</code> * <code>optional uint32 miracle_id = 1;</code>
* @return this * @return this
*/ */
public RogueMiracleSelectResult clearMiracleId() { public RogueMiracleSelectResult clearMiracleId() {
@@ -52,7 +52,7 @@ public final class RogueMiracleSelectResultOuterClass {
} }
/** /**
* <code>optional uint32 miracle_id = 9;</code> * <code>optional uint32 miracle_id = 1;</code>
* @return the miracleId * @return the miracleId
*/ */
public int getMiracleId() { public int getMiracleId() {
@@ -60,7 +60,7 @@ public final class RogueMiracleSelectResultOuterClass {
} }
/** /**
* <code>optional uint32 miracle_id = 9;</code> * <code>optional uint32 miracle_id = 1;</code>
* @param value the miracleId to set * @param value the miracleId to set
* @return this * @return this
*/ */
@@ -129,7 +129,7 @@ public final class RogueMiracleSelectResultOuterClass {
@Override @Override
public void writeTo(final ProtoSink output) throws IOException { public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) { if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 72); output.writeRawByte((byte) 8);
output.writeUInt32NoTag(miracleId); output.writeUInt32NoTag(miracleId);
} }
} }
@@ -150,7 +150,7 @@ public final class RogueMiracleSelectResultOuterClass {
int tag = input.readTag(); int tag = input.readTag();
while (true) { while (true) {
switch (tag) { switch (tag) {
case 72: { case 8: {
// miracleId // miracleId
miracleId = input.readUInt32(); miracleId = input.readUInt32();
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;

16
src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java
View File

@@ -37,7 +37,7 @@ public final class RogueRoomOuterClass {
* RogueRoomStatus OABFMKCFLGC = 10; * RogueRoomStatus OABFMKCFLGC = 10;
* </pre> * </pre>
* *
* <code>optional .RogueRoomStatus room_status = 10;</code> * <code>optional .RogueRoomStatus room_status = 6;</code>
*/ */
private int roomStatus; private int roomStatus;
@@ -146,7 +146,7 @@ public final class RogueRoomOuterClass {
* RogueRoomStatus OABFMKCFLGC = 10; * RogueRoomStatus OABFMKCFLGC = 10;
* </pre> * </pre>
* *
* <code>optional .RogueRoomStatus room_status = 10;</code> * <code>optional .RogueRoomStatus room_status = 6;</code>
* @return whether the roomStatus field is set * @return whether the roomStatus field is set
*/ */
public boolean hasRoomStatus() { public boolean hasRoomStatus() {
@@ -158,7 +158,7 @@ public final class RogueRoomOuterClass {
* RogueRoomStatus OABFMKCFLGC = 10; * RogueRoomStatus OABFMKCFLGC = 10;
* </pre> * </pre>
* *
* <code>optional .RogueRoomStatus room_status = 10;</code> * <code>optional .RogueRoomStatus room_status = 6;</code>
* @return this * @return this
*/ */
public RogueRoom clearRoomStatus() { public RogueRoom clearRoomStatus() {
@@ -172,7 +172,7 @@ public final class RogueRoomOuterClass {
* RogueRoomStatus OABFMKCFLGC = 10; * RogueRoomStatus OABFMKCFLGC = 10;
* </pre> * </pre>
* *
* <code>optional .RogueRoomStatus room_status = 10;</code> * <code>optional .RogueRoomStatus room_status = 6;</code>
* @return the roomStatus * @return the roomStatus
*/ */
public RogueRoomStatusOuterClass.RogueRoomStatus getRoomStatus() { public RogueRoomStatusOuterClass.RogueRoomStatus getRoomStatus() {
@@ -209,7 +209,7 @@ public final class RogueRoomOuterClass {
* RogueRoomStatus OABFMKCFLGC = 10; * RogueRoomStatus OABFMKCFLGC = 10;
* </pre> * </pre>
* *
* <code>optional .RogueRoomStatus room_status = 10;</code> * <code>optional .RogueRoomStatus room_status = 6;</code>
* @param value the roomStatus to set * @param value the roomStatus to set
* @return this * @return this
*/ */
@@ -298,7 +298,7 @@ public final class RogueRoomOuterClass {
output.writeUInt32NoTag(roomId); output.writeUInt32NoTag(roomId);
} }
if ((bitField0_ & 0x00000004) != 0) { if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 80); output.writeRawByte((byte) 48);
output.writeEnumNoTag(roomStatus); output.writeEnumNoTag(roomStatus);
} }
} }
@@ -339,11 +339,11 @@ public final class RogueRoomOuterClass {
roomId = input.readUInt32(); roomId = input.readUInt32();
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
tag = input.readTag(); tag = input.readTag();
if (tag != 80) { if (tag != 48) {
break; break;
} }
} }
case 80: { case 48: {
// roomStatus // roomStatus
final int value = input.readInt32(); final int value = input.readInt32();
if (RogueRoomStatusOuterClass.RogueRoomStatus.forNumber(value) != null) { if (RogueRoomStatusOuterClass.RogueRoomStatus.forNumber(value) != null) {

6
src/main/java/emu/lunarcore/game/rogue/RogueInstance.java
View File

@@ -277,7 +277,7 @@ public class RogueInstance {
var data = HandleRogueCommonPendingActionScRsp.newInstance(); var data = HandleRogueCommonPendingActionScRsp.newInstance();
data.getMutableRogueBuffSelect(); data.getMutableRogueBuffSelect();
data.setTimes(this.actionUniqueId - 2); data.setActionUniqueId(this.actionUniqueId - 2);
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(data)); this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(data));
return buff; return buff;
} }
@@ -355,7 +355,7 @@ public class RogueInstance {
var data = HandleRogueCommonPendingActionScRsp.newInstance(); var data = HandleRogueCommonPendingActionScRsp.newInstance();
data.getMutableMiracleSelect(); data.getMutableMiracleSelect();
data.setTimes(this.actionUniqueId - 2); data.setActionUniqueId(this.actionUniqueId - 2);
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(data)); this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(data));
return miracle; return miracle;
} }
@@ -402,7 +402,7 @@ public class RogueInstance {
// TODO: add event // TODO: add event
var data = HandleRogueCommonPendingActionScRsp.newInstance(); var data = HandleRogueCommonPendingActionScRsp.newInstance();
data.getMutableBonusSelect(); data.getMutableBonusSelect();
data.setTimes(this.actionUniqueId - 2); data.setActionUniqueId(this.actionUniqueId - 2);
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(data)); this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(data));
try { try {
this.onSelectDialogue(bonus.getEventId(), 0); this.onSelectDialogue(bonus.getEventId(), 0);

4
src/main/java/emu/lunarcore/server/packet/send/PacketHandleRogueCommonPendingActionScRsp.java
View File

@@ -15,12 +15,12 @@ public class PacketHandleRogueCommonPendingActionScRsp extends BasePacket {
public PacketHandleRogueCommonPendingActionScRsp(int id) { public PacketHandleRogueCommonPendingActionScRsp(int id) {
this(HandleRogueCommonPendingActionScRsp.newInstance() this(HandleRogueCommonPendingActionScRsp.newInstance()
.setTimes(id)); .setActionUniqueId(id));
} }
public PacketHandleRogueCommonPendingActionScRsp(RogueRerollBuff rogueRerollBuff, int id) { public PacketHandleRogueCommonPendingActionScRsp(RogueRerollBuff rogueRerollBuff, int id) {
this(HandleRogueCommonPendingActionScRsp.newInstance() this(HandleRogueCommonPendingActionScRsp.newInstance()
.setTimes(id) .setActionUniqueId(id)
.setRogueRerollBuff(rogueRerollBuff)); .setRogueRerollBuff(rogueRerollBuff));
} }