From 8b6478dd7c719ef240dc8084d95c40834bc57032 Mon Sep 17 00:00:00 2001 From: Melledy <121644117+Melledy@users.noreply.github.com> Date: Sat, 30 Dec 2023 21:59:31 -0800 Subject: [PATCH] Fix some protos --- .../proto/ActivityScheduleInfoOuterClass.java | 190 ++++++------ .../proto/ChallengeInfoOuterClass.java | 111 ++++++- .../proto/DailyActivityInfoOuterClass.java | 200 ++++++------- ...ActivityScheduleConfigScRspOuterClass.java | 34 +-- .../GetDailyActiveInfoScRspOuterClass.java | 72 ++--- .../proto/GetQuestDataScRspOuterClass.java | 190 ++++++------ .../emu/lunarcore/proto/QuestOuterClass.java | 224 +++++++------- .../proto/RelicArchiveOuterClass.java | 80 ++--- .../proto/RogueScoreRewardInfoOuterClass.java | 277 +++++++----------- .../proto/SceneSummonUnitInfoOuterClass.java | 80 ++--- .../game/scene/entity/EntitySummonUnit.java | 2 +- .../recv/HandlerGetDailyActiveInfoCsReq.java | 2 +- .../packet/recv/HandlerGetQuestDataCsReq.java | 5 +- .../send/PacketGetArchiveDataScRsp.java | 2 +- 14 files changed, 734 insertions(+), 735 deletions(-) diff --git a/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java index ca89a72..66cd6ec 100644 --- a/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java @@ -18,23 +18,23 @@ public final class ActivityScheduleInfoOuterClass { public static final class ActivityScheduleInfo extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional int64 begin_time = 1; - */ - private long beginTime; - /** * optional int64 end_time = 3; */ private long endTime; /** - * optional uint32 activity_id = 11; + * optional int64 begin_time = 8; + */ + private long beginTime; + + /** + * optional uint32 activity_id = 1; */ private int activityId; /** - * optional uint32 module_id = 13; + * optional uint32 module_id = 5; */ private int moduleId; @@ -48,49 +48,12 @@ public final class ActivityScheduleInfoOuterClass { return new ActivityScheduleInfo(); } - /** - * optional int64 begin_time = 1; - * @return whether the beginTime field is set - */ - public boolean hasBeginTime() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional int64 begin_time = 1; - * @return this - */ - public ActivityScheduleInfo clearBeginTime() { - bitField0_ &= ~0x00000001; - beginTime = 0L; - return this; - } - - /** - * optional int64 begin_time = 1; - * @return the beginTime - */ - public long getBeginTime() { - return beginTime; - } - - /** - * optional int64 begin_time = 1; - * @param value the beginTime to set - * @return this - */ - public ActivityScheduleInfo setBeginTime(final long value) { - bitField0_ |= 0x00000001; - beginTime = value; - return this; - } - /** * optional int64 end_time = 3; * @return whether the endTime field is set */ public boolean hasEndTime() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000001) != 0; } /** @@ -98,7 +61,7 @@ public final class ActivityScheduleInfoOuterClass { * @return this */ public ActivityScheduleInfo clearEndTime() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; endTime = 0L; return this; } @@ -117,13 +80,50 @@ public final class ActivityScheduleInfoOuterClass { * @return this */ public ActivityScheduleInfo setEndTime(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; endTime = value; return this; } /** - * optional uint32 activity_id = 11; + * optional int64 begin_time = 8; + * @return whether the beginTime field is set + */ + public boolean hasBeginTime() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional int64 begin_time = 8; + * @return this + */ + public ActivityScheduleInfo clearBeginTime() { + bitField0_ &= ~0x00000002; + beginTime = 0L; + return this; + } + + /** + * optional int64 begin_time = 8; + * @return the beginTime + */ + public long getBeginTime() { + return beginTime; + } + + /** + * optional int64 begin_time = 8; + * @param value the beginTime to set + * @return this + */ + public ActivityScheduleInfo setBeginTime(final long value) { + bitField0_ |= 0x00000002; + beginTime = value; + return this; + } + + /** + * optional uint32 activity_id = 1; * @return whether the activityId field is set */ public boolean hasActivityId() { @@ -131,7 +131,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 activity_id = 11; + * optional uint32 activity_id = 1; * @return this */ public ActivityScheduleInfo clearActivityId() { @@ -141,7 +141,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 activity_id = 11; + * optional uint32 activity_id = 1; * @return the activityId */ public int getActivityId() { @@ -149,7 +149,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 activity_id = 11; + * optional uint32 activity_id = 1; * @param value the activityId to set * @return this */ @@ -160,7 +160,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 module_id = 13; + * optional uint32 module_id = 5; * @return whether the moduleId field is set */ public boolean hasModuleId() { @@ -168,7 +168,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 module_id = 13; + * optional uint32 module_id = 5; * @return this */ public ActivityScheduleInfo clearModuleId() { @@ -178,7 +178,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 module_id = 13; + * optional uint32 module_id = 5; * @return the moduleId */ public int getModuleId() { @@ -186,7 +186,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 module_id = 13; + * optional uint32 module_id = 5; * @param value the moduleId to set * @return this */ @@ -201,8 +201,8 @@ public final class ActivityScheduleInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - beginTime = other.beginTime; endTime = other.endTime; + beginTime = other.beginTime; activityId = other.activityId; moduleId = other.moduleId; } @@ -215,12 +215,12 @@ public final class ActivityScheduleInfoOuterClass { return this; } cachedSize = -1; - if (other.hasBeginTime()) { - setBeginTime(other.beginTime); - } if (other.hasEndTime()) { setEndTime(other.endTime); } + if (other.hasBeginTime()) { + setBeginTime(other.beginTime); + } if (other.hasActivityId()) { setActivityId(other.activityId); } @@ -237,8 +237,8 @@ public final class ActivityScheduleInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - beginTime = 0L; endTime = 0L; + beginTime = 0L; activityId = 0; moduleId = 0; return this; @@ -264,8 +264,8 @@ public final class ActivityScheduleInfoOuterClass { } ActivityScheduleInfo other = (ActivityScheduleInfo) o; return bitField0_ == other.bitField0_ - && (!hasBeginTime() || beginTime == other.beginTime) && (!hasEndTime() || endTime == other.endTime) + && (!hasBeginTime() || beginTime == other.beginTime) && (!hasActivityId() || activityId == other.activityId) && (!hasModuleId() || moduleId == other.moduleId); } @@ -273,19 +273,19 @@ public final class ActivityScheduleInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeInt64NoTag(beginTime); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 24); output.writeInt64NoTag(endTime); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 64); + output.writeInt64NoTag(beginTime); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(activityId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(moduleId); } } @@ -294,10 +294,10 @@ public final class ActivityScheduleInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); + size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); + size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(activityId); @@ -315,34 +315,34 @@ public final class ActivityScheduleInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // beginTime - beginTime = input.readInt64(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 24) { - break; - } - } case 24: { // endTime endTime = input.readInt64(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 64) { break; } } - case 88: { + case 64: { + // beginTime + beginTime = input.readInt64(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 8) { + break; + } + } + case 8: { // activityId activityId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 104) { + if (tag != 40) { break; } } - case 104: { + case 40: { // moduleId moduleId = input.readUInt32(); bitField0_ |= 0x00000008; @@ -369,10 +369,10 @@ public final class ActivityScheduleInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeInt64(FieldNames.beginTime, beginTime); + output.writeInt64(FieldNames.endTime, endTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeInt64(FieldNames.endTime, endTime); + output.writeInt64(FieldNames.beginTime, beginTime); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.activityId, activityId); @@ -390,11 +390,11 @@ public final class ActivityScheduleInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1072839914: - case 1112183971: { - if (input.isAtField(FieldNames.beginTime)) { + case -1607243192: + case 1725551537: { + if (input.isAtField(FieldNames.endTime)) { if (!input.trySkipNullValue()) { - beginTime = input.readInt64(); + endTime = input.readInt64(); bitField0_ |= 0x00000001; } } else { @@ -402,11 +402,11 @@ public final class ActivityScheduleInfoOuterClass { } break; } - case -1607243192: - case 1725551537: { - if (input.isAtField(FieldNames.endTime)) { + case -1072839914: + case 1112183971: { + if (input.isAtField(FieldNames.beginTime)) { if (!input.trySkipNullValue()) { - endTime = input.readInt64(); + beginTime = input.readInt64(); bitField0_ |= 0x00000002; } } else { @@ -491,10 +491,10 @@ public final class ActivityScheduleInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName beginTime = FieldName.forField("beginTime", "begin_time"); - static final FieldName endTime = FieldName.forField("endTime", "end_time"); + static final FieldName beginTime = FieldName.forField("beginTime", "begin_time"); + static final FieldName activityId = FieldName.forField("activityId", "activity_id"); static final FieldName moduleId = FieldName.forField("moduleId", "module_id"); diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java index 74499cb..b7d60eb 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java @@ -23,6 +23,11 @@ public final class ChallengeInfoOuterClass { */ private int challengeId; + /** + * optional uint32 round_count = 2; + */ + private int roundCount; + /** * optional .ChallengeStatus status = 6; */ @@ -80,12 +85,49 @@ public final class ChallengeInfoOuterClass { return this; } + /** + * optional uint32 round_count = 2; + * @return whether the roundCount field is set + */ + public boolean hasRoundCount() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 round_count = 2; + * @return this + */ + public ChallengeInfo clearRoundCount() { + bitField0_ &= ~0x00000002; + roundCount = 0; + return this; + } + + /** + * optional uint32 round_count = 2; + * @return the roundCount + */ + public int getRoundCount() { + return roundCount; + } + + /** + * optional uint32 round_count = 2; + * @param value the roundCount to set + * @return this + */ + public ChallengeInfo setRoundCount(final int value) { + bitField0_ |= 0x00000002; + roundCount = value; + return this; + } + /** * optional .ChallengeStatus status = 6; * @return whether the status field is set */ public boolean hasStatus() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -93,7 +135,7 @@ public final class ChallengeInfoOuterClass { * @return this */ public ChallengeInfo clearStatus() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; status = 0; return this; } @@ -126,7 +168,7 @@ public final class ChallengeInfoOuterClass { * @return this */ public ChallengeInfo setStatusValue(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; status = value; return this; } @@ -137,7 +179,7 @@ public final class ChallengeInfoOuterClass { * @return this */ public ChallengeInfo setStatus(final ChallengeStatusOuterClass.ChallengeStatus value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; status = value.getNumber(); return this; } @@ -147,7 +189,7 @@ public final class ChallengeInfoOuterClass { * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000008) != 0; } /** @@ -155,7 +197,7 @@ public final class ChallengeInfoOuterClass { * @return this */ public ChallengeInfo clearExtraLineupType() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; extraLineupType = 0; return this; } @@ -188,7 +230,7 @@ public final class ChallengeInfoOuterClass { * @return this */ public ChallengeInfo setExtraLineupTypeValue(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; extraLineupType = value; return this; } @@ -199,7 +241,7 @@ public final class ChallengeInfoOuterClass { * @return this */ public ChallengeInfo setExtraLineupType(final ExtraLineupTypeOuterClass.ExtraLineupType value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; extraLineupType = value.getNumber(); return this; } @@ -210,6 +252,7 @@ public final class ChallengeInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; challengeId = other.challengeId; + roundCount = other.roundCount; status = other.status; extraLineupType = other.extraLineupType; } @@ -225,6 +268,9 @@ public final class ChallengeInfoOuterClass { if (other.hasChallengeId()) { setChallengeId(other.challengeId); } + if (other.hasRoundCount()) { + setRoundCount(other.roundCount); + } if (other.hasStatus()) { setStatusValue(other.status); } @@ -242,6 +288,7 @@ public final class ChallengeInfoOuterClass { cachedSize = -1; bitField0_ = 0; challengeId = 0; + roundCount = 0; status = 0; extraLineupType = 0; return this; @@ -268,6 +315,7 @@ public final class ChallengeInfoOuterClass { ChallengeInfo other = (ChallengeInfo) o; return bitField0_ == other.bitField0_ && (!hasChallengeId() || challengeId == other.challengeId) + && (!hasRoundCount() || roundCount == other.roundCount) && (!hasStatus() || status == other.status) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType); } @@ -279,10 +327,14 @@ public final class ChallengeInfoOuterClass { output.writeUInt32NoTag(challengeId); } if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(roundCount); + } + if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 48); output.writeEnumNoTag(status); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 120); output.writeEnumNoTag(extraLineupType); } @@ -295,9 +347,12 @@ public final class ChallengeInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(status); + size += 1 + ProtoSink.computeUInt32SizeNoTag(roundCount); } if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeEnumSizeNoTag(status); + } + if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); } return size; @@ -315,6 +370,15 @@ public final class ChallengeInfoOuterClass { challengeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 16) { + break; + } + } + case 16: { + // roundCount + roundCount = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); if (tag != 48) { break; } @@ -324,7 +388,7 @@ public final class ChallengeInfoOuterClass { final int value = input.readInt32(); if (ChallengeStatusOuterClass.ChallengeStatus.forNumber(value) != null) { status = value; - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } tag = input.readTag(); if (tag != 120) { @@ -336,7 +400,7 @@ public final class ChallengeInfoOuterClass { final int value = input.readInt32(); if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { extraLineupType = value; - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; } tag = input.readTag(); if (tag != 0) { @@ -364,9 +428,12 @@ public final class ChallengeInfoOuterClass { output.writeUInt32(FieldNames.challengeId, challengeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeEnum(FieldNames.status, status, ChallengeStatusOuterClass.ChallengeStatus.converter()); + output.writeUInt32(FieldNames.roundCount, roundCount); } if ((bitField0_ & 0x00000004) != 0) { + output.writeEnum(FieldNames.status, status, ChallengeStatusOuterClass.ChallengeStatus.converter()); + } + if ((bitField0_ & 0x00000008) != 0) { output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); } output.endObject(); @@ -391,13 +458,25 @@ public final class ChallengeInfoOuterClass { } break; } + case -171935711: + case -244677858: { + if (input.isAtField(FieldNames.roundCount)) { + if (!input.trySkipNullValue()) { + roundCount = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case -892481550: { if (input.isAtField(FieldNames.status)) { if (!input.trySkipNullValue()) { final ChallengeStatusOuterClass.ChallengeStatus value = input.readEnum(ChallengeStatusOuterClass.ChallengeStatus.converter()); if (value != null) { status = value.getNumber(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } else { input.skipUnknownEnumValue(); } @@ -414,7 +493,7 @@ public final class ChallengeInfoOuterClass { final ExtraLineupTypeOuterClass.ExtraLineupType value = input.readEnum(ExtraLineupTypeOuterClass.ExtraLineupType.converter()); if (value != null) { extraLineupType = value.getNumber(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; } else { input.skipUnknownEnumValue(); } @@ -478,6 +557,8 @@ public final class ChallengeInfoOuterClass { static class FieldNames { static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); + static final FieldName roundCount = FieldName.forField("roundCount", "round_count"); + static final FieldName status = FieldName.forField("status"); static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); diff --git a/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java index 0e2c7a1..e5d5222 100644 --- a/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java @@ -19,22 +19,22 @@ public final class DailyActivityInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 level = 5; - */ - private int level; - - /** - * optional uint32 daily_active_point = 9; + * optional uint32 daily_active_point = 2; */ private int dailyActivePoint; /** - * optional uint32 world_level = 10; + * optional uint32 level = 10; + */ + private int level; + + /** + * optional uint32 world_level = 12; */ private int worldLevel; /** - * optional bool is_has_taken = 13; + * optional bool is_has_taken = 8; */ private boolean isHasTaken; @@ -49,62 +49,25 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 level = 5; - * @return whether the level field is set + * optional uint32 daily_active_point = 2; + * @return whether the dailyActivePoint field is set */ - public boolean hasLevel() { + public boolean hasDailyActivePoint() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 level = 5; - * @return this - */ - public DailyActivityInfo clearLevel() { - bitField0_ &= ~0x00000001; - level = 0; - return this; - } - - /** - * optional uint32 level = 5; - * @return the level - */ - public int getLevel() { - return level; - } - - /** - * optional uint32 level = 5; - * @param value the level to set - * @return this - */ - public DailyActivityInfo setLevel(final int value) { - bitField0_ |= 0x00000001; - level = value; - return this; - } - - /** - * optional uint32 daily_active_point = 9; - * @return whether the dailyActivePoint field is set - */ - public boolean hasDailyActivePoint() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 daily_active_point = 9; + * optional uint32 daily_active_point = 2; * @return this */ public DailyActivityInfo clearDailyActivePoint() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; dailyActivePoint = 0; return this; } /** - * optional uint32 daily_active_point = 9; + * optional uint32 daily_active_point = 2; * @return the dailyActivePoint */ public int getDailyActivePoint() { @@ -112,18 +75,55 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 daily_active_point = 9; + * optional uint32 daily_active_point = 2; * @param value the dailyActivePoint to set * @return this */ public DailyActivityInfo setDailyActivePoint(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; dailyActivePoint = value; return this; } /** - * optional uint32 world_level = 10; + * optional uint32 level = 10; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 level = 10; + * @return this + */ + public DailyActivityInfo clearLevel() { + bitField0_ &= ~0x00000002; + level = 0; + return this; + } + + /** + * optional uint32 level = 10; + * @return the level + */ + public int getLevel() { + return level; + } + + /** + * optional uint32 level = 10; + * @param value the level to set + * @return this + */ + public DailyActivityInfo setLevel(final int value) { + bitField0_ |= 0x00000002; + level = value; + return this; + } + + /** + * optional uint32 world_level = 12; * @return whether the worldLevel field is set */ public boolean hasWorldLevel() { @@ -131,7 +131,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 world_level = 10; + * optional uint32 world_level = 12; * @return this */ public DailyActivityInfo clearWorldLevel() { @@ -141,7 +141,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 world_level = 10; + * optional uint32 world_level = 12; * @return the worldLevel */ public int getWorldLevel() { @@ -149,7 +149,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 world_level = 10; + * optional uint32 world_level = 12; * @param value the worldLevel to set * @return this */ @@ -160,7 +160,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional bool is_has_taken = 13; + * optional bool is_has_taken = 8; * @return whether the isHasTaken field is set */ public boolean hasIsHasTaken() { @@ -168,7 +168,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional bool is_has_taken = 13; + * optional bool is_has_taken = 8; * @return this */ public DailyActivityInfo clearIsHasTaken() { @@ -178,7 +178,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional bool is_has_taken = 13; + * optional bool is_has_taken = 8; * @return the isHasTaken */ public boolean getIsHasTaken() { @@ -186,7 +186,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional bool is_has_taken = 13; + * optional bool is_has_taken = 8; * @param value the isHasTaken to set * @return this */ @@ -201,8 +201,8 @@ public final class DailyActivityInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - level = other.level; dailyActivePoint = other.dailyActivePoint; + level = other.level; worldLevel = other.worldLevel; isHasTaken = other.isHasTaken; } @@ -215,12 +215,12 @@ public final class DailyActivityInfoOuterClass { return this; } cachedSize = -1; - if (other.hasLevel()) { - setLevel(other.level); - } if (other.hasDailyActivePoint()) { setDailyActivePoint(other.dailyActivePoint); } + if (other.hasLevel()) { + setLevel(other.level); + } if (other.hasWorldLevel()) { setWorldLevel(other.worldLevel); } @@ -237,8 +237,8 @@ public final class DailyActivityInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - level = 0; dailyActivePoint = 0; + level = 0; worldLevel = 0; isHasTaken = false; return this; @@ -264,8 +264,8 @@ public final class DailyActivityInfoOuterClass { } DailyActivityInfo other = (DailyActivityInfo) o; return bitField0_ == other.bitField0_ - && (!hasLevel() || level == other.level) && (!hasDailyActivePoint() || dailyActivePoint == other.dailyActivePoint) + && (!hasLevel() || level == other.level) && (!hasWorldLevel() || worldLevel == other.worldLevel) && (!hasIsHasTaken() || isHasTaken == other.isHasTaken); } @@ -273,19 +273,19 @@ public final class DailyActivityInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(level); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(dailyActivePoint); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 80); + output.writeUInt32NoTag(level); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 96); output.writeUInt32NoTag(worldLevel); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 64); output.writeBoolNoTag(isHasTaken); } } @@ -294,10 +294,10 @@ public final class DailyActivityInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dailyActivePoint); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dailyActivePoint); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); @@ -315,34 +315,34 @@ public final class DailyActivityInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 16: { // dailyActivePoint dailyActivePoint = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 80) { break; } } case 80: { + // level + level = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { // worldLevel worldLevel = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 104) { + if (tag != 64) { break; } } - case 104: { + case 64: { // isHasTaken isHasTaken = input.readBool(); bitField0_ |= 0x00000008; @@ -369,10 +369,10 @@ public final class DailyActivityInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.dailyActivePoint, dailyActivePoint); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.dailyActivePoint, dailyActivePoint); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.worldLevel, worldLevel); @@ -390,10 +390,11 @@ public final class DailyActivityInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 102865796: { - if (input.isAtField(FieldNames.level)) { + case 859671121: + case 1952864125: { + if (input.isAtField(FieldNames.dailyActivePoint)) { if (!input.trySkipNullValue()) { - level = input.readUInt32(); + dailyActivePoint = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -401,11 +402,10 @@ public final class DailyActivityInfoOuterClass { } break; } - case 859671121: - case 1952864125: { - if (input.isAtField(FieldNames.dailyActivePoint)) { + case 102865796: { + if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { - dailyActivePoint = input.readUInt32(); + level = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -490,10 +490,10 @@ public final class DailyActivityInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName level = FieldName.forField("level"); - static final FieldName dailyActivePoint = FieldName.forField("dailyActivePoint", "daily_active_point"); + static final FieldName level = FieldName.forField("level"); + static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); static final FieldName isHasTaken = FieldName.forField("isHasTaken", "is_has_taken"); diff --git a/src/generated/main/emu/lunarcore/proto/GetActivityScheduleConfigScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetActivityScheduleConfigScRspOuterClass.java index 254da1e..b642ee8 100644 --- a/src/generated/main/emu/lunarcore/proto/GetActivityScheduleConfigScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetActivityScheduleConfigScRspOuterClass.java @@ -20,12 +20,12 @@ public final class GetActivityScheduleConfigScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 2; */ private int retcode; /** - * repeated .ActivityScheduleInfo activity_schedule_list = 8; + * repeated .ActivityScheduleInfo activity_schedule_list = 10; */ private final RepeatedMessage activityScheduleList = RepeatedMessage.newEmptyInstance(ActivityScheduleInfoOuterClass.ActivityScheduleInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 2; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 2; * @return this */ public GetActivityScheduleConfigScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 8; + * repeated .ActivityScheduleInfo activity_schedule_list = 10; * @return whether the activityScheduleList field is set */ public boolean hasActivityScheduleList() { @@ -85,7 +85,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 8; + * repeated .ActivityScheduleInfo activity_schedule_list = 10; * @return this */ public GetActivityScheduleConfigScRsp clearActivityScheduleList() { @@ -95,7 +95,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 8; + * repeated .ActivityScheduleInfo activity_schedule_list = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -110,7 +110,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 8; + * repeated .ActivityScheduleInfo activity_schedule_list = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -125,7 +125,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 8; + * repeated .ActivityScheduleInfo activity_schedule_list = 10; * @param value the activityScheduleList to add * @return this */ @@ -137,7 +137,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 8; + * repeated .ActivityScheduleInfo activity_schedule_list = 10; * @param values the activityScheduleList to add * @return this */ @@ -214,12 +214,12 @@ public final class GetActivityScheduleConfigScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < activityScheduleList.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 82); output.writeMessageNoTag(activityScheduleList.get(i)); } } @@ -244,16 +244,16 @@ public final class GetActivityScheduleConfigScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 16: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 82) { break; } } - case 66: { + case 82: { // activityScheduleList tag = input.readRepeatedMessage(activityScheduleList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java index c9e713b..33da322 100644 --- a/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java @@ -21,22 +21,22 @@ public final class GetDailyActiveInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 daily_active_point = 2; + * optional uint32 daily_active_point = 9; */ private int dailyActivePoint; /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; */ private int retcode; /** - * repeated uint32 daily_active_quest_id_list = 3; + * repeated uint32 daily_active_quest_id_list = 15; */ private final RepeatedInt dailyActiveQuestIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .DailyActivityInfo daily_active_level_list = 10; + * repeated .DailyActivityInfo daily_active_level_list = 14; */ private final RepeatedMessage dailyActiveLevelList = RepeatedMessage.newEmptyInstance(DailyActivityInfoOuterClass.DailyActivityInfo.getFactory()); @@ -51,7 +51,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 daily_active_point = 2; + * optional uint32 daily_active_point = 9; * @return whether the dailyActivePoint field is set */ public boolean hasDailyActivePoint() { @@ -59,7 +59,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 daily_active_point = 2; + * optional uint32 daily_active_point = 9; * @return this */ public GetDailyActiveInfoScRsp clearDailyActivePoint() { @@ -69,7 +69,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 daily_active_point = 2; + * optional uint32 daily_active_point = 9; * @return the dailyActivePoint */ public int getDailyActivePoint() { @@ -77,7 +77,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 daily_active_point = 2; + * optional uint32 daily_active_point = 9; * @param value the dailyActivePoint to set * @return this */ @@ -88,7 +88,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -96,7 +96,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; * @return this */ public GetDailyActiveInfoScRsp clearRetcode() { @@ -106,7 +106,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; * @return the retcode */ public int getRetcode() { @@ -114,7 +114,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; * @param value the retcode to set * @return this */ @@ -125,7 +125,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 3; + * repeated uint32 daily_active_quest_id_list = 15; * @return whether the dailyActiveQuestIdList field is set */ public boolean hasDailyActiveQuestIdList() { @@ -133,7 +133,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 3; + * repeated uint32 daily_active_quest_id_list = 15; * @return this */ public GetDailyActiveInfoScRsp clearDailyActiveQuestIdList() { @@ -143,7 +143,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 3; + * repeated uint32 daily_active_quest_id_list = 15; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -157,7 +157,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 3; + * repeated uint32 daily_active_quest_id_list = 15; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -171,7 +171,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 3; + * repeated uint32 daily_active_quest_id_list = 15; * @param value the dailyActiveQuestIdList to add * @return this */ @@ -182,7 +182,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 3; + * repeated uint32 daily_active_quest_id_list = 15; * @param values the dailyActiveQuestIdList to add * @return this */ @@ -193,7 +193,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 10; + * repeated .DailyActivityInfo daily_active_level_list = 14; * @return whether the dailyActiveLevelList field is set */ public boolean hasDailyActiveLevelList() { @@ -201,7 +201,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 10; + * repeated .DailyActivityInfo daily_active_level_list = 14; * @return this */ public GetDailyActiveInfoScRsp clearDailyActiveLevelList() { @@ -211,7 +211,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 10; + * repeated .DailyActivityInfo daily_active_level_list = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -226,7 +226,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 10; + * repeated .DailyActivityInfo daily_active_level_list = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -241,7 +241,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 10; + * repeated .DailyActivityInfo daily_active_level_list = 14; * @param value the dailyActiveLevelList to add * @return this */ @@ -253,7 +253,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 10; + * repeated .DailyActivityInfo daily_active_level_list = 14; * @param values the dailyActiveLevelList to add * @return this */ @@ -343,22 +343,22 @@ public final class GetDailyActiveInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(dailyActivePoint); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < dailyActiveQuestIdList.length(); i++) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(dailyActiveQuestIdList.array()[i]); } } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < dailyActiveLevelList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 114); output.writeMessageNoTag(dailyActiveLevelList.get(i)); } } @@ -389,34 +389,34 @@ public final class GetDailyActiveInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 72: { // dailyActivePoint dailyActivePoint = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 96) { break; } } - case 120: { + case 96: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 26) { + if (tag != 122) { break; } } - case 26: { + case 122: { // dailyActiveQuestIdList [packed=true] input.readPackedUInt32(dailyActiveQuestIdList, tag); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 82) { + if (tag != 114) { break; } } - case 82: { + case 114: { // dailyActiveLevelList tag = input.readRepeatedMessage(dailyActiveLevelList, tag); bitField0_ |= 0x00000008; @@ -434,7 +434,7 @@ public final class GetDailyActiveInfoScRspOuterClass { tag = input.readTag(); break; } - case 24: { + case 120: { // dailyActiveQuestIdList [packed=false] tag = input.readRepeatedUInt32(dailyActiveQuestIdList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GetQuestDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetQuestDataScRspOuterClass.java index ce69d93..45e4b68 100644 --- a/src/generated/main/emu/lunarcore/proto/GetQuestDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetQuestDataScRspOuterClass.java @@ -20,17 +20,17 @@ public final class GetQuestDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 7; - */ - private int retcode; - - /** - * optional uint32 total_achievement_exp = 11; + * optional uint32 total_achievement_exp = 1; */ private int totalAchievementExp; /** - * repeated .Quest quest_list = 9; + * optional uint32 retcode = 8; + */ + private int retcode; + + /** + * repeated .Quest quest_list = 10; */ private final RepeatedMessage questList = RepeatedMessage.newEmptyInstance(QuestOuterClass.Quest.getFactory()); @@ -45,62 +45,25 @@ public final class GetQuestDataScRspOuterClass { } /** - * optional uint32 retcode = 7; - * @return whether the retcode field is set + * optional uint32 total_achievement_exp = 1; + * @return whether the totalAchievementExp field is set */ - public boolean hasRetcode() { + public boolean hasTotalAchievementExp() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 7; - * @return this - */ - public GetQuestDataScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 7; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 7; - * @param value the retcode to set - * @return this - */ - public GetQuestDataScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 total_achievement_exp = 11; - * @return whether the totalAchievementExp field is set - */ - public boolean hasTotalAchievementExp() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 total_achievement_exp = 11; + * optional uint32 total_achievement_exp = 1; * @return this */ public GetQuestDataScRsp clearTotalAchievementExp() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; totalAchievementExp = 0; return this; } /** - * optional uint32 total_achievement_exp = 11; + * optional uint32 total_achievement_exp = 1; * @return the totalAchievementExp */ public int getTotalAchievementExp() { @@ -108,18 +71,55 @@ public final class GetQuestDataScRspOuterClass { } /** - * optional uint32 total_achievement_exp = 11; + * optional uint32 total_achievement_exp = 1; * @param value the totalAchievementExp to set * @return this */ public GetQuestDataScRsp setTotalAchievementExp(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; totalAchievementExp = value; return this; } /** - * repeated .Quest quest_list = 9; + * optional uint32 retcode = 8; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 8; + * @return this + */ + public GetQuestDataScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 8; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 8; + * @param value the retcode to set + * @return this + */ + public GetQuestDataScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * repeated .Quest quest_list = 10; * @return whether the questList field is set */ public boolean hasQuestList() { @@ -127,7 +127,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 9; + * repeated .Quest quest_list = 10; * @return this */ public GetQuestDataScRsp clearQuestList() { @@ -137,7 +137,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 9; + * repeated .Quest quest_list = 10; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -151,7 +151,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 9; + * repeated .Quest quest_list = 10; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 9; + * repeated .Quest quest_list = 10; * @param value the questList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 9; + * repeated .Quest quest_list = 10; * @param values the questList to add * @return this */ @@ -191,8 +191,8 @@ public final class GetQuestDataScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; totalAchievementExp = other.totalAchievementExp; + retcode = other.retcode; questList.copyFrom(other.questList); } return this; @@ -204,12 +204,12 @@ public final class GetQuestDataScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasTotalAchievementExp()) { setTotalAchievementExp(other.totalAchievementExp); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasQuestList()) { getMutableQuestList().addAll(other.questList); } @@ -223,8 +223,8 @@ public final class GetQuestDataScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; totalAchievementExp = 0; + retcode = 0; questList.clear(); return this; } @@ -250,24 +250,24 @@ public final class GetQuestDataScRspOuterClass { } GetQuestDataScRsp other = (GetQuestDataScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasTotalAchievementExp() || totalAchievementExp == other.totalAchievementExp) + && (!hasRetcode() || retcode == other.retcode) && (!hasQuestList() || questList.equals(other.questList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(totalAchievementExp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(totalAchievementExp); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < questList.length(); i++) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 82); output.writeMessageNoTag(questList.get(i)); } } @@ -277,10 +277,10 @@ public final class GetQuestDataScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(totalAchievementExp); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(totalAchievementExp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += (1 * questList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(questList); @@ -295,25 +295,25 @@ public final class GetQuestDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { + case 8: { // totalAchievementExp totalAchievementExp = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 64) { break; } } - case 74: { + case 64: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 82) { + break; + } + } + case 82: { // questList tag = input.readRepeatedMessage(questList, tag); bitField0_ |= 0x00000004; @@ -339,10 +339,10 @@ public final class GetQuestDataScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.totalAchievementExp, totalAchievementExp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.totalAchievementExp, totalAchievementExp); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.questList, questList); @@ -357,10 +357,11 @@ public final class GetQuestDataScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 255336658: + case -1295039982: { + if (input.isAtField(FieldNames.totalAchievementExp)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + totalAchievementExp = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -368,11 +369,10 @@ public final class GetQuestDataScRspOuterClass { } break; } - case 255336658: - case -1295039982: { - if (input.isAtField(FieldNames.totalAchievementExp)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - totalAchievementExp = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -445,10 +445,10 @@ public final class GetQuestDataScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName totalAchievementExp = FieldName.forField("totalAchievementExp", "total_achievement_exp"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName questList = FieldName.forField("questList", "quest_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/QuestOuterClass.java b/src/generated/main/emu/lunarcore/proto/QuestOuterClass.java index 7eadf86..32ebc87 100644 --- a/src/generated/main/emu/lunarcore/proto/QuestOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/QuestOuterClass.java @@ -20,27 +20,27 @@ public final class QuestOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 finish_time = 13; + * optional int64 finish_time = 12; */ private long finishTime; /** - * optional uint32 id = 3; - */ - private int id; - - /** - * optional uint32 progress = 9; + * optional uint32 progress = 8; */ private int progress; /** - * optional .QuestStatus status = 5; + * optional uint32 id = 11; + */ + private int id; + + /** + * optional .QuestStatus status = 13; */ private int status; /** - * repeated uint32 taken_achievement_level_list = 7; + * repeated uint32 taken_achievement_level_list = 3; */ private final RepeatedInt takenAchievementLevelList = RepeatedInt.newEmptyInstance(); @@ -55,7 +55,7 @@ public final class QuestOuterClass { } /** - * optional int64 finish_time = 13; + * optional int64 finish_time = 12; * @return whether the finishTime field is set */ public boolean hasFinishTime() { @@ -63,7 +63,7 @@ public final class QuestOuterClass { } /** - * optional int64 finish_time = 13; + * optional int64 finish_time = 12; * @return this */ public Quest clearFinishTime() { @@ -73,7 +73,7 @@ public final class QuestOuterClass { } /** - * optional int64 finish_time = 13; + * optional int64 finish_time = 12; * @return the finishTime */ public long getFinishTime() { @@ -81,7 +81,7 @@ public final class QuestOuterClass { } /** - * optional int64 finish_time = 13; + * optional int64 finish_time = 12; * @param value the finishTime to set * @return this */ @@ -92,62 +92,25 @@ public final class QuestOuterClass { } /** - * optional uint32 id = 3; - * @return whether the id field is set + * optional uint32 progress = 8; + * @return whether the progress field is set */ - public boolean hasId() { + public boolean hasProgress() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 id = 3; - * @return this - */ - public Quest clearId() { - bitField0_ &= ~0x00000002; - id = 0; - return this; - } - - /** - * optional uint32 id = 3; - * @return the id - */ - public int getId() { - return id; - } - - /** - * optional uint32 id = 3; - * @param value the id to set - * @return this - */ - public Quest setId(final int value) { - bitField0_ |= 0x00000002; - id = value; - return this; - } - - /** - * optional uint32 progress = 9; - * @return whether the progress field is set - */ - public boolean hasProgress() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 progress = 9; + * optional uint32 progress = 8; * @return this */ public Quest clearProgress() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; progress = 0; return this; } /** - * optional uint32 progress = 9; + * optional uint32 progress = 8; * @return the progress */ public int getProgress() { @@ -155,18 +118,55 @@ public final class QuestOuterClass { } /** - * optional uint32 progress = 9; + * optional uint32 progress = 8; * @param value the progress to set * @return this */ public Quest setProgress(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; progress = value; return this; } /** - * optional .QuestStatus status = 5; + * optional uint32 id = 11; + * @return whether the id field is set + */ + public boolean hasId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 id = 11; + * @return this + */ + public Quest clearId() { + bitField0_ &= ~0x00000004; + id = 0; + return this; + } + + /** + * optional uint32 id = 11; + * @return the id + */ + public int getId() { + return id; + } + + /** + * optional uint32 id = 11; + * @param value the id to set + * @return this + */ + public Quest setId(final int value) { + bitField0_ |= 0x00000004; + id = value; + return this; + } + + /** + * optional .QuestStatus status = 13; * @return whether the status field is set */ public boolean hasStatus() { @@ -174,7 +174,7 @@ public final class QuestOuterClass { } /** - * optional .QuestStatus status = 5; + * optional .QuestStatus status = 13; * @return this */ public Quest clearStatus() { @@ -184,7 +184,7 @@ public final class QuestOuterClass { } /** - * optional .QuestStatus status = 5; + * optional .QuestStatus status = 13; * @return the status */ public QuestStatusOuterClass.QuestStatus getStatus() { @@ -217,7 +217,7 @@ public final class QuestOuterClass { } /** - * optional .QuestStatus status = 5; + * optional .QuestStatus status = 13; * @param value the status to set * @return this */ @@ -228,7 +228,7 @@ public final class QuestOuterClass { } /** - * repeated uint32 taken_achievement_level_list = 7; + * repeated uint32 taken_achievement_level_list = 3; * @return whether the takenAchievementLevelList field is set */ public boolean hasTakenAchievementLevelList() { @@ -236,7 +236,7 @@ public final class QuestOuterClass { } /** - * repeated uint32 taken_achievement_level_list = 7; + * repeated uint32 taken_achievement_level_list = 3; * @return this */ public Quest clearTakenAchievementLevelList() { @@ -246,7 +246,7 @@ public final class QuestOuterClass { } /** - * repeated uint32 taken_achievement_level_list = 7; + * repeated uint32 taken_achievement_level_list = 3; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -260,7 +260,7 @@ public final class QuestOuterClass { } /** - * repeated uint32 taken_achievement_level_list = 7; + * repeated uint32 taken_achievement_level_list = 3; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -274,7 +274,7 @@ public final class QuestOuterClass { } /** - * repeated uint32 taken_achievement_level_list = 7; + * repeated uint32 taken_achievement_level_list = 3; * @param value the takenAchievementLevelList to add * @return this */ @@ -285,7 +285,7 @@ public final class QuestOuterClass { } /** - * repeated uint32 taken_achievement_level_list = 7; + * repeated uint32 taken_achievement_level_list = 3; * @param values the takenAchievementLevelList to add * @return this */ @@ -301,8 +301,8 @@ public final class QuestOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; finishTime = other.finishTime; - id = other.id; progress = other.progress; + id = other.id; status = other.status; takenAchievementLevelList.copyFrom(other.takenAchievementLevelList); } @@ -318,12 +318,12 @@ public final class QuestOuterClass { if (other.hasFinishTime()) { setFinishTime(other.finishTime); } - if (other.hasId()) { - setId(other.id); - } if (other.hasProgress()) { setProgress(other.progress); } + if (other.hasId()) { + setId(other.id); + } if (other.hasStatus()) { setStatusValue(other.status); } @@ -341,8 +341,8 @@ public final class QuestOuterClass { cachedSize = -1; bitField0_ = 0; finishTime = 0L; - id = 0; progress = 0; + id = 0; status = 0; takenAchievementLevelList.clear(); return this; @@ -370,8 +370,8 @@ public final class QuestOuterClass { Quest other = (Quest) o; return bitField0_ == other.bitField0_ && (!hasFinishTime() || finishTime == other.finishTime) - && (!hasId() || id == other.id) && (!hasProgress() || progress == other.progress) + && (!hasId() || id == other.id) && (!hasStatus() || status == other.status) && (!hasTakenAchievementLevelList() || takenAchievementLevelList.equals(other.takenAchievementLevelList)); } @@ -379,24 +379,24 @@ public final class QuestOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 96); output.writeInt64NoTag(finishTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(id); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(progress); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(id); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 104); output.writeEnumNoTag(status); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < takenAchievementLevelList.length(); i++) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(takenAchievementLevelList.array()[i]); } } @@ -409,10 +409,10 @@ public final class QuestOuterClass { size += 1 + ProtoSink.computeInt64SizeNoTag(finishTime); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(id); + size += 1 + ProtoSink.computeUInt32SizeNoTag(progress); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(progress); + size += 1 + ProtoSink.computeUInt32SizeNoTag(id); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(status); @@ -430,34 +430,34 @@ public final class QuestOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 96: { // finishTime finishTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 64) { break; } } - case 24: { - // id - id = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 64: { // progress progress = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 40) { + if (tag != 88) { break; } } - case 40: { + case 88: { + // id + id = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { // status final int value = input.readInt32(); if (QuestStatusOuterClass.QuestStatus.forNumber(value) != null) { @@ -465,11 +465,11 @@ public final class QuestOuterClass { bitField0_ |= 0x00000008; } tag = input.readTag(); - if (tag != 58) { + if (tag != 26) { break; } } - case 58: { + case 26: { // takenAchievementLevelList [packed=true] input.readPackedUInt32(takenAchievementLevelList, tag); bitField0_ |= 0x00000010; @@ -488,7 +488,7 @@ public final class QuestOuterClass { tag = input.readTag(); break; } - case 56: { + case 24: { // takenAchievementLevelList [packed=false] tag = input.readRepeatedUInt32(takenAchievementLevelList, tag); bitField0_ |= 0x00000010; @@ -505,10 +505,10 @@ public final class QuestOuterClass { output.writeInt64(FieldNames.finishTime, finishTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.id, id); + output.writeUInt32(FieldNames.progress, progress); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.progress, progress); + output.writeUInt32(FieldNames.id, id); } if ((bitField0_ & 0x00000008) != 0) { output.writeEnum(FieldNames.status, status, QuestStatusOuterClass.QuestStatus.converter()); @@ -538,10 +538,10 @@ public final class QuestOuterClass { } break; } - case 3355: { - if (input.isAtField(FieldNames.id)) { + case -1001078227: { + if (input.isAtField(FieldNames.progress)) { if (!input.trySkipNullValue()) { - id = input.readUInt32(); + progress = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -549,10 +549,10 @@ public final class QuestOuterClass { } break; } - case -1001078227: { - if (input.isAtField(FieldNames.progress)) { + case 3355: { + if (input.isAtField(FieldNames.id)) { if (!input.trySkipNullValue()) { - progress = input.readUInt32(); + id = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -642,10 +642,10 @@ public final class QuestOuterClass { static class FieldNames { static final FieldName finishTime = FieldName.forField("finishTime", "finish_time"); - static final FieldName id = FieldName.forField("id"); - static final FieldName progress = FieldName.forField("progress"); + static final FieldName id = FieldName.forField("id"); + static final FieldName status = FieldName.forField("status"); static final FieldName takenAchievementLevelList = FieldName.forField("takenAchievementLevelList", "taken_achievement_level_list"); diff --git a/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java index 56712d5..f6a392e 100644 --- a/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java @@ -19,12 +19,12 @@ public final class RelicArchiveOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 type = 6; + * optional uint32 slot = 1; */ - private int type; + private int slot; /** - * optional uint32 relic_id = 8; + * optional uint32 relic_id = 12; */ private int relicId; @@ -39,44 +39,44 @@ public final class RelicArchiveOuterClass { } /** - * optional uint32 type = 6; - * @return whether the type field is set + * optional uint32 slot = 1; + * @return whether the slot field is set */ - public boolean hasType() { + public boolean hasSlot() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 type = 6; + * optional uint32 slot = 1; * @return this */ - public RelicArchive clearType() { + public RelicArchive clearSlot() { bitField0_ &= ~0x00000001; - type = 0; + slot = 0; return this; } /** - * optional uint32 type = 6; - * @return the type + * optional uint32 slot = 1; + * @return the slot */ - public int getType() { - return type; + public int getSlot() { + return slot; } /** - * optional uint32 type = 6; - * @param value the type to set + * optional uint32 slot = 1; + * @param value the slot to set * @return this */ - public RelicArchive setType(final int value) { + public RelicArchive setSlot(final int value) { bitField0_ |= 0x00000001; - type = value; + slot = value; return this; } /** - * optional uint32 relic_id = 8; + * optional uint32 relic_id = 12; * @return whether the relicId field is set */ public boolean hasRelicId() { @@ -84,7 +84,7 @@ public final class RelicArchiveOuterClass { } /** - * optional uint32 relic_id = 8; + * optional uint32 relic_id = 12; * @return this */ public RelicArchive clearRelicId() { @@ -94,7 +94,7 @@ public final class RelicArchiveOuterClass { } /** - * optional uint32 relic_id = 8; + * optional uint32 relic_id = 12; * @return the relicId */ public int getRelicId() { @@ -102,7 +102,7 @@ public final class RelicArchiveOuterClass { } /** - * optional uint32 relic_id = 8; + * optional uint32 relic_id = 12; * @param value the relicId to set * @return this */ @@ -117,7 +117,7 @@ public final class RelicArchiveOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - type = other.type; + slot = other.slot; relicId = other.relicId; } return this; @@ -129,8 +129,8 @@ public final class RelicArchiveOuterClass { return this; } cachedSize = -1; - if (other.hasType()) { - setType(other.type); + if (other.hasSlot()) { + setSlot(other.slot); } if (other.hasRelicId()) { setRelicId(other.relicId); @@ -145,7 +145,7 @@ public final class RelicArchiveOuterClass { } cachedSize = -1; bitField0_ = 0; - type = 0; + slot = 0; relicId = 0; return this; } @@ -170,18 +170,18 @@ public final class RelicArchiveOuterClass { } RelicArchive other = (RelicArchive) o; return bitField0_ == other.bitField0_ - && (!hasType() || type == other.type) + && (!hasSlot() || slot == other.slot) && (!hasRelicId() || relicId == other.relicId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(type); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(relicId); } } @@ -190,7 +190,7 @@ public final class RelicArchiveOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(type); + size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(relicId); @@ -205,16 +205,16 @@ public final class RelicArchiveOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // type - type = input.readUInt32(); + case 8: { + // slot + slot = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 96) { break; } } - case 64: { + case 96: { // relicId relicId = input.readUInt32(); bitField0_ |= 0x00000002; @@ -241,7 +241,7 @@ public final class RelicArchiveOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.type, type); + output.writeUInt32(FieldNames.slot, slot); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.relicId, relicId); @@ -256,10 +256,10 @@ public final class RelicArchiveOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 3575610: { - if (input.isAtField(FieldNames.type)) { + case 3533310: { + if (input.isAtField(FieldNames.slot)) { if (!input.trySkipNullValue()) { - type = input.readUInt32(); + slot = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -331,7 +331,7 @@ public final class RelicArchiveOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName type = FieldName.forField("type"); + static final FieldName slot = FieldName.forField("slot"); static final FieldName relicId = FieldName.forField("relicId", "relic_id"); } diff --git a/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java index 2278705..9a2100d 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java @@ -20,32 +20,27 @@ public final class RogueScoreRewardInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 rogue_immersifier = 3; - */ - private int rogueImmersifier; - - /** - * optional uint32 pool_id = 7; - */ - private int poolId; - - /** - * optional uint32 score = 9; + * optional uint32 score = 8; */ private int score; /** - * optional bool has_taken_initial_score = 1; + * optional uint32 pool_id = 11; + */ + private int poolId; + + /** + * optional bool has_taken_initial_score = 4; */ private boolean hasTakenInitialScore; /** - * optional bool pool_refreshed = 6; + * optional bool pool_refreshed = 9; */ private boolean poolRefreshed; /** - * repeated uint32 taken_score_reward_list = 4; + * repeated uint32 taken_score_reward_list = 1; */ private final RepeatedInt takenScoreRewardList = RepeatedInt.newEmptyInstance(); @@ -60,44 +55,44 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional uint32 rogue_immersifier = 3; - * @return whether the rogueImmersifier field is set + * optional uint32 score = 8; + * @return whether the score field is set */ - public boolean hasRogueImmersifier() { + public boolean hasScore() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 rogue_immersifier = 3; + * optional uint32 score = 8; * @return this */ - public RogueScoreRewardInfo clearRogueImmersifier() { + public RogueScoreRewardInfo clearScore() { bitField0_ &= ~0x00000001; - rogueImmersifier = 0; + score = 0; return this; } /** - * optional uint32 rogue_immersifier = 3; - * @return the rogueImmersifier + * optional uint32 score = 8; + * @return the score */ - public int getRogueImmersifier() { - return rogueImmersifier; + public int getScore() { + return score; } /** - * optional uint32 rogue_immersifier = 3; - * @param value the rogueImmersifier to set + * optional uint32 score = 8; + * @param value the score to set * @return this */ - public RogueScoreRewardInfo setRogueImmersifier(final int value) { + public RogueScoreRewardInfo setScore(final int value) { bitField0_ |= 0x00000001; - rogueImmersifier = value; + score = value; return this; } /** - * optional uint32 pool_id = 7; + * optional uint32 pool_id = 11; * @return whether the poolId field is set */ public boolean hasPoolId() { @@ -105,7 +100,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional uint32 pool_id = 7; + * optional uint32 pool_id = 11; * @return this */ public RogueScoreRewardInfo clearPoolId() { @@ -115,7 +110,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional uint32 pool_id = 7; + * optional uint32 pool_id = 11; * @return the poolId */ public int getPoolId() { @@ -123,7 +118,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional uint32 pool_id = 7; + * optional uint32 pool_id = 11; * @param value the poolId to set * @return this */ @@ -134,62 +129,25 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional uint32 score = 9; - * @return whether the score field is set + * optional bool has_taken_initial_score = 4; + * @return whether the hasTakenInitialScore field is set */ - public boolean hasScore() { + public boolean hasHasTakenInitialScore() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 score = 9; - * @return this - */ - public RogueScoreRewardInfo clearScore() { - bitField0_ &= ~0x00000004; - score = 0; - return this; - } - - /** - * optional uint32 score = 9; - * @return the score - */ - public int getScore() { - return score; - } - - /** - * optional uint32 score = 9; - * @param value the score to set - * @return this - */ - public RogueScoreRewardInfo setScore(final int value) { - bitField0_ |= 0x00000004; - score = value; - return this; - } - - /** - * optional bool has_taken_initial_score = 1; - * @return whether the hasTakenInitialScore field is set - */ - public boolean hasHasTakenInitialScore() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional bool has_taken_initial_score = 1; + * optional bool has_taken_initial_score = 4; * @return this */ public RogueScoreRewardInfo clearHasTakenInitialScore() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; hasTakenInitialScore = false; return this; } /** - * optional bool has_taken_initial_score = 1; + * optional bool has_taken_initial_score = 4; * @return the hasTakenInitialScore */ public boolean getHasTakenInitialScore() { @@ -197,36 +155,36 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional bool has_taken_initial_score = 1; + * optional bool has_taken_initial_score = 4; * @param value the hasTakenInitialScore to set * @return this */ public RogueScoreRewardInfo setHasTakenInitialScore(final boolean value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; hasTakenInitialScore = value; return this; } /** - * optional bool pool_refreshed = 6; + * optional bool pool_refreshed = 9; * @return whether the poolRefreshed field is set */ public boolean hasPoolRefreshed() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000008) != 0; } /** - * optional bool pool_refreshed = 6; + * optional bool pool_refreshed = 9; * @return this */ public RogueScoreRewardInfo clearPoolRefreshed() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; poolRefreshed = false; return this; } /** - * optional bool pool_refreshed = 6; + * optional bool pool_refreshed = 9; * @return the poolRefreshed */ public boolean getPoolRefreshed() { @@ -234,36 +192,36 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional bool pool_refreshed = 6; + * optional bool pool_refreshed = 9; * @param value the poolRefreshed to set * @return this */ public RogueScoreRewardInfo setPoolRefreshed(final boolean value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; poolRefreshed = value; return this; } /** - * repeated uint32 taken_score_reward_list = 4; + * repeated uint32 taken_score_reward_list = 1; * @return whether the takenScoreRewardList field is set */ public boolean hasTakenScoreRewardList() { - return (bitField0_ & 0x00000020) != 0; + return (bitField0_ & 0x00000010) != 0; } /** - * repeated uint32 taken_score_reward_list = 4; + * repeated uint32 taken_score_reward_list = 1; * @return this */ public RogueScoreRewardInfo clearTakenScoreRewardList() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; takenScoreRewardList.clear(); return this; } /** - * repeated uint32 taken_score_reward_list = 4; + * repeated uint32 taken_score_reward_list = 1; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -277,7 +235,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 taken_score_reward_list = 4; + * repeated uint32 taken_score_reward_list = 1; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -286,28 +244,28 @@ public final class RogueScoreRewardInfoOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableTakenScoreRewardList() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; return takenScoreRewardList; } /** - * repeated uint32 taken_score_reward_list = 4; + * repeated uint32 taken_score_reward_list = 1; * @param value the takenScoreRewardList to add * @return this */ public RogueScoreRewardInfo addTakenScoreRewardList(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; takenScoreRewardList.add(value); return this; } /** - * repeated uint32 taken_score_reward_list = 4; + * repeated uint32 taken_score_reward_list = 1; * @param values the takenScoreRewardList to add * @return this */ public RogueScoreRewardInfo addAllTakenScoreRewardList(final int... values) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; takenScoreRewardList.addAll(values); return this; } @@ -317,9 +275,8 @@ public final class RogueScoreRewardInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - rogueImmersifier = other.rogueImmersifier; - poolId = other.poolId; score = other.score; + poolId = other.poolId; hasTakenInitialScore = other.hasTakenInitialScore; poolRefreshed = other.poolRefreshed; takenScoreRewardList.copyFrom(other.takenScoreRewardList); @@ -333,15 +290,12 @@ public final class RogueScoreRewardInfoOuterClass { return this; } cachedSize = -1; - if (other.hasRogueImmersifier()) { - setRogueImmersifier(other.rogueImmersifier); + if (other.hasScore()) { + setScore(other.score); } if (other.hasPoolId()) { setPoolId(other.poolId); } - if (other.hasScore()) { - setScore(other.score); - } if (other.hasHasTakenInitialScore()) { setHasTakenInitialScore(other.hasTakenInitialScore); } @@ -361,9 +315,8 @@ public final class RogueScoreRewardInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - rogueImmersifier = 0; - poolId = 0; score = 0; + poolId = 0; hasTakenInitialScore = false; poolRefreshed = false; takenScoreRewardList.clear(); @@ -391,9 +344,8 @@ public final class RogueScoreRewardInfoOuterClass { } RogueScoreRewardInfo other = (RogueScoreRewardInfo) o; return bitField0_ == other.bitField0_ - && (!hasRogueImmersifier() || rogueImmersifier == other.rogueImmersifier) - && (!hasPoolId() || poolId == other.poolId) && (!hasScore() || score == other.score) + && (!hasPoolId() || poolId == other.poolId) && (!hasHasTakenInitialScore() || hasTakenInitialScore == other.hasTakenInitialScore) && (!hasPoolRefreshed() || poolRefreshed == other.poolRefreshed) && (!hasTakenScoreRewardList() || takenScoreRewardList.equals(other.takenScoreRewardList)); @@ -402,28 +354,24 @@ public final class RogueScoreRewardInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(rogueImmersifier); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(score); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(poolId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(score); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 32); output.writeBoolNoTag(hasTakenInitialScore); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 48); + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 72); output.writeBoolNoTag(poolRefreshed); } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < takenScoreRewardList.length(); i++) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(takenScoreRewardList.array()[i]); } } @@ -433,21 +381,18 @@ public final class RogueScoreRewardInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueImmersifier); + size += 1 + ProtoSink.computeUInt32SizeNoTag(score); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(poolId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(score); + size += 2; } if ((bitField0_ & 0x00000008) != 0) { size += 2; } if ((bitField0_ & 0x00000010) != 0) { - size += 2; - } - if ((bitField0_ & 0x00000020) != 0) { size += (1 * takenScoreRewardList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(takenScoreRewardList); } return size; @@ -460,55 +405,46 @@ public final class RogueScoreRewardInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // rogueImmersifier - rogueImmersifier = input.readUInt32(); + case 64: { + // score + score = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 88) { break; } } - case 56: { + case 88: { // poolId poolId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); + if (tag != 32) { + break; + } + } + case 32: { + // hasTakenInitialScore + hasTakenInitialScore = input.readBool(); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 72) { break; } } case 72: { - // score - score = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 8) { - break; - } - } - case 8: { - // hasTakenInitialScore - hasTakenInitialScore = input.readBool(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { // poolRefreshed poolRefreshed = input.readBool(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 34) { + if (tag != 10) { break; } } - case 34: { + case 10: { // takenScoreRewardList [packed=true] input.readPackedUInt32(takenScoreRewardList, tag); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { break; @@ -524,10 +460,10 @@ public final class RogueScoreRewardInfoOuterClass { tag = input.readTag(); break; } - case 32: { + case 8: { // takenScoreRewardList [packed=false] tag = input.readRepeatedUInt32(takenScoreRewardList, tag); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; break; } } @@ -538,21 +474,18 @@ public final class RogueScoreRewardInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.rogueImmersifier, rogueImmersifier); + output.writeUInt32(FieldNames.score, score); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.poolId, poolId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.score, score); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeBool(FieldNames.hasTakenInitialScore, hasTakenInitialScore); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeBool(FieldNames.poolRefreshed, poolRefreshed); } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedUInt32(FieldNames.takenScoreRewardList, takenScoreRewardList); } output.endObject(); @@ -565,11 +498,10 @@ public final class RogueScoreRewardInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1115528066: - case -1695636777: { - if (input.isAtField(FieldNames.rogueImmersifier)) { + case 109264530: { + if (input.isAtField(FieldNames.score)) { if (!input.trySkipNullValue()) { - rogueImmersifier = input.readUInt32(); + score = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -589,23 +521,12 @@ public final class RogueScoreRewardInfoOuterClass { } break; } - case 109264530: { - if (input.isAtField(FieldNames.score)) { - if (!input.trySkipNullValue()) { - score = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case 1561171099: case -1786836166: { if (input.isAtField(FieldNames.hasTakenInitialScore)) { if (!input.trySkipNullValue()) { hasTakenInitialScore = input.readBool(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -617,7 +538,7 @@ public final class RogueScoreRewardInfoOuterClass { if (input.isAtField(FieldNames.poolRefreshed)) { if (!input.trySkipNullValue()) { poolRefreshed = input.readBool(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -629,7 +550,7 @@ public final class RogueScoreRewardInfoOuterClass { if (input.isAtField(FieldNames.takenScoreRewardList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(takenScoreRewardList); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; } } else { input.skipUnknownField(); @@ -689,12 +610,10 @@ public final class RogueScoreRewardInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName rogueImmersifier = FieldName.forField("rogueImmersifier", "rogue_immersifier"); + static final FieldName score = FieldName.forField("score"); static final FieldName poolId = FieldName.forField("poolId", "pool_id"); - static final FieldName score = FieldName.forField("score"); - static final FieldName hasTakenInitialScore = FieldName.forField("hasTakenInitialScore", "has_taken_initial_score"); static final FieldName poolRefreshed = FieldName.forField("poolRefreshed", "pool_refreshed"); diff --git a/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java index 2101248..4421a05 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java @@ -45,9 +45,9 @@ public final class SceneSummonUnitInfoOuterClass { private int lifeTimeMs; /** - * repeated string custom_triggers = 4; + * repeated string trigger_name_list = 4; */ - private final RepeatedString customTriggers = RepeatedString.newEmptyInstance(); + private final RepeatedString triggerNameList = RepeatedString.newEmptyInstance(); private SceneSummonUnitInfo() { } @@ -245,39 +245,39 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * repeated string custom_triggers = 4; - * @return whether the customTriggers field is set + * repeated string trigger_name_list = 4; + * @return whether the triggerNameList field is set */ - public boolean hasCustomTriggers() { + public boolean hasTriggerNameList() { return (bitField0_ & 0x00000020) != 0; } /** - * repeated string custom_triggers = 4; + * repeated string trigger_name_list = 4; * @return this */ - public SceneSummonUnitInfo clearCustomTriggers() { + public SceneSummonUnitInfo clearTriggerNameList() { bitField0_ &= ~0x00000020; - customTriggers.clear(); + triggerNameList.clear(); return this; } /** - * repeated string custom_triggers = 4; + * repeated string trigger_name_list = 4; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableCustomTriggers()} if you want to modify it. + * Use {@link #getMutableTriggerNameList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedString getCustomTriggers() { - return customTriggers; + public RepeatedString getTriggerNameList() { + return triggerNameList; } /** - * repeated string custom_triggers = 4; + * repeated string trigger_name_list = 4; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -285,30 +285,30 @@ public final class SceneSummonUnitInfoOuterClass { * * @return internal storage object for modifications */ - public RepeatedString getMutableCustomTriggers() { + public RepeatedString getMutableTriggerNameList() { bitField0_ |= 0x00000020; - return customTriggers; + return triggerNameList; } /** - * repeated string custom_triggers = 4; - * @param value the customTriggers to add + * repeated string trigger_name_list = 4; + * @param value the triggerNameList to add * @return this */ - public SceneSummonUnitInfo addCustomTriggers(final CharSequence value) { + public SceneSummonUnitInfo addTriggerNameList(final CharSequence value) { bitField0_ |= 0x00000020; - customTriggers.add(value); + triggerNameList.add(value); return this; } /** - * repeated string custom_triggers = 4; - * @param values the customTriggers to add + * repeated string trigger_name_list = 4; + * @param values the triggerNameList to add * @return this */ - public SceneSummonUnitInfo addAllCustomTriggers(final CharSequence... values) { + public SceneSummonUnitInfo addAllTriggerNameList(final CharSequence... values) { bitField0_ |= 0x00000020; - customTriggers.addAll(values); + triggerNameList.addAll(values); return this; } @@ -322,7 +322,7 @@ public final class SceneSummonUnitInfoOuterClass { casterEntityId = other.casterEntityId; attachEntityId = other.attachEntityId; lifeTimeMs = other.lifeTimeMs; - customTriggers.copyFrom(other.customTriggers); + triggerNameList.copyFrom(other.triggerNameList); } return this; } @@ -348,8 +348,8 @@ public final class SceneSummonUnitInfoOuterClass { if (other.hasLifeTimeMs()) { setLifeTimeMs(other.lifeTimeMs); } - if (other.hasCustomTriggers()) { - getMutableCustomTriggers().addAll(other.customTriggers); + if (other.hasTriggerNameList()) { + getMutableTriggerNameList().addAll(other.triggerNameList); } return this; } @@ -366,7 +366,7 @@ public final class SceneSummonUnitInfoOuterClass { casterEntityId = 0; attachEntityId = 0; lifeTimeMs = 0; - customTriggers.clear(); + triggerNameList.clear(); return this; } @@ -377,7 +377,7 @@ public final class SceneSummonUnitInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - customTriggers.clear(); + triggerNameList.clear(); return this; } @@ -396,7 +396,7 @@ public final class SceneSummonUnitInfoOuterClass { && (!hasCasterEntityId() || casterEntityId == other.casterEntityId) && (!hasAttachEntityId() || attachEntityId == other.attachEntityId) && (!hasLifeTimeMs() || lifeTimeMs == other.lifeTimeMs) - && (!hasCustomTriggers() || customTriggers.equals(other.customTriggers)); + && (!hasTriggerNameList() || triggerNameList.equals(other.triggerNameList)); } @Override @@ -422,9 +422,9 @@ public final class SceneSummonUnitInfoOuterClass { output.writeSInt32NoTag(lifeTimeMs); } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < customTriggers.length(); i++) { + for (int i = 0; i < triggerNameList.length(); i++) { output.writeRawByte((byte) 34); - output.writeStringNoTag(customTriggers.get(i)); + output.writeStringNoTag(triggerNameList.get(i)); } } } @@ -448,7 +448,7 @@ public final class SceneSummonUnitInfoOuterClass { size += 1 + ProtoSink.computeSInt32SizeNoTag(lifeTimeMs); } if ((bitField0_ & 0x00000020) != 0) { - size += (1 * customTriggers.length()) + ProtoSink.computeRepeatedStringSizeNoTag(customTriggers); + size += (1 * triggerNameList.length()) + ProtoSink.computeRepeatedStringSizeNoTag(triggerNameList); } return size; } @@ -506,8 +506,8 @@ public final class SceneSummonUnitInfoOuterClass { } } case 34: { - // customTriggers - tag = input.readRepeatedString(customTriggers, tag); + // triggerNameList + tag = input.readRepeatedString(triggerNameList, tag); bitField0_ |= 0x00000020; if (tag != 0) { break; @@ -546,7 +546,7 @@ public final class SceneSummonUnitInfoOuterClass { output.writeSInt32(FieldNames.lifeTimeMs, lifeTimeMs); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRepeatedString(FieldNames.customTriggers, customTriggers); + output.writeRepeatedString(FieldNames.triggerNameList, triggerNameList); } output.endObject(); } @@ -618,11 +618,11 @@ public final class SceneSummonUnitInfoOuterClass { } break; } - case -1316859828: - case -1929554231: { - if (input.isAtField(FieldNames.customTriggers)) { + case -110500959: + case -107587573: { + if (input.isAtField(FieldNames.triggerNameList)) { if (!input.trySkipNullValue()) { - input.readRepeatedString(customTriggers); + input.readRepeatedString(triggerNameList); bitField0_ |= 0x00000020; } } else { @@ -693,7 +693,7 @@ public final class SceneSummonUnitInfoOuterClass { static final FieldName lifeTimeMs = FieldName.forField("lifeTimeMs", "life_time_ms"); - static final FieldName customTriggers = FieldName.forField("customTriggers", "custom_triggers"); + static final FieldName triggerNameList = FieldName.forField("triggerNameList", "trigger_name_list"); } } } diff --git a/src/main/java/emu/lunarcore/game/scene/entity/EntitySummonUnit.java b/src/main/java/emu/lunarcore/game/scene/entity/EntitySummonUnit.java index 3a33be7..e45481b 100644 --- a/src/main/java/emu/lunarcore/game/scene/entity/EntitySummonUnit.java +++ b/src/main/java/emu/lunarcore/game/scene/entity/EntitySummonUnit.java @@ -59,7 +59,7 @@ public class EntitySummonUnit implements GameEntity { .setSummonUnitId(this.getExcel().getId()); for (var trigger : this.getExcel().getInfo().getCustomTriggers()) { - summon.addCustomTriggers(trigger.getTriggerName()); + summon.addTriggerNameList(trigger.getTriggerName()); } var proto = SceneEntityInfo.newInstance() diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetDailyActiveInfoCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetDailyActiveInfoCsReq.java index 015bdf6..30691ac 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetDailyActiveInfoCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetDailyActiveInfoCsReq.java @@ -11,6 +11,6 @@ public class HandlerGetDailyActiveInfoCsReq extends PacketHandler { @Override public void handle(GameSession session, byte[] data) throws Exception { - //session.send(new PacketGetDailyActiveInfoScRsp(session.getPlayer())); + session.send(new PacketGetDailyActiveInfoScRsp(session.getPlayer())); } } diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetQuestDataCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetQuestDataCsReq.java index 49157c3..0de5187 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetQuestDataCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetQuestDataCsReq.java @@ -4,14 +4,13 @@ import emu.lunarcore.server.game.GameSession; import emu.lunarcore.server.packet.CmdId; import emu.lunarcore.server.packet.Opcodes; import emu.lunarcore.server.packet.PacketHandler; +import emu.lunarcore.server.packet.send.PacketGetQuestDataScRsp; @Opcodes(CmdId.GetQuestDataCsReq) public class HandlerGetQuestDataCsReq extends PacketHandler { @Override public void handle(GameSession session, byte[] data) throws Exception { - session.send(CmdId.GetQuestDataScRsp); - // TODO - //session.send(new PacketGetQuestDataScRsp()); + session.send(new PacketGetQuestDataScRsp()); } } \ No newline at end of file diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketGetArchiveDataScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketGetArchiveDataScRsp.java index 1c5fd50..fb913ff 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketGetArchiveDataScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketGetArchiveDataScRsp.java @@ -31,7 +31,7 @@ public class PacketGetArchiveDataScRsp extends BasePacket { for (var relicExcel : GameData.getRelicExcelMap().values()) { RelicArchive relicInfo = RelicArchive.newInstance() - .setType(relicExcel.getType().getVal()) + .setSlot(relicExcel.getType().getVal()) .setRelicId(relicExcel.getId()); // todo: add to db archiveData.addRelicList(relicInfo);