mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-06-05 05:43:33 +08:00
Upgrade to REL3.7 (#2164)
* Remove hardcoded quest data * Remove deprecated fields * Try to fix packet * Apply fix for token exchange * Upgrade to REL3.7 * Add obfuscated protocol definitions * Add missing enum (other protos too maybe) * Re-add field setters and add note on removal
This commit is contained in:
Magix
GitHub
+102
-102
@@ -19,29 +19,29 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>bool is_taken_reward = 3;</code>
|
||||
* @return The isTakenReward.
|
||||
*/
|
||||
boolean getIsTakenReward();
|
||||
|
||||
/**
|
||||
* <code>uint32 day_index = 5;</code>
|
||||
* <code>uint32 day_index = 12;</code>
|
||||
* @return The dayIndex.
|
||||
*/
|
||||
int getDayIndex();
|
||||
|
||||
/**
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 14;</code>
|
||||
* <code>bool is_taken_reward = 1;</code>
|
||||
* @return The isTakenReward.
|
||||
*/
|
||||
boolean getIsTakenReward();
|
||||
|
||||
/**
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 8;</code>
|
||||
* @return A list containing the finishedDeliveryQuestIndex.
|
||||
*/
|
||||
java.util.List<java.lang.Integer> getFinishedDeliveryQuestIndexList();
|
||||
/**
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 14;</code>
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 8;</code>
|
||||
* @return The count of finishedDeliveryQuestIndex.
|
||||
*/
|
||||
int getFinishedDeliveryQuestIndexCount();
|
||||
/**
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 14;</code>
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 8;</code>
|
||||
* @param index The index of the element to return.
|
||||
* @return The finishedDeliveryQuestIndex at the given index.
|
||||
*/
|
||||
@@ -49,7 +49,7 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: KCLDPAAOLOE
|
||||
* Obf: IOHOBABPFDF
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code DeliveryActivityDetailInfo}
|
||||
@@ -98,17 +98,12 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 24: {
|
||||
case 8: {
|
||||
|
||||
isTakenReward_ = input.readBool();
|
||||
break;
|
||||
}
|
||||
case 40: {
|
||||
|
||||
dayIndex_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 112: {
|
||||
case 64: {
|
||||
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
|
||||
finishedDeliveryQuestIndex_ = newIntList();
|
||||
mutable_bitField0_ |= 0x00000001;
|
||||
@@ -116,7 +111,7 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
finishedDeliveryQuestIndex_.addInt(input.readUInt32());
|
||||
break;
|
||||
}
|
||||
case 114: {
|
||||
case 66: {
|
||||
int length = input.readRawVarint32();
|
||||
int limit = input.pushLimit(length);
|
||||
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
|
||||
@@ -129,6 +124,11 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
input.popLimit(limit);
|
||||
break;
|
||||
}
|
||||
case 96: {
|
||||
|
||||
dayIndex_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
if (!parseUnknownField(
|
||||
input, unknownFields, extensionRegistry, tag)) {
|
||||
@@ -164,21 +164,10 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo.class, emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo.Builder.class);
|
||||
}
|
||||
|
||||
public static final int IS_TAKEN_REWARD_FIELD_NUMBER = 3;
|
||||
private boolean isTakenReward_;
|
||||
/**
|
||||
* <code>bool is_taken_reward = 3;</code>
|
||||
* @return The isTakenReward.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean getIsTakenReward() {
|
||||
return isTakenReward_;
|
||||
}
|
||||
|
||||
public static final int DAY_INDEX_FIELD_NUMBER = 5;
|
||||
public static final int DAY_INDEX_FIELD_NUMBER = 12;
|
||||
private int dayIndex_;
|
||||
/**
|
||||
* <code>uint32 day_index = 5;</code>
|
||||
* <code>uint32 day_index = 12;</code>
|
||||
* @return The dayIndex.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -186,10 +175,21 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
return dayIndex_;
|
||||
}
|
||||
|
||||
public static final int FINISHED_DELIVERY_QUEST_INDEX_FIELD_NUMBER = 14;
|
||||
public static final int IS_TAKEN_REWARD_FIELD_NUMBER = 1;
|
||||
private boolean isTakenReward_;
|
||||
/**
|
||||
* <code>bool is_taken_reward = 1;</code>
|
||||
* @return The isTakenReward.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean getIsTakenReward() {
|
||||
return isTakenReward_;
|
||||
}
|
||||
|
||||
public static final int FINISHED_DELIVERY_QUEST_INDEX_FIELD_NUMBER = 8;
|
||||
private com.google.protobuf.Internal.IntList finishedDeliveryQuestIndex_;
|
||||
/**
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 14;</code>
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 8;</code>
|
||||
* @return A list containing the finishedDeliveryQuestIndex.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -198,14 +198,14 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
return finishedDeliveryQuestIndex_;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 14;</code>
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 8;</code>
|
||||
* @return The count of finishedDeliveryQuestIndex.
|
||||
*/
|
||||
public int getFinishedDeliveryQuestIndexCount() {
|
||||
return finishedDeliveryQuestIndex_.size();
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 14;</code>
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 8;</code>
|
||||
* @param index The index of the element to return.
|
||||
* @return The finishedDeliveryQuestIndex at the given index.
|
||||
*/
|
||||
@@ -230,18 +230,18 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
throws java.io.IOException {
|
||||
getSerializedSize();
|
||||
if (isTakenReward_ != false) {
|
||||
output.writeBool(3, isTakenReward_);
|
||||
}
|
||||
if (dayIndex_ != 0) {
|
||||
output.writeUInt32(5, dayIndex_);
|
||||
output.writeBool(1, isTakenReward_);
|
||||
}
|
||||
if (getFinishedDeliveryQuestIndexList().size() > 0) {
|
||||
output.writeUInt32NoTag(114);
|
||||
output.writeUInt32NoTag(66);
|
||||
output.writeUInt32NoTag(finishedDeliveryQuestIndexMemoizedSerializedSize);
|
||||
}
|
||||
for (int i = 0; i < finishedDeliveryQuestIndex_.size(); i++) {
|
||||
output.writeUInt32NoTag(finishedDeliveryQuestIndex_.getInt(i));
|
||||
}
|
||||
if (dayIndex_ != 0) {
|
||||
output.writeUInt32(12, dayIndex_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
|
||||
@@ -253,11 +253,7 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
size = 0;
|
||||
if (isTakenReward_ != false) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeBoolSize(3, isTakenReward_);
|
||||
}
|
||||
if (dayIndex_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(5, dayIndex_);
|
||||
.computeBoolSize(1, isTakenReward_);
|
||||
}
|
||||
{
|
||||
int dataSize = 0;
|
||||
@@ -273,6 +269,10 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
}
|
||||
finishedDeliveryQuestIndexMemoizedSerializedSize = dataSize;
|
||||
}
|
||||
if (dayIndex_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(12, dayIndex_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
return size;
|
||||
@@ -288,10 +288,10 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
}
|
||||
emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo other = (emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo) obj;
|
||||
|
||||
if (getIsTakenReward()
|
||||
!= other.getIsTakenReward()) return false;
|
||||
if (getDayIndex()
|
||||
!= other.getDayIndex()) return false;
|
||||
if (getIsTakenReward()
|
||||
!= other.getIsTakenReward()) return false;
|
||||
if (!getFinishedDeliveryQuestIndexList()
|
||||
.equals(other.getFinishedDeliveryQuestIndexList())) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
@@ -305,11 +305,11 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + DAY_INDEX_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getDayIndex();
|
||||
hash = (37 * hash) + IS_TAKEN_REWARD_FIELD_NUMBER;
|
||||
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
|
||||
getIsTakenReward());
|
||||
hash = (37 * hash) + DAY_INDEX_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getDayIndex();
|
||||
if (getFinishedDeliveryQuestIndexCount() > 0) {
|
||||
hash = (37 * hash) + FINISHED_DELIVERY_QUEST_INDEX_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getFinishedDeliveryQuestIndexList().hashCode();
|
||||
@@ -411,7 +411,7 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: KCLDPAAOLOE
|
||||
* Obf: IOHOBABPFDF
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code DeliveryActivityDetailInfo}
|
||||
@@ -451,10 +451,10 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
@java.lang.Override
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
isTakenReward_ = false;
|
||||
|
||||
dayIndex_ = 0;
|
||||
|
||||
isTakenReward_ = false;
|
||||
|
||||
finishedDeliveryQuestIndex_ = emptyIntList();
|
||||
bitField0_ = (bitField0_ & ~0x00000001);
|
||||
return this;
|
||||
@@ -484,8 +484,8 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
public emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo buildPartial() {
|
||||
emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo result = new emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo(this);
|
||||
int from_bitField0_ = bitField0_;
|
||||
result.isTakenReward_ = isTakenReward_;
|
||||
result.dayIndex_ = dayIndex_;
|
||||
result.isTakenReward_ = isTakenReward_;
|
||||
if (((bitField0_ & 0x00000001) != 0)) {
|
||||
finishedDeliveryQuestIndex_.makeImmutable();
|
||||
bitField0_ = (bitField0_ & ~0x00000001);
|
||||
@@ -539,12 +539,12 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
|
||||
public Builder mergeFrom(emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo other) {
|
||||
if (other == emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo.getDefaultInstance()) return this;
|
||||
if (other.getIsTakenReward() != false) {
|
||||
setIsTakenReward(other.getIsTakenReward());
|
||||
}
|
||||
if (other.getDayIndex() != 0) {
|
||||
setDayIndex(other.getDayIndex());
|
||||
}
|
||||
if (other.getIsTakenReward() != false) {
|
||||
setIsTakenReward(other.getIsTakenReward());
|
||||
}
|
||||
if (!other.finishedDeliveryQuestIndex_.isEmpty()) {
|
||||
if (finishedDeliveryQuestIndex_.isEmpty()) {
|
||||
finishedDeliveryQuestIndex_ = other.finishedDeliveryQuestIndex_;
|
||||
@@ -585,40 +585,9 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
}
|
||||
private int bitField0_;
|
||||
|
||||
private boolean isTakenReward_ ;
|
||||
/**
|
||||
* <code>bool is_taken_reward = 3;</code>
|
||||
* @return The isTakenReward.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean getIsTakenReward() {
|
||||
return isTakenReward_;
|
||||
}
|
||||
/**
|
||||
* <code>bool is_taken_reward = 3;</code>
|
||||
* @param value The isTakenReward to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setIsTakenReward(boolean value) {
|
||||
|
||||
isTakenReward_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>bool is_taken_reward = 3;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearIsTakenReward() {
|
||||
|
||||
isTakenReward_ = false;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int dayIndex_ ;
|
||||
/**
|
||||
* <code>uint32 day_index = 5;</code>
|
||||
* <code>uint32 day_index = 12;</code>
|
||||
* @return The dayIndex.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -626,7 +595,7 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
return dayIndex_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 day_index = 5;</code>
|
||||
* <code>uint32 day_index = 12;</code>
|
||||
* @param value The dayIndex to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -637,7 +606,7 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 day_index = 5;</code>
|
||||
* <code>uint32 day_index = 12;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearDayIndex() {
|
||||
@@ -647,6 +616,37 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private boolean isTakenReward_ ;
|
||||
/**
|
||||
* <code>bool is_taken_reward = 1;</code>
|
||||
* @return The isTakenReward.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean getIsTakenReward() {
|
||||
return isTakenReward_;
|
||||
}
|
||||
/**
|
||||
* <code>bool is_taken_reward = 1;</code>
|
||||
* @param value The isTakenReward to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setIsTakenReward(boolean value) {
|
||||
|
||||
isTakenReward_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>bool is_taken_reward = 1;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearIsTakenReward() {
|
||||
|
||||
isTakenReward_ = false;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private com.google.protobuf.Internal.IntList finishedDeliveryQuestIndex_ = emptyIntList();
|
||||
private void ensureFinishedDeliveryQuestIndexIsMutable() {
|
||||
if (!((bitField0_ & 0x00000001) != 0)) {
|
||||
@@ -655,7 +655,7 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 14;</code>
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 8;</code>
|
||||
* @return A list containing the finishedDeliveryQuestIndex.
|
||||
*/
|
||||
public java.util.List<java.lang.Integer>
|
||||
@@ -664,14 +664,14 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
java.util.Collections.unmodifiableList(finishedDeliveryQuestIndex_) : finishedDeliveryQuestIndex_;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 14;</code>
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 8;</code>
|
||||
* @return The count of finishedDeliveryQuestIndex.
|
||||
*/
|
||||
public int getFinishedDeliveryQuestIndexCount() {
|
||||
return finishedDeliveryQuestIndex_.size();
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 14;</code>
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 8;</code>
|
||||
* @param index The index of the element to return.
|
||||
* @return The finishedDeliveryQuestIndex at the given index.
|
||||
*/
|
||||
@@ -679,7 +679,7 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
return finishedDeliveryQuestIndex_.getInt(index);
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 14;</code>
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 8;</code>
|
||||
* @param index The index to set the value at.
|
||||
* @param value The finishedDeliveryQuestIndex to set.
|
||||
* @return This builder for chaining.
|
||||
@@ -692,7 +692,7 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 14;</code>
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 8;</code>
|
||||
* @param value The finishedDeliveryQuestIndex to add.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -703,7 +703,7 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 14;</code>
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 8;</code>
|
||||
* @param values The finishedDeliveryQuestIndex to add.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -716,7 +716,7 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 14;</code>
|
||||
* <code>repeated uint32 finished_delivery_quest_index = 8;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearFinishedDeliveryQuestIndex() {
|
||||
@@ -793,9 +793,9 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n DeliveryActivityDetailInfo.proto\"o\n\032De" +
|
||||
"liveryActivityDetailInfo\022\027\n\017is_taken_rew" +
|
||||
"ard\030\003 \001(\010\022\021\n\tday_index\030\005 \001(\r\022%\n\035finished" +
|
||||
"_delivery_quest_index\030\016 \003(\rB\033\n\031emu.grass" +
|
||||
"liveryActivityDetailInfo\022\021\n\tday_index\030\014 " +
|
||||
"\001(\r\022\027\n\017is_taken_reward\030\001 \001(\010\022%\n\035finished" +
|
||||
"_delivery_quest_index\030\010 \003(\rB\033\n\031emu.grass" +
|
||||
"cutter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
@@ -807,7 +807,7 @@ public final class DeliveryActivityDetailInfoOuterClass {
|
||||
internal_static_DeliveryActivityDetailInfo_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_DeliveryActivityDetailInfo_descriptor,
|
||||
new java.lang.String[] { "IsTakenReward", "DayIndex", "FinishedDeliveryQuestIndex", });
|
||||
new java.lang.String[] { "DayIndex", "IsTakenReward", "FinishedDeliveryQuestIndex", });
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
Reference in New Issue
Block a user