From fc7de04f738c17efd0c1ded278b2f26a7c206345 Mon Sep 17 00:00:00 2001 From: Nazrin Date: Sat, 26 Aug 2023 18:02:51 -0700 Subject: [PATCH] fix forging (again) (#2309) --- .../net/proto/ForgeQueueDataOuterClass.java | 280 +++++++++--------- 1 file changed, 139 insertions(+), 141 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 de23757e8..de619c977 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataOuterClass.java @@ -31,29 +31,29 @@ public final class ForgeQueueDataOuterClass { int getAvatarId(); /** - * uint32 queue_id = 3; - * @return The queueId. - */ - int getQueueId(); - - /** - * uint32 finish_count = 14; + * uint32 finish_count = 3; * @return The finishCount. */ int getFinishCount(); /** - * uint32 next_finish_timestamp = 11; - * @return The nextFinishTimestamp. + * uint32 queueId = 14; + * @return The queueId. */ - int getNextFinishTimestamp(); + int getQueueId(); /** - * uint32 unfinish_count = 4; + * uint32 unfinishCount = 11; * @return The unfinishCount. */ int getUnfinishCount(); + /** + * uint32 next_finish_timestamp = 4; + * @return The nextFinishTimestamp. + */ + int getNextFinishTimestamp(); + /** * uint32 forge_id = 15; * @return The forgeId. @@ -111,12 +111,12 @@ public final class ForgeQueueDataOuterClass { break; case 24: { - queueId_ = input.readUInt32(); + finishCount_ = input.readUInt32(); break; } case 32: { - unfinishCount_ = input.readUInt32(); + nextFinishTimestamp_ = input.readUInt32(); break; } case 64: { @@ -126,7 +126,7 @@ public final class ForgeQueueDataOuterClass { } case 88: { - nextFinishTimestamp_ = input.readUInt32(); + unfinishCount_ = input.readUInt32(); break; } case 104: { @@ -136,7 +136,7 @@ public final class ForgeQueueDataOuterClass { } case 112: { - finishCount_ = input.readUInt32(); + queueId_ = input.readUInt32(); break; } case 120: { @@ -198,21 +198,10 @@ public final class ForgeQueueDataOuterClass { return avatarId_; } - public static final int QUEUE_ID_FIELD_NUMBER = 3; - private int queueId_; - /** - * uint32 queue_id = 3; - * @return The queueId. - */ - @java.lang.Override - public int getQueueId() { - return queueId_; - } - - public static final int FINISH_COUNT_FIELD_NUMBER = 14; + public static final int FINISH_COUNT_FIELD_NUMBER = 3; private int finishCount_; /** - * uint32 finish_count = 14; + * uint32 finish_count = 3; * @return The finishCount. */ @java.lang.Override @@ -220,21 +209,21 @@ public final class ForgeQueueDataOuterClass { return finishCount_; } - public static final int NEXT_FINISH_TIMESTAMP_FIELD_NUMBER = 11; - private int nextFinishTimestamp_; + public static final int QUEUEID_FIELD_NUMBER = 14; + private int queueId_; /** - * uint32 next_finish_timestamp = 11; - * @return The nextFinishTimestamp. + * uint32 queueId = 14; + * @return The queueId. */ @java.lang.Override - public int getNextFinishTimestamp() { - return nextFinishTimestamp_; + public int getQueueId() { + return queueId_; } - public static final int UNFINISH_COUNT_FIELD_NUMBER = 4; + public static final int UNFINISHCOUNT_FIELD_NUMBER = 11; private int unfinishCount_; /** - * uint32 unfinish_count = 4; + * uint32 unfinishCount = 11; * @return The unfinishCount. */ @java.lang.Override @@ -242,6 +231,17 @@ public final class ForgeQueueDataOuterClass { return unfinishCount_; } + public static final int NEXT_FINISH_TIMESTAMP_FIELD_NUMBER = 4; + private int nextFinishTimestamp_; + /** + * uint32 next_finish_timestamp = 4; + * @return The nextFinishTimestamp. + */ + @java.lang.Override + public int getNextFinishTimestamp() { + return nextFinishTimestamp_; + } + public static final int FORGE_ID_FIELD_NUMBER = 15; private int forgeId_; /** @@ -267,23 +267,23 @@ public final class ForgeQueueDataOuterClass { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (queueId_ != 0) { - output.writeUInt32(3, queueId_); + if (finishCount_ != 0) { + output.writeUInt32(3, finishCount_); } - if (unfinishCount_ != 0) { - output.writeUInt32(4, unfinishCount_); + if (nextFinishTimestamp_ != 0) { + output.writeUInt32(4, nextFinishTimestamp_); } if (avatarId_ != 0) { output.writeUInt32(8, avatarId_); } - if (nextFinishTimestamp_ != 0) { - output.writeUInt32(11, nextFinishTimestamp_); + if (unfinishCount_ != 0) { + output.writeUInt32(11, unfinishCount_); } if (totalFinishTimestamp_ != 0) { output.writeUInt32(13, totalFinishTimestamp_); } - if (finishCount_ != 0) { - output.writeUInt32(14, finishCount_); + if (queueId_ != 0) { + output.writeUInt32(14, queueId_); } if (forgeId_ != 0) { output.writeUInt32(15, forgeId_); @@ -297,29 +297,29 @@ public final class ForgeQueueDataOuterClass { if (size != -1) return size; size = 0; - if (queueId_ != 0) { + if (finishCount_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, queueId_); + .computeUInt32Size(3, finishCount_); } - if (unfinishCount_ != 0) { + if (nextFinishTimestamp_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, unfinishCount_); + .computeUInt32Size(4, nextFinishTimestamp_); } if (avatarId_ != 0) { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(8, avatarId_); } - if (nextFinishTimestamp_ != 0) { + if (unfinishCount_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, nextFinishTimestamp_); + .computeUInt32Size(11, unfinishCount_); } if (totalFinishTimestamp_ != 0) { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(13, totalFinishTimestamp_); } - if (finishCount_ != 0) { + if (queueId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, finishCount_); + .computeUInt32Size(14, queueId_); } if (forgeId_ != 0) { size += com.google.protobuf.CodedOutputStream @@ -332,8 +332,7 @@ public final class ForgeQueueDataOuterClass { @java.lang.Override public boolean equals(final java.lang.Object obj) { - if (obj == this) { - return true; + if (obj == this) {return true; } if (!(obj instanceof emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData)) { return super.equals(obj); @@ -344,14 +343,14 @@ public final class ForgeQueueDataOuterClass { != other.getTotalFinishTimestamp()) return false; if (getAvatarId() != other.getAvatarId()) return false; - if (getQueueId() - != other.getQueueId()) return false; if (getFinishCount() != other.getFinishCount()) return false; - if (getNextFinishTimestamp() - != other.getNextFinishTimestamp()) return false; + if (getQueueId() + != other.getQueueId()) return false; if (getUnfinishCount() != other.getUnfinishCount()) return false; + if (getNextFinishTimestamp() + != other.getNextFinishTimestamp()) return false; if (getForgeId() != other.getForgeId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -369,14 +368,14 @@ public final class ForgeQueueDataOuterClass { hash = (53 * hash) + getTotalFinishTimestamp(); hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER; hash = (53 * hash) + getAvatarId(); - 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) + QUEUEID_FIELD_NUMBER; + hash = (53 * hash) + getQueueId(); + hash = (37 * hash) + UNFINISHCOUNT_FIELD_NUMBER; + hash = (53 * hash) + getUnfinishCount(); hash = (37 * hash) + NEXT_FINISH_TIMESTAMP_FIELD_NUMBER; hash = (53 * hash) + getNextFinishTimestamp(); - hash = (37 * hash) + UNFINISH_COUNT_FIELD_NUMBER; - hash = (53 * hash) + getUnfinishCount(); hash = (37 * hash) + FORGE_ID_FIELD_NUMBER; hash = (53 * hash) + getForgeId(); hash = (29 * hash) + unknownFields.hashCode(); @@ -520,14 +519,14 @@ public final class ForgeQueueDataOuterClass { avatarId_ = 0; - queueId_ = 0; - finishCount_ = 0; - nextFinishTimestamp_ = 0; + queueId_ = 0; unfinishCount_ = 0; + nextFinishTimestamp_ = 0; + forgeId_ = 0; return this; @@ -558,10 +557,10 @@ public final class ForgeQueueDataOuterClass { emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData result = new emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData(this); result.totalFinishTimestamp_ = totalFinishTimestamp_; result.avatarId_ = avatarId_; - result.queueId_ = queueId_; result.finishCount_ = finishCount_; - result.nextFinishTimestamp_ = nextFinishTimestamp_; + result.queueId_ = queueId_; result.unfinishCount_ = unfinishCount_; + result.nextFinishTimestamp_ = nextFinishTimestamp_; result.forgeId_ = forgeId_; onBuilt(); return result; @@ -617,18 +616,18 @@ public final class ForgeQueueDataOuterClass { if (other.getAvatarId() != 0) { setAvatarId(other.getAvatarId()); } - if (other.getQueueId() != 0) { - setQueueId(other.getQueueId()); - } if (other.getFinishCount() != 0) { setFinishCount(other.getFinishCount()); } - if (other.getNextFinishTimestamp() != 0) { - setNextFinishTimestamp(other.getNextFinishTimestamp()); + if (other.getQueueId() != 0) { + setQueueId(other.getQueueId()); } if (other.getUnfinishCount() != 0) { setUnfinishCount(other.getUnfinishCount()); } + if (other.getNextFinishTimestamp() != 0) { + setNextFinishTimestamp(other.getNextFinishTimestamp()); + } if (other.getForgeId() != 0) { setForgeId(other.getForgeId()); } @@ -676,7 +675,7 @@ public final class ForgeQueueDataOuterClass { * @return This builder for chaining. */ public Builder setTotalFinishTimestamp(int value) { - + totalFinishTimestamp_ = value; onChanged(); return this; @@ -686,7 +685,7 @@ public final class ForgeQueueDataOuterClass { * @return This builder for chaining. */ public Builder clearTotalFinishTimestamp() { - + totalFinishTimestamp_ = 0; onChanged(); return this; @@ -707,7 +706,7 @@ public final class ForgeQueueDataOuterClass { * @return This builder for chaining. */ public Builder setAvatarId(int value) { - + avatarId_ = value; onChanged(); return this; @@ -717,46 +716,15 @@ public final class ForgeQueueDataOuterClass { * @return This builder for chaining. */ public Builder clearAvatarId() { - - avatarId_ = 0; - onChanged(); - return this; - } - private int queueId_ ; - /** - * uint32 queue_id = 3; - * @return The queueId. - */ - @java.lang.Override - public int getQueueId() { - return queueId_; - } - /** - * uint32 queue_id = 3; - * @param value The queueId to set. - * @return This builder for chaining. - */ - public Builder setQueueId(int value) { - - queueId_ = value; - onChanged(); - return this; - } - /** - * uint32 queue_id = 3; - * @return This builder for chaining. - */ - public Builder clearQueueId() { - - queueId_ = 0; + avatarId_ = 0; onChanged(); return this; } private int finishCount_ ; /** - * uint32 finish_count = 14; + * uint32 finish_count = 3; * @return The finishCount. */ @java.lang.Override @@ -764,61 +732,61 @@ public final class ForgeQueueDataOuterClass { return finishCount_; } /** - * uint32 finish_count = 14; + * uint32 finish_count = 3; * @param value The finishCount to set. * @return This builder for chaining. */ public Builder setFinishCount(int value) { - + finishCount_ = value; onChanged(); return this; } /** - * uint32 finish_count = 14; + * uint32 finish_count = 3; * @return This builder for chaining. */ public Builder clearFinishCount() { - + finishCount_ = 0; onChanged(); return this; } - private int nextFinishTimestamp_ ; + private int queueId_ ; /** - * uint32 next_finish_timestamp = 11; - * @return The nextFinishTimestamp. + * uint32 queueId = 14; + * @return The queueId. */ @java.lang.Override - public int getNextFinishTimestamp() { - return nextFinishTimestamp_; + public int getQueueId() { + return queueId_; } /** - * uint32 next_finish_timestamp = 11; - * @param value The nextFinishTimestamp to set. + * uint32 queueId = 14; + * @param value The queueId to set. * @return This builder for chaining. */ - public Builder setNextFinishTimestamp(int value) { - - nextFinishTimestamp_ = value; + public Builder setQueueId(int value) { + + queueId_ = value; onChanged(); return this; } /** - * uint32 next_finish_timestamp = 11; + * uint32 queueId = 14; * @return This builder for chaining. */ - public Builder clearNextFinishTimestamp() { - - nextFinishTimestamp_ = 0; + public Builder clearQueueId() { + + queueId_ = 0; onChanged(); return this; } private int unfinishCount_ ; /** - * uint32 unfinish_count = 4; + * uint32 unfinishCount = 11; * @return The unfinishCount. */ @java.lang.Override @@ -826,27 +794,58 @@ public final class ForgeQueueDataOuterClass { return unfinishCount_; } /** - * uint32 unfinish_count = 4; + * uint32 unfinishCount = 11; * @param value The unfinishCount to set. * @return This builder for chaining. */ public Builder setUnfinishCount(int value) { - + unfinishCount_ = value; onChanged(); return this; } /** - * uint32 unfinish_count = 4; + * uint32 unfinishCount = 11; * @return This builder for chaining. */ public Builder clearUnfinishCount() { - + unfinishCount_ = 0; onChanged(); return this; } + private int nextFinishTimestamp_ ; + /** + * uint32 next_finish_timestamp = 4; + * @return The nextFinishTimestamp. + */ + @java.lang.Override + public int getNextFinishTimestamp() { + return nextFinishTimestamp_; + } + /** + * uint32 next_finish_timestamp = 4; + * @param value The nextFinishTimestamp to set. + * @return This builder for chaining. + */ + public Builder setNextFinishTimestamp(int value) { + + nextFinishTimestamp_ = value; + onChanged(); + return this; + } + /** + * uint32 next_finish_timestamp = 4; + * @return This builder for chaining. + */ + public Builder clearNextFinishTimestamp() { + + nextFinishTimestamp_ = 0; + onChanged(); + return this; + } + private int forgeId_ ; /** * uint32 forge_id = 15; @@ -862,7 +861,7 @@ public final class ForgeQueueDataOuterClass { * @return This builder for chaining. */ public Builder setForgeId(int value) { - + forgeId_ = value; onChanged(); return this; @@ -872,7 +871,7 @@ public final class ForgeQueueDataOuterClass { * @return This builder for chaining. */ public Builder clearForgeId() { - + forgeId_ = 0; onChanged(); return this; @@ -932,7 +931,7 @@ public final class ForgeQueueDataOuterClass { private static final com.google.protobuf.Descriptors.Descriptor internal_static_ForgeQueueData_descriptor; - private static final + private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_ForgeQueueData_fieldAccessorTable; @@ -944,13 +943,12 @@ public final class ForgeQueueDataOuterClass { descriptor; static { java.lang.String[] descriptorData = { - "\n\024ForgeQueueData.proto\"\264\001\n\016ForgeQueueDat" + + "\n\024ForgeQueueData.proto\"\262\001\n\016ForgeQueueDat" + "a\022\036\n\026total_finish_timestamp\030\r \001(\r\022\021\n\tava" + - "tar_id\030\010 \001(\r\022\020\n\010queue_id\030\003 \001(\r\022\024\n\014finish" + - "_count\030\016 \001(\r\022\035\n\025next_finish_timestamp\030\013 " + - "\001(\r\022\026\n\016unfinish_count\030\004 \001(\r\022\020\n\010forge_id\030" + - "\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" + - "o3" + "tar_id\030\010 \001(\r\022\024\n\014finish_count\030\003 \001(\r\022\017\n\007qu" + + "eueId\030\016 \001(\r\022\025\n\runfinishCount\030\013 \001(\r\022\035\n\025ne" + + "xt_finish_timestamp\030\004 \001(\r\022\020\n\010forge_id\030\017 " + + "\001(\rB\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -961,7 +959,7 @@ public final class ForgeQueueDataOuterClass { internal_static_ForgeQueueData_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ForgeQueueData_descriptor, - new java.lang.String[] { "TotalFinishTimestamp", "AvatarId", "QueueId", "FinishCount", "NextFinishTimestamp", "UnfinishCount", "ForgeId", }); + new java.lang.String[] { "TotalFinishTimestamp", "AvatarId", "FinishCount", "QueueId", "UnfinishCount", "NextFinishTimestamp", "ForgeId", }); } // @@protoc_insertion_point(outer_class_scope)