From b6fe9f2e2b2c38d6d22ef3e10796be3e2accb399 Mon Sep 17 00:00:00 2001 From: Hiro <84511935+Hiro420@users.noreply.github.com> Date: Tue, 6 Feb 2024 06:02:30 +0200 Subject: [PATCH] fix GetFarmStageGachaInfo proto --- .../proto/FarmStageGachaInfoOuterClass.java | 190 +++++++++--------- .../GetFarmStageGachaInfoCsReqOuterClass.java | 20 +- .../GetFarmStageGachaInfoScRspOuterClass.java | 34 ++-- 3 files changed, 122 insertions(+), 122 deletions(-) diff --git a/src/generated/main/emu/lunarcore/proto/FarmStageGachaInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FarmStageGachaInfoOuterClass.java index ed2673b..d58fed7 100644 --- a/src/generated/main/emu/lunarcore/proto/FarmStageGachaInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FarmStageGachaInfoOuterClass.java @@ -19,17 +19,17 @@ public final class FarmStageGachaInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 end_time = 4; - */ - private long endTime; - - /** - * optional int64 begin_time = 5; + * optional int64 begin_time = 13; */ private long beginTime; /** - * optional uint32 gacha_id = 3; + * optional int64 end_time = 14; + */ + private long endTime; + + /** + * optional uint32 gacha_id = 12; */ private int gachaId; @@ -44,62 +44,25 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional int64 end_time = 4; - * @return whether the endTime field is set + * optional int64 begin_time = 13; + * @return whether the beginTime field is set */ - public boolean hasEndTime() { + public boolean hasBeginTime() { return (bitField0_ & 0x00000001) != 0; } /** - * optional int64 end_time = 4; - * @return this - */ - public FarmStageGachaInfo clearEndTime() { - bitField0_ &= ~0x00000001; - endTime = 0L; - return this; - } - - /** - * optional int64 end_time = 4; - * @return the endTime - */ - public long getEndTime() { - return endTime; - } - - /** - * optional int64 end_time = 4; - * @param value the endTime to set - * @return this - */ - public FarmStageGachaInfo setEndTime(final long value) { - bitField0_ |= 0x00000001; - endTime = value; - return this; - } - - /** - * optional int64 begin_time = 5; - * @return whether the beginTime field is set - */ - public boolean hasBeginTime() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional int64 begin_time = 5; + * optional int64 begin_time = 13; * @return this */ public FarmStageGachaInfo clearBeginTime() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; beginTime = 0L; return this; } /** - * optional int64 begin_time = 5; + * optional int64 begin_time = 13; * @return the beginTime */ public long getBeginTime() { @@ -107,18 +70,55 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional int64 begin_time = 5; + * optional int64 begin_time = 13; * @param value the beginTime to set * @return this */ public FarmStageGachaInfo setBeginTime(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; beginTime = value; return this; } /** - * optional uint32 gacha_id = 3; + * optional int64 end_time = 14; + * @return whether the endTime field is set + */ + public boolean hasEndTime() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional int64 end_time = 14; + * @return this + */ + public FarmStageGachaInfo clearEndTime() { + bitField0_ &= ~0x00000002; + endTime = 0L; + return this; + } + + /** + * optional int64 end_time = 14; + * @return the endTime + */ + public long getEndTime() { + return endTime; + } + + /** + * optional int64 end_time = 14; + * @param value the endTime to set + * @return this + */ + public FarmStageGachaInfo setEndTime(final long value) { + bitField0_ |= 0x00000002; + endTime = value; + return this; + } + + /** + * optional uint32 gacha_id = 12; * @return whether the gachaId field is set */ public boolean hasGachaId() { @@ -126,7 +126,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional uint32 gacha_id = 3; + * optional uint32 gacha_id = 12; * @return this */ public FarmStageGachaInfo clearGachaId() { @@ -136,7 +136,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional uint32 gacha_id = 3; + * optional uint32 gacha_id = 12; * @return the gachaId */ public int getGachaId() { @@ -144,7 +144,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional uint32 gacha_id = 3; + * optional uint32 gacha_id = 12; * @param value the gachaId to set * @return this */ @@ -159,8 +159,8 @@ public final class FarmStageGachaInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - endTime = other.endTime; beginTime = other.beginTime; + endTime = other.endTime; gachaId = other.gachaId; } return this; @@ -172,12 +172,12 @@ public final class FarmStageGachaInfoOuterClass { return this; } cachedSize = -1; - if (other.hasEndTime()) { - setEndTime(other.endTime); - } if (other.hasBeginTime()) { setBeginTime(other.beginTime); } + if (other.hasEndTime()) { + setEndTime(other.endTime); + } if (other.hasGachaId()) { setGachaId(other.gachaId); } @@ -191,8 +191,8 @@ public final class FarmStageGachaInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - endTime = 0L; beginTime = 0L; + endTime = 0L; gachaId = 0; return this; } @@ -217,23 +217,23 @@ public final class FarmStageGachaInfoOuterClass { } FarmStageGachaInfo other = (FarmStageGachaInfo) o; return bitField0_ == other.bitField0_ - && (!hasEndTime() || endTime == other.endTime) && (!hasBeginTime() || beginTime == other.beginTime) + && (!hasEndTime() || endTime == other.endTime) && (!hasGachaId() || gachaId == other.gachaId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeInt64NoTag(endTime); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 104); output.writeInt64NoTag(beginTime); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 112); + output.writeInt64NoTag(endTime); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(gachaId); } } @@ -242,10 +242,10 @@ public final class FarmStageGachaInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); + size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); + size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); @@ -260,25 +260,25 @@ public final class FarmStageGachaInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // endTime - endTime = input.readInt64(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { + case 104: { // beginTime beginTime = input.readInt64(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 112) { break; } } - case 24: { + case 112: { + // endTime + endTime = input.readInt64(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { // gachaId gachaId = input.readUInt32(); bitField0_ |= 0x00000004; @@ -305,10 +305,10 @@ public final class FarmStageGachaInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeInt64(FieldNames.endTime, endTime); + output.writeInt64(FieldNames.beginTime, beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeInt64(FieldNames.beginTime, beginTime); + output.writeInt64(FieldNames.endTime, endTime); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.gachaId, gachaId); @@ -323,11 +323,11 @@ public final class FarmStageGachaInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1607243192: - case 1725551537: { - if (input.isAtField(FieldNames.endTime)) { + case -1072839914: + case 1112183971: { + if (input.isAtField(FieldNames.beginTime)) { if (!input.trySkipNullValue()) { - endTime = input.readInt64(); + beginTime = input.readInt64(); bitField0_ |= 0x00000001; } } else { @@ -335,11 +335,11 @@ public final class FarmStageGachaInfoOuterClass { } break; } - case -1072839914: - case 1112183971: { - if (input.isAtField(FieldNames.beginTime)) { + case -1607243192: + case 1725551537: { + if (input.isAtField(FieldNames.endTime)) { if (!input.trySkipNullValue()) { - beginTime = input.readInt64(); + endTime = input.readInt64(); bitField0_ |= 0x00000002; } } else { @@ -412,10 +412,10 @@ public final class FarmStageGachaInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName endTime = FieldName.forField("endTime", "end_time"); - static final FieldName beginTime = FieldName.forField("beginTime", "begin_time"); + static final FieldName endTime = FieldName.forField("endTime", "end_time"); + static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoCsReqOuterClass.java index 6e86d0b..2760a8b 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoCsReqOuterClass.java @@ -20,7 +20,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 farm_stage_gacha_id_list = 11; + * repeated uint32 farm_stage_gacha_id_list = 12; */ private final RepeatedInt farmStageGachaIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 11; + * repeated uint32 farm_stage_gacha_id_list = 12; * @return whether the farmStageGachaIdList field is set */ public boolean hasFarmStageGachaIdList() { @@ -43,7 +43,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 11; + * repeated uint32 farm_stage_gacha_id_list = 12; * @return this */ public GetFarmStageGachaInfoCsReq clearFarmStageGachaIdList() { @@ -53,7 +53,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 11; + * repeated uint32 farm_stage_gacha_id_list = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 11; + * repeated uint32 farm_stage_gacha_id_list = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 11; + * repeated uint32 farm_stage_gacha_id_list = 12; * @param value the farmStageGachaIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 11; + * repeated uint32 farm_stage_gacha_id_list = 12; * @param values the farmStageGachaIdList to add * @return this */ @@ -163,7 +163,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < farmStageGachaIdList.length(); i++) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(farmStageGachaIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 90: { + case 98: { // farmStageGachaIdList [packed=true] input.readPackedUInt32(farmStageGachaIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { tag = input.readTag(); break; } - case 88: { + case 96: { // farmStageGachaIdList [packed=false] tag = input.readRepeatedUInt32(farmStageGachaIdList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoScRspOuterClass.java index 57abe2e..08835eb 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoScRspOuterClass.java @@ -20,12 +20,12 @@ public final class GetFarmStageGachaInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 5; */ private int retcode; /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 10; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 12; */ private final RepeatedMessage farmStageGachaInfoList = RepeatedMessage.newEmptyInstance(FarmStageGachaInfoOuterClass.FarmStageGachaInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 5; * @return this */ public GetFarmStageGachaInfoScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 10; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 12; * @return whether the farmStageGachaInfoList field is set */ public boolean hasFarmStageGachaInfoList() { @@ -85,7 +85,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 10; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 12; * @return this */ public GetFarmStageGachaInfoScRsp clearFarmStageGachaInfoList() { @@ -95,7 +95,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 10; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 12; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -110,7 +110,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 10; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 12; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -125,7 +125,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 10; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 12; * @param value the farmStageGachaInfoList to add * @return this */ @@ -137,7 +137,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 10; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 12; * @param values the farmStageGachaInfoList to add * @return this */ @@ -214,12 +214,12 @@ public final class GetFarmStageGachaInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < farmStageGachaInfoList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 98); output.writeMessageNoTag(farmStageGachaInfoList.get(i)); } } @@ -244,16 +244,16 @@ public final class GetFarmStageGachaInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 40: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 98) { break; } } - case 82: { + case 98: { // farmStageGachaInfoList tag = input.readRepeatedMessage(farmStageGachaInfoList, tag); bitField0_ |= 0x00000002;