Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 07:33:33 +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/SceneTransToPointRspOuterClass.java
+95 -95
View File
@@ -19,27 +19,27 @@ public final class SceneTransToPointRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 scene_id = 8;</code>
* @return The sceneId.
*/
int getSceneId();
/**
* <code>uint32 point_id = 14;</code>
* <code>uint32 point_id = 12;</code>
* @return The pointId.
*/
int getPointId();
/**
* <code>int32 retcode = 1;</code>
* <code>uint32 scene_id = 13;</code>
* @return The sceneId.
*/
int getSceneId();
/**
* <code>int32 retcode = 3;</code>
* @return The retcode.
*/
int getRetcode();
}
/**
* <pre>
* CmdId: 294
* Name: PGPHKCGFFIK
* CmdId: 268
* Obf: BCNGDFENAPI
* </pre>
*
* Protobuf type {@code SceneTransToPointRsp}
@@ -86,21 +86,21 @@ public final class SceneTransToPointRspOuterClass {
case 0:
done = true;
break;
case 8: {
case 24: {
retcode_ = input.readInt32();
break;
}
case 64: {
sceneId_ = input.readUInt32();
break;
}
case 112: {
case 96: {
pointId_ = input.readUInt32();
break;
}
case 104: {
sceneId_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -133,21 +133,10 @@ public final class SceneTransToPointRspOuterClass {
emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp.class, emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp.Builder.class);
}
public static final int SCENE_ID_FIELD_NUMBER = 8;
private int sceneId_;
/**
* <code>uint32 scene_id = 8;</code>
* @return The sceneId.
*/
@java.lang.Override
public int getSceneId() {
return sceneId_;
}
public static final int POINT_ID_FIELD_NUMBER = 14;
public static final int POINT_ID_FIELD_NUMBER = 12;
private int pointId_;
/**
* <code>uint32 point_id = 14;</code>
* <code>uint32 point_id = 12;</code>
* @return The pointId.
*/
@java.lang.Override
@@ -155,10 +144,21 @@ public final class SceneTransToPointRspOuterClass {
return pointId_;
}
public static final int RETCODE_FIELD_NUMBER = 1;
public static final int SCENE_ID_FIELD_NUMBER = 13;
private int sceneId_;
/**
* <code>uint32 scene_id = 13;</code>
* @return The sceneId.
*/
@java.lang.Override
public int getSceneId() {
return sceneId_;
}
public static final int RETCODE_FIELD_NUMBER = 3;
private int retcode_;
/**
* <code>int32 retcode = 1;</code>
* <code>int32 retcode = 3;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -181,13 +181,13 @@ public final class SceneTransToPointRspOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(1, retcode_);
}
if (sceneId_ != 0) {
output.writeUInt32(8, sceneId_);
output.writeInt32(3, retcode_);
}
if (pointId_ != 0) {
output.writeUInt32(14, pointId_);
output.writeUInt32(12, pointId_);
}
if (sceneId_ != 0) {
output.writeUInt32(13, sceneId_);
}
unknownFields.writeTo(output);
}
@@ -200,15 +200,15 @@ public final class SceneTransToPointRspOuterClass {
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(1, retcode_);
}
if (sceneId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(8, sceneId_);
.computeInt32Size(3, retcode_);
}
if (pointId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, pointId_);
.computeUInt32Size(12, pointId_);
}
if (sceneId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, sceneId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -225,10 +225,10 @@ public final class SceneTransToPointRspOuterClass {
}
emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp other = (emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp) obj;
if (getSceneId()
!= other.getSceneId()) return false;
if (getPointId()
!= other.getPointId()) return false;
if (getSceneId()
!= other.getSceneId()) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
@@ -242,10 +242,10 @@ public final class SceneTransToPointRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
hash = (53 * hash) + getSceneId();
hash = (37 * hash) + POINT_ID_FIELD_NUMBER;
hash = (53 * hash) + getPointId();
hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
hash = (53 * hash) + getSceneId();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (29 * hash) + unknownFields.hashCode();
@@ -345,8 +345,8 @@ public final class SceneTransToPointRspOuterClass {
}
/**
* <pre>
* CmdId: 294
* Name: PGPHKCGFFIK
* CmdId: 268
* Obf: BCNGDFENAPI
* </pre>
*
* Protobuf type {@code SceneTransToPointRsp}
@@ -386,10 +386,10 @@ public final class SceneTransToPointRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
sceneId_ = 0;
pointId_ = 0;
sceneId_ = 0;
retcode_ = 0;
return this;
@@ -418,8 +418,8 @@ public final class SceneTransToPointRspOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp buildPartial() {
emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp result = new emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp(this);
result.sceneId_ = sceneId_;
result.pointId_ = pointId_;
result.sceneId_ = sceneId_;
result.retcode_ = retcode_;
onBuilt();
return result;
@@ -469,12 +469,12 @@ public final class SceneTransToPointRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp other) {
if (other == emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp.getDefaultInstance()) return this;
if (other.getSceneId() != 0) {
setSceneId(other.getSceneId());
}
if (other.getPointId() != 0) {
setPointId(other.getPointId());
}
if (other.getSceneId() != 0) {
setSceneId(other.getSceneId());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
@@ -507,40 +507,9 @@ public final class SceneTransToPointRspOuterClass {
return this;
}
private int sceneId_ ;
/**
* <code>uint32 scene_id = 8;</code>
* @return The sceneId.
*/
@java.lang.Override
public int getSceneId() {
return sceneId_;
}
/**
* <code>uint32 scene_id = 8;</code>
* @param value The sceneId to set.
* @return This builder for chaining.
*/
public Builder setSceneId(int value) {
sceneId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 scene_id = 8;</code>
* @return This builder for chaining.
*/
public Builder clearSceneId() {
sceneId_ = 0;
onChanged();
return this;
}
private int pointId_ ;
/**
* <code>uint32 point_id = 14;</code>
* <code>uint32 point_id = 12;</code>
* @return The pointId.
*/
@java.lang.Override
@@ -548,7 +517,7 @@ public final class SceneTransToPointRspOuterClass {
return pointId_;
}
/**
* <code>uint32 point_id = 14;</code>
* <code>uint32 point_id = 12;</code>
* @param value The pointId to set.
* @return This builder for chaining.
*/
@@ -559,7 +528,7 @@ public final class SceneTransToPointRspOuterClass {
return this;
}
/**
* <code>uint32 point_id = 14;</code>
* <code>uint32 point_id = 12;</code>
* @return This builder for chaining.
*/
public Builder clearPointId() {
@@ -569,9 +538,40 @@ public final class SceneTransToPointRspOuterClass {
return this;
}
private int sceneId_ ;
/**
* <code>uint32 scene_id = 13;</code>
* @return The sceneId.
*/
@java.lang.Override
public int getSceneId() {
return sceneId_;
}
/**
* <code>uint32 scene_id = 13;</code>
* @param value The sceneId to set.
* @return This builder for chaining.
*/
public Builder setSceneId(int value) {
sceneId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 scene_id = 13;</code>
* @return This builder for chaining.
*/
public Builder clearSceneId() {
sceneId_ = 0;
onChanged();
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 1;</code>
* <code>int32 retcode = 3;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -579,7 +579,7 @@ public final class SceneTransToPointRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 1;</code>
* <code>int32 retcode = 3;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -590,7 +590,7 @@ public final class SceneTransToPointRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 1;</code>
* <code>int32 retcode = 3;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -667,8 +667,8 @@ public final class SceneTransToPointRspOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\032SceneTransToPointRsp.proto\"K\n\024SceneTra" +
"nsToPointRsp\022\020\n\010scene_id\030\010 \001(\r\022\020\n\010point_" +
"id\030\016 \001(\r\022\017\n\007retcode\030\001 \001(\005B\033\n\031emu.grasscu" +
"nsToPointRsp\022\020\n\010point_id\030\014 \001(\r\022\020\n\010scene_" +
"id\030\r \001(\r\022\017\n\007retcode\030\003 \001(\005B\033\n\031emu.grasscu" +
"tter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +680,7 @@ public final class SceneTransToPointRspOuterClass {
internal_static_SceneTransToPointRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_SceneTransToPointRsp_descriptor,
new java.lang.String[] { "SceneId", "PointId", "Retcode", });
new java.lang.String[] { "PointId", "SceneId", "Retcode", });
}
// @@protoc_insertion_point(outer_class_scope)