mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-23 13:49:59 +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
+98
-90
@@ -19,23 +19,27 @@ public final class SceneTransToPointReqOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint32 scene_id = 13;</code>
|
||||
* @return The sceneId.
|
||||
*/
|
||||
int getSceneId();
|
||||
|
||||
/**
|
||||
* <code>uint32 point_id = 1;</code>
|
||||
* <code>uint32 point_id = 9;</code>
|
||||
* @return The pointId.
|
||||
*/
|
||||
int getPointId();
|
||||
|
||||
/**
|
||||
* <code>uint32 scene_id = 7;</code>
|
||||
* @return The sceneId.
|
||||
*/
|
||||
int getSceneId();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 239
|
||||
* EnetChannelId: 0
|
||||
* EnetIsReliable: false
|
||||
* IsAllowClient: true
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 216;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* IS_ALLOW_CLIENT = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code SceneTransToPointReq}
|
||||
@@ -82,16 +86,16 @@ public final class SceneTransToPointReqOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 8: {
|
||||
|
||||
pointId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 104: {
|
||||
case 56: {
|
||||
|
||||
sceneId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 72: {
|
||||
|
||||
pointId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
if (!parseUnknownField(
|
||||
input, unknownFields, extensionRegistry, tag)) {
|
||||
@@ -124,21 +128,10 @@ public final class SceneTransToPointReqOuterClass {
|
||||
emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPointReq.class, emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPointReq.Builder.class);
|
||||
}
|
||||
|
||||
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 POINT_ID_FIELD_NUMBER = 1;
|
||||
public static final int POINT_ID_FIELD_NUMBER = 9;
|
||||
private int pointId_;
|
||||
/**
|
||||
* <code>uint32 point_id = 1;</code>
|
||||
* <code>uint32 point_id = 9;</code>
|
||||
* @return The pointId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -146,6 +139,17 @@ public final class SceneTransToPointReqOuterClass {
|
||||
return pointId_;
|
||||
}
|
||||
|
||||
public static final int SCENE_ID_FIELD_NUMBER = 7;
|
||||
private int sceneId_;
|
||||
/**
|
||||
* <code>uint32 scene_id = 7;</code>
|
||||
* @return The sceneId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getSceneId() {
|
||||
return sceneId_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@java.lang.Override
|
||||
public final boolean isInitialized() {
|
||||
@@ -160,11 +164,11 @@ public final class SceneTransToPointReqOuterClass {
|
||||
@java.lang.Override
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (pointId_ != 0) {
|
||||
output.writeUInt32(1, pointId_);
|
||||
}
|
||||
if (sceneId_ != 0) {
|
||||
output.writeUInt32(13, sceneId_);
|
||||
output.writeUInt32(7, sceneId_);
|
||||
}
|
||||
if (pointId_ != 0) {
|
||||
output.writeUInt32(9, pointId_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -175,13 +179,13 @@ public final class SceneTransToPointReqOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (pointId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(1, pointId_);
|
||||
}
|
||||
if (sceneId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(13, sceneId_);
|
||||
.computeUInt32Size(7, sceneId_);
|
||||
}
|
||||
if (pointId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(9, pointId_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -198,10 +202,10 @@ public final class SceneTransToPointReqOuterClass {
|
||||
}
|
||||
emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPointReq other = (emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPointReq) obj;
|
||||
|
||||
if (getSceneId()
|
||||
!= other.getSceneId()) return false;
|
||||
if (getPointId()
|
||||
!= other.getPointId()) return false;
|
||||
if (getSceneId()
|
||||
!= other.getSceneId()) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
return true;
|
||||
}
|
||||
@@ -213,10 +217,10 @@ public final class SceneTransToPointReqOuterClass {
|
||||
}
|
||||
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 = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@@ -314,10 +318,14 @@ public final class SceneTransToPointReqOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 239
|
||||
* EnetChannelId: 0
|
||||
* EnetIsReliable: false
|
||||
* IsAllowClient: true
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 216;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* IS_ALLOW_CLIENT = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code SceneTransToPointReq}
|
||||
@@ -357,10 +365,10 @@ public final class SceneTransToPointReqOuterClass {
|
||||
@java.lang.Override
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
sceneId_ = 0;
|
||||
|
||||
pointId_ = 0;
|
||||
|
||||
sceneId_ = 0;
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -387,8 +395,8 @@ public final class SceneTransToPointReqOuterClass {
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPointReq buildPartial() {
|
||||
emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPointReq result = new emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPointReq(this);
|
||||
result.sceneId_ = sceneId_;
|
||||
result.pointId_ = pointId_;
|
||||
result.sceneId_ = sceneId_;
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
@@ -437,12 +445,12 @@ public final class SceneTransToPointReqOuterClass {
|
||||
|
||||
public Builder mergeFrom(emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPointReq other) {
|
||||
if (other == emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPointReq.getDefaultInstance()) return this;
|
||||
if (other.getSceneId() != 0) {
|
||||
setSceneId(other.getSceneId());
|
||||
}
|
||||
if (other.getPointId() != 0) {
|
||||
setPointId(other.getPointId());
|
||||
}
|
||||
if (other.getSceneId() != 0) {
|
||||
setSceneId(other.getSceneId());
|
||||
}
|
||||
this.mergeUnknownFields(other.unknownFields);
|
||||
onChanged();
|
||||
return this;
|
||||
@@ -472,40 +480,9 @@ public final class SceneTransToPointReqOuterClass {
|
||||
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 pointId_ ;
|
||||
/**
|
||||
* <code>uint32 point_id = 1;</code>
|
||||
* <code>uint32 point_id = 9;</code>
|
||||
* @return The pointId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -513,7 +490,7 @@ public final class SceneTransToPointReqOuterClass {
|
||||
return pointId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 point_id = 1;</code>
|
||||
* <code>uint32 point_id = 9;</code>
|
||||
* @param value The pointId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -524,7 +501,7 @@ public final class SceneTransToPointReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 point_id = 1;</code>
|
||||
* <code>uint32 point_id = 9;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearPointId() {
|
||||
@@ -533,6 +510,37 @@ public final class SceneTransToPointReqOuterClass {
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int sceneId_ ;
|
||||
/**
|
||||
* <code>uint32 scene_id = 7;</code>
|
||||
* @return The sceneId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getSceneId() {
|
||||
return sceneId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 scene_id = 7;</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 = 7;</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) {
|
||||
@@ -601,8 +609,8 @@ public final class SceneTransToPointReqOuterClass {
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\032SceneTransToPointReq.proto\":\n\024SceneTra" +
|
||||
"nsToPointReq\022\020\n\010scene_id\030\r \001(\r\022\020\n\010point_" +
|
||||
"id\030\001 \001(\rB\033\n\031emu.grasscutter.net.protob\006p" +
|
||||
"nsToPointReq\022\020\n\010point_id\030\t \001(\r\022\020\n\010scene_" +
|
||||
"id\030\007 \001(\rB\033\n\031emu.grasscutter.net.protob\006p" +
|
||||
"roto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
@@ -614,7 +622,7 @@ public final class SceneTransToPointReqOuterClass {
|
||||
internal_static_SceneTransToPointReq_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_SceneTransToPointReq_descriptor,
|
||||
new java.lang.String[] { "SceneId", "PointId", });
|
||||
new java.lang.String[] { "PointId", "SceneId", });
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
Reference in New Issue
Block a user