Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 09:54:14 +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/EnterSceneReadyRspOuterClass.java
+68 -68
View File
@@ -18,22 +18,22 @@ public final class EnterSceneReadyRspOuterClass {
// @@protoc_insertion_point(interface_extends:EnterSceneReadyRsp)
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 enter_scene_token = 3;</code>
* @return The enterSceneToken.
*/
int getEnterSceneToken();
/**
* <code>int32 retcode = 13;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint32 enter_scene_token = 1;</code>
* @return The enterSceneToken.
*/
int getEnterSceneToken();
}
/**
* <pre>
* CmdId: 285
* Name: MLIDIOPMEBK
* CmdId: 282
* Obf: NKPMELMPFMD
* </pre>
*
* Protobuf type {@code EnterSceneReadyRsp}
@@ -80,7 +80,7 @@ public final class EnterSceneReadyRspOuterClass {
case 0:
done = true;
break;
case 8: {
case 24: {
enterSceneToken_ = input.readUInt32();
break;
@@ -122,6 +122,17 @@ public final class EnterSceneReadyRspOuterClass {
emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp.class, emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp.Builder.class);
}
public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 3;
private int enterSceneToken_;
/**
* <code>uint32 enter_scene_token = 3;</code>
* @return The enterSceneToken.
*/
@java.lang.Override
public int getEnterSceneToken() {
return enterSceneToken_;
}
public static final int RETCODE_FIELD_NUMBER = 13;
private int retcode_;
/**
@@ -133,17 +144,6 @@ public final class EnterSceneReadyRspOuterClass {
return retcode_;
}
public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 1;
private int enterSceneToken_;
/**
* <code>uint32 enter_scene_token = 1;</code>
* @return The enterSceneToken.
*/
@java.lang.Override
public int getEnterSceneToken() {
return enterSceneToken_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -159,7 +159,7 @@ public final class EnterSceneReadyRspOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (enterSceneToken_ != 0) {
output.writeUInt32(1, enterSceneToken_);
output.writeUInt32(3, enterSceneToken_);
}
if (retcode_ != 0) {
output.writeInt32(13, retcode_);
@@ -175,7 +175,7 @@ public final class EnterSceneReadyRspOuterClass {
size = 0;
if (enterSceneToken_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, enterSceneToken_);
.computeUInt32Size(3, enterSceneToken_);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
@@ -196,10 +196,10 @@ public final class EnterSceneReadyRspOuterClass {
}
emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp other = (emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp) obj;
if (getRetcode()
!= other.getRetcode()) return false;
if (getEnterSceneToken()
!= other.getEnterSceneToken()) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -211,10 +211,10 @@ public final class EnterSceneReadyRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + ENTER_SCENE_TOKEN_FIELD_NUMBER;
hash = (53 * hash) + getEnterSceneToken();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -312,8 +312,8 @@ public final class EnterSceneReadyRspOuterClass {
}
/**
* <pre>
* CmdId: 285
* Name: MLIDIOPMEBK
* CmdId: 282
* Obf: NKPMELMPFMD
* </pre>
*
* Protobuf type {@code EnterSceneReadyRsp}
@@ -353,10 +353,10 @@ public final class EnterSceneReadyRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
retcode_ = 0;
enterSceneToken_ = 0;
retcode_ = 0;
return this;
}
@@ -383,8 +383,8 @@ public final class EnterSceneReadyRspOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp buildPartial() {
emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp result = new emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp(this);
result.retcode_ = retcode_;
result.enterSceneToken_ = enterSceneToken_;
result.retcode_ = retcode_;
onBuilt();
return result;
}
@@ -433,12 +433,12 @@ public final class EnterSceneReadyRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp other) {
if (other == emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp.getDefaultInstance()) return this;
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.getEnterSceneToken() != 0) {
setEnterSceneToken(other.getEnterSceneToken());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -468,6 +468,37 @@ public final class EnterSceneReadyRspOuterClass {
return this;
}
private int enterSceneToken_ ;
/**
* <code>uint32 enter_scene_token = 3;</code>
* @return The enterSceneToken.
*/
@java.lang.Override
public int getEnterSceneToken() {
return enterSceneToken_;
}
/**
* <code>uint32 enter_scene_token = 3;</code>
* @param value The enterSceneToken to set.
* @return This builder for chaining.
*/
public Builder setEnterSceneToken(int value) {
enterSceneToken_ = value;
onChanged();
return this;
}
/**
* <code>uint32 enter_scene_token = 3;</code>
* @return This builder for chaining.
*/
public Builder clearEnterSceneToken() {
enterSceneToken_ = 0;
onChanged();
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 13;</code>
@@ -498,37 +529,6 @@ public final class EnterSceneReadyRspOuterClass {
onChanged();
return this;
}
private int enterSceneToken_ ;
/**
* <code>uint32 enter_scene_token = 1;</code>
* @return The enterSceneToken.
*/
@java.lang.Override
public int getEnterSceneToken() {
return enterSceneToken_;
}
/**
* <code>uint32 enter_scene_token = 1;</code>
* @param value The enterSceneToken to set.
* @return This builder for chaining.
*/
public Builder setEnterSceneToken(int value) {
enterSceneToken_ = value;
onChanged();
return this;
}
/**
* <code>uint32 enter_scene_token = 1;</code>
* @return This builder for chaining.
*/
public Builder clearEnterSceneToken() {
enterSceneToken_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -597,8 +597,8 @@ public final class EnterSceneReadyRspOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\030EnterSceneReadyRsp.proto\"@\n\022EnterScene" +
"ReadyRsp\022\017\n\007retcode\030\r \001(\005\022\031\n\021enter_scene" +
"_token\030\001 \001(\rB\033\n\031emu.grasscutter.net.prot" +
"ReadyRsp\022\031\n\021enter_scene_token\030\003 \001(\r\022\017\n\007r" +
"etcode\030\r \001(\005B\033\n\031emu.grasscutter.net.prot" +
"ob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -610,7 +610,7 @@ public final class EnterSceneReadyRspOuterClass {
internal_static_EnterSceneReadyRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_EnterSceneReadyRsp_descriptor,
new java.lang.String[] { "Retcode", "EnterSceneToken", });
new java.lang.String[] { "EnterSceneToken", "Retcode", });
}
// @@protoc_insertion_point(outer_class_scope)