mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-23 19:29:50 +08:00
Update gc to 3.3 (#1981)
* replace the deprecated api * update proto * delete music game * fixed codes * fix costume switch * fix mail bug * Bump version number. * Re-add max boss chest number Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
Unverified
parent
8b83dbf58c
commit
92fbaa8670
+131
-125
@@ -19,29 +19,32 @@ public final class SceneTransToPointRspOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint32 point_id = 14;</code>
|
||||
* <code>int32 retcode = 8;</code>
|
||||
* @return The retcode.
|
||||
*/
|
||||
int getRetcode();
|
||||
|
||||
/**
|
||||
* <code>uint32 point_id = 4;</code>
|
||||
* @return The pointId.
|
||||
*/
|
||||
int getPointId();
|
||||
|
||||
/**
|
||||
* <code>uint32 scene_id = 3;</code>
|
||||
* <code>uint32 scene_id = 10;</code>
|
||||
* @return The sceneId.
|
||||
*/
|
||||
int getSceneId();
|
||||
|
||||
/**
|
||||
* <code>int32 retcode = 8;</code>
|
||||
* @return The retcode.
|
||||
*/
|
||||
int getRetcode();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 253
|
||||
* EnetChannelId: 0
|
||||
* EnetIsReliable: false
|
||||
* IsAllowClient: true
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 273;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code SceneTransToPointRsp}
|
||||
@@ -88,9 +91,9 @@ public final class SceneTransToPointRspOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 24: {
|
||||
case 32: {
|
||||
|
||||
sceneId_ = input.readUInt32();
|
||||
pointId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 64: {
|
||||
@@ -98,9 +101,9 @@ public final class SceneTransToPointRspOuterClass {
|
||||
retcode_ = input.readInt32();
|
||||
break;
|
||||
}
|
||||
case 112: {
|
||||
case 80: {
|
||||
|
||||
pointId_ = input.readUInt32();
|
||||
sceneId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
@@ -135,28 +138,6 @@ public final class SceneTransToPointRspOuterClass {
|
||||
emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp.class, emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp.Builder.class);
|
||||
}
|
||||
|
||||
public static final int POINT_ID_FIELD_NUMBER = 14;
|
||||
private int pointId_;
|
||||
/**
|
||||
* <code>uint32 point_id = 14;</code>
|
||||
* @return The pointId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getPointId() {
|
||||
return pointId_;
|
||||
}
|
||||
|
||||
public static final int SCENE_ID_FIELD_NUMBER = 3;
|
||||
private int sceneId_;
|
||||
/**
|
||||
* <code>uint32 scene_id = 3;</code>
|
||||
* @return The sceneId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getSceneId() {
|
||||
return sceneId_;
|
||||
}
|
||||
|
||||
public static final int RETCODE_FIELD_NUMBER = 8;
|
||||
private int retcode_;
|
||||
/**
|
||||
@@ -168,6 +149,28 @@ public final class SceneTransToPointRspOuterClass {
|
||||
return retcode_;
|
||||
}
|
||||
|
||||
public static final int POINT_ID_FIELD_NUMBER = 4;
|
||||
private int pointId_;
|
||||
/**
|
||||
* <code>uint32 point_id = 4;</code>
|
||||
* @return The pointId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getPointId() {
|
||||
return pointId_;
|
||||
}
|
||||
|
||||
public static final int SCENE_ID_FIELD_NUMBER = 10;
|
||||
private int sceneId_;
|
||||
/**
|
||||
* <code>uint32 scene_id = 10;</code>
|
||||
* @return The sceneId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getSceneId() {
|
||||
return sceneId_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@java.lang.Override
|
||||
public final boolean isInitialized() {
|
||||
@@ -182,14 +185,14 @@ public final class SceneTransToPointRspOuterClass {
|
||||
@java.lang.Override
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (sceneId_ != 0) {
|
||||
output.writeUInt32(3, sceneId_);
|
||||
if (pointId_ != 0) {
|
||||
output.writeUInt32(4, pointId_);
|
||||
}
|
||||
if (retcode_ != 0) {
|
||||
output.writeInt32(8, retcode_);
|
||||
}
|
||||
if (pointId_ != 0) {
|
||||
output.writeUInt32(14, pointId_);
|
||||
if (sceneId_ != 0) {
|
||||
output.writeUInt32(10, sceneId_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -200,17 +203,17 @@ public final class SceneTransToPointRspOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (sceneId_ != 0) {
|
||||
if (pointId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(3, sceneId_);
|
||||
.computeUInt32Size(4, pointId_);
|
||||
}
|
||||
if (retcode_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeInt32Size(8, retcode_);
|
||||
}
|
||||
if (pointId_ != 0) {
|
||||
if (sceneId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(14, pointId_);
|
||||
.computeUInt32Size(10, sceneId_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -227,12 +230,12 @@ public final class SceneTransToPointRspOuterClass {
|
||||
}
|
||||
emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp other = (emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp) obj;
|
||||
|
||||
if (getRetcode()
|
||||
!= other.getRetcode()) 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;
|
||||
return true;
|
||||
}
|
||||
@@ -244,12 +247,12 @@ public final class SceneTransToPointRspOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getRetcode();
|
||||
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();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@@ -347,10 +350,13 @@ public final class SceneTransToPointRspOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 253
|
||||
* EnetChannelId: 0
|
||||
* EnetIsReliable: false
|
||||
* IsAllowClient: true
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 273;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code SceneTransToPointRsp}
|
||||
@@ -390,12 +396,12 @@ public final class SceneTransToPointRspOuterClass {
|
||||
@java.lang.Override
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
retcode_ = 0;
|
||||
|
||||
pointId_ = 0;
|
||||
|
||||
sceneId_ = 0;
|
||||
|
||||
retcode_ = 0;
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -422,9 +428,9 @@ 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.retcode_ = retcode_;
|
||||
result.pointId_ = pointId_;
|
||||
result.sceneId_ = sceneId_;
|
||||
result.retcode_ = retcode_;
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
@@ -473,15 +479,15 @@ 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.getRetcode() != 0) {
|
||||
setRetcode(other.getRetcode());
|
||||
}
|
||||
if (other.getPointId() != 0) {
|
||||
setPointId(other.getPointId());
|
||||
}
|
||||
if (other.getSceneId() != 0) {
|
||||
setSceneId(other.getSceneId());
|
||||
}
|
||||
if (other.getRetcode() != 0) {
|
||||
setRetcode(other.getRetcode());
|
||||
}
|
||||
this.mergeUnknownFields(other.unknownFields);
|
||||
onChanged();
|
||||
return this;
|
||||
@@ -511,68 +517,6 @@ public final class SceneTransToPointRspOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private int pointId_ ;
|
||||
/**
|
||||
* <code>uint32 point_id = 14;</code>
|
||||
* @return The pointId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getPointId() {
|
||||
return pointId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 point_id = 14;</code>
|
||||
* @param value The pointId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setPointId(int value) {
|
||||
|
||||
pointId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 point_id = 14;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearPointId() {
|
||||
|
||||
pointId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int sceneId_ ;
|
||||
/**
|
||||
* <code>uint32 scene_id = 3;</code>
|
||||
* @return The sceneId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getSceneId() {
|
||||
return sceneId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 scene_id = 3;</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 = 3;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearSceneId() {
|
||||
|
||||
sceneId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int retcode_ ;
|
||||
/**
|
||||
* <code>int32 retcode = 8;</code>
|
||||
@@ -603,6 +547,68 @@ public final class SceneTransToPointRspOuterClass {
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int pointId_ ;
|
||||
/**
|
||||
* <code>uint32 point_id = 4;</code>
|
||||
* @return The pointId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getPointId() {
|
||||
return pointId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 point_id = 4;</code>
|
||||
* @param value The pointId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setPointId(int value) {
|
||||
|
||||
pointId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 point_id = 4;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearPointId() {
|
||||
|
||||
pointId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int sceneId_ ;
|
||||
/**
|
||||
* <code>uint32 scene_id = 10;</code>
|
||||
* @return The sceneId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getSceneId() {
|
||||
return sceneId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 scene_id = 10;</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 = 10;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearSceneId() {
|
||||
|
||||
sceneId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
@java.lang.Override
|
||||
public final Builder setUnknownFields(
|
||||
final com.google.protobuf.UnknownFieldSet unknownFields) {
|
||||
@@ -671,8 +677,8 @@ public final class SceneTransToPointRspOuterClass {
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\032SceneTransToPointRsp.proto\"K\n\024SceneTra" +
|
||||
"nsToPointRsp\022\020\n\010point_id\030\016 \001(\r\022\020\n\010scene_" +
|
||||
"id\030\003 \001(\r\022\017\n\007retcode\030\010 \001(\005B\033\n\031emu.grasscu" +
|
||||
"nsToPointRsp\022\017\n\007retcode\030\010 \001(\005\022\020\n\010point_i" +
|
||||
"d\030\004 \001(\r\022\020\n\010scene_id\030\n \001(\rB\033\n\031emu.grasscu" +
|
||||
"tter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
@@ -684,7 +690,7 @@ public final class SceneTransToPointRspOuterClass {
|
||||
internal_static_SceneTransToPointRsp_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_SceneTransToPointRsp_descriptor,
|
||||
new java.lang.String[] { "PointId", "SceneId", "Retcode", });
|
||||
new java.lang.String[] { "Retcode", "PointId", "SceneId", });
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
Reference in New Issue
Block a user