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

Upgrade to REL3.7 (#2164)

Browse Source 
* Remove hardcoded quest data

* Remove deprecated fields

* Try to fix packet

* Apply fix for token exchange

* Upgrade to REL3.7

* Add obfuscated protocol definitions

* Add missing enum (other protos too maybe)

* Re-add field setters and add note on removal
This commit is contained in:
Magix
2023-05-26 21:29:02 -07:00
committed by GitHub
Unverified
parent 19bf2dfc69
commit 71f6198361
1382 changed files with 227149 additions and 199653 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/SceneTeamUpdateNotifyOuterClass.java
+56 -56
View File
@@ -19,39 +19,39 @@ public final class SceneTeamUpdateNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
java.util.List<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar>
getSceneTeamAvatarListList();
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar getSceneTeamAvatarList(int index);
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
int getSceneTeamAvatarListCount();
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
java.util.List<? extends emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuilder>
getSceneTeamAvatarListOrBuilderList();
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuilder getSceneTeamAvatarListOrBuilder(
int index);
/**
* <code>bool is_in_mp = 4;</code>
* <code>bool is_in_mp = 13;</code>
* @return The isInMp.
*/
boolean getIsInMp();
}
/**
* <pre>
* CmdId: 1646
* Name: MJFGNJJDJDN
* CmdId: 1652
* Obf: BNPIBIMJIEG
* </pre>
*
* Protobuf type {@code SceneTeamUpdateNotify}
@@ -100,12 +100,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
case 0:
done = true;
break;
case 32: {
isInMp_ = input.readBool();
break;
}
case 58: {
case 66: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
sceneTeamAvatarList_ = new java.util.ArrayList<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar>();
mutable_bitField0_ |= 0x00000001;
@@ -114,6 +109,11 @@ 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,17 @@ public final class SceneTeamUpdateNotifyOuterClass {
emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify.class, emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify.Builder.class);
}
public static final int SCENE_TEAM_AVATAR_LIST_FIELD_NUMBER = 7;
public static final int SCENE_TEAM_AVATAR_LIST_FIELD_NUMBER = 8;
private java.util.List<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar> sceneTeamAvatarList_;
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
@java.lang.Override
public java.util.List<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar> getSceneTeamAvatarListList() {
return sceneTeamAvatarList_;
}
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
@java.lang.Override
public java.util.List<? extends emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuilder>
@@ -167,21 +167,21 @@ public final class SceneTeamUpdateNotifyOuterClass {
return sceneTeamAvatarList_;
}
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
@java.lang.Override
public int getSceneTeamAvatarListCount() {
return sceneTeamAvatarList_.size();
}
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar getSceneTeamAvatarList(int index) {
return sceneTeamAvatarList_.get(index);
}
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuilder getSceneTeamAvatarListOrBuilder(
@@ -189,10 +189,10 @@ public final class SceneTeamUpdateNotifyOuterClass {
return sceneTeamAvatarList_.get(index);
}
public static final int IS_IN_MP_FIELD_NUMBER = 4;
public static final int IS_IN_MP_FIELD_NUMBER = 13;
private boolean isInMp_;
/**
* <code>bool is_in_mp = 4;</code>
* <code>bool is_in_mp = 13;</code>
* @return The isInMp.
*/
@java.lang.Override
@@ -214,11 +214,11 @@ 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));
output.writeMessage(8, sceneTeamAvatarList_.get(i));
}
if (isInMp_ != false) {
output.writeBool(13, isInMp_);
}
unknownFields.writeTo(output);
}
@@ -229,13 +229,13 @@ 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));
.computeMessageSize(8, sceneTeamAvatarList_.get(i));
}
if (isInMp_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(13, isInMp_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -371,8 +371,8 @@ public final class SceneTeamUpdateNotifyOuterClass {
}
/**
* <pre>
* CmdId: 1646
* Name: MJFGNJJDJDN
* CmdId: 1652
* Obf: BNPIBIMJIEG
* </pre>
*
* Protobuf type {@code SceneTeamUpdateNotify}
@@ -578,7 +578,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar, emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder, emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuilder> sceneTeamAvatarListBuilder_;
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
public java.util.List<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar> getSceneTeamAvatarListList() {
if (sceneTeamAvatarListBuilder_ == null) {
@@ -588,7 +588,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
}
}
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
public int getSceneTeamAvatarListCount() {
if (sceneTeamAvatarListBuilder_ == null) {
@@ -598,7 +598,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
}
}
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar getSceneTeamAvatarList(int index) {
if (sceneTeamAvatarListBuilder_ == null) {
@@ -608,7 +608,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
}
}
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
public Builder setSceneTeamAvatarList(
int index, emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar value) {
@@ -625,7 +625,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
return this;
}
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
public Builder setSceneTeamAvatarList(
int index, emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder builderForValue) {
@@ -639,7 +639,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
return this;
}
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
public Builder addSceneTeamAvatarList(emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar value) {
if (sceneTeamAvatarListBuilder_ == null) {
@@ -655,7 +655,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
return this;
}
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
public Builder addSceneTeamAvatarList(
int index, emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar value) {
@@ -672,7 +672,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
return this;
}
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
public Builder addSceneTeamAvatarList(
emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder builderForValue) {
@@ -686,7 +686,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
return this;
}
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
public Builder addSceneTeamAvatarList(
int index, emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder builderForValue) {
@@ -700,7 +700,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
return this;
}
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
public Builder addAllSceneTeamAvatarList(
java.lang.Iterable<? extends emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar> values) {
@@ -715,7 +715,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
return this;
}
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
public Builder clearSceneTeamAvatarList() {
if (sceneTeamAvatarListBuilder_ == null) {
@@ -728,7 +728,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
return this;
}
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
public Builder removeSceneTeamAvatarList(int index) {
if (sceneTeamAvatarListBuilder_ == null) {
@@ -741,14 +741,14 @@ public final class SceneTeamUpdateNotifyOuterClass {
return this;
}
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder getSceneTeamAvatarListBuilder(
int index) {
return getSceneTeamAvatarListFieldBuilder().getBuilder(index);
}
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuilder getSceneTeamAvatarListOrBuilder(
int index) {
@@ -758,7 +758,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
}
}
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
public java.util.List<? extends emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuilder>
getSceneTeamAvatarListOrBuilderList() {
@@ -769,14 +769,14 @@ public final class SceneTeamUpdateNotifyOuterClass {
}
}
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder addSceneTeamAvatarListBuilder() {
return getSceneTeamAvatarListFieldBuilder().addBuilder(
emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.getDefaultInstance());
}
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder addSceneTeamAvatarListBuilder(
int index) {
@@ -784,7 +784,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
index, emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.getDefaultInstance());
}
/**
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 7;</code>
* <code>repeated .SceneTeamAvatar scene_team_avatar_list = 8;</code>
*/
public java.util.List<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder>
getSceneTeamAvatarListBuilderList() {
@@ -807,7 +807,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
private boolean isInMp_ ;
/**
* <code>bool is_in_mp = 4;</code>
* <code>bool is_in_mp = 13;</code>
* @return The isInMp.
*/
@java.lang.Override
@@ -815,7 +815,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
return isInMp_;
}
/**
* <code>bool is_in_mp = 4;</code>
* <code>bool is_in_mp = 13;</code>
* @param value The isInMp to set.
* @return This builder for chaining.
*/
@@ -826,7 +826,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
return this;
}
/**
* <code>bool is_in_mp = 4;</code>
* <code>bool is_in_mp = 13;</code>
* @return This builder for chaining.
*/
public Builder clearIsInMp() {
@@ -904,8 +904,8 @@ public final class SceneTeamUpdateNotifyOuterClass {
java.lang.String[] descriptorData = {
"\n\033SceneTeamUpdateNotify.proto\032\025SceneTeam" +
"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" +
"\026scene_team_avatar_list\030\010 \003(\0132\020.SceneTea" +
"mAvatar\022\020\n\010is_in_mp\030\r \001(\010B\033\n\031emu.grasscu" +
"tter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor