Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 09:54:14 +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/DelTeamEntityNotifyOuterClass.java
+68 -68
View File
@@ -18,12 +18,6 @@ public final class DelTeamEntityNotifyOuterClass {
// @@protoc_insertion_point(interface_extends:DelTeamEntityNotify)
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 scene_id = 15;</code>
* @return The sceneId.
*/
int getSceneId();
/**
* <code>repeated uint32 del_entity_id_list = 1;</code>
* @return A list containing the delEntityIdList.
@@ -40,11 +34,17 @@ public final class DelTeamEntityNotifyOuterClass {
* @return The delEntityIdList at the given index.
*/
int getDelEntityIdList(int index);
/**
* <code>uint32 scene_id = 8;</code>
* @return The sceneId.
*/
int getSceneId();
}
/**
* <pre>
* Name: DIEEAFMCPBM
* CmdId: 330
* CmdId: 340
* Name: LLAEAGCDEND
* </pre>
*
* Protobuf type {@code DelTeamEntityNotify}
@@ -114,7 +114,7 @@ public final class DelTeamEntityNotifyOuterClass {
input.popLimit(limit);
break;
}
case 120: {
case 64: {
sceneId_ = input.readUInt32();
break;
@@ -154,17 +154,6 @@ public final class DelTeamEntityNotifyOuterClass {
emu.grasscutter.net.proto.DelTeamEntityNotifyOuterClass.DelTeamEntityNotify.class, emu.grasscutter.net.proto.DelTeamEntityNotifyOuterClass.DelTeamEntityNotify.Builder.class);
}
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 DEL_ENTITY_ID_LIST_FIELD_NUMBER = 1;
private com.google.protobuf.Internal.IntList delEntityIdList_;
/**
@@ -193,6 +182,17 @@ public final class DelTeamEntityNotifyOuterClass {
}
private int delEntityIdListMemoizedSerializedSize = -1;
public static final int SCENE_ID_FIELD_NUMBER = 8;
private int sceneId_;
/**
* <code>uint32 scene_id = 8;</code>
* @return The sceneId.
*/
@java.lang.Override
public int getSceneId() {
return sceneId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -216,7 +216,7 @@ public final class DelTeamEntityNotifyOuterClass {
output.writeUInt32NoTag(delEntityIdList_.getInt(i));
}
if (sceneId_ != 0) {
output.writeUInt32(15, sceneId_);
output.writeUInt32(8, sceneId_);
}
unknownFields.writeTo(output);
}
@@ -243,7 +243,7 @@ public final class DelTeamEntityNotifyOuterClass {
}
if (sceneId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, sceneId_);
.computeUInt32Size(8, sceneId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -260,10 +260,10 @@ public final class DelTeamEntityNotifyOuterClass {
}
emu.grasscutter.net.proto.DelTeamEntityNotifyOuterClass.DelTeamEntityNotify other = (emu.grasscutter.net.proto.DelTeamEntityNotifyOuterClass.DelTeamEntityNotify) obj;
if (getSceneId()
!= other.getSceneId()) return false;
if (!getDelEntityIdListList()
.equals(other.getDelEntityIdListList())) return false;
if (getSceneId()
!= other.getSceneId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -275,12 +275,12 @@ public final class DelTeamEntityNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
hash = (53 * hash) + getSceneId();
if (getDelEntityIdListCount() > 0) {
hash = (37 * hash) + DEL_ENTITY_ID_LIST_FIELD_NUMBER;
hash = (53 * hash) + getDelEntityIdListList().hashCode();
}
hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
hash = (53 * hash) + getSceneId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -378,8 +378,8 @@ public final class DelTeamEntityNotifyOuterClass {
}
/**
* <pre>
* Name: DIEEAFMCPBM
* CmdId: 330
* CmdId: 340
* Name: LLAEAGCDEND
* </pre>
*
* Protobuf type {@code DelTeamEntityNotify}
@@ -419,10 +419,10 @@ public final class DelTeamEntityNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
sceneId_ = 0;
delEntityIdList_ = emptyIntList();
bitField0_ = (bitField0_ & ~0x00000001);
sceneId_ = 0;
return this;
}
@@ -450,12 +450,12 @@ public final class DelTeamEntityNotifyOuterClass {
public emu.grasscutter.net.proto.DelTeamEntityNotifyOuterClass.DelTeamEntityNotify buildPartial() {
emu.grasscutter.net.proto.DelTeamEntityNotifyOuterClass.DelTeamEntityNotify result = new emu.grasscutter.net.proto.DelTeamEntityNotifyOuterClass.DelTeamEntityNotify(this);
int from_bitField0_ = bitField0_;
result.sceneId_ = sceneId_;
if (((bitField0_ & 0x00000001) != 0)) {
delEntityIdList_.makeImmutable();
bitField0_ = (bitField0_ & ~0x00000001);
}
result.delEntityIdList_ = delEntityIdList_;
result.sceneId_ = sceneId_;
onBuilt();
return result;
}
@@ -504,9 +504,6 @@ public final class DelTeamEntityNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.DelTeamEntityNotifyOuterClass.DelTeamEntityNotify other) {
if (other == emu.grasscutter.net.proto.DelTeamEntityNotifyOuterClass.DelTeamEntityNotify.getDefaultInstance()) return this;
if (other.getSceneId() != 0) {
setSceneId(other.getSceneId());
}
if (!other.delEntityIdList_.isEmpty()) {
if (delEntityIdList_.isEmpty()) {
delEntityIdList_ = other.delEntityIdList_;
@@ -517,6 +514,9 @@ public final class DelTeamEntityNotifyOuterClass {
}
onChanged();
}
if (other.getSceneId() != 0) {
setSceneId(other.getSceneId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -547,37 +547,6 @@ public final class DelTeamEntityNotifyOuterClass {
}
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 com.google.protobuf.Internal.IntList delEntityIdList_ = emptyIntList();
private void ensureDelEntityIdListIsMutable() {
if (!((bitField0_ & 0x00000001) != 0)) {
@@ -656,6 +625,37 @@ public final class DelTeamEntityNotifyOuterClass {
onChanged();
return this;
}
private int sceneId_ ;
/**
* <code>uint32 scene_id = 8;</code>
* @return The sceneId.
*/
@java.lang.Override
public int getSceneId() {
return sceneId_;
}
/**
* <code>uint32 scene_id = 8;</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 = 8;</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) {
@@ -724,8 +724,8 @@ public final class DelTeamEntityNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\031DelTeamEntityNotify.proto\"C\n\023DelTeamEn" +
"tityNotify\022\020\n\010scene_id\030\017 \001(\r\022\032\n\022del_enti" +
"ty_id_list\030\001 \003(\rB\033\n\031emu.grasscutter.net." +
"tityNotify\022\032\n\022del_entity_id_list\030\001 \003(\r\022\020" +
"\n\010scene_id\030\010 \001(\rB\033\n\031emu.grasscutter.net." +
"protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -737,7 +737,7 @@ public final class DelTeamEntityNotifyOuterClass {
internal_static_DelTeamEntityNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_DelTeamEntityNotify_descriptor,
new java.lang.String[] { "SceneId", "DelEntityIdList", });
new java.lang.String[] { "DelEntityIdList", "SceneId", });
}
// @@protoc_insertion_point(outer_class_scope)