Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 04:55:01 +08:00
Code Issues Projects Releases Wiki Activity

Upgrade to REL3.7 (#2164)

Browse Source 
* 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
2023-05-26 21:29:02 -07:00
committed by GitHub
Unverified
parent 19bf2dfc69
commit 71f6198361
1382 changed files with 227149 additions and 199653 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/AsterProgressDetailInfoOuterClass.java
+84 -84
View File
@@ -19,20 +19,20 @@ public final class AsterProgressDetailInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 last_auto_add_time = 9;</code>
* @return The lastAutoAddTime.
*/
int getLastAutoAddTime();
/**
* <code>uint32 count = 6;</code>
* <code>uint32 count = 12;</code>
* @return The count.
*/
int getCount();
/**
* <code>uint32 last_auto_add_time = 1;</code>
* @return The lastAutoAddTime.
*/
int getLastAutoAddTime();
}
/**
* <pre>
* Name: FFNJNOEBCFC
* Obf: MMEFLEOFLND
* </pre>
*
* Protobuf type {@code AsterProgressDetailInfo}
@@ -79,16 +79,16 @@ public final class AsterProgressDetailInfoOuterClass {
case 0:
done = true;
break;
case 48: {
count_ = input.readUInt32();
break;
}
case 72: {
case 8: {
lastAutoAddTime_ = input.readUInt32();
break;
}
case 96: {
count_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -121,21 +121,10 @@ public final class AsterProgressDetailInfoOuterClass {
emu.grasscutter.net.proto.AsterProgressDetailInfoOuterClass.AsterProgressDetailInfo.class, emu.grasscutter.net.proto.AsterProgressDetailInfoOuterClass.AsterProgressDetailInfo.Builder.class);
}
public static final int LAST_AUTO_ADD_TIME_FIELD_NUMBER = 9;
private int lastAutoAddTime_;
/**
* <code>uint32 last_auto_add_time = 9;</code>
* @return The lastAutoAddTime.
*/
@java.lang.Override
public int getLastAutoAddTime() {
return lastAutoAddTime_;
}
public static final int COUNT_FIELD_NUMBER = 6;
public static final int COUNT_FIELD_NUMBER = 12;
private int count_;
/**
* <code>uint32 count = 6;</code>
* <code>uint32 count = 12;</code>
* @return The count.
*/
@java.lang.Override
@@ -143,6 +132,17 @@ public final class AsterProgressDetailInfoOuterClass {
return count_;
}
public static final int LAST_AUTO_ADD_TIME_FIELD_NUMBER = 1;
private int lastAutoAddTime_;
/**
* <code>uint32 last_auto_add_time = 1;</code>
* @return The lastAutoAddTime.
*/
@java.lang.Override
public int getLastAutoAddTime() {
return lastAutoAddTime_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -157,11 +157,11 @@ public final class AsterProgressDetailInfoOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (count_ != 0) {
output.writeUInt32(6, count_);
}
if (lastAutoAddTime_ != 0) {
output.writeUInt32(9, lastAutoAddTime_);
output.writeUInt32(1, lastAutoAddTime_);
}
if (count_ != 0) {
output.writeUInt32(12, count_);
}
unknownFields.writeTo(output);
}
@@ -172,13 +172,13 @@ public final class AsterProgressDetailInfoOuterClass {
if (size != -1) return size;
size = 0;
if (count_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, count_);
}
if (lastAutoAddTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, lastAutoAddTime_);
.computeUInt32Size(1, lastAutoAddTime_);
}
if (count_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(12, count_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -195,10 +195,10 @@ public final class AsterProgressDetailInfoOuterClass {
}
emu.grasscutter.net.proto.AsterProgressDetailInfoOuterClass.AsterProgressDetailInfo other = (emu.grasscutter.net.proto.AsterProgressDetailInfoOuterClass.AsterProgressDetailInfo) obj;
if (getLastAutoAddTime()
!= other.getLastAutoAddTime()) return false;
if (getCount()
!= other.getCount()) return false;
if (getLastAutoAddTime()
!= other.getLastAutoAddTime()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -210,10 +210,10 @@ public final class AsterProgressDetailInfoOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + LAST_AUTO_ADD_TIME_FIELD_NUMBER;
hash = (53 * hash) + getLastAutoAddTime();
hash = (37 * hash) + COUNT_FIELD_NUMBER;
hash = (53 * hash) + getCount();
hash = (37 * hash) + LAST_AUTO_ADD_TIME_FIELD_NUMBER;
hash = (53 * hash) + getLastAutoAddTime();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -311,7 +311,7 @@ public final class AsterProgressDetailInfoOuterClass {
}
/**
* <pre>
* Name: FFNJNOEBCFC
* Obf: MMEFLEOFLND
* </pre>
*
* Protobuf type {@code AsterProgressDetailInfo}
@@ -351,10 +351,10 @@ public final class AsterProgressDetailInfoOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
lastAutoAddTime_ = 0;
count_ = 0;
lastAutoAddTime_ = 0;
return this;
}
@@ -381,8 +381,8 @@ public final class AsterProgressDetailInfoOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.AsterProgressDetailInfoOuterClass.AsterProgressDetailInfo buildPartial() {
emu.grasscutter.net.proto.AsterProgressDetailInfoOuterClass.AsterProgressDetailInfo result = new emu.grasscutter.net.proto.AsterProgressDetailInfoOuterClass.AsterProgressDetailInfo(this);
result.lastAutoAddTime_ = lastAutoAddTime_;
result.count_ = count_;
result.lastAutoAddTime_ = lastAutoAddTime_;
onBuilt();
return result;
}
@@ -431,12 +431,12 @@ public final class AsterProgressDetailInfoOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AsterProgressDetailInfoOuterClass.AsterProgressDetailInfo other) {
if (other == emu.grasscutter.net.proto.AsterProgressDetailInfoOuterClass.AsterProgressDetailInfo.getDefaultInstance()) return this;
if (other.getLastAutoAddTime() != 0) {
setLastAutoAddTime(other.getLastAutoAddTime());
}
if (other.getCount() != 0) {
setCount(other.getCount());
}
if (other.getLastAutoAddTime() != 0) {
setLastAutoAddTime(other.getLastAutoAddTime());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -466,40 +466,9 @@ public final class AsterProgressDetailInfoOuterClass {
return this;
}
private int lastAutoAddTime_ ;
/**
* <code>uint32 last_auto_add_time = 9;</code>
* @return The lastAutoAddTime.
*/
@java.lang.Override
public int getLastAutoAddTime() {
return lastAutoAddTime_;
}
/**
* <code>uint32 last_auto_add_time = 9;</code>
* @param value The lastAutoAddTime to set.
* @return This builder for chaining.
*/
public Builder setLastAutoAddTime(int value) {
lastAutoAddTime_ = value;
onChanged();
return this;
}
/**
* <code>uint32 last_auto_add_time = 9;</code>
* @return This builder for chaining.
*/
public Builder clearLastAutoAddTime() {
lastAutoAddTime_ = 0;
onChanged();
return this;
}
private int count_ ;
/**
* <code>uint32 count = 6;</code>
* <code>uint32 count = 12;</code>
* @return The count.
*/
@java.lang.Override
@@ -507,7 +476,7 @@ public final class AsterProgressDetailInfoOuterClass {
return count_;
}
/**
* <code>uint32 count = 6;</code>
* <code>uint32 count = 12;</code>
* @param value The count to set.
* @return This builder for chaining.
*/
@@ -518,7 +487,7 @@ public final class AsterProgressDetailInfoOuterClass {
return this;
}
/**
* <code>uint32 count = 6;</code>
* <code>uint32 count = 12;</code>
* @return This builder for chaining.
*/
public Builder clearCount() {
@@ -527,6 +496,37 @@ public final class AsterProgressDetailInfoOuterClass {
onChanged();
return this;
}
private int lastAutoAddTime_ ;
/**
* <code>uint32 last_auto_add_time = 1;</code>
* @return The lastAutoAddTime.
*/
@java.lang.Override
public int getLastAutoAddTime() {
return lastAutoAddTime_;
}
/**
* <code>uint32 last_auto_add_time = 1;</code>
* @param value The lastAutoAddTime to set.
* @return This builder for chaining.
*/
public Builder setLastAutoAddTime(int value) {
lastAutoAddTime_ = value;
onChanged();
return this;
}
/**
* <code>uint32 last_auto_add_time = 1;</code>
* @return This builder for chaining.
*/
public Builder clearLastAutoAddTime() {
lastAutoAddTime_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -595,8 +595,8 @@ public final class AsterProgressDetailInfoOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\035AsterProgressDetailInfo.proto\"D\n\027Aster" +
"ProgressDetailInfo\022\032\n\022last_auto_add_time" +
"\030\t \001(\r\022\r\n\005count\030\006 \001(\rB\033\n\031emu.grasscutter" +
"ProgressDetailInfo\022\r\n\005count\030\014 \001(\r\022\032\n\022las" +
"t_auto_add_time\030\001 \001(\rB\033\n\031emu.grasscutter" +
".net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -608,7 +608,7 @@ public final class AsterProgressDetailInfoOuterClass {
internal_static_AsterProgressDetailInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AsterProgressDetailInfo_descriptor,
new java.lang.String[] { "LastAutoAddTime", "Count", });
new java.lang.String[] { "Count", "LastAutoAddTime", });
}
// @@protoc_insertion_point(outer_class_scope)