Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 19:43:45 +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/TeamEntityInfoOuterClass.java
+50 -50
View File
@@ -19,35 +19,35 @@ public final class TeamEntityInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 team_entity_id = 6;</code>
* <code>uint32 team_entity_id = 8;</code>
* @return The teamEntityId.
*/
int getTeamEntityId();
/**
* <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
* @return Whether the teamAbilityInfo field is set.
*/
boolean hasTeamAbilityInfo();
/**
* <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
* @return The teamAbilityInfo.
*/
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getTeamAbilityInfo();
/**
* <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
*/
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder();
/**
* <code>uint32 authority_peer_id = 9;</code>
* <code>uint32 authority_peer_id = 2;</code>
* @return The authorityPeerId.
*/
int getAuthorityPeerId();
}
/**
* <pre>
* Name: AKBGENMICHJ
* Obf: OABINEMNKPI
* </pre>
*
* Protobuf type {@code TeamEntityInfo}
@@ -94,17 +94,12 @@ public final class TeamEntityInfoOuterClass {
case 0:
done = true;
break;
case 48: {
teamEntityId_ = input.readUInt32();
break;
}
case 72: {
case 16: {
authorityPeerId_ = input.readUInt32();
break;
}
case 106: {
case 42: {
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder subBuilder = null;
if (teamAbilityInfo_ != null) {
subBuilder = teamAbilityInfo_.toBuilder();
@@ -117,6 +112,11 @@ public final class TeamEntityInfoOuterClass {
break;
}
case 64: {
teamEntityId_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -149,10 +149,10 @@ public final class TeamEntityInfoOuterClass {
emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.class, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder.class);
}
public static final int TEAM_ENTITY_ID_FIELD_NUMBER = 6;
public static final int TEAM_ENTITY_ID_FIELD_NUMBER = 8;
private int teamEntityId_;
/**
* <code>uint32 team_entity_id = 6;</code>
* <code>uint32 team_entity_id = 8;</code>
* @return The teamEntityId.
*/
@java.lang.Override
@@ -160,10 +160,10 @@ public final class TeamEntityInfoOuterClass {
return teamEntityId_;
}
public static final int TEAM_ABILITY_INFO_FIELD_NUMBER = 13;
public static final int TEAM_ABILITY_INFO_FIELD_NUMBER = 5;
private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo teamAbilityInfo_;
/**
* <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
* @return Whether the teamAbilityInfo field is set.
*/
@java.lang.Override
@@ -171,7 +171,7 @@ public final class TeamEntityInfoOuterClass {
return teamAbilityInfo_ != null;
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
* @return The teamAbilityInfo.
*/
@java.lang.Override
@@ -179,17 +179,17 @@ public final class TeamEntityInfoOuterClass {
return teamAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : teamAbilityInfo_;
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder() {
return getTeamAbilityInfo();
}
public static final int AUTHORITY_PEER_ID_FIELD_NUMBER = 9;
public static final int AUTHORITY_PEER_ID_FIELD_NUMBER = 2;
private int authorityPeerId_;
/**
* <code>uint32 authority_peer_id = 9;</code>
* <code>uint32 authority_peer_id = 2;</code>
* @return The authorityPeerId.
*/
@java.lang.Override
@@ -211,14 +211,14 @@ public final class TeamEntityInfoOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (teamEntityId_ != 0) {
output.writeUInt32(6, teamEntityId_);
}
if (authorityPeerId_ != 0) {
output.writeUInt32(9, authorityPeerId_);
output.writeUInt32(2, authorityPeerId_);
}
if (teamAbilityInfo_ != null) {
output.writeMessage(13, getTeamAbilityInfo());
output.writeMessage(5, getTeamAbilityInfo());
}
if (teamEntityId_ != 0) {
output.writeUInt32(8, teamEntityId_);
}
unknownFields.writeTo(output);
}
@@ -229,17 +229,17 @@ public final class TeamEntityInfoOuterClass {
if (size != -1) return size;
size = 0;
if (teamEntityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, teamEntityId_);
}
if (authorityPeerId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, authorityPeerId_);
.computeUInt32Size(2, authorityPeerId_);
}
if (teamAbilityInfo_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(13, getTeamAbilityInfo());
.computeMessageSize(5, getTeamAbilityInfo());
}
if (teamEntityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(8, teamEntityId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -381,7 +381,7 @@ public final class TeamEntityInfoOuterClass {
}
/**
* <pre>
* Name: AKBGENMICHJ
* Obf: OABINEMNKPI
* </pre>
*
* Protobuf type {@code TeamEntityInfo}
@@ -552,7 +552,7 @@ public final class TeamEntityInfoOuterClass {
private int teamEntityId_ ;
/**
* <code>uint32 team_entity_id = 6;</code>
* <code>uint32 team_entity_id = 8;</code>
* @return The teamEntityId.
*/
@java.lang.Override
@@ -560,7 +560,7 @@ public final class TeamEntityInfoOuterClass {
return teamEntityId_;
}
/**
* <code>uint32 team_entity_id = 6;</code>
* <code>uint32 team_entity_id = 8;</code>
* @param value The teamEntityId to set.
* @return This builder for chaining.
*/
@@ -571,7 +571,7 @@ public final class TeamEntityInfoOuterClass {
return this;
}
/**
* <code>uint32 team_entity_id = 6;</code>
* <code>uint32 team_entity_id = 8;</code>
* @return This builder for chaining.
*/
public Builder clearTeamEntityId() {
@@ -585,14 +585,14 @@ public final class TeamEntityInfoOuterClass {
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> teamAbilityInfoBuilder_;
/**
* <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
* @return Whether the teamAbilityInfo field is set.
*/
public boolean hasTeamAbilityInfo() {
return teamAbilityInfoBuilder_ != null || teamAbilityInfo_ != null;
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
* @return The teamAbilityInfo.
*/
public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getTeamAbilityInfo() {
@@ -603,7 +603,7 @@ public final class TeamEntityInfoOuterClass {
}
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
*/
public Builder setTeamAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
if (teamAbilityInfoBuilder_ == null) {
@@ -619,7 +619,7 @@ public final class TeamEntityInfoOuterClass {
return this;
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
*/
public Builder setTeamAbilityInfo(
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
@@ -633,7 +633,7 @@ public final class TeamEntityInfoOuterClass {
return this;
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
*/
public Builder mergeTeamAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
if (teamAbilityInfoBuilder_ == null) {
@@ -651,7 +651,7 @@ public final class TeamEntityInfoOuterClass {
return this;
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
*/
public Builder clearTeamAbilityInfo() {
if (teamAbilityInfoBuilder_ == null) {
@@ -665,7 +665,7 @@ public final class TeamEntityInfoOuterClass {
return this;
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
*/
public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getTeamAbilityInfoBuilder() {
@@ -673,7 +673,7 @@ public final class TeamEntityInfoOuterClass {
return getTeamAbilityInfoFieldBuilder().getBuilder();
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
*/
public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder() {
if (teamAbilityInfoBuilder_ != null) {
@@ -684,7 +684,7 @@ public final class TeamEntityInfoOuterClass {
}
}
/**
* <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
* <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder>
@@ -702,7 +702,7 @@ public final class TeamEntityInfoOuterClass {
private int authorityPeerId_ ;
/**
* <code>uint32 authority_peer_id = 9;</code>
* <code>uint32 authority_peer_id = 2;</code>
* @return The authorityPeerId.
*/
@java.lang.Override
@@ -710,7 +710,7 @@ public final class TeamEntityInfoOuterClass {
return authorityPeerId_;
}
/**
* <code>uint32 authority_peer_id = 9;</code>
* <code>uint32 authority_peer_id = 2;</code>
* @param value The authorityPeerId to set.
* @return This builder for chaining.
*/
@@ -721,7 +721,7 @@ public final class TeamEntityInfoOuterClass {
return this;
}
/**
* <code>uint32 authority_peer_id = 9;</code>
* <code>uint32 authority_peer_id = 2;</code>
* @return This builder for chaining.
*/
public Builder clearAuthorityPeerId() {
@@ -799,9 +799,9 @@ public final class TeamEntityInfoOuterClass {
java.lang.String[] descriptorData = {
"\n\024TeamEntityInfo.proto\032\032AbilitySyncState" +
"Info.proto\"u\n\016TeamEntityInfo\022\026\n\016team_ent" +
"ity_id\030\006 \001(\r\0220\n\021team_ability_info\030\r \001(\0132" +
"ity_id\030\010 \001(\r\0220\n\021team_ability_info\030\005 \001(\0132" +
"\025.AbilitySyncStateInfo\022\031\n\021authority_peer" +
"_id\030\t \001(\rB\033\n\031emu.grasscutter.net.protob\006" +
"_id\030\002 \001(\rB\033\n\031emu.grasscutter.net.protob\006" +
"proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor