Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 13:53:37 +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/SetEquipLockStateReqOuterClass.java
+87 -87
View File
@@ -19,21 +19,21 @@ public final class SetEquipLockStateReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>bool is_locked = 2;</code>
* @return The isLocked.
*/
boolean getIsLocked();
/**
* <code>uint64 target_equip_guid = 11;</code>
* <code>uint64 target_equip_guid = 4;</code>
* @return The targetEquipGuid.
*/
long getTargetEquipGuid();
/**
* <code>bool is_locked = 12;</code>
* @return The isLocked.
*/
boolean getIsLocked();
}
/**
* <pre>
* CmdId: 632
* Name: EFAIJMEIALJ
* CmdId: 661
* Obf: EEKKEIGCNPK
* </pre>
*
* Protobuf type {@code SetEquipLockStateReq}
@@ -80,16 +80,16 @@ public final class SetEquipLockStateReqOuterClass {
case 0:
done = true;
break;
case 16: {
isLocked_ = input.readBool();
break;
}
case 88: {
case 32: {
targetEquipGuid_ = input.readUInt64();
break;
}
case 96: {
isLocked_ = input.readBool();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -122,21 +122,10 @@ public final class SetEquipLockStateReqOuterClass {
emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq.class, emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq.Builder.class);
}
public static final int IS_LOCKED_FIELD_NUMBER = 2;
private boolean isLocked_;
/**
* <code>bool is_locked = 2;</code>
* @return The isLocked.
*/
@java.lang.Override
public boolean getIsLocked() {
return isLocked_;
}
public static final int TARGET_EQUIP_GUID_FIELD_NUMBER = 11;
public static final int TARGET_EQUIP_GUID_FIELD_NUMBER = 4;
private long targetEquipGuid_;
/**
* <code>uint64 target_equip_guid = 11;</code>
* <code>uint64 target_equip_guid = 4;</code>
* @return The targetEquipGuid.
*/
@java.lang.Override
@@ -144,6 +133,17 @@ public final class SetEquipLockStateReqOuterClass {
return targetEquipGuid_;
}
public static final int IS_LOCKED_FIELD_NUMBER = 12;
private boolean isLocked_;
/**
* <code>bool is_locked = 12;</code>
* @return The isLocked.
*/
@java.lang.Override
public boolean getIsLocked() {
return isLocked_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -158,11 +158,11 @@ public final class SetEquipLockStateReqOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (isLocked_ != false) {
output.writeBool(2, isLocked_);
}
if (targetEquipGuid_ != 0L) {
output.writeUInt64(11, targetEquipGuid_);
output.writeUInt64(4, targetEquipGuid_);
}
if (isLocked_ != false) {
output.writeBool(12, isLocked_);
}
unknownFields.writeTo(output);
}
@@ -173,13 +173,13 @@ public final class SetEquipLockStateReqOuterClass {
if (size != -1) return size;
size = 0;
if (isLocked_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(2, isLocked_);
}
if (targetEquipGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(11, targetEquipGuid_);
.computeUInt64Size(4, targetEquipGuid_);
}
if (isLocked_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(12, isLocked_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -196,10 +196,10 @@ public final class SetEquipLockStateReqOuterClass {
}
emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq other = (emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq) obj;
if (getIsLocked()
!= other.getIsLocked()) return false;
if (getTargetEquipGuid()
!= other.getTargetEquipGuid()) return false;
if (getIsLocked()
!= other.getIsLocked()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -211,12 +211,12 @@ public final class SetEquipLockStateReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + IS_LOCKED_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsLocked());
hash = (37 * hash) + TARGET_EQUIP_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getTargetEquipGuid());
hash = (37 * hash) + IS_LOCKED_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsLocked());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -314,8 +314,8 @@ public final class SetEquipLockStateReqOuterClass {
}
/**
* <pre>
* CmdId: 632
* Name: EFAIJMEIALJ
* CmdId: 661
* Obf: EEKKEIGCNPK
* </pre>
*
* Protobuf type {@code SetEquipLockStateReq}
@@ -355,10 +355,10 @@ public final class SetEquipLockStateReqOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
isLocked_ = false;
targetEquipGuid_ = 0L;
isLocked_ = false;
return this;
}
@@ -385,8 +385,8 @@ public final class SetEquipLockStateReqOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq buildPartial() {
emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq result = new emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq(this);
result.isLocked_ = isLocked_;
result.targetEquipGuid_ = targetEquipGuid_;
result.isLocked_ = isLocked_;
onBuilt();
return result;
}
@@ -435,12 +435,12 @@ public final class SetEquipLockStateReqOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq other) {
if (other == emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq.getDefaultInstance()) return this;
if (other.getIsLocked() != false) {
setIsLocked(other.getIsLocked());
}
if (other.getTargetEquipGuid() != 0L) {
setTargetEquipGuid(other.getTargetEquipGuid());
}
if (other.getIsLocked() != false) {
setIsLocked(other.getIsLocked());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -470,40 +470,9 @@ public final class SetEquipLockStateReqOuterClass {
return this;
}
private boolean isLocked_ ;
/**
* <code>bool is_locked = 2;</code>
* @return The isLocked.
*/
@java.lang.Override
public boolean getIsLocked() {
return isLocked_;
}
/**
* <code>bool is_locked = 2;</code>
* @param value The isLocked to set.
* @return This builder for chaining.
*/
public Builder setIsLocked(boolean value) {
isLocked_ = value;
onChanged();
return this;
}
/**
* <code>bool is_locked = 2;</code>
* @return This builder for chaining.
*/
public Builder clearIsLocked() {
isLocked_ = false;
onChanged();
return this;
}
private long targetEquipGuid_ ;
/**
* <code>uint64 target_equip_guid = 11;</code>
* <code>uint64 target_equip_guid = 4;</code>
* @return The targetEquipGuid.
*/
@java.lang.Override
@@ -511,7 +480,7 @@ public final class SetEquipLockStateReqOuterClass {
return targetEquipGuid_;
}
/**
* <code>uint64 target_equip_guid = 11;</code>
* <code>uint64 target_equip_guid = 4;</code>
* @param value The targetEquipGuid to set.
* @return This builder for chaining.
*/
@@ -522,7 +491,7 @@ public final class SetEquipLockStateReqOuterClass {
return this;
}
/**
* <code>uint64 target_equip_guid = 11;</code>
* <code>uint64 target_equip_guid = 4;</code>
* @return This builder for chaining.
*/
public Builder clearTargetEquipGuid() {
@@ -531,6 +500,37 @@ public final class SetEquipLockStateReqOuterClass {
onChanged();
return this;
}
private boolean isLocked_ ;
/**
* <code>bool is_locked = 12;</code>
* @return The isLocked.
*/
@java.lang.Override
public boolean getIsLocked() {
return isLocked_;
}
/**
* <code>bool is_locked = 12;</code>
* @param value The isLocked to set.
* @return This builder for chaining.
*/
public Builder setIsLocked(boolean value) {
isLocked_ = value;
onChanged();
return this;
}
/**
* <code>bool is_locked = 12;</code>
* @return This builder for chaining.
*/
public Builder clearIsLocked() {
isLocked_ = false;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -599,8 +599,8 @@ public final class SetEquipLockStateReqOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\032SetEquipLockStateReq.proto\"D\n\024SetEquip" +
"LockStateReq\022\021\n\tis_locked\030\002 \001(\010\022\031\n\021targe" +
"t_equip_guid\030\013 \001(\004B\033\n\031emu.grasscutter.ne" +
"LockStateReq\022\031\n\021target_equip_guid\030\004 \001(\004\022" +
"\021\n\tis_locked\030\014 \001(\010B\033\n\031emu.grasscutter.ne" +
"t.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -612,7 +612,7 @@ public final class SetEquipLockStateReqOuterClass {
internal_static_SetEquipLockStateReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_SetEquipLockStateReq_descriptor,
new java.lang.String[] { "IsLocked", "TargetEquipGuid", });
new java.lang.String[] { "TargetEquipGuid", "IsLocked", });
}
// @@protoc_insertion_point(outer_class_scope)