Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 21:49:54 +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/CodexDataUpdateNotifyOuterClass.java
+100 -100
View File
@@ -19,32 +19,32 @@ public final class CodexDataUpdateNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 id = 13;</code>
* @return The id.
*/
int getId();
/**
* <code>.CodexType type = 6;</code>
* <code>.CodexType type = 7;</code>
* @return The enum numeric value on the wire for type.
*/
int getTypeValue();
/**
* <code>.CodexType type = 6;</code>
* <code>.CodexType type = 7;</code>
* @return The type.
*/
emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType getType();
/**
* <code>uint32 weapon_max_promote_level = 10;</code>
* <code>uint32 id = 4;</code>
* @return The id.
*/
int getId();
/**
* <code>uint32 weapon_max_promote_level = 1;</code>
* @return The weaponMaxPromoteLevel.
*/
int getWeaponMaxPromoteLevel();
}
/**
* <pre>
* CmdId: 4209
* Name: CAEKJKGCKLD
* CmdId: 4206
* Obf: AMEDMFGHJKL
* </pre>
*
* Protobuf type {@code CodexDataUpdateNotify}
@@ -92,22 +92,22 @@ public final class CodexDataUpdateNotifyOuterClass {
case 0:
done = true;
break;
case 48: {
int rawValue = input.readEnum();
type_ = rawValue;
break;
}
case 80: {
case 8: {
weaponMaxPromoteLevel_ = input.readUInt32();
break;
}
case 104: {
case 32: {
id_ = input.readUInt32();
break;
}
case 56: {
int rawValue = input.readEnum();
type_ = rawValue;
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -140,28 +140,17 @@ public final class CodexDataUpdateNotifyOuterClass {
emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify.class, emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify.Builder.class);
}
public static final int ID_FIELD_NUMBER = 13;
private int id_;
/**
* <code>uint32 id = 13;</code>
* @return The id.
*/
@java.lang.Override
public int getId() {
return id_;
}
public static final int TYPE_FIELD_NUMBER = 6;
public static final int TYPE_FIELD_NUMBER = 7;
private int type_;
/**
* <code>.CodexType type = 6;</code>
* <code>.CodexType type = 7;</code>
* @return The enum numeric value on the wire for type.
*/
@java.lang.Override public int getTypeValue() {
return type_;
}
/**
* <code>.CodexType type = 6;</code>
* <code>.CodexType type = 7;</code>
* @return The type.
*/
@java.lang.Override public emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType getType() {
@@ -170,10 +159,21 @@ public final class CodexDataUpdateNotifyOuterClass {
return result == null ? emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType.UNRECOGNIZED : result;
}
public static final int WEAPON_MAX_PROMOTE_LEVEL_FIELD_NUMBER = 10;
public static final int ID_FIELD_NUMBER = 4;
private int id_;
/**
* <code>uint32 id = 4;</code>
* @return The id.
*/
@java.lang.Override
public int getId() {
return id_;
}
public static final int WEAPON_MAX_PROMOTE_LEVEL_FIELD_NUMBER = 1;
private int weaponMaxPromoteLevel_;
/**
* <code>uint32 weapon_max_promote_level = 10;</code>
* <code>uint32 weapon_max_promote_level = 1;</code>
* @return The weaponMaxPromoteLevel.
*/
@java.lang.Override
@@ -195,14 +195,14 @@ public final class CodexDataUpdateNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (type_ != emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType.CODEX_NONE.getNumber()) {
output.writeEnum(6, type_);
}
if (weaponMaxPromoteLevel_ != 0) {
output.writeUInt32(10, weaponMaxPromoteLevel_);
output.writeUInt32(1, weaponMaxPromoteLevel_);
}
if (id_ != 0) {
output.writeUInt32(13, id_);
output.writeUInt32(4, id_);
}
if (type_ != emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType.CODEX_NONE.getNumber()) {
output.writeEnum(7, type_);
}
unknownFields.writeTo(output);
}
@@ -213,17 +213,17 @@ public final class CodexDataUpdateNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (type_ != emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType.CODEX_NONE.getNumber()) {
size += com.google.protobuf.CodedOutputStream
.computeEnumSize(6, type_);
}
if (weaponMaxPromoteLevel_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, weaponMaxPromoteLevel_);
.computeUInt32Size(1, weaponMaxPromoteLevel_);
}
if (id_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, id_);
.computeUInt32Size(4, id_);
}
if (type_ != emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType.CODEX_NONE.getNumber()) {
size += com.google.protobuf.CodedOutputStream
.computeEnumSize(7, type_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -240,9 +240,9 @@ public final class CodexDataUpdateNotifyOuterClass {
}
emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify other = (emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify) obj;
if (type_ != other.type_) return false;
if (getId()
!= other.getId()) return false;
if (type_ != other.type_) return false;
if (getWeaponMaxPromoteLevel()
!= other.getWeaponMaxPromoteLevel()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
@@ -256,10 +256,10 @@ public final class CodexDataUpdateNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + ID_FIELD_NUMBER;
hash = (53 * hash) + getId();
hash = (37 * hash) + TYPE_FIELD_NUMBER;
hash = (53 * hash) + type_;
hash = (37 * hash) + ID_FIELD_NUMBER;
hash = (53 * hash) + getId();
hash = (37 * hash) + WEAPON_MAX_PROMOTE_LEVEL_FIELD_NUMBER;
hash = (53 * hash) + getWeaponMaxPromoteLevel();
hash = (29 * hash) + unknownFields.hashCode();
@@ -359,8 +359,8 @@ public final class CodexDataUpdateNotifyOuterClass {
}
/**
* <pre>
* CmdId: 4209
* Name: CAEKJKGCKLD
* CmdId: 4206
* Obf: AMEDMFGHJKL
* </pre>
*
* Protobuf type {@code CodexDataUpdateNotify}
@@ -400,10 +400,10 @@ public final class CodexDataUpdateNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
id_ = 0;
type_ = 0;
id_ = 0;
weaponMaxPromoteLevel_ = 0;
return this;
@@ -432,8 +432,8 @@ public final class CodexDataUpdateNotifyOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify buildPartial() {
emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify result = new emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify(this);
result.id_ = id_;
result.type_ = type_;
result.id_ = id_;
result.weaponMaxPromoteLevel_ = weaponMaxPromoteLevel_;
onBuilt();
return result;
@@ -483,12 +483,12 @@ public final class CodexDataUpdateNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify other) {
if (other == emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify.getDefaultInstance()) return this;
if (other.getId() != 0) {
setId(other.getId());
}
if (other.type_ != 0) {
setTypeValue(other.getTypeValue());
}
if (other.getId() != 0) {
setId(other.getId());
}
if (other.getWeaponMaxPromoteLevel() != 0) {
setWeaponMaxPromoteLevel(other.getWeaponMaxPromoteLevel());
}
@@ -521,47 +521,16 @@ public final class CodexDataUpdateNotifyOuterClass {
return this;
}
private int id_ ;
/**
* <code>uint32 id = 13;</code>
* @return The id.
*/
@java.lang.Override
public int getId() {
return id_;
}
/**
* <code>uint32 id = 13;</code>
* @param value The id to set.
* @return This builder for chaining.
*/
public Builder setId(int value) {
id_ = value;
onChanged();
return this;
}
/**
* <code>uint32 id = 13;</code>
* @return This builder for chaining.
*/
public Builder clearId() {
id_ = 0;
onChanged();
return this;
}
private int type_ = 0;
/**
* <code>.CodexType type = 6;</code>
* <code>.CodexType type = 7;</code>
* @return The enum numeric value on the wire for type.
*/
@java.lang.Override public int getTypeValue() {
return type_;
}
/**
* <code>.CodexType type = 6;</code>
* <code>.CodexType type = 7;</code>
* @param value The enum numeric value on the wire for type to set.
* @return This builder for chaining.
*/
@@ -572,7 +541,7 @@ public final class CodexDataUpdateNotifyOuterClass {
return this;
}
/**
* <code>.CodexType type = 6;</code>
* <code>.CodexType type = 7;</code>
* @return The type.
*/
@java.lang.Override
@@ -582,7 +551,7 @@ public final class CodexDataUpdateNotifyOuterClass {
return result == null ? emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType.UNRECOGNIZED : result;
}
/**
* <code>.CodexType type = 6;</code>
* <code>.CodexType type = 7;</code>
* @param value The type to set.
* @return This builder for chaining.
*/
@@ -596,7 +565,7 @@ public final class CodexDataUpdateNotifyOuterClass {
return this;
}
/**
* <code>.CodexType type = 6;</code>
* <code>.CodexType type = 7;</code>
* @return This builder for chaining.
*/
public Builder clearType() {
@@ -606,9 +575,40 @@ public final class CodexDataUpdateNotifyOuterClass {
return this;
}
private int id_ ;
/**
* <code>uint32 id = 4;</code>
* @return The id.
*/
@java.lang.Override
public int getId() {
return id_;
}
/**
* <code>uint32 id = 4;</code>
* @param value The id to set.
* @return This builder for chaining.
*/
public Builder setId(int value) {
id_ = value;
onChanged();
return this;
}
/**
* <code>uint32 id = 4;</code>
* @return This builder for chaining.
*/
public Builder clearId() {
id_ = 0;
onChanged();
return this;
}
private int weaponMaxPromoteLevel_ ;
/**
* <code>uint32 weapon_max_promote_level = 10;</code>
* <code>uint32 weapon_max_promote_level = 1;</code>
* @return The weaponMaxPromoteLevel.
*/
@java.lang.Override
@@ -616,7 +616,7 @@ public final class CodexDataUpdateNotifyOuterClass {
return weaponMaxPromoteLevel_;
}
/**
* <code>uint32 weapon_max_promote_level = 10;</code>
* <code>uint32 weapon_max_promote_level = 1;</code>
* @param value The weaponMaxPromoteLevel to set.
* @return This builder for chaining.
*/
@@ -627,7 +627,7 @@ public final class CodexDataUpdateNotifyOuterClass {
return this;
}
/**
* <code>uint32 weapon_max_promote_level = 10;</code>
* <code>uint32 weapon_max_promote_level = 1;</code>
* @return This builder for chaining.
*/
public Builder clearWeaponMaxPromoteLevel() {
@@ -704,9 +704,9 @@ public final class CodexDataUpdateNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\033CodexDataUpdateNotify.proto\032\017CodexType" +
".proto\"_\n\025CodexDataUpdateNotify\022\n\n\002id\030\r " +
"\001(\r\022\030\n\004type\030\006 \001(\0162\n.CodexType\022 \n\030weapon_" +
"max_promote_level\030\n \001(\rB\033\n\031emu.grasscutt" +
".proto\"_\n\025CodexDataUpdateNotify\022\030\n\004type\030" +
"\007 \001(\0162\n.CodexType\022\n\n\002id\030\004 \001(\r\022 \n\030weapon_" +
"max_promote_level\030\001 \001(\rB\033\n\031emu.grasscutt" +
"er.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -719,7 +719,7 @@ public final class CodexDataUpdateNotifyOuterClass {
internal_static_CodexDataUpdateNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_CodexDataUpdateNotify_descriptor,
new java.lang.String[] { "Id", "Type", "WeaponMaxPromoteLevel", });
new java.lang.String[] { "Type", "Id", "WeaponMaxPromoteLevel", });
emu.grasscutter.net.proto.CodexTypeOuterClass.getDescriptor();
}