Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-08 21:03:40 +08:00
Code Issues Projects Releases Wiki Activity

Update gc to 3.3 (#1981)

Browse Source 
* 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:
Simplxs
2022-12-24 05:12:02 +08:00
committed by GitHub
Unverified
parent 8b83dbf58c
commit 92fbaa8670
1142 changed files with 474411 additions and 169883 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/EnterScenePeerNotifyOuterClass.java
+114 -108
View File
@@ -19,35 +19,38 @@ public final class EnterScenePeerNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 dest_scene_id = 12;</code>
* @return The destSceneId.
*/
int getDestSceneId();
/**
* <code>uint32 enter_scene_token = 11;</code>
* <code>uint32 enter_scene_token = 7;</code>
* @return The enterSceneToken.
*/
int getEnterSceneToken();
/**
* <code>uint32 host_peer_id = 14;</code>
* <code>uint32 host_peer_id = 12;</code>
* @return The hostPeerId.
*/
int getHostPeerId();
/**
* <code>uint32 peer_id = 1;</code>
* <code>uint32 peer_id = 14;</code>
* @return The peerId.
*/
int getPeerId();
/**
* <code>uint32 dest_scene_id = 2;</code>
* @return The destSceneId.
*/
int getDestSceneId();
}
/**
* <pre>
* CmdId: 252
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 271;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code EnterScenePeerNotify}
@@ -94,24 +97,24 @@ public final class EnterScenePeerNotifyOuterClass {
case 0:
done = true;
break;
case 8: {
case 16: {
peerId_ = input.readUInt32();
destSceneId_ = input.readUInt32();
break;
}
case 88: {
case 56: {
enterSceneToken_ = input.readUInt32();
break;
}
case 96: {
destSceneId_ = input.readUInt32();
hostPeerId_ = input.readUInt32();
break;
}
case 112: {
hostPeerId_ = input.readUInt32();
peerId_ = input.readUInt32();
break;
}
default: {
@@ -146,21 +149,10 @@ public final class EnterScenePeerNotifyOuterClass {
emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify.class, emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify.Builder.class);
}
public static final int DEST_SCENE_ID_FIELD_NUMBER = 12;
private int destSceneId_;
/**
* <code>uint32 dest_scene_id = 12;</code>
* @return The destSceneId.
*/
@java.lang.Override
public int getDestSceneId() {
return destSceneId_;
}
public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 11;
public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 7;
private int enterSceneToken_;
/**
* <code>uint32 enter_scene_token = 11;</code>
* <code>uint32 enter_scene_token = 7;</code>
* @return The enterSceneToken.
*/
@java.lang.Override
@@ -168,10 +160,10 @@ public final class EnterScenePeerNotifyOuterClass {
return enterSceneToken_;
}
public static final int HOST_PEER_ID_FIELD_NUMBER = 14;
public static final int HOST_PEER_ID_FIELD_NUMBER = 12;
private int hostPeerId_;
/**
* <code>uint32 host_peer_id = 14;</code>
* <code>uint32 host_peer_id = 12;</code>
* @return The hostPeerId.
*/
@java.lang.Override
@@ -179,10 +171,10 @@ public final class EnterScenePeerNotifyOuterClass {
return hostPeerId_;
}
public static final int PEER_ID_FIELD_NUMBER = 1;
public static final int PEER_ID_FIELD_NUMBER = 14;
private int peerId_;
/**
* <code>uint32 peer_id = 1;</code>
* <code>uint32 peer_id = 14;</code>
* @return The peerId.
*/
@java.lang.Override
@@ -190,6 +182,17 @@ public final class EnterScenePeerNotifyOuterClass {
return peerId_;
}
public static final int DEST_SCENE_ID_FIELD_NUMBER = 2;
private int destSceneId_;
/**
* <code>uint32 dest_scene_id = 2;</code>
* @return The destSceneId.
*/
@java.lang.Override
public int getDestSceneId() {
return destSceneId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -204,17 +207,17 @@ public final class EnterScenePeerNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (peerId_ != 0) {
output.writeUInt32(1, peerId_);
if (destSceneId_ != 0) {
output.writeUInt32(2, destSceneId_);
}
if (enterSceneToken_ != 0) {
output.writeUInt32(11, enterSceneToken_);
}
if (destSceneId_ != 0) {
output.writeUInt32(12, destSceneId_);
output.writeUInt32(7, enterSceneToken_);
}
if (hostPeerId_ != 0) {
output.writeUInt32(14, hostPeerId_);
output.writeUInt32(12, hostPeerId_);
}
if (peerId_ != 0) {
output.writeUInt32(14, peerId_);
}
unknownFields.writeTo(output);
}
@@ -225,21 +228,21 @@ public final class EnterScenePeerNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (peerId_ != 0) {
if (destSceneId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, peerId_);
.computeUInt32Size(2, destSceneId_);
}
if (enterSceneToken_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, enterSceneToken_);
}
if (destSceneId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(12, destSceneId_);
.computeUInt32Size(7, enterSceneToken_);
}
if (hostPeerId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, hostPeerId_);
.computeUInt32Size(12, hostPeerId_);
}
if (peerId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, peerId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -256,14 +259,14 @@ public final class EnterScenePeerNotifyOuterClass {
}
emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify other = (emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify) obj;
if (getDestSceneId()
!= other.getDestSceneId()) return false;
if (getEnterSceneToken()
!= other.getEnterSceneToken()) return false;
if (getHostPeerId()
!= other.getHostPeerId()) return false;
if (getPeerId()
!= other.getPeerId()) return false;
if (getDestSceneId()
!= other.getDestSceneId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -275,14 +278,14 @@ public final class EnterScenePeerNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + DEST_SCENE_ID_FIELD_NUMBER;
hash = (53 * hash) + getDestSceneId();
hash = (37 * hash) + ENTER_SCENE_TOKEN_FIELD_NUMBER;
hash = (53 * hash) + getEnterSceneToken();
hash = (37 * hash) + HOST_PEER_ID_FIELD_NUMBER;
hash = (53 * hash) + getHostPeerId();
hash = (37 * hash) + PEER_ID_FIELD_NUMBER;
hash = (53 * hash) + getPeerId();
hash = (37 * hash) + DEST_SCENE_ID_FIELD_NUMBER;
hash = (53 * hash) + getDestSceneId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -380,10 +383,13 @@ public final class EnterScenePeerNotifyOuterClass {
}
/**
* <pre>
* CmdId: 252
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 271;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code EnterScenePeerNotify}
@@ -423,14 +429,14 @@ public final class EnterScenePeerNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
destSceneId_ = 0;
enterSceneToken_ = 0;
hostPeerId_ = 0;
peerId_ = 0;
destSceneId_ = 0;
return this;
}
@@ -457,10 +463,10 @@ public final class EnterScenePeerNotifyOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify buildPartial() {
emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify result = new emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify(this);
result.destSceneId_ = destSceneId_;
result.enterSceneToken_ = enterSceneToken_;
result.hostPeerId_ = hostPeerId_;
result.peerId_ = peerId_;
result.destSceneId_ = destSceneId_;
onBuilt();
return result;
}
@@ -509,9 +515,6 @@ public final class EnterScenePeerNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify other) {
if (other == emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify.getDefaultInstance()) return this;
if (other.getDestSceneId() != 0) {
setDestSceneId(other.getDestSceneId());
}
if (other.getEnterSceneToken() != 0) {
setEnterSceneToken(other.getEnterSceneToken());
}
@@ -521,6 +524,9 @@ public final class EnterScenePeerNotifyOuterClass {
if (other.getPeerId() != 0) {
setPeerId(other.getPeerId());
}
if (other.getDestSceneId() != 0) {
setDestSceneId(other.getDestSceneId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -550,40 +556,9 @@ public final class EnterScenePeerNotifyOuterClass {
return this;
}
private int destSceneId_ ;
/**
* <code>uint32 dest_scene_id = 12;</code>
* @return The destSceneId.
*/
@java.lang.Override
public int getDestSceneId() {
return destSceneId_;
}
/**
* <code>uint32 dest_scene_id = 12;</code>
* @param value The destSceneId to set.
* @return This builder for chaining.
*/
public Builder setDestSceneId(int value) {
destSceneId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 dest_scene_id = 12;</code>
* @return This builder for chaining.
*/
public Builder clearDestSceneId() {
destSceneId_ = 0;
onChanged();
return this;
}
private int enterSceneToken_ ;
/**
* <code>uint32 enter_scene_token = 11;</code>
* <code>uint32 enter_scene_token = 7;</code>
* @return The enterSceneToken.
*/
@java.lang.Override
@@ -591,7 +566,7 @@ public final class EnterScenePeerNotifyOuterClass {
return enterSceneToken_;
}
/**
* <code>uint32 enter_scene_token = 11;</code>
* <code>uint32 enter_scene_token = 7;</code>
* @param value The enterSceneToken to set.
* @return This builder for chaining.
*/
@@ -602,7 +577,7 @@ public final class EnterScenePeerNotifyOuterClass {
return this;
}
/**
* <code>uint32 enter_scene_token = 11;</code>
* <code>uint32 enter_scene_token = 7;</code>
* @return This builder for chaining.
*/
public Builder clearEnterSceneToken() {
@@ -614,7 +589,7 @@ public final class EnterScenePeerNotifyOuterClass {
private int hostPeerId_ ;
/**
* <code>uint32 host_peer_id = 14;</code>
* <code>uint32 host_peer_id = 12;</code>
* @return The hostPeerId.
*/
@java.lang.Override
@@ -622,7 +597,7 @@ public final class EnterScenePeerNotifyOuterClass {
return hostPeerId_;
}
/**
* <code>uint32 host_peer_id = 14;</code>
* <code>uint32 host_peer_id = 12;</code>
* @param value The hostPeerId to set.
* @return This builder for chaining.
*/
@@ -633,7 +608,7 @@ public final class EnterScenePeerNotifyOuterClass {
return this;
}
/**
* <code>uint32 host_peer_id = 14;</code>
* <code>uint32 host_peer_id = 12;</code>
* @return This builder for chaining.
*/
public Builder clearHostPeerId() {
@@ -645,7 +620,7 @@ public final class EnterScenePeerNotifyOuterClass {
private int peerId_ ;
/**
* <code>uint32 peer_id = 1;</code>
* <code>uint32 peer_id = 14;</code>
* @return The peerId.
*/
@java.lang.Override
@@ -653,7 +628,7 @@ public final class EnterScenePeerNotifyOuterClass {
return peerId_;
}
/**
* <code>uint32 peer_id = 1;</code>
* <code>uint32 peer_id = 14;</code>
* @param value The peerId to set.
* @return This builder for chaining.
*/
@@ -664,7 +639,7 @@ public final class EnterScenePeerNotifyOuterClass {
return this;
}
/**
* <code>uint32 peer_id = 1;</code>
* <code>uint32 peer_id = 14;</code>
* @return This builder for chaining.
*/
public Builder clearPeerId() {
@@ -673,6 +648,37 @@ public final class EnterScenePeerNotifyOuterClass {
onChanged();
return this;
}
private int destSceneId_ ;
/**
* <code>uint32 dest_scene_id = 2;</code>
* @return The destSceneId.
*/
@java.lang.Override
public int getDestSceneId() {
return destSceneId_;
}
/**
* <code>uint32 dest_scene_id = 2;</code>
* @param value The destSceneId to set.
* @return This builder for chaining.
*/
public Builder setDestSceneId(int value) {
destSceneId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 dest_scene_id = 2;</code>
* @return This builder for chaining.
*/
public Builder clearDestSceneId() {
destSceneId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -741,9 +747,9 @@ public final class EnterScenePeerNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\032EnterScenePeerNotify.proto\"o\n\024EnterSce" +
"nePeerNotify\022\025\n\rdest_scene_id\030\014 \001(\r\022\031\n\021e" +
"nter_scene_token\030\013 \001(\r\022\024\n\014host_peer_id\030\016" +
" \001(\r\022\017\n\007peer_id\030\001 \001(\rB\033\n\031emu.grasscutter" +
"nePeerNotify\022\031\n\021enter_scene_token\030\007 \001(\r\022" +
"\024\n\014host_peer_id\030\014 \001(\r\022\017\n\007peer_id\030\016 \001(\r\022\025" +
"\n\rdest_scene_id\030\002 \001(\rB\033\n\031emu.grasscutter" +
".net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -755,7 +761,7 @@ public final class EnterScenePeerNotifyOuterClass {
internal_static_EnterScenePeerNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_EnterScenePeerNotify_descriptor,
new java.lang.String[] { "DestSceneId", "EnterSceneToken", "HostPeerId", "PeerId", });
new java.lang.String[] { "EnterSceneToken", "HostPeerId", "PeerId", "DestSceneId", });
}
// @@protoc_insertion_point(outer_class_scope)