From 8c54950af06b2187cf4c945f7ac1ca1478946fa6 Mon Sep 17 00:00:00 2001 From: KingRainbow44 Date: Sat, 13 May 2023 17:38:52 -0400 Subject: [PATCH] Fix forge queue data protocol definition --- .../net/proto/ForgeQueueDataOuterClass.java | 400 +++++++++--------- 1 file changed, 200 insertions(+), 200 deletions(-) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataOuterClass.java index 07633de9a..0e376fe8c 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataOuterClass.java @@ -24,11 +24,11 @@ public final class ForgeQueueDataOuterClass { * LFKLAHBIMHG * * - * uint32 queue_id = 5; + * uint32 total_finish_timestamp = 5; * - * @return The queueId. + * @return The totalFinishTimestamp. */ - int getQueueId(); + int getTotalFinishTimestamp(); /** * @@ -37,11 +37,11 @@ public final class ForgeQueueDataOuterClass { * ANEHHKAEKNL * * - * uint32 finish_count = 12; + * uint32 unfinish_count = 12; * - * @return The finishCount. + * @return The unfinishCount. */ - int getFinishCount(); + int getUnfinishCount(); /** * uint32 avatar_id = 13; @@ -64,11 +64,11 @@ public final class ForgeQueueDataOuterClass { * HANICBEMMJM * * - * uint32 total_finish_timestamp = 11; + * uint32 finish_count = 11; * - * @return The totalFinishTimestamp. + * @return The finishCount. */ - int getTotalFinishTimestamp(); + int getFinishCount(); /** * @@ -77,11 +77,11 @@ public final class ForgeQueueDataOuterClass { * EBFDNIFEKBN * * - * uint32 unfinish_count = 1; + * uint32 next_finish_timestamp = 1; * - * @return The unfinishCount. + * @return The nextFinishTimestamp. */ - int getUnfinishCount(); + int getNextFinishTimestamp(); /** * @@ -90,11 +90,11 @@ public final class ForgeQueueDataOuterClass { * JHCELCAALGH * * - * uint32 next_finish_timestamp = 15; + * uint32 queue_id = 15; * - * @return The nextFinishTimestamp. + * @return The queueId. */ - int getNextFinishTimestamp(); + int getQueueId(); } /** * @@ -148,22 +148,22 @@ public final class ForgeQueueDataOuterClass { break; case 8: { - unfinishCount_ = input.readUInt32(); + nextFinishTimestamp_ = input.readUInt32(); break; } case 40: { - queueId_ = input.readUInt32(); + totalFinishTimestamp_ = input.readUInt32(); break; } case 88: { - totalFinishTimestamp_ = input.readUInt32(); + finishCount_ = input.readUInt32(); break; } case 96: { - finishCount_ = input.readUInt32(); + unfinishCount_ = input.readUInt32(); break; } case 104: @@ -178,7 +178,7 @@ public final class ForgeQueueDataOuterClass { } case 120: { - nextFinishTimestamp_ = input.readUInt32(); + queueId_ = input.readUInt32(); break; } default: @@ -215,8 +215,8 @@ public final class ForgeQueueDataOuterClass { emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData.Builder.class); } - public static final int QUEUE_ID_FIELD_NUMBER = 5; - private int queueId_; + public static final int TOTAL_FINISH_TIMESTAMP_FIELD_NUMBER = 5; + private int totalFinishTimestamp_; /** * * @@ -224,17 +224,17 @@ public final class ForgeQueueDataOuterClass { * LFKLAHBIMHG * * - * uint32 queue_id = 5; + * uint32 total_finish_timestamp = 5; * - * @return The queueId. + * @return The totalFinishTimestamp. */ @java.lang.Override - public int getQueueId() { - return queueId_; + public int getTotalFinishTimestamp() { + return totalFinishTimestamp_; } - public static final int FINISH_COUNT_FIELD_NUMBER = 12; - private int finishCount_; + public static final int UNFINISH_COUNT_FIELD_NUMBER = 12; + private int unfinishCount_; /** * * @@ -242,13 +242,13 @@ public final class ForgeQueueDataOuterClass { * ANEHHKAEKNL * * - * uint32 finish_count = 12; + * uint32 unfinish_count = 12; * - * @return The finishCount. + * @return The unfinishCount. */ @java.lang.Override - public int getFinishCount() { - return finishCount_; + public int getUnfinishCount() { + return unfinishCount_; } public static final int AVATAR_ID_FIELD_NUMBER = 13; @@ -275,8 +275,8 @@ public final class ForgeQueueDataOuterClass { return forgeId_; } - public static final int TOTAL_FINISH_TIMESTAMP_FIELD_NUMBER = 11; - private int totalFinishTimestamp_; + public static final int FINISH_COUNT_FIELD_NUMBER = 11; + private int finishCount_; /** * * @@ -284,17 +284,17 @@ public final class ForgeQueueDataOuterClass { * HANICBEMMJM * * - * uint32 total_finish_timestamp = 11; + * uint32 finish_count = 11; * - * @return The totalFinishTimestamp. + * @return The finishCount. */ @java.lang.Override - public int getTotalFinishTimestamp() { - return totalFinishTimestamp_; + public int getFinishCount() { + return finishCount_; } - public static final int UNFINISH_COUNT_FIELD_NUMBER = 1; - private int unfinishCount_; + public static final int NEXT_FINISH_TIMESTAMP_FIELD_NUMBER = 1; + private int nextFinishTimestamp_; /** * * @@ -302,17 +302,17 @@ public final class ForgeQueueDataOuterClass { * EBFDNIFEKBN * * - * uint32 unfinish_count = 1; + * uint32 next_finish_timestamp = 1; * - * @return The unfinishCount. + * @return The nextFinishTimestamp. */ @java.lang.Override - public int getUnfinishCount() { - return unfinishCount_; + public int getNextFinishTimestamp() { + return nextFinishTimestamp_; } - public static final int NEXT_FINISH_TIMESTAMP_FIELD_NUMBER = 15; - private int nextFinishTimestamp_; + public static final int QUEUE_ID_FIELD_NUMBER = 15; + private int queueId_; /** * * @@ -320,13 +320,13 @@ public final class ForgeQueueDataOuterClass { * JHCELCAALGH * * - * uint32 next_finish_timestamp = 15; + * uint32 queue_id = 15; * - * @return The nextFinishTimestamp. + * @return The queueId. */ @java.lang.Override - public int getNextFinishTimestamp() { - return nextFinishTimestamp_; + public int getQueueId() { + return queueId_; } private byte memoizedIsInitialized = -1; @@ -343,17 +343,17 @@ public final class ForgeQueueDataOuterClass { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (unfinishCount_ != 0) { - output.writeUInt32(1, unfinishCount_); - } - if (queueId_ != 0) { - output.writeUInt32(5, queueId_); + if (nextFinishTimestamp_ != 0) { + output.writeUInt32(1, nextFinishTimestamp_); } if (totalFinishTimestamp_ != 0) { - output.writeUInt32(11, totalFinishTimestamp_); + output.writeUInt32(5, totalFinishTimestamp_); } if (finishCount_ != 0) { - output.writeUInt32(12, finishCount_); + output.writeUInt32(11, finishCount_); + } + if (unfinishCount_ != 0) { + output.writeUInt32(12, unfinishCount_); } if (avatarId_ != 0) { output.writeUInt32(13, avatarId_); @@ -361,8 +361,8 @@ public final class ForgeQueueDataOuterClass { if (forgeId_ != 0) { output.writeUInt32(14, forgeId_); } - if (nextFinishTimestamp_ != 0) { - output.writeUInt32(15, nextFinishTimestamp_); + if (queueId_ != 0) { + output.writeUInt32(15, queueId_); } unknownFields.writeTo(output); } @@ -373,17 +373,17 @@ public final class ForgeQueueDataOuterClass { if (size != -1) return size; size = 0; - if (unfinishCount_ != 0) { - size += com.google.protobuf.CodedOutputStream.computeUInt32Size(1, unfinishCount_); - } - if (queueId_ != 0) { - size += com.google.protobuf.CodedOutputStream.computeUInt32Size(5, queueId_); + if (nextFinishTimestamp_ != 0) { + size += com.google.protobuf.CodedOutputStream.computeUInt32Size(1, nextFinishTimestamp_); } if (totalFinishTimestamp_ != 0) { - size += com.google.protobuf.CodedOutputStream.computeUInt32Size(11, totalFinishTimestamp_); + size += com.google.protobuf.CodedOutputStream.computeUInt32Size(5, totalFinishTimestamp_); } if (finishCount_ != 0) { - size += com.google.protobuf.CodedOutputStream.computeUInt32Size(12, finishCount_); + size += com.google.protobuf.CodedOutputStream.computeUInt32Size(11, finishCount_); + } + if (unfinishCount_ != 0) { + size += com.google.protobuf.CodedOutputStream.computeUInt32Size(12, unfinishCount_); } if (avatarId_ != 0) { size += com.google.protobuf.CodedOutputStream.computeUInt32Size(13, avatarId_); @@ -391,8 +391,8 @@ public final class ForgeQueueDataOuterClass { if (forgeId_ != 0) { size += com.google.protobuf.CodedOutputStream.computeUInt32Size(14, forgeId_); } - if (nextFinishTimestamp_ != 0) { - size += com.google.protobuf.CodedOutputStream.computeUInt32Size(15, nextFinishTimestamp_); + if (queueId_ != 0) { + size += com.google.protobuf.CodedOutputStream.computeUInt32Size(15, queueId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -410,13 +410,13 @@ public final class ForgeQueueDataOuterClass { emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData other = (emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData) obj; - if (getQueueId() != other.getQueueId()) return false; - if (getFinishCount() != other.getFinishCount()) return false; - if (getAvatarId() != other.getAvatarId()) return false; - if (getForgeId() != other.getForgeId()) return false; if (getTotalFinishTimestamp() != other.getTotalFinishTimestamp()) return false; if (getUnfinishCount() != other.getUnfinishCount()) return false; + if (getAvatarId() != other.getAvatarId()) return false; + if (getForgeId() != other.getForgeId()) return false; + if (getFinishCount() != other.getFinishCount()) return false; if (getNextFinishTimestamp() != other.getNextFinishTimestamp()) return false; + if (getQueueId() != other.getQueueId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -428,20 +428,20 @@ public final class ForgeQueueDataOuterClass { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + QUEUE_ID_FIELD_NUMBER; - hash = (53 * hash) + getQueueId(); - hash = (37 * hash) + FINISH_COUNT_FIELD_NUMBER; - hash = (53 * hash) + getFinishCount(); - hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER; - hash = (53 * hash) + getAvatarId(); - hash = (37 * hash) + FORGE_ID_FIELD_NUMBER; - hash = (53 * hash) + getForgeId(); hash = (37 * hash) + TOTAL_FINISH_TIMESTAMP_FIELD_NUMBER; hash = (53 * hash) + getTotalFinishTimestamp(); hash = (37 * hash) + UNFINISH_COUNT_FIELD_NUMBER; hash = (53 * hash) + getUnfinishCount(); + hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER; + hash = (53 * hash) + getAvatarId(); + hash = (37 * hash) + FORGE_ID_FIELD_NUMBER; + hash = (53 * hash) + getForgeId(); + hash = (37 * hash) + FINISH_COUNT_FIELD_NUMBER; + hash = (53 * hash) + getFinishCount(); hash = (37 * hash) + NEXT_FINISH_TIMESTAMP_FIELD_NUMBER; hash = (53 * hash) + getNextFinishTimestamp(); + hash = (37 * hash) + QUEUE_ID_FIELD_NUMBER; + hash = (53 * hash) + getQueueId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -592,20 +592,20 @@ public final class ForgeQueueDataOuterClass { @java.lang.Override public Builder clear() { super.clear(); - queueId_ = 0; + totalFinishTimestamp_ = 0; - finishCount_ = 0; + unfinishCount_ = 0; avatarId_ = 0; forgeId_ = 0; - totalFinishTimestamp_ = 0; - - unfinishCount_ = 0; + finishCount_ = 0; nextFinishTimestamp_ = 0; + queueId_ = 0; + return this; } @@ -635,13 +635,13 @@ public final class ForgeQueueDataOuterClass { public emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData buildPartial() { emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData result = new emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData(this); - result.queueId_ = queueId_; - result.finishCount_ = finishCount_; - result.avatarId_ = avatarId_; - result.forgeId_ = forgeId_; result.totalFinishTimestamp_ = totalFinishTimestamp_; result.unfinishCount_ = unfinishCount_; + result.avatarId_ = avatarId_; + result.forgeId_ = forgeId_; + result.finishCount_ = finishCount_; result.nextFinishTimestamp_ = nextFinishTimestamp_; + result.queueId_ = queueId_; onBuilt(); return result; } @@ -697,11 +697,11 @@ public final class ForgeQueueDataOuterClass { if (other == emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData .getDefaultInstance()) return this; - if (other.getQueueId() != 0) { - setQueueId(other.getQueueId()); + if (other.getTotalFinishTimestamp() != 0) { + setTotalFinishTimestamp(other.getTotalFinishTimestamp()); } - if (other.getFinishCount() != 0) { - setFinishCount(other.getFinishCount()); + if (other.getUnfinishCount() != 0) { + setUnfinishCount(other.getUnfinishCount()); } if (other.getAvatarId() != 0) { setAvatarId(other.getAvatarId()); @@ -709,15 +709,15 @@ public final class ForgeQueueDataOuterClass { if (other.getForgeId() != 0) { setForgeId(other.getForgeId()); } - if (other.getTotalFinishTimestamp() != 0) { - setTotalFinishTimestamp(other.getTotalFinishTimestamp()); - } - if (other.getUnfinishCount() != 0) { - setUnfinishCount(other.getUnfinishCount()); + if (other.getFinishCount() != 0) { + setFinishCount(other.getFinishCount()); } if (other.getNextFinishTimestamp() != 0) { setNextFinishTimestamp(other.getNextFinishTimestamp()); } + if (other.getQueueId() != 0) { + setQueueId(other.getQueueId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -749,7 +749,7 @@ public final class ForgeQueueDataOuterClass { return this; } - private int queueId_; + private int totalFinishTimestamp_; /** * * @@ -757,13 +757,13 @@ public final class ForgeQueueDataOuterClass { * LFKLAHBIMHG * * - * uint32 queue_id = 5; + * uint32 total_finish_timestamp = 5; * - * @return The queueId. + * @return The totalFinishTimestamp. */ @java.lang.Override - public int getQueueId() { - return queueId_; + public int getTotalFinishTimestamp() { + return totalFinishTimestamp_; } /** * @@ -772,14 +772,14 @@ public final class ForgeQueueDataOuterClass { * LFKLAHBIMHG * * - * uint32 queue_id = 5; + * uint32 total_finish_timestamp = 5; * - * @param value The queueId to set. + * @param value The totalFinishTimestamp to set. * @return This builder for chaining. */ - public Builder setQueueId(int value) { + public Builder setTotalFinishTimestamp(int value) { - queueId_ = value; + totalFinishTimestamp_ = value; onChanged(); return this; } @@ -790,18 +790,18 @@ public final class ForgeQueueDataOuterClass { * LFKLAHBIMHG * * - * uint32 queue_id = 5; + * uint32 total_finish_timestamp = 5; * * @return This builder for chaining. */ - public Builder clearQueueId() { + public Builder clearTotalFinishTimestamp() { - queueId_ = 0; + totalFinishTimestamp_ = 0; onChanged(); return this; } - private int finishCount_; + private int unfinishCount_; /** * * @@ -809,13 +809,13 @@ public final class ForgeQueueDataOuterClass { * ANEHHKAEKNL * * - * uint32 finish_count = 12; + * uint32 unfinish_count = 12; * - * @return The finishCount. + * @return The unfinishCount. */ @java.lang.Override - public int getFinishCount() { - return finishCount_; + public int getUnfinishCount() { + return unfinishCount_; } /** * @@ -824,14 +824,14 @@ public final class ForgeQueueDataOuterClass { * ANEHHKAEKNL * * - * uint32 finish_count = 12; + * uint32 unfinish_count = 12; * - * @param value The finishCount to set. + * @param value The unfinishCount to set. * @return This builder for chaining. */ - public Builder setFinishCount(int value) { + public Builder setUnfinishCount(int value) { - finishCount_ = value; + unfinishCount_ = value; onChanged(); return this; } @@ -842,13 +842,13 @@ public final class ForgeQueueDataOuterClass { * ANEHHKAEKNL * * - * uint32 finish_count = 12; + * uint32 unfinish_count = 12; * * @return This builder for chaining. */ - public Builder clearFinishCount() { + public Builder clearUnfinishCount() { - finishCount_ = 0; + unfinishCount_ = 0; onChanged(); return this; } @@ -921,7 +921,7 @@ public final class ForgeQueueDataOuterClass { return this; } - private int totalFinishTimestamp_; + private int finishCount_; /** * * @@ -929,13 +929,13 @@ public final class ForgeQueueDataOuterClass { * HANICBEMMJM * * - * uint32 total_finish_timestamp = 11; + * uint32 finish_count = 11; * - * @return The totalFinishTimestamp. + * @return The finishCount. */ @java.lang.Override - public int getTotalFinishTimestamp() { - return totalFinishTimestamp_; + public int getFinishCount() { + return finishCount_; } /** * @@ -944,14 +944,14 @@ public final class ForgeQueueDataOuterClass { * HANICBEMMJM * * - * uint32 total_finish_timestamp = 11; + * uint32 finish_count = 11; * - * @param value The totalFinishTimestamp to set. + * @param value The finishCount to set. * @return This builder for chaining. */ - public Builder setTotalFinishTimestamp(int value) { + public Builder setFinishCount(int value) { - totalFinishTimestamp_ = value; + finishCount_ = value; onChanged(); return this; } @@ -962,65 +962,13 @@ public final class ForgeQueueDataOuterClass { * HANICBEMMJM * * - * uint32 total_finish_timestamp = 11; + * uint32 finish_count = 11; * * @return This builder for chaining. */ - public Builder clearTotalFinishTimestamp() { + public Builder clearFinishCount() { - totalFinishTimestamp_ = 0; - onChanged(); - return this; - } - - private int unfinishCount_; - /** - * - * - * 
-             * EBFDNIFEKBN
-             *
- * - * uint32 unfinish_count = 1; - * - * @return The unfinishCount. - */ - @java.lang.Override - public int getUnfinishCount() { - return unfinishCount_; - } - /** - * - * - * 
-             * EBFDNIFEKBN
-             *
- * - * uint32 unfinish_count = 1; - * - * @param value The unfinishCount to set. - * @return This builder for chaining. - */ - public Builder setUnfinishCount(int value) { - - unfinishCount_ = value; - onChanged(); - return this; - } - /** - * - * - * 
-             * EBFDNIFEKBN
-             *
- * - * uint32 unfinish_count = 1; - * - * @return This builder for chaining. - */ - public Builder clearUnfinishCount() { - - unfinishCount_ = 0; + finishCount_ = 0; onChanged(); return this; } @@ -1030,10 +978,10 @@ public final class ForgeQueueDataOuterClass { * * * 
-             * JHCELCAALGH
+             * EBFDNIFEKBN
              *
* - * uint32 next_finish_timestamp = 15; + * uint32 next_finish_timestamp = 1; * * @return The nextFinishTimestamp. */ @@ -1045,10 +993,10 @@ public final class ForgeQueueDataOuterClass { * * * 
-             * JHCELCAALGH
+             * EBFDNIFEKBN
              *
* - * uint32 next_finish_timestamp = 15; + * uint32 next_finish_timestamp = 1; * * @param value The nextFinishTimestamp to set. * @return This builder for chaining. @@ -1063,10 +1011,10 @@ public final class ForgeQueueDataOuterClass { * * * 
-             * JHCELCAALGH
+             * EBFDNIFEKBN
              *
* - * uint32 next_finish_timestamp = 15; + * uint32 next_finish_timestamp = 1; * * @return This builder for chaining. */ @@ -1077,6 +1025,58 @@ public final class ForgeQueueDataOuterClass { return this; } + private int queueId_; + /** + * + * + * 
+             * JHCELCAALGH
+             *
+ * + * uint32 queue_id = 15; + * + * @return The queueId. + */ + @java.lang.Override + public int getQueueId() { + return queueId_; + } + /** + * + * + * 
+             * JHCELCAALGH
+             *
+ * + * uint32 queue_id = 15; + * + * @param value The queueId to set. + * @return This builder for chaining. + */ + public Builder setQueueId(int value) { + + queueId_ = value; + onChanged(); + return this; + } + /** + * + * + * 
+             * JHCELCAALGH
+             *
+ * + * uint32 queue_id = 15; + * + * @return This builder for chaining. + */ + public Builder clearQueueId() { + + queueId_ = 0; + onChanged(); + return this; + } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1146,10 +1146,10 @@ public final class ForgeQueueDataOuterClass { static { java.lang.String[] descriptorData = { "\n\024ForgeQueueData.proto\"\264\001\n\016ForgeQueueDat" - + "a\022\020\n\010queue_id\030\005 \001(\r\022\024\n\014finish_count\030\014 \001(" - + "\r\022\021\n\tavatar_id\030\r \001(\r\022\020\n\010forge_id\030\016 \001(\r\022\036" - + "\n\026total_finish_timestamp\030\013 \001(\r\022\026\n\016unfini" - + "sh_count\030\001 \001(\r\022\035\n\025next_finish_timestamp\030" + + "a\022\036\n\026total_finish_timestamp\030\005 \001(\r\022\026\n\016unf" + + "inish_count\030\014 \001(\r\022\021\n\tavatar_id\030\r \001(\r\022\020\n\010" + + "forge_id\030\016 \001(\r\022\024\n\014finish_count\030\013 \001(\r\022\035\n\025" + + "next_finish_timestamp\030\001 \001(\r\022\020\n\010queue_id\030" + "\017 \001(\rB!\n\031emu.grasscutter.net.protoZ\004/gen" + "b\006proto3" }; @@ -1161,13 +1161,13 @@ public final class ForgeQueueDataOuterClass { new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ForgeQueueData_descriptor, new java.lang.String[] { - "QueueId", - "FinishCount", - "AvatarId", - "ForgeId", "TotalFinishTimestamp", "UnfinishCount", + "AvatarId", + "ForgeId", + "FinishCount", "NextFinishTimestamp", + "QueueId", }); }