Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-18 08:49:50 +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/AvatarSkillMaxChargeCountNotifyOuterClass.java
+128 -128
View File
@@ -19,27 +19,27 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 skill_id = 10;</code>
* @return The skillId.
* <code>uint32 max_charge_count = 3;</code>
* @return The maxChargeCount.
*/
int getSkillId();
int getMaxChargeCount();
/**
* <code>uint64 avatar_guid = 15;</code>
* <code>uint64 avatar_guid = 12;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
/**
* <code>uint32 max_charge_count = 13;</code>
* @return The maxChargeCount.
* <code>uint32 skill_id = 5;</code>
* @return The skillId.
*/
int getMaxChargeCount();
int getSkillId();
}
/**
* <pre>
* CmdId: 1041
* Name: OGKJAJFBMIO
* CmdId: 1058
* Obf: MEHNGPGKFOL
* </pre>
*
* Protobuf type {@code AvatarSkillMaxChargeCountNotify}
@@ -86,17 +86,17 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
case 0:
done = true;
break;
case 80: {
skillId_ = input.readUInt32();
break;
}
case 104: {
case 24: {
maxChargeCount_ = input.readUInt32();
break;
}
case 120: {
case 40: {
skillId_ = input.readUInt32();
break;
}
case 96: {
avatarGuid_ = input.readUInt64();
break;
@@ -133,21 +133,21 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify.class, emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify.Builder.class);
}
public static final int SKILL_ID_FIELD_NUMBER = 10;
private int skillId_;
public static final int MAX_CHARGE_COUNT_FIELD_NUMBER = 3;
private int maxChargeCount_;
/**
* <code>uint32 skill_id = 10;</code>
* @return The skillId.
* <code>uint32 max_charge_count = 3;</code>
* @return The maxChargeCount.
*/
@java.lang.Override
public int getSkillId() {
return skillId_;
public int getMaxChargeCount() {
return maxChargeCount_;
}
public static final int AVATAR_GUID_FIELD_NUMBER = 15;
public static final int AVATAR_GUID_FIELD_NUMBER = 12;
private long avatarGuid_;
/**
* <code>uint64 avatar_guid = 15;</code>
* <code>uint64 avatar_guid = 12;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -155,15 +155,15 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
return avatarGuid_;
}
public static final int MAX_CHARGE_COUNT_FIELD_NUMBER = 13;
private int maxChargeCount_;
public static final int SKILL_ID_FIELD_NUMBER = 5;
private int skillId_;
/**
* <code>uint32 max_charge_count = 13;</code>
* @return The maxChargeCount.
* <code>uint32 skill_id = 5;</code>
* @return The skillId.
*/
@java.lang.Override
public int getMaxChargeCount() {
return maxChargeCount_;
public int getSkillId() {
return skillId_;
}
private byte memoizedIsInitialized = -1;
@@ -180,14 +180,14 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (skillId_ != 0) {
output.writeUInt32(10, skillId_);
}
if (maxChargeCount_ != 0) {
output.writeUInt32(13, maxChargeCount_);
output.writeUInt32(3, maxChargeCount_);
}
if (skillId_ != 0) {
output.writeUInt32(5, skillId_);
}
if (avatarGuid_ != 0L) {
output.writeUInt64(15, avatarGuid_);
output.writeUInt64(12, avatarGuid_);
}
unknownFields.writeTo(output);
}
@@ -198,17 +198,17 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (skillId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, skillId_);
}
if (maxChargeCount_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, maxChargeCount_);
.computeUInt32Size(3, maxChargeCount_);
}
if (skillId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, skillId_);
}
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(15, avatarGuid_);
.computeUInt64Size(12, avatarGuid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -225,12 +225,12 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
}
emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify other = (emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify) obj;
if (getSkillId()
!= other.getSkillId()) return false;
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (getMaxChargeCount()
!= other.getMaxChargeCount()) return false;
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (getSkillId()
!= other.getSkillId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -242,13 +242,13 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
hash = (53 * hash) + getSkillId();
hash = (37 * hash) + MAX_CHARGE_COUNT_FIELD_NUMBER;
hash = (53 * hash) + getMaxChargeCount();
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
hash = (37 * hash) + MAX_CHARGE_COUNT_FIELD_NUMBER;
hash = (53 * hash) + getMaxChargeCount();
hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
hash = (53 * hash) + getSkillId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -346,8 +346,8 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
}
/**
* <pre>
* CmdId: 1041
* Name: OGKJAJFBMIO
* CmdId: 1058
* Obf: MEHNGPGKFOL
* </pre>
*
* Protobuf type {@code AvatarSkillMaxChargeCountNotify}
@@ -387,11 +387,11 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
skillId_ = 0;
maxChargeCount_ = 0;
avatarGuid_ = 0L;
maxChargeCount_ = 0;
skillId_ = 0;
return this;
}
@@ -419,9 +419,9 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify buildPartial() {
emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify result = new emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify(this);
result.skillId_ = skillId_;
result.avatarGuid_ = avatarGuid_;
result.maxChargeCount_ = maxChargeCount_;
result.avatarGuid_ = avatarGuid_;
result.skillId_ = skillId_;
onBuilt();
return result;
}
@@ -470,14 +470,14 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify other) {
if (other == emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify.getDefaultInstance()) return this;
if (other.getSkillId() != 0) {
setSkillId(other.getSkillId());
if (other.getMaxChargeCount() != 0) {
setMaxChargeCount(other.getMaxChargeCount());
}
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
}
if (other.getMaxChargeCount() != 0) {
setMaxChargeCount(other.getMaxChargeCount());
if (other.getSkillId() != 0) {
setSkillId(other.getSkillId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -508,71 +508,9 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
return this;
}
private int skillId_ ;
/**
* <code>uint32 skill_id = 10;</code>
* @return The skillId.
*/
@java.lang.Override
public int getSkillId() {
return skillId_;
}
/**
* <code>uint32 skill_id = 10;</code>
* @param value The skillId to set.
* @return This builder for chaining.
*/
public Builder setSkillId(int value) {
skillId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 skill_id = 10;</code>
* @return This builder for chaining.
*/
public Builder clearSkillId() {
skillId_ = 0;
onChanged();
return this;
}
private long avatarGuid_ ;
/**
* <code>uint64 avatar_guid = 15;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
/**
* <code>uint64 avatar_guid = 15;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
public Builder setAvatarGuid(long value) {
avatarGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 avatar_guid = 15;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
avatarGuid_ = 0L;
onChanged();
return this;
}
private int maxChargeCount_ ;
/**
* <code>uint32 max_charge_count = 13;</code>
* <code>uint32 max_charge_count = 3;</code>
* @return The maxChargeCount.
*/
@java.lang.Override
@@ -580,7 +518,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
return maxChargeCount_;
}
/**
* <code>uint32 max_charge_count = 13;</code>
* <code>uint32 max_charge_count = 3;</code>
* @param value The maxChargeCount to set.
* @return This builder for chaining.
*/
@@ -591,7 +529,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
return this;
}
/**
* <code>uint32 max_charge_count = 13;</code>
* <code>uint32 max_charge_count = 3;</code>
* @return This builder for chaining.
*/
public Builder clearMaxChargeCount() {
@@ -600,6 +538,68 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
onChanged();
return this;
}
private long avatarGuid_ ;
/**
* <code>uint64 avatar_guid = 12;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
/**
* <code>uint64 avatar_guid = 12;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
public Builder setAvatarGuid(long value) {
avatarGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 avatar_guid = 12;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
avatarGuid_ = 0L;
onChanged();
return this;
}
private int skillId_ ;
/**
* <code>uint32 skill_id = 5;</code>
* @return The skillId.
*/
@java.lang.Override
public int getSkillId() {
return skillId_;
}
/**
* <code>uint32 skill_id = 5;</code>
* @param value The skillId to set.
* @return This builder for chaining.
*/
public Builder setSkillId(int value) {
skillId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 skill_id = 5;</code>
* @return This builder for chaining.
*/
public Builder clearSkillId() {
skillId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -668,9 +668,9 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n%AvatarSkillMaxChargeCountNotify.proto\"" +
"b\n\037AvatarSkillMaxChargeCountNotify\022\020\n\010sk" +
"ill_id\030\n \001(\r\022\023\n\013avatar_guid\030\017 \001(\004\022\030\n\020max" +
"_charge_count\030\r \001(\rB\033\n\031emu.grasscutter.n" +
"b\n\037AvatarSkillMaxChargeCountNotify\022\030\n\020ma" +
"x_charge_count\030\003 \001(\r\022\023\n\013avatar_guid\030\014 \001(" +
"\004\022\020\n\010skill_id\030\005 \001(\rB\033\n\031emu.grasscutter.n" +
"et.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -682,7 +682,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
internal_static_AvatarSkillMaxChargeCountNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AvatarSkillMaxChargeCountNotify_descriptor,
new java.lang.String[] { "SkillId", "AvatarGuid", "MaxChargeCount", });
new java.lang.String[] { "MaxChargeCount", "AvatarGuid", "SkillId", });
}
// @@protoc_insertion_point(outer_class_scope)