Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 20:29:52 +08:00
Code Issues Projects Releases Wiki Activity

Add support for game version 3.6 (#2110)

Browse Source 
* Update to game version `3.6.0` (pt. 1)

not complete!

* Update to game version `3.6.0` (pt. 2)

not complete!

* Update compiled definitions
This commit is contained in:
Magix
2023-04-30 19:08:54 -07:00
committed by GitHub
Unverified
parent 60e8106b01
commit c4f1208f45
1323 changed files with 434863 additions and 141164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/SceneTeamUpdateNotifyOuterClass.java
+79 -79
View File
@@ -18,12 +18,6 @@ public final class SceneTeamUpdateNotifyOuterClass {
// @@protoc_insertion_point(interface_extends:SceneTeamUpdateNotify)
com.google.protobuf.MessageOrBuilder {
/**
* <code>bool is_in_mp = 13;</code>
* @return The isInMp.
*/
boolean getIsInMp();
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
*/
@@ -47,11 +41,17 @@ public final class SceneTeamUpdateNotifyOuterClass {
*/
emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuilder getSceneTeamAvatarListOrBuilder(
int index);
/**
* <code>bool is_in_mp = 4;</code>
* @return The isInMp.
*/
boolean getIsInMp();
}
/**
* <pre>
* Name: LMBIEIJIEMO
* CmdId: 1762
* CmdId: 1646
* Name: MJFGNJJDJDN
* </pre>
*
* Protobuf type {@code SceneTeamUpdateNotify}
@@ -100,6 +100,11 @@ public final class SceneTeamUpdateNotifyOuterClass {
case 0:
done = true;
break;
case 32: {
isInMp_ = input.readBool();
break;
}
case 58: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
sceneTeamAvatarList_ = new java.util.ArrayList<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar>();
@@ -109,11 +114,6 @@ public final class SceneTeamUpdateNotifyOuterClass {
input.readMessage(emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.parser(), extensionRegistry));
break;
}
case 104: {
isInMp_ = input.readBool();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -149,17 +149,6 @@ public final class SceneTeamUpdateNotifyOuterClass {
emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify.class, emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify.Builder.class);
}
public static final int IS_IN_MP_FIELD_NUMBER = 13;
private boolean isInMp_;
/**
* <code>bool is_in_mp = 13;</code>
* @return The isInMp.
*/
@java.lang.Override
public boolean getIsInMp() {
return isInMp_;
}
public static final int SCENE_TEAM_AVATAR_LIST_FIELD_NUMBER = 7;
private java.util.List<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar> sceneTeamAvatarList_;
/**
@@ -200,6 +189,17 @@ public final class SceneTeamUpdateNotifyOuterClass {
return sceneTeamAvatarList_.get(index);
}
public static final int IS_IN_MP_FIELD_NUMBER = 4;
private boolean isInMp_;
/**
* <code>bool is_in_mp = 4;</code>
* @return The isInMp.
*/
@java.lang.Override
public boolean getIsInMp() {
return isInMp_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -214,12 +214,12 @@ public final class SceneTeamUpdateNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (isInMp_ != false) {
output.writeBool(4, isInMp_);
}
for (int i = 0; i < sceneTeamAvatarList_.size(); i++) {
output.writeMessage(7, sceneTeamAvatarList_.get(i));
}
if (isInMp_ != false) {
output.writeBool(13, isInMp_);
}
unknownFields.writeTo(output);
}
@@ -229,14 +229,14 @@ public final class SceneTeamUpdateNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (isInMp_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(4, isInMp_);
}
for (int i = 0; i < sceneTeamAvatarList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(7, sceneTeamAvatarList_.get(i));
}
if (isInMp_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(13, isInMp_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -252,10 +252,10 @@ public final class SceneTeamUpdateNotifyOuterClass {
}
emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify other = (emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify) obj;
if (getIsInMp()
!= other.getIsInMp()) return false;
if (!getSceneTeamAvatarListList()
.equals(other.getSceneTeamAvatarListList())) return false;
if (getIsInMp()
!= other.getIsInMp()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -267,13 +267,13 @@ public final class SceneTeamUpdateNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + IS_IN_MP_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsInMp());
if (getSceneTeamAvatarListCount() > 0) {
hash = (37 * hash) + SCENE_TEAM_AVATAR_LIST_FIELD_NUMBER;
hash = (53 * hash) + getSceneTeamAvatarListList().hashCode();
}
hash = (37 * hash) + IS_IN_MP_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsInMp());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -371,8 +371,8 @@ public final class SceneTeamUpdateNotifyOuterClass {
}
/**
* <pre>
* Name: LMBIEIJIEMO
* CmdId: 1762
* CmdId: 1646
* Name: MJFGNJJDJDN
* </pre>
*
* Protobuf type {@code SceneTeamUpdateNotify}
@@ -413,14 +413,14 @@ public final class SceneTeamUpdateNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
isInMp_ = false;
if (sceneTeamAvatarListBuilder_ == null) {
sceneTeamAvatarList_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001);
} else {
sceneTeamAvatarListBuilder_.clear();
}
isInMp_ = false;
return this;
}
@@ -448,7 +448,6 @@ public final class SceneTeamUpdateNotifyOuterClass {
public emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify buildPartial() {
emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify result = new emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify(this);
int from_bitField0_ = bitField0_;
result.isInMp_ = isInMp_;
if (sceneTeamAvatarListBuilder_ == null) {
if (((bitField0_ & 0x00000001) != 0)) {
sceneTeamAvatarList_ = java.util.Collections.unmodifiableList(sceneTeamAvatarList_);
@@ -458,6 +457,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
} else {
result.sceneTeamAvatarList_ = sceneTeamAvatarListBuilder_.build();
}
result.isInMp_ = isInMp_;
onBuilt();
return result;
}
@@ -506,9 +506,6 @@ public final class SceneTeamUpdateNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify other) {
if (other == emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify.getDefaultInstance()) return this;
if (other.getIsInMp() != false) {
setIsInMp(other.getIsInMp());
}
if (sceneTeamAvatarListBuilder_ == null) {
if (!other.sceneTeamAvatarList_.isEmpty()) {
if (sceneTeamAvatarList_.isEmpty()) {
@@ -535,6 +532,9 @@ public final class SceneTeamUpdateNotifyOuterClass {
}
}
}
if (other.getIsInMp() != false) {
setIsInMp(other.getIsInMp());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -565,37 +565,6 @@ public final class SceneTeamUpdateNotifyOuterClass {
}
private int bitField0_;
private boolean isInMp_ ;
/**
* <code>bool is_in_mp = 13;</code>
* @return The isInMp.
*/
@java.lang.Override
public boolean getIsInMp() {
return isInMp_;
}
/**
* <code>bool is_in_mp = 13;</code>
* @param value The isInMp to set.
* @return This builder for chaining.
*/
public Builder setIsInMp(boolean value) {
isInMp_ = value;
onChanged();
return this;
}
/**
* <code>bool is_in_mp = 13;</code>
* @return This builder for chaining.
*/
public Builder clearIsInMp() {
isInMp_ = false;
onChanged();
return this;
}
private java.util.List<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar> sceneTeamAvatarList_ =
java.util.Collections.emptyList();
private void ensureSceneTeamAvatarListIsMutable() {
@@ -835,6 +804,37 @@ public final class SceneTeamUpdateNotifyOuterClass {
}
return sceneTeamAvatarListBuilder_;
}
private boolean isInMp_ ;
/**
* <code>bool is_in_mp = 4;</code>
* @return The isInMp.
*/
@java.lang.Override
public boolean getIsInMp() {
return isInMp_;
}
/**
* <code>bool is_in_mp = 4;</code>
* @param value The isInMp to set.
* @return This builder for chaining.
*/
public Builder setIsInMp(boolean value) {
isInMp_ = value;
onChanged();
return this;
}
/**
* <code>bool is_in_mp = 4;</code>
* @return This builder for chaining.
*/
public Builder clearIsInMp() {
isInMp_ = false;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -903,9 +903,9 @@ public final class SceneTeamUpdateNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\033SceneTeamUpdateNotify.proto\032\025SceneTeam" +
"Avatar.proto\"[\n\025SceneTeamUpdateNotify\022\020\n" +
"\010is_in_mp\030\r \001(\010\0220\n\026scene_team_avatar_lis" +
"t\030\007 \003(\0132\020.SceneTeamAvatarB\033\n\031emu.grasscu" +
"Avatar.proto\"[\n\025SceneTeamUpdateNotify\0220\n" +
"\026scene_team_avatar_list\030\007 \003(\0132\020.SceneTea" +
"mAvatar\022\020\n\010is_in_mp\030\004 \001(\010B\033\n\031emu.grasscu" +
"tter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -918,7 +918,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
internal_static_SceneTeamUpdateNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_SceneTeamUpdateNotify_descriptor,
new java.lang.String[] { "IsInMp", "SceneTeamAvatarList", });
new java.lang.String[] { "SceneTeamAvatarList", "IsInMp", });
emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.getDescriptor();
}