Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-18 13:29:53 +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/AbilityChangeNotifyOuterClass.java
+43 -43
View File
@@ -19,30 +19,30 @@ public final class AbilityChangeNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 entity_id = 11;</code>
* <code>uint32 entity_id = 10;</code>
* @return The entityId.
*/
int getEntityId();
/**
* <code>.AbilityControlBlock ability_control_block = 15;</code>
* <code>.AbilityControlBlock ability_control_block = 2;</code>
* @return Whether the abilityControlBlock field is set.
*/
boolean hasAbilityControlBlock();
/**
* <code>.AbilityControlBlock ability_control_block = 15;</code>
* <code>.AbilityControlBlock ability_control_block = 2;</code>
* @return The abilityControlBlock.
*/
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock();
/**
* <code>.AbilityControlBlock ability_control_block = 15;</code>
* <code>.AbilityControlBlock ability_control_block = 2;</code>
*/
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder();
}
/**
* <pre>
* CmdId: 1159
* Name: BOGDLGCDJGN
* CmdId: 1184
* Obf: PLMKKNIJMEC
* </pre>
*
* Protobuf type {@code AbilityChangeNotify}
@@ -89,12 +89,7 @@ public final class AbilityChangeNotifyOuterClass {
case 0:
done = true;
break;
case 88: {
entityId_ = input.readUInt32();
break;
}
case 122: {
case 18: {
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder subBuilder = null;
if (abilityControlBlock_ != null) {
subBuilder = abilityControlBlock_.toBuilder();
@@ -107,6 +102,11 @@ public final class AbilityChangeNotifyOuterClass {
break;
}
case 80: {
entityId_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -139,10 +139,10 @@ public final class AbilityChangeNotifyOuterClass {
emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify.class, emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify.Builder.class);
}
public static final int ENTITY_ID_FIELD_NUMBER = 11;
public static final int ENTITY_ID_FIELD_NUMBER = 10;
private int entityId_;
/**
* <code>uint32 entity_id = 11;</code>
* <code>uint32 entity_id = 10;</code>
* @return The entityId.
*/
@java.lang.Override
@@ -150,10 +150,10 @@ public final class AbilityChangeNotifyOuterClass {
return entityId_;
}
public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 15;
public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 2;
private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
/**
* <code>.AbilityControlBlock ability_control_block = 15;</code>
* <code>.AbilityControlBlock ability_control_block = 2;</code>
* @return Whether the abilityControlBlock field is set.
*/
@java.lang.Override
@@ -161,7 +161,7 @@ public final class AbilityChangeNotifyOuterClass {
return abilityControlBlock_ != null;
}
/**
* <code>.AbilityControlBlock ability_control_block = 15;</code>
* <code>.AbilityControlBlock ability_control_block = 2;</code>
* @return The abilityControlBlock.
*/
@java.lang.Override
@@ -169,7 +169,7 @@ public final class AbilityChangeNotifyOuterClass {
return abilityControlBlock_ == null ? emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
}
/**
* <code>.AbilityControlBlock ability_control_block = 15;</code>
* <code>.AbilityControlBlock ability_control_block = 2;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
@@ -190,11 +190,11 @@ public final class AbilityChangeNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (entityId_ != 0) {
output.writeUInt32(11, entityId_);
}
if (abilityControlBlock_ != null) {
output.writeMessage(15, getAbilityControlBlock());
output.writeMessage(2, getAbilityControlBlock());
}
if (entityId_ != 0) {
output.writeUInt32(10, entityId_);
}
unknownFields.writeTo(output);
}
@@ -205,13 +205,13 @@ public final class AbilityChangeNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (entityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, entityId_);
}
if (abilityControlBlock_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(15, getAbilityControlBlock());
.computeMessageSize(2, getAbilityControlBlock());
}
if (entityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, entityId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -349,8 +349,8 @@ public final class AbilityChangeNotifyOuterClass {
}
/**
* <pre>
* CmdId: 1159
* Name: BOGDLGCDJGN
* CmdId: 1184
* Obf: PLMKKNIJMEC
* </pre>
*
* Protobuf type {@code AbilityChangeNotify}
@@ -515,7 +515,7 @@ public final class AbilityChangeNotifyOuterClass {
private int entityId_ ;
/**
* <code>uint32 entity_id = 11;</code>
* <code>uint32 entity_id = 10;</code>
* @return The entityId.
*/
@java.lang.Override
@@ -523,7 +523,7 @@ public final class AbilityChangeNotifyOuterClass {
return entityId_;
}
/**
* <code>uint32 entity_id = 11;</code>
* <code>uint32 entity_id = 10;</code>
* @param value The entityId to set.
* @return This builder for chaining.
*/
@@ -534,7 +534,7 @@ public final class AbilityChangeNotifyOuterClass {
return this;
}
/**
* <code>uint32 entity_id = 11;</code>
* <code>uint32 entity_id = 10;</code>
* @return This builder for chaining.
*/
public Builder clearEntityId() {
@@ -548,14 +548,14 @@ public final class AbilityChangeNotifyOuterClass {
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder> abilityControlBlockBuilder_;
/**
* <code>.AbilityControlBlock ability_control_block = 15;</code>
* <code>.AbilityControlBlock ability_control_block = 2;</code>
* @return Whether the abilityControlBlock field is set.
*/
public boolean hasAbilityControlBlock() {
return abilityControlBlockBuilder_ != null || abilityControlBlock_ != null;
}
/**
* <code>.AbilityControlBlock ability_control_block = 15;</code>
* <code>.AbilityControlBlock ability_control_block = 2;</code>
* @return The abilityControlBlock.
*/
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock() {
@@ -566,7 +566,7 @@ public final class AbilityChangeNotifyOuterClass {
}
}
/**
* <code>.AbilityControlBlock ability_control_block = 15;</code>
* <code>.AbilityControlBlock ability_control_block = 2;</code>
*/
public Builder setAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
if (abilityControlBlockBuilder_ == null) {
@@ -582,7 +582,7 @@ public final class AbilityChangeNotifyOuterClass {
return this;
}
/**
* <code>.AbilityControlBlock ability_control_block = 15;</code>
* <code>.AbilityControlBlock ability_control_block = 2;</code>
*/
public Builder setAbilityControlBlock(
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder builderForValue) {
@@ -596,7 +596,7 @@ public final class AbilityChangeNotifyOuterClass {
return this;
}
/**
* <code>.AbilityControlBlock ability_control_block = 15;</code>
* <code>.AbilityControlBlock ability_control_block = 2;</code>
*/
public Builder mergeAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
if (abilityControlBlockBuilder_ == null) {
@@ -614,7 +614,7 @@ public final class AbilityChangeNotifyOuterClass {
return this;
}
/**
* <code>.AbilityControlBlock ability_control_block = 15;</code>
* <code>.AbilityControlBlock ability_control_block = 2;</code>
*/
public Builder clearAbilityControlBlock() {
if (abilityControlBlockBuilder_ == null) {
@@ -628,7 +628,7 @@ public final class AbilityChangeNotifyOuterClass {
return this;
}
/**
* <code>.AbilityControlBlock ability_control_block = 15;</code>
* <code>.AbilityControlBlock ability_control_block = 2;</code>
*/
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder getAbilityControlBlockBuilder() {
@@ -636,7 +636,7 @@ public final class AbilityChangeNotifyOuterClass {
return getAbilityControlBlockFieldBuilder().getBuilder();
}
/**
* <code>.AbilityControlBlock ability_control_block = 15;</code>
* <code>.AbilityControlBlock ability_control_block = 2;</code>
*/
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
if (abilityControlBlockBuilder_ != null) {
@@ -647,7 +647,7 @@ public final class AbilityChangeNotifyOuterClass {
}
}
/**
* <code>.AbilityControlBlock ability_control_block = 15;</code>
* <code>.AbilityControlBlock ability_control_block = 2;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder>
@@ -731,8 +731,8 @@ public final class AbilityChangeNotifyOuterClass {
java.lang.String[] descriptorData = {
"\n\031AbilityChangeNotify.proto\032\031AbilityCont" +
"rolBlock.proto\"]\n\023AbilityChangeNotify\022\021\n" +
"\tentity_id\030\013 \001(\r\0223\n\025ability_control_bloc" +
"k\030\017 \001(\0132\024.AbilityControlBlockB\033\n\031emu.gra" +
"\tentity_id\030\n \001(\r\0223\n\025ability_control_bloc" +
"k\030\002 \001(\0132\024.AbilityControlBlockB\033\n\031emu.gra" +
"sscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor