diff --git a/src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java index 062aa4f..237bb62 100644 --- a/src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java @@ -22,37 +22,37 @@ public final class BuffInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 add_time_ms = 8; + * optional uint64 add_time_ms = 1; */ private long addTimeMs; /** - * optional float life_time = 9; + * optional float life_time = 3; */ private float lifeTime; /** - * optional uint32 count = 1; - */ - private int count; - - /** - * optional uint32 buff_id = 5; + * optional uint32 buff_id = 4; */ private int buffId; /** - * optional uint32 base_avatar_id = 11; + * optional uint32 base_avatar_id = 9; */ private int baseAvatarId; /** - * optional uint32 level = 14; + * optional uint32 level = 12; */ private int level; /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; + * optional uint32 count = 13; + */ + private int count; + + /** + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 5; */ private final RepeatedMessage dynamicValues = RepeatedMessage.newEmptyInstance(DynamicValuesEntry.getFactory()); @@ -67,7 +67,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint64 add_time_ms = 8; + * optional uint64 add_time_ms = 1; * @return whether the addTimeMs field is set */ public boolean hasAddTimeMs() { @@ -75,7 +75,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint64 add_time_ms = 8; + * optional uint64 add_time_ms = 1; * @return this */ public BuffInfo clearAddTimeMs() { @@ -85,7 +85,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint64 add_time_ms = 8; + * optional uint64 add_time_ms = 1; * @return the addTimeMs */ public long getAddTimeMs() { @@ -93,7 +93,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint64 add_time_ms = 8; + * optional uint64 add_time_ms = 1; * @param value the addTimeMs to set * @return this */ @@ -104,7 +104,7 @@ public final class BuffInfoOuterClass { } /** - * optional float life_time = 9; + * optional float life_time = 3; * @return whether the lifeTime field is set */ public boolean hasLifeTime() { @@ -112,7 +112,7 @@ public final class BuffInfoOuterClass { } /** - * optional float life_time = 9; + * optional float life_time = 3; * @return this */ public BuffInfo clearLifeTime() { @@ -122,7 +122,7 @@ public final class BuffInfoOuterClass { } /** - * optional float life_time = 9; + * optional float life_time = 3; * @return the lifeTime */ public float getLifeTime() { @@ -130,7 +130,7 @@ public final class BuffInfoOuterClass { } /** - * optional float life_time = 9; + * optional float life_time = 3; * @param value the lifeTime to set * @return this */ @@ -141,62 +141,25 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 count = 1; - * @return whether the count field is set + * optional uint32 buff_id = 4; + * @return whether the buffId field is set */ - public boolean hasCount() { + public boolean hasBuffId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 count = 1; - * @return this - */ - public BuffInfo clearCount() { - bitField0_ &= ~0x00000004; - count = 0; - return this; - } - - /** - * optional uint32 count = 1; - * @return the count - */ - public int getCount() { - return count; - } - - /** - * optional uint32 count = 1; - * @param value the count to set - * @return this - */ - public BuffInfo setCount(final int value) { - bitField0_ |= 0x00000004; - count = value; - return this; - } - - /** - * optional uint32 buff_id = 5; - * @return whether the buffId field is set - */ - public boolean hasBuffId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 buff_id = 5; + * optional uint32 buff_id = 4; * @return this */ public BuffInfo clearBuffId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; buffId = 0; return this; } /** - * optional uint32 buff_id = 5; + * optional uint32 buff_id = 4; * @return the buffId */ public int getBuffId() { @@ -204,36 +167,36 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 buff_id = 5; + * optional uint32 buff_id = 4; * @param value the buffId to set * @return this */ public BuffInfo setBuffId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; buffId = value; return this; } /** - * optional uint32 base_avatar_id = 11; + * optional uint32 base_avatar_id = 9; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 base_avatar_id = 11; + * optional uint32 base_avatar_id = 9; * @return this */ public BuffInfo clearBaseAvatarId() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; baseAvatarId = 0; return this; } /** - * optional uint32 base_avatar_id = 11; + * optional uint32 base_avatar_id = 9; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -241,36 +204,36 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 base_avatar_id = 11; + * optional uint32 base_avatar_id = 9; * @param value the baseAvatarId to set * @return this */ public BuffInfo setBaseAvatarId(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; baseAvatarId = value; return this; } /** - * optional uint32 level = 14; + * optional uint32 level = 12; * @return whether the level field is set */ public boolean hasLevel() { - return (bitField0_ & 0x00000020) != 0; + return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 level = 14; + * optional uint32 level = 12; * @return this */ public BuffInfo clearLevel() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; level = 0; return this; } /** - * optional uint32 level = 14; + * optional uint32 level = 12; * @return the level */ public int getLevel() { @@ -278,18 +241,55 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 level = 14; + * optional uint32 level = 12; * @param value the level to set * @return this */ public BuffInfo setLevel(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; level = value; return this; } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; + * optional uint32 count = 13; + * @return whether the count field is set + */ + public boolean hasCount() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional uint32 count = 13; + * @return this + */ + public BuffInfo clearCount() { + bitField0_ &= ~0x00000020; + count = 0; + return this; + } + + /** + * optional uint32 count = 13; + * @return the count + */ + public int getCount() { + return count; + } + + /** + * optional uint32 count = 13; + * @param value the count to set + * @return this + */ + public BuffInfo setCount(final int value) { + bitField0_ |= 0x00000020; + count = value; + return this; + } + + /** + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 5; * @return whether the dynamicValues field is set */ public boolean hasDynamicValues() { @@ -297,7 +297,7 @@ public final class BuffInfoOuterClass { } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 5; * @return this */ public BuffInfo clearDynamicValues() { @@ -307,7 +307,7 @@ public final class BuffInfoOuterClass { } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 5; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -321,7 +321,7 @@ public final class BuffInfoOuterClass { } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 5; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -335,7 +335,7 @@ public final class BuffInfoOuterClass { } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 5; * @param value the dynamicValues to add * @return this */ @@ -346,7 +346,7 @@ public final class BuffInfoOuterClass { } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 5; * @param values the dynamicValues to add * @return this */ @@ -363,10 +363,10 @@ public final class BuffInfoOuterClass { bitField0_ = other.bitField0_; addTimeMs = other.addTimeMs; lifeTime = other.lifeTime; - count = other.count; buffId = other.buffId; baseAvatarId = other.baseAvatarId; level = other.level; + count = other.count; dynamicValues.copyFrom(other.dynamicValues); } return this; @@ -384,9 +384,6 @@ public final class BuffInfoOuterClass { if (other.hasLifeTime()) { setLifeTime(other.lifeTime); } - if (other.hasCount()) { - setCount(other.count); - } if (other.hasBuffId()) { setBuffId(other.buffId); } @@ -396,6 +393,9 @@ public final class BuffInfoOuterClass { if (other.hasLevel()) { setLevel(other.level); } + if (other.hasCount()) { + setCount(other.count); + } if (other.hasDynamicValues()) { getMutableDynamicValues().addAll(other.dynamicValues); } @@ -411,10 +411,10 @@ public final class BuffInfoOuterClass { bitField0_ = 0; addTimeMs = 0L; lifeTime = 0F; - count = 0; buffId = 0; baseAvatarId = 0; level = 0; + count = 0; dynamicValues.clear(); return this; } @@ -442,42 +442,42 @@ public final class BuffInfoOuterClass { return bitField0_ == other.bitField0_ && (!hasAddTimeMs() || addTimeMs == other.addTimeMs) && (!hasLifeTime() || ProtoUtil.isEqual(lifeTime, other.lifeTime)) - && (!hasCount() || count == other.count) && (!hasBuffId() || buffId == other.buffId) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!hasLevel() || level == other.level) + && (!hasCount() || count == other.count) && (!hasDynamicValues() || dynamicValues.equals(other.dynamicValues)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 8); output.writeUInt64NoTag(addTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 77); + output.writeRawByte((byte) 29); output.writeFloatNoTag(lifeTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(count); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(buffId); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 88); + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 72); output.writeUInt32NoTag(baseAvatarId); } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 112); + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 96); output.writeUInt32NoTag(level); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(count); + } if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < dynamicValues.length(); i++) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 42); output.writeMessageNoTag(dynamicValues.get(i)); } } @@ -493,17 +493,17 @@ public final class BuffInfoOuterClass { size += 5; } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(count); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(count); + } if ((bitField0_ & 0x00000040) != 0) { size += (1 * dynamicValues.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dynamicValues); } @@ -517,61 +517,61 @@ public final class BuffInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 8: { // addTimeMs addTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 77) { + if (tag != 29) { break; } } - case 77: { + case 29: { // lifeTime lifeTime = input.readFloat(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 8) { + if (tag != 32) { break; } } - case 8: { - // count - count = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { + case 32: { // buffId buffId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 88) { + if (tag != 72) { break; } } - case 88: { + case 72: { // baseAvatarId baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 112) { + if (tag != 96) { break; } } - case 112: { + case 96: { // level level = input.readUInt32(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 34) { + if (tag != 104) { break; } } - case 34: { + case 104: { + // count + count = input.readUInt32(); + bitField0_ |= 0x00000020; + tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { // dynamicValues tag = input.readRepeatedMessage(dynamicValues, tag); bitField0_ |= 0x00000040; @@ -603,17 +603,17 @@ public final class BuffInfoOuterClass { output.writeFloat(FieldNames.lifeTime, lifeTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.count, count); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.buffId, buffId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.level, level); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeUInt32(FieldNames.count, count); + } if ((bitField0_ & 0x00000040) != 0) { output.writeRepeatedMessage(FieldNames.dynamicValues, dynamicValues); } @@ -651,23 +651,12 @@ public final class BuffInfoOuterClass { } break; } - case 94851343: { - if (input.isAtField(FieldNames.count)) { - if (!input.trySkipNullValue()) { - count = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case -1378119474: case 227990663: { if (input.isAtField(FieldNames.buffId)) { if (!input.trySkipNullValue()) { buffId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -679,7 +668,7 @@ public final class BuffInfoOuterClass { if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -690,6 +679,17 @@ public final class BuffInfoOuterClass { if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { level = input.readUInt32(); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + case 94851343: { + if (input.isAtField(FieldNames.count)) { + if (!input.trySkipNullValue()) { + count = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -1119,14 +1119,14 @@ public final class BuffInfoOuterClass { static final FieldName lifeTime = FieldName.forField("lifeTime", "life_time"); - static final FieldName count = FieldName.forField("count"); - static final FieldName buffId = FieldName.forField("buffId", "buff_id"); static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); static final FieldName level = FieldName.forField("level"); + static final FieldName count = FieldName.forField("count"); + static final FieldName dynamicValues = FieldName.forField("dynamicValues", "dynamic_values"); } } diff --git a/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionCsReqOuterClass.java index 31c0ef9..22ed285 100644 --- a/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionCsReqOuterClass.java @@ -19,24 +19,24 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueBuffRollInfo roll_buff = 308; + * optional .RogueCommonBuffSelectResult buff_select_result = 744; */ - private final RogueBuffRollInfoOuterClass.RogueBuffRollInfo rollBuff = RogueBuffRollInfoOuterClass.RogueBuffRollInfo.newInstance(); + private final RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult buffSelectResult = RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult.newInstance(); /** - * optional .RogueBonusSelectResult bonus_select_result = 1156; + * optional .RogueBonusSelectResult bonus_select_result = 1047; */ private final RogueBonusSelectResultOuterClass.RogueBonusSelectResult bonusSelectResult = RogueBonusSelectResultOuterClass.RogueBonusSelectResult.newInstance(); /** - * optional .RogueMiracleSelectResult miracle_select_result = 1209; + * optional .RogueMiracleSelectResult miracle_select_result = 1741; */ private final RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult miracleSelectResult = RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult.newInstance(); /** - * optional .RogueCommonBuffSelectResult buff_select_result = 1586; + * optional .RogueBuffRollInfo roll_buff = 2038; */ - private final RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult buffSelectResult = RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult.newInstance(); + private final RogueBuffRollInfoOuterClass.RogueBuffRollInfo rollBuff = RogueBuffRollInfoOuterClass.RogueBuffRollInfo.newInstance(); private HandleRogueCommonPendingActionCsReq() { } @@ -54,80 +54,80 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { public HandleRogueCommonPendingActionCsReq clearPendingAction() { if (hasPendingAction()) { - clearRollBuff(); + clearBuffSelectResult(); clearBonusSelectResult(); clearMiracleSelectResult(); - clearBuffSelectResult(); + clearRollBuff(); } return this; } - private void clearPendingActionOtherRollBuff() { + private void clearPendingActionOtherBuffSelectResult() { if ((((bitField0_ & 0x0000000e)) != 0)) { clearBonusSelectResult(); clearMiracleSelectResult(); - clearBuffSelectResult(); + clearRollBuff(); } } private void clearPendingActionOtherBonusSelectResult() { if ((((bitField0_ & 0x0000000d)) != 0)) { - clearRollBuff(); - clearMiracleSelectResult(); clearBuffSelectResult(); + clearMiracleSelectResult(); + clearRollBuff(); } } private void clearPendingActionOtherMiracleSelectResult() { if ((((bitField0_ & 0x0000000b)) != 0)) { - clearRollBuff(); - clearBonusSelectResult(); clearBuffSelectResult(); + clearBonusSelectResult(); + clearRollBuff(); } } - private void clearPendingActionOtherBuffSelectResult() { + private void clearPendingActionOtherRollBuff() { if ((((bitField0_ & 0x00000007)) != 0)) { - clearRollBuff(); + clearBuffSelectResult(); clearBonusSelectResult(); clearMiracleSelectResult(); } } /** - * optional .RogueBuffRollInfo roll_buff = 308; - * @return whether the rollBuff field is set + * optional .RogueCommonBuffSelectResult buff_select_result = 744; + * @return whether the buffSelectResult field is set */ - public boolean hasRollBuff() { + public boolean hasBuffSelectResult() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .RogueBuffRollInfo roll_buff = 308; + * optional .RogueCommonBuffSelectResult buff_select_result = 744; * @return this */ - public HandleRogueCommonPendingActionCsReq clearRollBuff() { + public HandleRogueCommonPendingActionCsReq clearBuffSelectResult() { bitField0_ &= ~0x00000001; - rollBuff.clear(); + buffSelectResult.clear(); return this; } /** - * optional .RogueBuffRollInfo roll_buff = 308; + * optional .RogueCommonBuffSelectResult buff_select_result = 744; * * This method returns the internal storage object without modifying any has state. * 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 */ - public RogueBuffRollInfoOuterClass.RogueBuffRollInfo getRollBuff() { - return rollBuff; + public RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult getBuffSelectResult() { + return buffSelectResult; } /** - * optional .RogueBuffRollInfo roll_buff = 308; + * optional .RogueCommonBuffSelectResult buff_select_result = 744; * * This method returns the internal storage object and sets the corresponding * 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 */ - public RogueBuffRollInfoOuterClass.RogueBuffRollInfo getMutableRollBuff() { - clearPendingActionOtherRollBuff(); + public RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult getMutableBuffSelectResult( + ) { + clearPendingActionOtherBuffSelectResult(); bitField0_ |= 0x00000001; - return rollBuff; + return buffSelectResult; } /** - * optional .RogueBuffRollInfo roll_buff = 308; - * @param value the rollBuff to set + * optional .RogueCommonBuffSelectResult buff_select_result = 744; + * @param value the buffSelectResult to set * @return this */ - public HandleRogueCommonPendingActionCsReq setRollBuff( - final RogueBuffRollInfoOuterClass.RogueBuffRollInfo value) { - clearPendingActionOtherRollBuff(); + public HandleRogueCommonPendingActionCsReq setBuffSelectResult( + final RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult value) { + clearPendingActionOtherBuffSelectResult(); bitField0_ |= 0x00000001; - rollBuff.copyFrom(value); + buffSelectResult.copyFrom(value); return this; } /** - * optional .RogueBonusSelectResult bonus_select_result = 1156; + * optional .RogueBonusSelectResult bonus_select_result = 1047; * @return whether the bonusSelectResult field is set */ public boolean hasBonusSelectResult() { @@ -163,7 +164,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } /** - * optional .RogueBonusSelectResult bonus_select_result = 1156; + * optional .RogueBonusSelectResult bonus_select_result = 1047; * @return this */ public HandleRogueCommonPendingActionCsReq clearBonusSelectResult() { @@ -173,7 +174,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } /** - * optional .RogueBonusSelectResult bonus_select_result = 1156; + * optional .RogueBonusSelectResult bonus_select_result = 1047; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -187,7 +188,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } /** - * optional .RogueBonusSelectResult bonus_select_result = 1156; + * optional .RogueBonusSelectResult bonus_select_result = 1047; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -202,7 +203,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } /** - * optional .RogueBonusSelectResult bonus_select_result = 1156; + * optional .RogueBonusSelectResult bonus_select_result = 1047; * @param value the bonusSelectResult to set * @return this */ @@ -215,7 +216,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } /** - * optional .RogueMiracleSelectResult miracle_select_result = 1209; + * optional .RogueMiracleSelectResult miracle_select_result = 1741; * @return whether the miracleSelectResult field is set */ public boolean hasMiracleSelectResult() { @@ -223,7 +224,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } /** - * optional .RogueMiracleSelectResult miracle_select_result = 1209; + * optional .RogueMiracleSelectResult miracle_select_result = 1741; * @return this */ public HandleRogueCommonPendingActionCsReq clearMiracleSelectResult() { @@ -233,7 +234,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } /** - * optional .RogueMiracleSelectResult miracle_select_result = 1209; + * optional .RogueMiracleSelectResult miracle_select_result = 1741; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -247,7 +248,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } /** - * optional .RogueMiracleSelectResult miracle_select_result = 1209; + * optional .RogueMiracleSelectResult miracle_select_result = 1741; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -263,7 +264,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } /** - * optional .RogueMiracleSelectResult miracle_select_result = 1209; + * optional .RogueMiracleSelectResult miracle_select_result = 1741; * @param value the miracleSelectResult to set * @return this */ @@ -276,39 +277,39 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } /** - * optional .RogueCommonBuffSelectResult buff_select_result = 1586; - * @return whether the buffSelectResult field is set + * optional .RogueBuffRollInfo roll_buff = 2038; + * @return whether the rollBuff field is set */ - public boolean hasBuffSelectResult() { + public boolean hasRollBuff() { return (bitField0_ & 0x00000008) != 0; } /** - * optional .RogueCommonBuffSelectResult buff_select_result = 1586; + * optional .RogueBuffRollInfo roll_buff = 2038; * @return this */ - public HandleRogueCommonPendingActionCsReq clearBuffSelectResult() { + public HandleRogueCommonPendingActionCsReq clearRollBuff() { bitField0_ &= ~0x00000008; - buffSelectResult.clear(); + rollBuff.clear(); return this; } /** - * optional .RogueCommonBuffSelectResult buff_select_result = 1586; + * optional .RogueBuffRollInfo roll_buff = 2038; * * This method returns the internal storage object without modifying any has state. * 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 */ - public RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult getBuffSelectResult() { - return buffSelectResult; + public RogueBuffRollInfoOuterClass.RogueBuffRollInfo getRollBuff() { + return rollBuff; } /** - * optional .RogueCommonBuffSelectResult buff_select_result = 1586; + * optional .RogueBuffRollInfo roll_buff = 2038; * * This method returns the internal storage object and sets the corresponding * 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 */ - public RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult getMutableBuffSelectResult( - ) { - clearPendingActionOtherBuffSelectResult(); + public RogueBuffRollInfoOuterClass.RogueBuffRollInfo getMutableRollBuff() { + clearPendingActionOtherRollBuff(); bitField0_ |= 0x00000008; - return buffSelectResult; + return rollBuff; } /** - * optional .RogueCommonBuffSelectResult buff_select_result = 1586; - * @param value the buffSelectResult to set + * optional .RogueBuffRollInfo roll_buff = 2038; + * @param value the rollBuff to set * @return this */ - public HandleRogueCommonPendingActionCsReq setBuffSelectResult( - final RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult value) { - clearPendingActionOtherBuffSelectResult(); + public HandleRogueCommonPendingActionCsReq setRollBuff( + final RogueBuffRollInfoOuterClass.RogueBuffRollInfo value) { + clearPendingActionOtherRollBuff(); bitField0_ |= 0x00000008; - buffSelectResult.copyFrom(value); + rollBuff.copyFrom(value); return this; } @@ -342,10 +342,10 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - rollBuff.copyFrom(other.rollBuff); + buffSelectResult.copyFrom(other.buffSelectResult); bonusSelectResult.copyFrom(other.bonusSelectResult); miracleSelectResult.copyFrom(other.miracleSelectResult); - buffSelectResult.copyFrom(other.buffSelectResult); + rollBuff.copyFrom(other.rollBuff); } return this; } @@ -357,8 +357,8 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasRollBuff()) { - getMutableRollBuff().mergeFrom(other.rollBuff); + if (other.hasBuffSelectResult()) { + getMutableBuffSelectResult().mergeFrom(other.buffSelectResult); } if (other.hasBonusSelectResult()) { getMutableBonusSelectResult().mergeFrom(other.bonusSelectResult); @@ -366,8 +366,8 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { if (other.hasMiracleSelectResult()) { getMutableMiracleSelectResult().mergeFrom(other.miracleSelectResult); } - if (other.hasBuffSelectResult()) { - getMutableBuffSelectResult().mergeFrom(other.buffSelectResult); + if (other.hasRollBuff()) { + getMutableRollBuff().mergeFrom(other.rollBuff); } return this; } @@ -379,10 +379,10 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - rollBuff.clear(); + buffSelectResult.clear(); bonusSelectResult.clear(); miracleSelectResult.clear(); - buffSelectResult.clear(); + rollBuff.clear(); return this; } @@ -393,10 +393,10 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - rollBuff.clearQuick(); + buffSelectResult.clearQuick(); bonusSelectResult.clearQuick(); miracleSelectResult.clearQuick(); - buffSelectResult.clearQuick(); + rollBuff.clearQuick(); return this; } @@ -410,29 +410,29 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } HandleRogueCommonPendingActionCsReq other = (HandleRogueCommonPendingActionCsReq) o; return bitField0_ == other.bitField0_ - && (!hasRollBuff() || rollBuff.equals(other.rollBuff)) + && (!hasBuffSelectResult() || buffSelectResult.equals(other.buffSelectResult)) && (!hasBonusSelectResult() || bonusSelectResult.equals(other.bonusSelectResult)) && (!hasMiracleSelectResult() || miracleSelectResult.equals(other.miracleSelectResult)) - && (!hasBuffSelectResult() || buffSelectResult.equals(other.buffSelectResult)); + && (!hasRollBuff() || rollBuff.equals(other.rollBuff)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawLittleEndian16((short) 5026); - output.writeMessageNoTag(rollBuff); + output.writeRawLittleEndian16((short) 11970); + output.writeMessageNoTag(buffSelectResult); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawLittleEndian16((short) 18594); + output.writeRawLittleEndian16((short) 16826); output.writeMessageNoTag(bonusSelectResult); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawLittleEndian16((short) 19402); + output.writeRawLittleEndian16((short) 27882); output.writeMessageNoTag(miracleSelectResult); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawLittleEndian16((short) 25490); - output.writeMessageNoTag(buffSelectResult); + output.writeRawLittleEndian16((short) 32690); + output.writeMessageNoTag(rollBuff); } } @@ -440,7 +440,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(rollBuff); + size += 2 + ProtoSink.computeMessageSizeNoTag(buffSelectResult); } if ((bitField0_ & 0x00000002) != 0) { size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelectResult); @@ -449,7 +449,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelectResult); } if ((bitField0_ & 0x00000008) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(buffSelectResult); + size += 2 + ProtoSink.computeMessageSizeNoTag(rollBuff); } return size; } @@ -462,40 +462,40 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 2466: { - // rollBuff - clearPendingActionOtherRollBuff(); - input.readMessage(rollBuff); + case 5954: { + // buffSelectResult + clearPendingActionOtherBuffSelectResult(); + input.readMessage(buffSelectResult); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 9250) { + if (tag != 8378) { break; } } - case 9250: { + case 8378: { // bonusSelectResult clearPendingActionOtherBonusSelectResult(); input.readMessage(bonusSelectResult); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 9674) { + if (tag != 13930) { break; } } - case 9674: { + case 13930: { // miracleSelectResult clearPendingActionOtherMiracleSelectResult(); input.readMessage(miracleSelectResult); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 12690) { + if (tag != 16306) { break; } } - case 12690: { - // buffSelectResult - clearPendingActionOtherBuffSelectResult(); - input.readMessage(buffSelectResult); + case 16306: { + // rollBuff + clearPendingActionOtherRollBuff(); + input.readMessage(rollBuff); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -520,7 +520,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.rollBuff, rollBuff); + output.writeMessage(FieldNames.buffSelectResult, buffSelectResult); } if ((bitField0_ & 0x00000002) != 0) { output.writeMessage(FieldNames.bonusSelectResult, bonusSelectResult); @@ -529,7 +529,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { output.writeMessage(FieldNames.miracleSelectResult, miracleSelectResult); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.buffSelectResult, buffSelectResult); + output.writeMessage(FieldNames.rollBuff, rollBuff); } output.endObject(); } @@ -542,12 +542,12 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -260653456: - case 535908053: { - if (input.isAtField(FieldNames.rollBuff)) { + case -224789460: + case -839396908: { + if (input.isAtField(FieldNames.buffSelectResult)) { if (!input.trySkipNullValue()) { - clearPendingActionOtherRollBuff(); - input.readMessage(rollBuff); + clearPendingActionOtherBuffSelectResult(); + input.readMessage(buffSelectResult); bitField0_ |= 0x00000001; } } else { @@ -581,12 +581,12 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } break; } - case -224789460: - case -839396908: { - if (input.isAtField(FieldNames.buffSelectResult)) { + case -260653456: + case 535908053: { + if (input.isAtField(FieldNames.rollBuff)) { if (!input.trySkipNullValue()) { - clearPendingActionOtherBuffSelectResult(); - input.readMessage(buffSelectResult); + clearPendingActionOtherRollBuff(); + input.readMessage(rollBuff); bitField0_ |= 0x00000008; } } else { @@ -649,13 +649,13 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { * Contains name constants used for serializing JSON */ 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 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"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionScRspOuterClass.java index 5e2ec8c..ca9ed2f 100644 --- a/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionScRspOuterClass.java @@ -19,37 +19,32 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 times = 7; + * optional uint32 action_unique_id = 1; */ - private int times; + private int actionUniqueId; /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 15; */ private int retcode; /** - * optional uint32 times2 = 14; - */ - private int times2; - - /** - * optional .RogueRerollBuff rogue_reroll_buff = 126; - */ - private final RogueRerollBuffOuterClass.RogueRerollBuff rogueRerollBuff = RogueRerollBuffOuterClass.RogueRerollBuff.newInstance(); - - /** - * optional .RogueBonusSelect bonus_select = 392; + * optional .RogueBonusSelect bonus_select = 59; */ private final RogueBonusSelectOuterClass.RogueBonusSelect bonusSelect = RogueBonusSelectOuterClass.RogueBonusSelect.newInstance(); /** - * optional .RogueBuffSelect rogue_buff_select = 1087; + * optional .RogueRerollBuff rogue_reroll_buff = 523; + */ + private final RogueRerollBuffOuterClass.RogueRerollBuff rogueRerollBuff = RogueRerollBuffOuterClass.RogueRerollBuff.newInstance(); + + /** + * optional .RogueBuffSelect rogue_buff_select = 688; */ private final RogueBuffSelectOuterClass.RogueBuffSelect rogueBuffSelect = RogueBuffSelectOuterClass.RogueBuffSelect.newInstance(); /** - * optional .RogueMiracleSelect miracle_select = 2029; + * optional .RogueMiracleSelect miracle_select = 741; */ private final RogueMiracleSelectOuterClass.RogueMiracleSelect miracleSelect = RogueMiracleSelectOuterClass.RogueMiracleSelect.newInstance(); @@ -64,44 +59,44 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * optional uint32 times = 7; - * @return whether the times field is set + * optional uint32 action_unique_id = 1; + * @return whether the actionUniqueId field is set */ - public boolean hasTimes() { + public boolean hasActionUniqueId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 times = 7; + * optional uint32 action_unique_id = 1; * @return this */ - public HandleRogueCommonPendingActionScRsp clearTimes() { + public HandleRogueCommonPendingActionScRsp clearActionUniqueId() { bitField0_ &= ~0x00000001; - times = 0; + actionUniqueId = 0; return this; } /** - * optional uint32 times = 7; - * @return the times + * optional uint32 action_unique_id = 1; + * @return the actionUniqueId */ - public int getTimes() { - return times; + public int getActionUniqueId() { + return actionUniqueId; } /** - * optional uint32 times = 7; - * @param value the times to set + * optional uint32 action_unique_id = 1; + * @param value the actionUniqueId to set * @return this */ - public HandleRogueCommonPendingActionScRsp setTimes(final int value) { + public HandleRogueCommonPendingActionScRsp setActionUniqueId(final int value) { bitField0_ |= 0x00000001; - times = value; + actionUniqueId = value; return this; } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 15; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -109,7 +104,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 15; * @return this */ public HandleRogueCommonPendingActionScRsp clearRetcode() { @@ -119,7 +114,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -127,7 +122,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -138,120 +133,25 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * optional uint32 times2 = 14; - * @return whether the times2 field is set + * optional .RogueBonusSelect bonus_select = 59; + * @return whether the bonusSelect field is set */ - public boolean hasTimes2() { + public boolean hasBonusSelect() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 times2 = 14; - * @return this - */ - public HandleRogueCommonPendingActionScRsp clearTimes2() { - bitField0_ &= ~0x00000004; - times2 = 0; - return this; - } - - /** - * optional uint32 times2 = 14; - * @return the times2 - */ - public int getTimes2() { - return times2; - } - - /** - * optional uint32 times2 = 14; - * @param value the times2 to set - * @return this - */ - public HandleRogueCommonPendingActionScRsp setTimes2(final int value) { - bitField0_ |= 0x00000004; - times2 = value; - return this; - } - - /** - * optional .RogueRerollBuff rogue_reroll_buff = 126; - * @return whether the rogueRerollBuff field is set - */ - public boolean hasRogueRerollBuff() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional .RogueRerollBuff rogue_reroll_buff = 126; - * @return this - */ - public HandleRogueCommonPendingActionScRsp clearRogueRerollBuff() { - bitField0_ &= ~0x00000008; - rogueRerollBuff.clear(); - return this; - } - - /** - * optional .RogueRerollBuff rogue_reroll_buff = 126; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableRogueRerollBuff()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueRerollBuffOuterClass.RogueRerollBuff getRogueRerollBuff() { - return rogueRerollBuff; - } - - /** - * optional .RogueRerollBuff rogue_reroll_buff = 126; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * 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; - } - - /** - * optional .RogueRerollBuff rogue_reroll_buff = 126; - * @param value the rogueRerollBuff to set - * @return this - */ - public HandleRogueCommonPendingActionScRsp setRogueRerollBuff( - final RogueRerollBuffOuterClass.RogueRerollBuff value) { - bitField0_ |= 0x00000008; - rogueRerollBuff.copyFrom(value); - return this; - } - - /** - * optional .RogueBonusSelect bonus_select = 392; - * @return whether the bonusSelect field is set - */ - public boolean hasBonusSelect() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional .RogueBonusSelect bonus_select = 392; + * optional .RogueBonusSelect bonus_select = 59; * @return this */ public HandleRogueCommonPendingActionScRsp clearBonusSelect() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000004; bonusSelect.clear(); return this; } /** - * optional .RogueBonusSelect bonus_select = 392; + * optional .RogueBonusSelect bonus_select = 59; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -265,7 +165,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * optional .RogueBonusSelect bonus_select = 392; + * optional .RogueBonusSelect bonus_select = 59; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -274,42 +174,100 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { * @return internal storage object for modifications */ public RogueBonusSelectOuterClass.RogueBonusSelect getMutableBonusSelect() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; return bonusSelect; } /** - * optional .RogueBonusSelect bonus_select = 392; + * optional .RogueBonusSelect bonus_select = 59; * @param value the bonusSelect to set * @return this */ public HandleRogueCommonPendingActionScRsp setBonusSelect( final RogueBonusSelectOuterClass.RogueBonusSelect value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; bonusSelect.copyFrom(value); return this; } /** - * optional .RogueBuffSelect rogue_buff_select = 1087; - * @return whether the rogueBuffSelect field is set + * optional .RogueRerollBuff rogue_reroll_buff = 523; + * @return whether the rogueRerollBuff field is set */ - public boolean hasRogueBuffSelect() { - return (bitField0_ & 0x00000020) != 0; + public boolean hasRogueRerollBuff() { + return (bitField0_ & 0x00000008) != 0; } /** - * optional .RogueBuffSelect rogue_buff_select = 1087; + * optional .RogueRerollBuff rogue_reroll_buff = 523; + * @return this + */ + public HandleRogueCommonPendingActionScRsp clearRogueRerollBuff() { + bitField0_ &= ~0x00000008; + rogueRerollBuff.clear(); + return this; + } + + /** + * optional .RogueRerollBuff rogue_reroll_buff = 523; + * + * This method returns 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; + } + + /** + * optional .RogueRerollBuff rogue_reroll_buff = 523; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of 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; + } + + /** + * optional .RogueRerollBuff rogue_reroll_buff = 523; + * @param value the rogueRerollBuff to set + * @return this + */ + public HandleRogueCommonPendingActionScRsp setRogueRerollBuff( + final RogueRerollBuffOuterClass.RogueRerollBuff value) { + bitField0_ |= 0x00000008; + rogueRerollBuff.copyFrom(value); + return this; + } + + /** + * optional .RogueBuffSelect rogue_buff_select = 688; + * @return whether the rogueBuffSelect field is set + */ + public boolean hasRogueBuffSelect() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional .RogueBuffSelect rogue_buff_select = 688; * @return this */ public HandleRogueCommonPendingActionScRsp clearRogueBuffSelect() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; rogueBuffSelect.clear(); return this; } /** - * optional .RogueBuffSelect rogue_buff_select = 1087; + * optional .RogueBuffSelect rogue_buff_select = 688; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -323,7 +281,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * optional .RogueBuffSelect rogue_buff_select = 1087; + * optional .RogueBuffSelect rogue_buff_select = 688; * * This method returns the internal storage object and sets the corresponding * 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 */ public RogueBuffSelectOuterClass.RogueBuffSelect getMutableRogueBuffSelect() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; return rogueBuffSelect; } /** - * optional .RogueBuffSelect rogue_buff_select = 1087; + * optional .RogueBuffSelect rogue_buff_select = 688; * @param value the rogueBuffSelect to set * @return this */ public HandleRogueCommonPendingActionScRsp setRogueBuffSelect( final RogueBuffSelectOuterClass.RogueBuffSelect value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; rogueBuffSelect.copyFrom(value); return this; } /** - * optional .RogueMiracleSelect miracle_select = 2029; + * optional .RogueMiracleSelect miracle_select = 741; * @return whether the miracleSelect field is set */ public boolean hasMiracleSelect() { - return (bitField0_ & 0x00000040) != 0; + return (bitField0_ & 0x00000020) != 0; } /** - * optional .RogueMiracleSelect miracle_select = 2029; + * optional .RogueMiracleSelect miracle_select = 741; * @return this */ public HandleRogueCommonPendingActionScRsp clearMiracleSelect() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000020; miracleSelect.clear(); return this; } /** - * optional .RogueMiracleSelect miracle_select = 2029; + * optional .RogueMiracleSelect miracle_select = 741; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -381,7 +339,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * optional .RogueMiracleSelect miracle_select = 2029; + * optional .RogueMiracleSelect miracle_select = 741; * * This method returns the internal storage object and sets the corresponding * 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 */ public RogueMiracleSelectOuterClass.RogueMiracleSelect getMutableMiracleSelect() { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; return miracleSelect; } /** - * optional .RogueMiracleSelect miracle_select = 2029; + * optional .RogueMiracleSelect miracle_select = 741; * @param value the miracleSelect to set * @return this */ public HandleRogueCommonPendingActionScRsp setMiracleSelect( final RogueMiracleSelectOuterClass.RogueMiracleSelect value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; miracleSelect.copyFrom(value); return this; } @@ -412,11 +370,10 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - times = other.times; + actionUniqueId = other.actionUniqueId; retcode = other.retcode; - times2 = other.times2; - rogueRerollBuff.copyFrom(other.rogueRerollBuff); bonusSelect.copyFrom(other.bonusSelect); + rogueRerollBuff.copyFrom(other.rogueRerollBuff); rogueBuffSelect.copyFrom(other.rogueBuffSelect); miracleSelect.copyFrom(other.miracleSelect); } @@ -430,21 +387,18 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { return this; } cachedSize = -1; - if (other.hasTimes()) { - setTimes(other.times); + if (other.hasActionUniqueId()) { + setActionUniqueId(other.actionUniqueId); } if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasTimes2()) { - setTimes2(other.times2); + if (other.hasBonusSelect()) { + getMutableBonusSelect().mergeFrom(other.bonusSelect); } if (other.hasRogueRerollBuff()) { getMutableRogueRerollBuff().mergeFrom(other.rogueRerollBuff); } - if (other.hasBonusSelect()) { - getMutableBonusSelect().mergeFrom(other.bonusSelect); - } if (other.hasRogueBuffSelect()) { getMutableRogueBuffSelect().mergeFrom(other.rogueBuffSelect); } @@ -461,11 +415,10 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - times = 0; + actionUniqueId = 0; retcode = 0; - times2 = 0; - rogueRerollBuff.clear(); bonusSelect.clear(); + rogueRerollBuff.clear(); rogueBuffSelect.clear(); miracleSelect.clear(); return this; @@ -478,8 +431,8 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - rogueRerollBuff.clearQuick(); bonusSelect.clearQuick(); + rogueRerollBuff.clearQuick(); rogueBuffSelect.clearQuick(); miracleSelect.clearQuick(); return this; @@ -495,11 +448,10 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } HandleRogueCommonPendingActionScRsp other = (HandleRogueCommonPendingActionScRsp) o; return bitField0_ == other.bitField0_ - && (!hasTimes() || times == other.times) + && (!hasActionUniqueId() || actionUniqueId == other.actionUniqueId) && (!hasRetcode() || retcode == other.retcode) - && (!hasTimes2() || times2 == other.times2) - && (!hasRogueRerollBuff() || rogueRerollBuff.equals(other.rogueRerollBuff)) && (!hasBonusSelect() || bonusSelect.equals(other.bonusSelect)) + && (!hasRogueRerollBuff() || rogueRerollBuff.equals(other.rogueRerollBuff)) && (!hasRogueBuffSelect() || rogueBuffSelect.equals(other.rogueBuffSelect)) && (!hasMiracleSelect() || miracleSelect.equals(other.miracleSelect)); } @@ -507,31 +459,27 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(times); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(actionUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(times2); + output.writeRawLittleEndian16((short) 986); + output.writeMessageNoTag(bonusSelect); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawLittleEndian16((short) 2034); + output.writeRawLittleEndian16((short) 8410); output.writeMessageNoTag(rogueRerollBuff); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawLittleEndian16((short) 6338); - output.writeMessageNoTag(bonusSelect); - } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawLittleEndian16((short) 17402); + output.writeRawLittleEndian16((short) 11138); output.writeMessageNoTag(rogueBuffSelect); } - if ((bitField0_ & 0x00000040) != 0) { - output.writeRawLittleEndian16((short) 32490); + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawLittleEndian16((short) 11946); output.writeMessageNoTag(miracleSelect); } } @@ -540,24 +488,21 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(times); + size += 1 + ProtoSink.computeUInt32SizeNoTag(actionUniqueId); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(times2); + size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelect); } if ((bitField0_ & 0x00000008) != 0) { size += 2 + ProtoSink.computeMessageSizeNoTag(rogueRerollBuff); } if ((bitField0_ & 0x00000010) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelect); - } - if ((bitField0_ & 0x00000020) != 0) { size += 2 + ProtoSink.computeMessageSizeNoTag(rogueBuffSelect); } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000020) != 0) { size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelect); } return size; @@ -571,64 +516,55 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // times - times = input.readUInt32(); + case 8: { + // actionUniqueId + actionUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 120) { break; } } - case 72: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 112) { + if (tag != 474) { break; } } - case 112: { - // times2 - times2 = input.readUInt32(); + case 474: { + // bonusSelect + input.readMessage(bonusSelect); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 1010) { + if (tag != 4186) { break; } } - case 1010: { + case 4186: { // rogueRerollBuff input.readMessage(rogueRerollBuff); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 3138) { + if (tag != 5506) { break; } } - case 3138: { - // bonusSelect - input.readMessage(bonusSelect); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 8698) { - break; - } - } - case 8698: { + case 5506: { // rogueBuffSelect input.readMessage(rogueBuffSelect); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 16234) { + if (tag != 5930) { break; } } - case 16234: { + case 5930: { // miracleSelect input.readMessage(miracleSelect); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 0) { break; @@ -652,24 +588,21 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.times, times); + output.writeUInt32(FieldNames.actionUniqueId, actionUniqueId); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.times2, times2); + output.writeMessage(FieldNames.bonusSelect, bonusSelect); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.rogueRerollBuff, rogueRerollBuff); } if ((bitField0_ & 0x00000010) != 0) { - output.writeMessage(FieldNames.bonusSelect, bonusSelect); - } - if ((bitField0_ & 0x00000020) != 0) { output.writeMessage(FieldNames.rogueBuffSelect, rogueBuffSelect); } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000020) != 0) { output.writeMessage(FieldNames.miracleSelect, miracleSelect); } output.endObject(); @@ -683,10 +616,11 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 110364486: { - if (input.isAtField(FieldNames.times)) { + case -208785118: + case 1003664768: { + if (input.isAtField(FieldNames.actionUniqueId)) { if (!input.trySkipNullValue()) { - times = input.readUInt32(); + actionUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -705,10 +639,11 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } break; } - case -873668180: { - if (input.isAtField(FieldNames.times2)) { + case 1904635387: + case 1368817948: { + if (input.isAtField(FieldNames.bonusSelect)) { if (!input.trySkipNullValue()) { - times2 = input.readUInt32(); + input.readMessage(bonusSelect); bitField0_ |= 0x00000004; } } else { @@ -728,24 +663,12 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } break; } - case 1904635387: - case 1368817948: { - if (input.isAtField(FieldNames.bonusSelect)) { - if (!input.trySkipNullValue()) { - input.readMessage(bonusSelect); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } case -183502679: case -1750117501: { if (input.isAtField(FieldNames.rogueBuffSelect)) { if (!input.trySkipNullValue()) { input.readMessage(rogueBuffSelect); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; } } else { input.skipUnknownField(); @@ -757,7 +680,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { if (input.isAtField(FieldNames.miracleSelect)) { if (!input.trySkipNullValue()) { input.readMessage(miracleSelect); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; } } else { input.skipUnknownField(); @@ -819,16 +742,14 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { * Contains name constants used for serializing JSON */ 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 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 bonusSelect = FieldName.forField("bonusSelect", "bonus_select"); - static final FieldName rogueBuffSelect = FieldName.forField("rogueBuffSelect", "rogue_buff_select"); static final FieldName miracleSelect = FieldName.forField("miracleSelect", "miracle_select"); diff --git a/src/generated/main/emu/lunarcore/proto/RogueBonusSelectResultOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBonusSelectResultOuterClass.java index affc529..7a6f990 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueBonusSelectResultOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueBonusSelectResultOuterClass.java @@ -19,7 +19,7 @@ public final class RogueBonusSelectResultOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 bonus_id = 14; + * optional uint32 bonus_id = 2; */ private int bonusId; @@ -34,7 +34,7 @@ public final class RogueBonusSelectResultOuterClass { } /** - * optional uint32 bonus_id = 14; + * optional uint32 bonus_id = 2; * @return whether the bonusId field is set */ public boolean hasBonusId() { @@ -42,7 +42,7 @@ public final class RogueBonusSelectResultOuterClass { } /** - * optional uint32 bonus_id = 14; + * optional uint32 bonus_id = 2; * @return this */ public RogueBonusSelectResult clearBonusId() { @@ -52,7 +52,7 @@ public final class RogueBonusSelectResultOuterClass { } /** - * optional uint32 bonus_id = 14; + * optional uint32 bonus_id = 2; * @return the bonusId */ public int getBonusId() { @@ -60,7 +60,7 @@ public final class RogueBonusSelectResultOuterClass { } /** - * optional uint32 bonus_id = 14; + * optional uint32 bonus_id = 2; * @param value the bonusId to set * @return this */ @@ -129,7 +129,7 @@ public final class RogueBonusSelectResultOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(bonusId); } } @@ -150,7 +150,7 @@ public final class RogueBonusSelectResultOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 16: { // bonusId bonusId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectResultOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectResultOuterClass.java index 7ccb6b7..72b79ca 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectResultOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectResultOuterClass.java @@ -19,7 +19,7 @@ public final class RogueCommonBuffSelectResultOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 buff_id = 4; + * optional uint32 buff_id = 15; */ private int buffId; @@ -34,7 +34,7 @@ public final class RogueCommonBuffSelectResultOuterClass { } /** - * optional uint32 buff_id = 4; + * optional uint32 buff_id = 15; * @return whether the buffId field is set */ public boolean hasBuffId() { @@ -42,7 +42,7 @@ public final class RogueCommonBuffSelectResultOuterClass { } /** - * optional uint32 buff_id = 4; + * optional uint32 buff_id = 15; * @return this */ public RogueCommonBuffSelectResult clearBuffId() { @@ -52,7 +52,7 @@ public final class RogueCommonBuffSelectResultOuterClass { } /** - * optional uint32 buff_id = 4; + * optional uint32 buff_id = 15; * @return the buffId */ public int getBuffId() { @@ -60,7 +60,7 @@ public final class RogueCommonBuffSelectResultOuterClass { } /** - * optional uint32 buff_id = 4; + * optional uint32 buff_id = 15; * @param value the buffId to set * @return this */ @@ -129,7 +129,7 @@ public final class RogueCommonBuffSelectResultOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(buffId); } } @@ -150,7 +150,7 @@ public final class RogueCommonBuffSelectResultOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 120: { // buffId buffId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueMapInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMapInfoOuterClass.java index d73fad4..87eacf6 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueMapInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueMapInfoOuterClass.java @@ -20,27 +20,27 @@ public final class RogueMapInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 map_id = 2; - */ - private int mapId; - - /** - * optional uint32 cur_room_id = 4; + * optional uint32 cur_room_id = 1; */ private int curRoomId; /** - * optional uint32 cur_site_id = 11; + * optional uint32 map_id = 4; */ - private int curSiteId; + private int mapId; /** - * optional uint32 area_id = 13; + * optional uint32 area_id = 8; */ private int areaId; /** - * repeated .RogueRoom room_list = 3; + * optional uint32 cur_site_id = 13; + */ + private int curSiteId; + + /** + * repeated .RogueRoom room_list = 15; */ private final RepeatedMessage roomList = RepeatedMessage.newEmptyInstance(RogueRoomOuterClass.RogueRoom.getFactory()); @@ -55,62 +55,25 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 map_id = 2; - * @return whether the mapId field is set + * optional uint32 cur_room_id = 1; + * @return whether the curRoomId field is set */ - public boolean hasMapId() { + public boolean hasCurRoomId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 map_id = 2; - * @return this - */ - public RogueMapInfo clearMapId() { - bitField0_ &= ~0x00000001; - mapId = 0; - return this; - } - - /** - * optional uint32 map_id = 2; - * @return the mapId - */ - public int getMapId() { - return mapId; - } - - /** - * optional uint32 map_id = 2; - * @param value the mapId to set - * @return this - */ - public RogueMapInfo setMapId(final int value) { - bitField0_ |= 0x00000001; - mapId = value; - return this; - } - - /** - * optional uint32 cur_room_id = 4; - * @return whether the curRoomId field is set - */ - public boolean hasCurRoomId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 cur_room_id = 4; + * optional uint32 cur_room_id = 1; * @return this */ public RogueMapInfo clearCurRoomId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; curRoomId = 0; return this; } /** - * optional uint32 cur_room_id = 4; + * optional uint32 cur_room_id = 1; * @return the curRoomId */ public int getCurRoomId() { @@ -118,73 +81,73 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 cur_room_id = 4; + * optional uint32 cur_room_id = 1; * @param value the curRoomId to set * @return this */ public RogueMapInfo setCurRoomId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; curRoomId = value; return this; } /** - * optional uint32 cur_site_id = 11; - * @return whether the curSiteId field is set + * optional uint32 map_id = 4; + * @return whether the mapId field is set */ - public boolean hasCurSiteId() { + public boolean hasMapId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 map_id = 4; + * @return this + */ + public RogueMapInfo clearMapId() { + bitField0_ &= ~0x00000002; + mapId = 0; + return this; + } + + /** + * optional uint32 map_id = 4; + * @return the mapId + */ + public int getMapId() { + return mapId; + } + + /** + * optional uint32 map_id = 4; + * @param value the mapId to set + * @return this + */ + public RogueMapInfo setMapId(final int value) { + bitField0_ |= 0x00000002; + mapId = value; + return this; + } + + /** + * optional uint32 area_id = 8; + * @return whether the areaId field is set + */ + public boolean hasAreaId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 cur_site_id = 11; - * @return this - */ - public RogueMapInfo clearCurSiteId() { - bitField0_ &= ~0x00000004; - curSiteId = 0; - return this; - } - - /** - * optional uint32 cur_site_id = 11; - * @return the curSiteId - */ - public int getCurSiteId() { - return curSiteId; - } - - /** - * optional uint32 cur_site_id = 11; - * @param value the curSiteId to set - * @return this - */ - public RogueMapInfo setCurSiteId(final int value) { - bitField0_ |= 0x00000004; - curSiteId = value; - return this; - } - - /** - * optional uint32 area_id = 13; - * @return whether the areaId field is set - */ - public boolean hasAreaId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 area_id = 13; + * optional uint32 area_id = 8; * @return this */ public RogueMapInfo clearAreaId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; areaId = 0; return this; } /** - * optional uint32 area_id = 13; + * optional uint32 area_id = 8; * @return the areaId */ public int getAreaId() { @@ -192,18 +155,55 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 area_id = 13; + * optional uint32 area_id = 8; * @param value the areaId to set * @return this */ public RogueMapInfo setAreaId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; areaId = value; return this; } /** - * repeated .RogueRoom room_list = 3; + * optional uint32 cur_site_id = 13; + * @return whether the curSiteId field is set + */ + public boolean hasCurSiteId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 cur_site_id = 13; + * @return this + */ + public RogueMapInfo clearCurSiteId() { + bitField0_ &= ~0x00000008; + curSiteId = 0; + return this; + } + + /** + * optional uint32 cur_site_id = 13; + * @return the curSiteId + */ + public int getCurSiteId() { + return curSiteId; + } + + /** + * optional uint32 cur_site_id = 13; + * @param value the curSiteId to set + * @return this + */ + public RogueMapInfo setCurSiteId(final int value) { + bitField0_ |= 0x00000008; + curSiteId = value; + return this; + } + + /** + * repeated .RogueRoom room_list = 15; * @return whether the roomList field is set */ public boolean hasRoomList() { @@ -211,7 +211,7 @@ public final class RogueMapInfoOuterClass { } /** - * repeated .RogueRoom room_list = 3; + * repeated .RogueRoom room_list = 15; * @return this */ public RogueMapInfo clearRoomList() { @@ -221,7 +221,7 @@ public final class RogueMapInfoOuterClass { } /** - * repeated .RogueRoom room_list = 3; + * repeated .RogueRoom room_list = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -235,7 +235,7 @@ public final class RogueMapInfoOuterClass { } /** - * repeated .RogueRoom room_list = 3; + * repeated .RogueRoom room_list = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -249,7 +249,7 @@ public final class RogueMapInfoOuterClass { } /** - * repeated .RogueRoom room_list = 3; + * repeated .RogueRoom room_list = 15; * @param value the roomList to add * @return this */ @@ -260,7 +260,7 @@ public final class RogueMapInfoOuterClass { } /** - * repeated .RogueRoom room_list = 3; + * repeated .RogueRoom room_list = 15; * @param values the roomList to add * @return this */ @@ -275,10 +275,10 @@ public final class RogueMapInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - mapId = other.mapId; curRoomId = other.curRoomId; - curSiteId = other.curSiteId; + mapId = other.mapId; areaId = other.areaId; + curSiteId = other.curSiteId; roomList.copyFrom(other.roomList); } return this; @@ -290,18 +290,18 @@ public final class RogueMapInfoOuterClass { return this; } cachedSize = -1; - if (other.hasMapId()) { - setMapId(other.mapId); - } if (other.hasCurRoomId()) { setCurRoomId(other.curRoomId); } - if (other.hasCurSiteId()) { - setCurSiteId(other.curSiteId); + if (other.hasMapId()) { + setMapId(other.mapId); } if (other.hasAreaId()) { setAreaId(other.areaId); } + if (other.hasCurSiteId()) { + setCurSiteId(other.curSiteId); + } if (other.hasRoomList()) { getMutableRoomList().addAll(other.roomList); } @@ -315,10 +315,10 @@ public final class RogueMapInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - mapId = 0; curRoomId = 0; - curSiteId = 0; + mapId = 0; areaId = 0; + curSiteId = 0; roomList.clear(); return this; } @@ -344,34 +344,34 @@ public final class RogueMapInfoOuterClass { } RogueMapInfo other = (RogueMapInfo) o; return bitField0_ == other.bitField0_ - && (!hasMapId() || mapId == other.mapId) && (!hasCurRoomId() || curRoomId == other.curRoomId) - && (!hasCurSiteId() || curSiteId == other.curSiteId) + && (!hasMapId() || mapId == other.mapId) && (!hasAreaId() || areaId == other.areaId) + && (!hasCurSiteId() || curSiteId == other.curSiteId) && (!hasRoomList() || roomList.equals(other.roomList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(mapId); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(curRoomId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(curRoomId); + output.writeUInt32NoTag(mapId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(curSiteId); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(areaId); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 104); - output.writeUInt32NoTag(areaId); + output.writeUInt32NoTag(curSiteId); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < roomList.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 122); output.writeMessageNoTag(roomList.get(i)); } } @@ -381,16 +381,16 @@ public final class RogueMapInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mapId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(curRoomId); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(mapId); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curSiteId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(areaId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(areaId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curSiteId); } if ((bitField0_ & 0x00000010) != 0) { size += (1 * roomList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(roomList); @@ -405,9 +405,9 @@ public final class RogueMapInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // mapId - mapId = input.readUInt32(); + case 8: { + // curRoomId + curRoomId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 32) { @@ -415,17 +415,17 @@ public final class RogueMapInfoOuterClass { } } case 32: { - // curRoomId - curRoomId = input.readUInt32(); + // mapId + mapId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 64) { break; } } - case 88: { - // curSiteId - curSiteId = input.readUInt32(); + case 64: { + // areaId + areaId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 104) { @@ -433,15 +433,15 @@ public final class RogueMapInfoOuterClass { } } case 104: { - // areaId - areaId = input.readUInt32(); + // curSiteId + curSiteId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 26) { + if (tag != 122) { break; } } - case 26: { + case 122: { // roomList tag = input.readRepeatedMessage(roomList, tag); bitField0_ |= 0x00000010; @@ -467,16 +467,16 @@ public final class RogueMapInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.mapId, mapId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.curRoomId, curRoomId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.mapId, mapId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.curSiteId, curSiteId); + output.writeUInt32(FieldNames.areaId, areaId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.areaId, areaId); + output.writeUInt32(FieldNames.curSiteId, curSiteId); } if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedMessage(FieldNames.roomList, roomList); @@ -491,11 +491,11 @@ public final class RogueMapInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 103663511: - case -1081377058: { - if (input.isAtField(FieldNames.mapId)) { + case -249266762: + case 524969984: { + if (input.isAtField(FieldNames.curRoomId)) { if (!input.trySkipNullValue()) { - mapId = input.readUInt32(); + curRoomId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -503,11 +503,11 @@ public final class RogueMapInfoOuterClass { } break; } - case -249266762: - case 524969984: { - if (input.isAtField(FieldNames.curRoomId)) { + case 103663511: + case -1081377058: { + if (input.isAtField(FieldNames.mapId)) { if (!input.trySkipNullValue()) { - curRoomId = input.readUInt32(); + mapId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -515,23 +515,23 @@ public final class RogueMapInfoOuterClass { } 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 -746472947: { if (input.isAtField(FieldNames.areaId)) { if (!input.trySkipNullValue()) { 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; } } else { @@ -603,14 +603,14 @@ public final class RogueMapInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName mapId = FieldName.forField("mapId", "map_id"); - static final FieldName curRoomId = FieldName.forField("curRoomId", "cur_room_id"); - static final FieldName curSiteId = FieldName.forField("curSiteId", "cur_site_id"); + static final FieldName mapId = FieldName.forField("mapId", "map_id"); static final FieldName areaId = FieldName.forField("areaId", "area_id"); + static final FieldName curSiteId = FieldName.forField("curSiteId", "cur_site_id"); + static final FieldName roomList = FieldName.forField("roomList", "room_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectResultOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectResultOuterClass.java index 94ce593..bb9c2a4 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectResultOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectResultOuterClass.java @@ -19,7 +19,7 @@ public final class RogueMiracleSelectResultOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 miracle_id = 9; + * optional uint32 miracle_id = 1; */ private int miracleId; @@ -34,7 +34,7 @@ public final class RogueMiracleSelectResultOuterClass { } /** - * optional uint32 miracle_id = 9; + * optional uint32 miracle_id = 1; * @return whether the miracleId field is set */ public boolean hasMiracleId() { @@ -42,7 +42,7 @@ public final class RogueMiracleSelectResultOuterClass { } /** - * optional uint32 miracle_id = 9; + * optional uint32 miracle_id = 1; * @return this */ public RogueMiracleSelectResult clearMiracleId() { @@ -52,7 +52,7 @@ public final class RogueMiracleSelectResultOuterClass { } /** - * optional uint32 miracle_id = 9; + * optional uint32 miracle_id = 1; * @return the miracleId */ public int getMiracleId() { @@ -60,7 +60,7 @@ public final class RogueMiracleSelectResultOuterClass { } /** - * optional uint32 miracle_id = 9; + * optional uint32 miracle_id = 1; * @param value the miracleId to set * @return this */ @@ -129,7 +129,7 @@ public final class RogueMiracleSelectResultOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(miracleId); } } @@ -150,7 +150,7 @@ public final class RogueMiracleSelectResultOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 8: { // miracleId miracleId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java index 93d265f..ee44792 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java @@ -37,7 +37,7 @@ public final class RogueRoomOuterClass { * RogueRoomStatus OABFMKCFLGC = 10; * * - * optional .RogueRoomStatus room_status = 10; + * optional .RogueRoomStatus room_status = 6; */ private int roomStatus; @@ -146,7 +146,7 @@ public final class RogueRoomOuterClass { * RogueRoomStatus OABFMKCFLGC = 10; * * - * optional .RogueRoomStatus room_status = 10; + * optional .RogueRoomStatus room_status = 6; * @return whether the roomStatus field is set */ public boolean hasRoomStatus() { @@ -158,7 +158,7 @@ public final class RogueRoomOuterClass { * RogueRoomStatus OABFMKCFLGC = 10; * * - * optional .RogueRoomStatus room_status = 10; + * optional .RogueRoomStatus room_status = 6; * @return this */ public RogueRoom clearRoomStatus() { @@ -172,7 +172,7 @@ public final class RogueRoomOuterClass { * RogueRoomStatus OABFMKCFLGC = 10; * * - * optional .RogueRoomStatus room_status = 10; + * optional .RogueRoomStatus room_status = 6; * @return the roomStatus */ public RogueRoomStatusOuterClass.RogueRoomStatus getRoomStatus() { @@ -209,7 +209,7 @@ public final class RogueRoomOuterClass { * RogueRoomStatus OABFMKCFLGC = 10; * * - * optional .RogueRoomStatus room_status = 10; + * optional .RogueRoomStatus room_status = 6; * @param value the roomStatus to set * @return this */ @@ -298,7 +298,7 @@ public final class RogueRoomOuterClass { output.writeUInt32NoTag(roomId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 48); output.writeEnumNoTag(roomStatus); } } @@ -339,11 +339,11 @@ public final class RogueRoomOuterClass { roomId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 48) { break; } } - case 80: { + case 48: { // roomStatus final int value = input.readInt32(); if (RogueRoomStatusOuterClass.RogueRoomStatus.forNumber(value) != null) { diff --git a/src/main/java/emu/lunarcore/game/rogue/RogueInstance.java b/src/main/java/emu/lunarcore/game/rogue/RogueInstance.java index 49b0202..43a3347 100644 --- a/src/main/java/emu/lunarcore/game/rogue/RogueInstance.java +++ b/src/main/java/emu/lunarcore/game/rogue/RogueInstance.java @@ -277,7 +277,7 @@ public class RogueInstance { var data = HandleRogueCommonPendingActionScRsp.newInstance(); data.getMutableRogueBuffSelect(); - data.setTimes(this.actionUniqueId - 2); + data.setActionUniqueId(this.actionUniqueId - 2); this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(data)); return buff; } @@ -355,7 +355,7 @@ public class RogueInstance { var data = HandleRogueCommonPendingActionScRsp.newInstance(); data.getMutableMiracleSelect(); - data.setTimes(this.actionUniqueId - 2); + data.setActionUniqueId(this.actionUniqueId - 2); this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(data)); return miracle; } @@ -402,7 +402,7 @@ public class RogueInstance { // TODO: add event var data = HandleRogueCommonPendingActionScRsp.newInstance(); data.getMutableBonusSelect(); - data.setTimes(this.actionUniqueId - 2); + data.setActionUniqueId(this.actionUniqueId - 2); this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(data)); try { this.onSelectDialogue(bonus.getEventId(), 0); diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketHandleRogueCommonPendingActionScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketHandleRogueCommonPendingActionScRsp.java index 5ad6555..bc3a229 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketHandleRogueCommonPendingActionScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketHandleRogueCommonPendingActionScRsp.java @@ -15,12 +15,12 @@ public class PacketHandleRogueCommonPendingActionScRsp extends BasePacket { public PacketHandleRogueCommonPendingActionScRsp(int id) { this(HandleRogueCommonPendingActionScRsp.newInstance() - .setTimes(id)); + .setActionUniqueId(id)); } public PacketHandleRogueCommonPendingActionScRsp(RogueRerollBuff rogueRerollBuff, int id) { this(HandleRogueCommonPendingActionScRsp.newInstance() - .setTimes(id) + .setActionUniqueId(id) .setRogueRerollBuff(rogueRerollBuff)); }