Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-06 22:33:38 +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/AvatarRenameInfoOuterClass.java
+87 -87
View File
@@ -19,26 +19,26 @@ public final class AvatarRenameInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>string avatar_name = 14;</code>
* <code>uint32 avatar_id = 12;</code>
* @return The avatarId.
*/
int getAvatarId();
/**
* <code>string avatar_name = 10;</code>
* @return The avatarName.
*/
java.lang.String getAvatarName();
/**
* <code>string avatar_name = 14;</code>
* <code>string avatar_name = 10;</code>
* @return The bytes for avatarName.
*/
com.google.protobuf.ByteString
getAvatarNameBytes();
/**
* <code>uint32 avatar_id = 5;</code>
* @return The avatarId.
*/
int getAvatarId();
}
/**
* <pre>
* Name: ANPKECIJOAF
* Obf: NFELDEIIPPJ
* </pre>
*
* Protobuf type {@code AvatarRenameInfo}
@@ -86,17 +86,17 @@ public final class AvatarRenameInfoOuterClass {
case 0:
done = true;
break;
case 40: {
avatarId_ = input.readUInt32();
break;
}
case 114: {
case 82: {
java.lang.String s = input.readStringRequireUtf8();
avatarName_ = s;
break;
}
case 96: {
avatarId_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -129,10 +129,21 @@ public final class AvatarRenameInfoOuterClass {
emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.class, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder.class);
}
public static final int AVATAR_NAME_FIELD_NUMBER = 14;
public static final int AVATAR_ID_FIELD_NUMBER = 12;
private int avatarId_;
/**
* <code>uint32 avatar_id = 12;</code>
* @return The avatarId.
*/
@java.lang.Override
public int getAvatarId() {
return avatarId_;
}
public static final int AVATAR_NAME_FIELD_NUMBER = 10;
private volatile java.lang.Object avatarName_;
/**
* <code>string avatar_name = 14;</code>
* <code>string avatar_name = 10;</code>
* @return The avatarName.
*/
@java.lang.Override
@@ -149,7 +160,7 @@ public final class AvatarRenameInfoOuterClass {
}
}
/**
* <code>string avatar_name = 14;</code>
* <code>string avatar_name = 10;</code>
* @return The bytes for avatarName.
*/
@java.lang.Override
@@ -167,17 +178,6 @@ public final class AvatarRenameInfoOuterClass {
}
}
public static final int AVATAR_ID_FIELD_NUMBER = 5;
private int avatarId_;
/**
* <code>uint32 avatar_id = 5;</code>
* @return The avatarId.
*/
@java.lang.Override
public int getAvatarId() {
return avatarId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -192,11 +192,11 @@ public final class AvatarRenameInfoOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (avatarId_ != 0) {
output.writeUInt32(5, avatarId_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(avatarName_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 14, avatarName_);
com.google.protobuf.GeneratedMessageV3.writeString(output, 10, avatarName_);
}
if (avatarId_ != 0) {
output.writeUInt32(12, avatarId_);
}
unknownFields.writeTo(output);
}
@@ -207,12 +207,12 @@ public final class AvatarRenameInfoOuterClass {
if (size != -1) return size;
size = 0;
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(avatarName_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, avatarName_);
}
if (avatarId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, avatarId_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(avatarName_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, avatarName_);
.computeUInt32Size(12, avatarId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -229,10 +229,10 @@ public final class AvatarRenameInfoOuterClass {
}
emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo other = (emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo) obj;
if (!getAvatarName()
.equals(other.getAvatarName())) return false;
if (getAvatarId()
!= other.getAvatarId()) return false;
if (!getAvatarName()
.equals(other.getAvatarName())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -244,10 +244,10 @@ public final class AvatarRenameInfoOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + AVATAR_NAME_FIELD_NUMBER;
hash = (53 * hash) + getAvatarName().hashCode();
hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
hash = (53 * hash) + getAvatarId();
hash = (37 * hash) + AVATAR_NAME_FIELD_NUMBER;
hash = (53 * hash) + getAvatarName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -345,7 +345,7 @@ public final class AvatarRenameInfoOuterClass {
}
/**
* <pre>
* Name: ANPKECIJOAF
* Obf: NFELDEIIPPJ
* </pre>
*
* Protobuf type {@code AvatarRenameInfo}
@@ -385,10 +385,10 @@ public final class AvatarRenameInfoOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
avatarName_ = "";
avatarId_ = 0;
avatarName_ = "";
return this;
}
@@ -415,8 +415,8 @@ public final class AvatarRenameInfoOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo buildPartial() {
emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo result = new emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo(this);
result.avatarName_ = avatarName_;
result.avatarId_ = avatarId_;
result.avatarName_ = avatarName_;
onBuilt();
return result;
}
@@ -465,13 +465,13 @@ public final class AvatarRenameInfoOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo other) {
if (other == emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.getDefaultInstance()) return this;
if (other.getAvatarId() != 0) {
setAvatarId(other.getAvatarId());
}
if (!other.getAvatarName().isEmpty()) {
avatarName_ = other.avatarName_;
onChanged();
}
if (other.getAvatarId() != 0) {
setAvatarId(other.getAvatarId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -501,9 +501,40 @@ public final class AvatarRenameInfoOuterClass {
return this;
}
private int avatarId_ ;
/**
* <code>uint32 avatar_id = 12;</code>
* @return The avatarId.
*/
@java.lang.Override
public int getAvatarId() {
return avatarId_;
}
/**
* <code>uint32 avatar_id = 12;</code>
* @param value The avatarId to set.
* @return This builder for chaining.
*/
public Builder setAvatarId(int value) {
avatarId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 avatar_id = 12;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarId() {
avatarId_ = 0;
onChanged();
return this;
}
private java.lang.Object avatarName_ = "";
/**
* <code>string avatar_name = 14;</code>
* <code>string avatar_name = 10;</code>
* @return The avatarName.
*/
public java.lang.String getAvatarName() {
@@ -519,7 +550,7 @@ public final class AvatarRenameInfoOuterClass {
}
}
/**
* <code>string avatar_name = 14;</code>
* <code>string avatar_name = 10;</code>
* @return The bytes for avatarName.
*/
public com.google.protobuf.ByteString
@@ -536,7 +567,7 @@ public final class AvatarRenameInfoOuterClass {
}
}
/**
* <code>string avatar_name = 14;</code>
* <code>string avatar_name = 10;</code>
* @param value The avatarName to set.
* @return This builder for chaining.
*/
@@ -551,7 +582,7 @@ public final class AvatarRenameInfoOuterClass {
return this;
}
/**
* <code>string avatar_name = 14;</code>
* <code>string avatar_name = 10;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarName() {
@@ -561,7 +592,7 @@ public final class AvatarRenameInfoOuterClass {
return this;
}
/**
* <code>string avatar_name = 14;</code>
* <code>string avatar_name = 10;</code>
* @param value The bytes for avatarName to set.
* @return This builder for chaining.
*/
@@ -576,37 +607,6 @@ public final class AvatarRenameInfoOuterClass {
onChanged();
return this;
}
private int avatarId_ ;
/**
* <code>uint32 avatar_id = 5;</code>
* @return The avatarId.
*/
@java.lang.Override
public int getAvatarId() {
return avatarId_;
}
/**
* <code>uint32 avatar_id = 5;</code>
* @param value The avatarId to set.
* @return This builder for chaining.
*/
public Builder setAvatarId(int value) {
avatarId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 avatar_id = 5;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarId() {
avatarId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -675,8 +675,8 @@ public final class AvatarRenameInfoOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\026AvatarRenameInfo.proto\":\n\020AvatarRename" +
"Info\022\023\n\013avatar_name\030\016 \001(\t\022\021\n\tavatar_id\030\005" +
" \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
"Info\022\021\n\tavatar_id\030\014 \001(\r\022\023\n\013avatar_name\030\n" +
" \001(\tB\033\n\031emu.grasscutter.net.protob\006proto" +
"3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -688,7 +688,7 @@ public final class AvatarRenameInfoOuterClass {
internal_static_AvatarRenameInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AvatarRenameInfo_descriptor,
new java.lang.String[] { "AvatarName", "AvatarId", });
new java.lang.String[] { "AvatarId", "AvatarName", });
}
// @@protoc_insertion_point(outer_class_scope)