Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 23:51:25 +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/SyncScenePlayTeamEntityNotifyOuterClass.java
+101 -101
View File
@@ -19,39 +19,39 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>uint32 scene_id = 15;</code>
* @return The sceneId.
*/
int getSceneId();
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
java.util.List<emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo>
getEntityInfoListList();
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo getEntityInfoList(int index);
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
int getEntityInfoListCount();
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
java.util.List<? extends emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfoOrBuilder>
getEntityInfoListOrBuilderList();
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfoOrBuilder getEntityInfoListOrBuilder(
int index);
/**
* <code>uint32 scene_id = 14;</code>
* @return The sceneId.
*/
int getSceneId();
}
/**
* <pre>
* Name: GFENDIBMJBG
* CmdId: 3362
* CmdId: 3170
* Name: IJAJCEENKHC
* </pre>
*
* Protobuf type {@code SyncScenePlayTeamEntityNotify}
@@ -100,7 +100,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
case 0:
done = true;
break;
case 98: {
case 106: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
entityInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo>();
mutable_bitField0_ |= 0x00000001;
@@ -109,7 +109,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
input.readMessage(emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo.parser(), extensionRegistry));
break;
}
case 112: {
case 120: {
sceneId_ = input.readUInt32();
break;
@@ -149,17 +149,28 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
emu.grasscutter.net.proto.SyncScenePlayTeamEntityNotifyOuterClass.SyncScenePlayTeamEntityNotify.class, emu.grasscutter.net.proto.SyncScenePlayTeamEntityNotifyOuterClass.SyncScenePlayTeamEntityNotify.Builder.class);
}
public static final int ENTITY_INFO_LIST_FIELD_NUMBER = 12;
public static final int SCENE_ID_FIELD_NUMBER = 15;
private int sceneId_;
/**
* <code>uint32 scene_id = 15;</code>
* @return The sceneId.
*/
@java.lang.Override
public int getSceneId() {
return sceneId_;
}
public static final int ENTITY_INFO_LIST_FIELD_NUMBER = 13;
private java.util.List<emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo> entityInfoList_;
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
@java.lang.Override
public java.util.List<emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo> getEntityInfoListList() {
return entityInfoList_;
}
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
@java.lang.Override
public java.util.List<? extends emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfoOrBuilder>
@@ -167,21 +178,21 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
return entityInfoList_;
}
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
@java.lang.Override
public int getEntityInfoListCount() {
return entityInfoList_.size();
}
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo getEntityInfoList(int index) {
return entityInfoList_.get(index);
}
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfoOrBuilder getEntityInfoListOrBuilder(
@@ -189,17 +200,6 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
return entityInfoList_.get(index);
}
public static final int SCENE_ID_FIELD_NUMBER = 14;
private int sceneId_;
/**
* <code>uint32 scene_id = 14;</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 SyncScenePlayTeamEntityNotifyOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
for (int i = 0; i < entityInfoList_.size(); i++) {
output.writeMessage(12, entityInfoList_.get(i));
output.writeMessage(13, entityInfoList_.get(i));
}
if (sceneId_ != 0) {
output.writeUInt32(14, sceneId_);
output.writeUInt32(15, sceneId_);
}
unknownFields.writeTo(output);
}
@@ -231,11 +231,11 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
size = 0;
for (int i = 0; i < entityInfoList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(12, entityInfoList_.get(i));
.computeMessageSize(13, entityInfoList_.get(i));
}
if (sceneId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, sceneId_);
.computeUInt32Size(15, sceneId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -252,10 +252,10 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
}
emu.grasscutter.net.proto.SyncScenePlayTeamEntityNotifyOuterClass.SyncScenePlayTeamEntityNotify other = (emu.grasscutter.net.proto.SyncScenePlayTeamEntityNotifyOuterClass.SyncScenePlayTeamEntityNotify) obj;
if (!getEntityInfoListList()
.equals(other.getEntityInfoListList())) return false;
if (getSceneId()
!= other.getSceneId()) return false;
if (!getEntityInfoListList()
.equals(other.getEntityInfoListList())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -267,12 +267,12 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
hash = (53 * hash) + getSceneId();
if (getEntityInfoListCount() > 0) {
hash = (37 * hash) + ENTITY_INFO_LIST_FIELD_NUMBER;
hash = (53 * hash) + getEntityInfoListList().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 SyncScenePlayTeamEntityNotifyOuterClass {
}
/**
* <pre>
* Name: GFENDIBMJBG
* CmdId: 3362
* CmdId: 3170
* Name: IJAJCEENKHC
* </pre>
*
* Protobuf type {@code SyncScenePlayTeamEntityNotify}
@@ -412,14 +412,14 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
sceneId_ = 0;
if (entityInfoListBuilder_ == null) {
entityInfoList_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001);
} else {
entityInfoListBuilder_.clear();
}
sceneId_ = 0;
return this;
}
@@ -447,6 +447,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
public emu.grasscutter.net.proto.SyncScenePlayTeamEntityNotifyOuterClass.SyncScenePlayTeamEntityNotify buildPartial() {
emu.grasscutter.net.proto.SyncScenePlayTeamEntityNotifyOuterClass.SyncScenePlayTeamEntityNotify result = new emu.grasscutter.net.proto.SyncScenePlayTeamEntityNotifyOuterClass.SyncScenePlayTeamEntityNotify(this);
int from_bitField0_ = bitField0_;
result.sceneId_ = sceneId_;
if (entityInfoListBuilder_ == null) {
if (((bitField0_ & 0x00000001) != 0)) {
entityInfoList_ = java.util.Collections.unmodifiableList(entityInfoList_);
@@ -456,7 +457,6 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
} else {
result.entityInfoList_ = entityInfoListBuilder_.build();
}
result.sceneId_ = sceneId_;
onBuilt();
return result;
}
@@ -505,6 +505,9 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.SyncScenePlayTeamEntityNotifyOuterClass.SyncScenePlayTeamEntityNotify other) {
if (other == emu.grasscutter.net.proto.SyncScenePlayTeamEntityNotifyOuterClass.SyncScenePlayTeamEntityNotify.getDefaultInstance()) return this;
if (other.getSceneId() != 0) {
setSceneId(other.getSceneId());
}
if (entityInfoListBuilder_ == null) {
if (!other.entityInfoList_.isEmpty()) {
if (entityInfoList_.isEmpty()) {
@@ -531,9 +534,6 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
}
}
}
if (other.getSceneId() != 0) {
setSceneId(other.getSceneId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -564,6 +564,37 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
}
private int bitField0_;
private int sceneId_ ;
/**
* <code>uint32 scene_id = 15;</code>
* @return The sceneId.
*/
@java.lang.Override
public int getSceneId() {
return sceneId_;
}
/**
* <code>uint32 scene_id = 15;</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 = 15;</code>
* @return This builder for chaining.
*/
public Builder clearSceneId() {
sceneId_ = 0;
onChanged();
return this;
}
private java.util.List<emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo> entityInfoList_ =
java.util.Collections.emptyList();
private void ensureEntityInfoListIsMutable() {
@@ -577,7 +608,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo, emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo.Builder, emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfoOrBuilder> entityInfoListBuilder_;
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
public java.util.List<emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo> getEntityInfoListList() {
if (entityInfoListBuilder_ == null) {
@@ -587,7 +618,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
}
}
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
public int getEntityInfoListCount() {
if (entityInfoListBuilder_ == null) {
@@ -597,7 +628,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
}
}
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
public emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo getEntityInfoList(int index) {
if (entityInfoListBuilder_ == null) {
@@ -607,7 +638,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
}
}
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
public Builder setEntityInfoList(
int index, emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo value) {
@@ -624,7 +655,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
public Builder setEntityInfoList(
int index, emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo.Builder builderForValue) {
@@ -638,7 +669,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
public Builder addEntityInfoList(emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo value) {
if (entityInfoListBuilder_ == null) {
@@ -654,7 +685,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
public Builder addEntityInfoList(
int index, emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo value) {
@@ -671,7 +702,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
public Builder addEntityInfoList(
emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo.Builder builderForValue) {
@@ -685,7 +716,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
public Builder addEntityInfoList(
int index, emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo.Builder builderForValue) {
@@ -699,7 +730,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
public Builder addAllEntityInfoList(
java.lang.Iterable<? extends emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo> values) {
@@ -714,7 +745,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
public Builder clearEntityInfoList() {
if (entityInfoListBuilder_ == null) {
@@ -727,7 +758,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
public Builder removeEntityInfoList(int index) {
if (entityInfoListBuilder_ == null) {
@@ -740,14 +771,14 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
public emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo.Builder getEntityInfoListBuilder(
int index) {
return getEntityInfoListFieldBuilder().getBuilder(index);
}
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
public emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfoOrBuilder getEntityInfoListOrBuilder(
int index) {
@@ -757,7 +788,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
}
}
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
public java.util.List<? extends emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfoOrBuilder>
getEntityInfoListOrBuilderList() {
@@ -768,14 +799,14 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
}
}
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
public emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo.Builder addEntityInfoListBuilder() {
return getEntityInfoListFieldBuilder().addBuilder(
emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo.getDefaultInstance());
}
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
public emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo.Builder addEntityInfoListBuilder(
int index) {
@@ -783,7 +814,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
index, emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo.getDefaultInstance());
}
/**
* <code>repeated .PlayTeamEntityInfo entity_info_list = 12;</code>
* <code>repeated .PlayTeamEntityInfo entity_info_list = 13;</code>
*/
public java.util.List<emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo.Builder>
getEntityInfoListBuilderList() {
@@ -803,37 +834,6 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
}
return entityInfoListBuilder_;
}
private int sceneId_ ;
/**
* <code>uint32 scene_id = 14;</code>
* @return The sceneId.
*/
@java.lang.Override
public int getSceneId() {
return sceneId_;
}
/**
* <code>uint32 scene_id = 14;</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 = 14;</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) {
@@ -903,9 +903,9 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
java.lang.String[] descriptorData = {
"\n#SyncScenePlayTeamEntityNotify.proto\032\030P" +
"layTeamEntityInfo.proto\"`\n\035SyncScenePlay" +
"TeamEntityNotify\022-\n\020entity_info_list\030\014 \003" +
"(\0132\023.PlayTeamEntityInfo\022\020\n\010scene_id\030\016 \001(" +
"\rB\033\n\031emu.grasscutter.net.protob\006proto3"
"TeamEntityNotify\022\020\n\010scene_id\030\017 \001(\r\022-\n\020en" +
"tity_info_list\030\r \003(\0132\023.PlayTeamEntityInf" +
"oB\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -917,7 +917,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
internal_static_SyncScenePlayTeamEntityNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_SyncScenePlayTeamEntityNotify_descriptor,
new java.lang.String[] { "EntityInfoList", "SceneId", });
new java.lang.String[] { "SceneId", "EntityInfoList", });
emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.getDescriptor();
}