Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 11:33:35 +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/SyncTeamEntityNotifyOuterClass.java
+101 -101
View File
@@ -19,39 +19,39 @@ public final class SyncTeamEntityNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 scene_id = 6;</code>
* @return The sceneId.
*/
int getSceneId();
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
java.util.List<emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo>
getTeamEntityInfoListList();
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo getTeamEntityInfoList(int index);
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
int getTeamEntityInfoListCount();
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
java.util.List<? extends emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfoOrBuilder>
getTeamEntityInfoListOrBuilderList();
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfoOrBuilder getTeamEntityInfoListOrBuilder(
int index);
/**
* <code>uint32 scene_id = 5;</code>
* @return The sceneId.
*/
int getSceneId();
}
/**
* <pre>
* Name: GHJLPNCDIHF
* CmdId: 393
* CmdId: 326
* Name: GDCDGDCNMLB
* </pre>
*
* Protobuf type {@code SyncTeamEntityNotify}
@@ -100,7 +100,7 @@ public final class SyncTeamEntityNotifyOuterClass {
case 0:
done = true;
break;
case 42: {
case 18: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
teamEntityInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo>();
mutable_bitField0_ |= 0x00000001;
@@ -109,7 +109,7 @@ public final class SyncTeamEntityNotifyOuterClass {
input.readMessage(emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.parser(), extensionRegistry));
break;
}
case 48: {
case 40: {
sceneId_ = input.readUInt32();
break;
@@ -149,28 +149,17 @@ public final class SyncTeamEntityNotifyOuterClass {
emu.grasscutter.net.proto.SyncTeamEntityNotifyOuterClass.SyncTeamEntityNotify.class, emu.grasscutter.net.proto.SyncTeamEntityNotifyOuterClass.SyncTeamEntityNotify.Builder.class);
}
public static final int SCENE_ID_FIELD_NUMBER = 6;
private int sceneId_;
/**
* <code>uint32 scene_id = 6;</code>
* @return The sceneId.
*/
@java.lang.Override
public int getSceneId() {
return sceneId_;
}
public static final int TEAM_ENTITY_INFO_LIST_FIELD_NUMBER = 5;
public static final int TEAM_ENTITY_INFO_LIST_FIELD_NUMBER = 2;
private java.util.List<emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo> teamEntityInfoList_;
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
@java.lang.Override
public java.util.List<emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo> getTeamEntityInfoListList() {
return teamEntityInfoList_;
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
@java.lang.Override
public java.util.List<? extends emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfoOrBuilder>
@@ -178,21 +167,21 @@ public final class SyncTeamEntityNotifyOuterClass {
return teamEntityInfoList_;
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
@java.lang.Override
public int getTeamEntityInfoListCount() {
return teamEntityInfoList_.size();
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo getTeamEntityInfoList(int index) {
return teamEntityInfoList_.get(index);
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfoOrBuilder getTeamEntityInfoListOrBuilder(
@@ -200,6 +189,17 @@ public final class SyncTeamEntityNotifyOuterClass {
return teamEntityInfoList_.get(index);
}
public static final int SCENE_ID_FIELD_NUMBER = 5;
private int sceneId_;
/**
* <code>uint32 scene_id = 5;</code>
* @return The sceneId.
*/
@java.lang.Override
public int getSceneId() {
return sceneId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -215,10 +215,10 @@ public final class SyncTeamEntityNotifyOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
for (int i = 0; i < teamEntityInfoList_.size(); i++) {
output.writeMessage(5, teamEntityInfoList_.get(i));
output.writeMessage(2, teamEntityInfoList_.get(i));
}
if (sceneId_ != 0) {
output.writeUInt32(6, sceneId_);
output.writeUInt32(5, sceneId_);
}
unknownFields.writeTo(output);
}
@@ -231,11 +231,11 @@ public final class SyncTeamEntityNotifyOuterClass {
size = 0;
for (int i = 0; i < teamEntityInfoList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(5, teamEntityInfoList_.get(i));
.computeMessageSize(2, teamEntityInfoList_.get(i));
}
if (sceneId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, sceneId_);
.computeUInt32Size(5, sceneId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -252,10 +252,10 @@ public final class SyncTeamEntityNotifyOuterClass {
}
emu.grasscutter.net.proto.SyncTeamEntityNotifyOuterClass.SyncTeamEntityNotify other = (emu.grasscutter.net.proto.SyncTeamEntityNotifyOuterClass.SyncTeamEntityNotify) obj;
if (getSceneId()
!= other.getSceneId()) return false;
if (!getTeamEntityInfoListList()
.equals(other.getTeamEntityInfoListList())) return false;
if (getSceneId()
!= other.getSceneId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -267,12 +267,12 @@ public final class SyncTeamEntityNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
hash = (53 * hash) + getSceneId();
if (getTeamEntityInfoListCount() > 0) {
hash = (37 * hash) + TEAM_ENTITY_INFO_LIST_FIELD_NUMBER;
hash = (53 * hash) + getTeamEntityInfoListList().hashCode();
}
hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
hash = (53 * hash) + getSceneId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -370,8 +370,8 @@ public final class SyncTeamEntityNotifyOuterClass {
}
/**
* <pre>
* Name: GHJLPNCDIHF
* CmdId: 393
* CmdId: 326
* Name: GDCDGDCNMLB
* </pre>
*
* Protobuf type {@code SyncTeamEntityNotify}
@@ -412,14 +412,14 @@ public final class SyncTeamEntityNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
sceneId_ = 0;
if (teamEntityInfoListBuilder_ == null) {
teamEntityInfoList_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001);
} else {
teamEntityInfoListBuilder_.clear();
}
sceneId_ = 0;
return this;
}
@@ -447,7 +447,6 @@ public final class SyncTeamEntityNotifyOuterClass {
public emu.grasscutter.net.proto.SyncTeamEntityNotifyOuterClass.SyncTeamEntityNotify buildPartial() {
emu.grasscutter.net.proto.SyncTeamEntityNotifyOuterClass.SyncTeamEntityNotify result = new emu.grasscutter.net.proto.SyncTeamEntityNotifyOuterClass.SyncTeamEntityNotify(this);
int from_bitField0_ = bitField0_;
result.sceneId_ = sceneId_;
if (teamEntityInfoListBuilder_ == null) {
if (((bitField0_ & 0x00000001) != 0)) {
teamEntityInfoList_ = java.util.Collections.unmodifiableList(teamEntityInfoList_);
@@ -457,6 +456,7 @@ public final class SyncTeamEntityNotifyOuterClass {
} else {
result.teamEntityInfoList_ = teamEntityInfoListBuilder_.build();
}
result.sceneId_ = sceneId_;
onBuilt();
return result;
}
@@ -505,9 +505,6 @@ public final class SyncTeamEntityNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.SyncTeamEntityNotifyOuterClass.SyncTeamEntityNotify other) {
if (other == emu.grasscutter.net.proto.SyncTeamEntityNotifyOuterClass.SyncTeamEntityNotify.getDefaultInstance()) return this;
if (other.getSceneId() != 0) {
setSceneId(other.getSceneId());
}
if (teamEntityInfoListBuilder_ == null) {
if (!other.teamEntityInfoList_.isEmpty()) {
if (teamEntityInfoList_.isEmpty()) {
@@ -534,6 +531,9 @@ public final class SyncTeamEntityNotifyOuterClass {
}
}
}
if (other.getSceneId() != 0) {
setSceneId(other.getSceneId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -564,37 +564,6 @@ public final class SyncTeamEntityNotifyOuterClass {
}
private int bitField0_;
private int sceneId_ ;
/**
* <code>uint32 scene_id = 6;</code>
* @return The sceneId.
*/
@java.lang.Override
public int getSceneId() {
return sceneId_;
}
/**
* <code>uint32 scene_id = 6;</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 = 6;</code>
* @return This builder for chaining.
*/
public Builder clearSceneId() {
sceneId_ = 0;
onChanged();
return this;
}
private java.util.List<emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo> teamEntityInfoList_ =
java.util.Collections.emptyList();
private void ensureTeamEntityInfoListIsMutable() {
@@ -608,7 +577,7 @@ public final class SyncTeamEntityNotifyOuterClass {
emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfoOrBuilder> teamEntityInfoListBuilder_;
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
public java.util.List<emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo> getTeamEntityInfoListList() {
if (teamEntityInfoListBuilder_ == null) {
@@ -618,7 +587,7 @@ public final class SyncTeamEntityNotifyOuterClass {
}
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
public int getTeamEntityInfoListCount() {
if (teamEntityInfoListBuilder_ == null) {
@@ -628,7 +597,7 @@ public final class SyncTeamEntityNotifyOuterClass {
}
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo getTeamEntityInfoList(int index) {
if (teamEntityInfoListBuilder_ == null) {
@@ -638,7 +607,7 @@ public final class SyncTeamEntityNotifyOuterClass {
}
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
public Builder setTeamEntityInfoList(
int index, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo value) {
@@ -655,7 +624,7 @@ public final class SyncTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
public Builder setTeamEntityInfoList(
int index, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder builderForValue) {
@@ -669,7 +638,7 @@ public final class SyncTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
public Builder addTeamEntityInfoList(emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo value) {
if (teamEntityInfoListBuilder_ == null) {
@@ -685,7 +654,7 @@ public final class SyncTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
public Builder addTeamEntityInfoList(
int index, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo value) {
@@ -702,7 +671,7 @@ public final class SyncTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
public Builder addTeamEntityInfoList(
emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder builderForValue) {
@@ -716,7 +685,7 @@ public final class SyncTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
public Builder addTeamEntityInfoList(
int index, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder builderForValue) {
@@ -730,7 +699,7 @@ public final class SyncTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
public Builder addAllTeamEntityInfoList(
java.lang.Iterable<? extends emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo> values) {
@@ -745,7 +714,7 @@ public final class SyncTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
public Builder clearTeamEntityInfoList() {
if (teamEntityInfoListBuilder_ == null) {
@@ -758,7 +727,7 @@ public final class SyncTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
public Builder removeTeamEntityInfoList(int index) {
if (teamEntityInfoListBuilder_ == null) {
@@ -771,14 +740,14 @@ public final class SyncTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder getTeamEntityInfoListBuilder(
int index) {
return getTeamEntityInfoListFieldBuilder().getBuilder(index);
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfoOrBuilder getTeamEntityInfoListOrBuilder(
int index) {
@@ -788,7 +757,7 @@ public final class SyncTeamEntityNotifyOuterClass {
}
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
public java.util.List<? extends emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfoOrBuilder>
getTeamEntityInfoListOrBuilderList() {
@@ -799,14 +768,14 @@ public final class SyncTeamEntityNotifyOuterClass {
}
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder addTeamEntityInfoListBuilder() {
return getTeamEntityInfoListFieldBuilder().addBuilder(
emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.getDefaultInstance());
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder addTeamEntityInfoListBuilder(
int index) {
@@ -814,7 +783,7 @@ public final class SyncTeamEntityNotifyOuterClass {
index, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.getDefaultInstance());
}
/**
* <code>repeated .TeamEntityInfo team_entity_info_list = 5;</code>
* <code>repeated .TeamEntityInfo team_entity_info_list = 2;</code>
*/
public java.util.List<emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder>
getTeamEntityInfoListBuilderList() {
@@ -834,6 +803,37 @@ public final class SyncTeamEntityNotifyOuterClass {
}
return teamEntityInfoListBuilder_;
}
private int sceneId_ ;
/**
* <code>uint32 scene_id = 5;</code>
* @return The sceneId.
*/
@java.lang.Override
public int getSceneId() {
return sceneId_;
}
/**
* <code>uint32 scene_id = 5;</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 = 5;</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) {
@@ -902,9 +902,9 @@ public final class SyncTeamEntityNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\032SyncTeamEntityNotify.proto\032\024TeamEntity" +
"Info.proto\"X\n\024SyncTeamEntityNotify\022\020\n\010sc" +
"ene_id\030\006 \001(\r\022.\n\025team_entity_info_list\030\005 " +
"\003(\0132\017.TeamEntityInfoB\033\n\031emu.grasscutter." +
"Info.proto\"X\n\024SyncTeamEntityNotify\022.\n\025te" +
"am_entity_info_list\030\002 \003(\0132\017.TeamEntityIn" +
"fo\022\020\n\010scene_id\030\005 \001(\rB\033\n\031emu.grasscutter." +
"net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -917,7 +917,7 @@ public final class SyncTeamEntityNotifyOuterClass {
internal_static_SyncTeamEntityNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_SyncTeamEntityNotify_descriptor,
new java.lang.String[] { "SceneId", "TeamEntityInfoList", });
new java.lang.String[] { "TeamEntityInfoList", "SceneId", });
emu.grasscutter.net.proto.TeamEntityInfoOuterClass.getDescriptor();
}