Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 17:19: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/PlayerCompoundMaterialRspOuterClass.java
+34 -34
View File
@@ -19,30 +19,30 @@ public final class PlayerCompoundMaterialRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.CompoundQueueData compoundQueueData = 4;</code>
* <code>.CompoundQueueData compoundQueueData = 7;</code>
* @return Whether the compoundQueueData field is set.
*/
boolean hasCompoundQueueData();
/**
* <code>.CompoundQueueData compoundQueueData = 4;</code>
* <code>.CompoundQueueData compoundQueueData = 7;</code>
* @return The compoundQueueData.
*/
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData getCompoundQueueData();
/**
* <code>.CompoundQueueData compoundQueueData = 4;</code>
* <code>.CompoundQueueData compoundQueueData = 7;</code>
*/
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder getCompoundQueueDataOrBuilder();
/**
* <code>int32 retcode = 13;</code>
* <code>int32 retcode = 10;</code>
* @return The retcode.
*/
int getRetcode();
}
/**
* <pre>
* CmdId: 183
* Name: NPAHEOCCAHH
* CmdId: 107
* Obf: JJIKDLOONLH
* </pre>
*
* Protobuf type {@code PlayerCompoundMaterialRsp}
@@ -89,7 +89,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
case 0:
done = true;
break;
case 34: {
case 58: {
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder subBuilder = null;
if (compoundQueueData_ != null) {
subBuilder = compoundQueueData_.toBuilder();
@@ -102,7 +102,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
break;
}
case 104: {
case 80: {
retcode_ = input.readInt32();
break;
@@ -139,10 +139,10 @@ public final class PlayerCompoundMaterialRspOuterClass {
emu.grasscutter.net.proto.PlayerCompoundMaterialRspOuterClass.PlayerCompoundMaterialRsp.class, emu.grasscutter.net.proto.PlayerCompoundMaterialRspOuterClass.PlayerCompoundMaterialRsp.Builder.class);
}
public static final int COMPOUNDQUEUEDATA_FIELD_NUMBER = 4;
public static final int COMPOUNDQUEUEDATA_FIELD_NUMBER = 7;
private emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData compoundQueueData_;
/**
* <code>.CompoundQueueData compoundQueueData = 4;</code>
* <code>.CompoundQueueData compoundQueueData = 7;</code>
* @return Whether the compoundQueueData field is set.
*/
@java.lang.Override
@@ -150,7 +150,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
return compoundQueueData_ != null;
}
/**
* <code>.CompoundQueueData compoundQueueData = 4;</code>
* <code>.CompoundQueueData compoundQueueData = 7;</code>
* @return The compoundQueueData.
*/
@java.lang.Override
@@ -158,17 +158,17 @@ public final class PlayerCompoundMaterialRspOuterClass {
return compoundQueueData_ == null ? emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.getDefaultInstance() : compoundQueueData_;
}
/**
* <code>.CompoundQueueData compoundQueueData = 4;</code>
* <code>.CompoundQueueData compoundQueueData = 7;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder getCompoundQueueDataOrBuilder() {
return getCompoundQueueData();
}
public static final int RETCODE_FIELD_NUMBER = 13;
public static final int RETCODE_FIELD_NUMBER = 10;
private int retcode_;
/**
* <code>int32 retcode = 13;</code>
* <code>int32 retcode = 10;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -191,10 +191,10 @@ public final class PlayerCompoundMaterialRspOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (compoundQueueData_ != null) {
output.writeMessage(4, getCompoundQueueData());
output.writeMessage(7, getCompoundQueueData());
}
if (retcode_ != 0) {
output.writeInt32(13, retcode_);
output.writeInt32(10, retcode_);
}
unknownFields.writeTo(output);
}
@@ -207,11 +207,11 @@ public final class PlayerCompoundMaterialRspOuterClass {
size = 0;
if (compoundQueueData_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(4, getCompoundQueueData());
.computeMessageSize(7, getCompoundQueueData());
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(13, retcode_);
.computeInt32Size(10, retcode_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -349,8 +349,8 @@ public final class PlayerCompoundMaterialRspOuterClass {
}
/**
* <pre>
* CmdId: 183
* Name: NPAHEOCCAHH
* CmdId: 107
* Obf: JJIKDLOONLH
* </pre>
*
* Protobuf type {@code PlayerCompoundMaterialRsp}
@@ -517,14 +517,14 @@ public final class PlayerCompoundMaterialRspOuterClass {
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder> compoundQueueDataBuilder_;
/**
* <code>.CompoundQueueData compoundQueueData = 4;</code>
* <code>.CompoundQueueData compoundQueueData = 7;</code>
* @return Whether the compoundQueueData field is set.
*/
public boolean hasCompoundQueueData() {
return compoundQueueDataBuilder_ != null || compoundQueueData_ != null;
}
/**
* <code>.CompoundQueueData compoundQueueData = 4;</code>
* <code>.CompoundQueueData compoundQueueData = 7;</code>
* @return The compoundQueueData.
*/
public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData getCompoundQueueData() {
@@ -535,7 +535,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
}
}
/**
* <code>.CompoundQueueData compoundQueueData = 4;</code>
* <code>.CompoundQueueData compoundQueueData = 7;</code>
*/
public Builder setCompoundQueueData(emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData value) {
if (compoundQueueDataBuilder_ == null) {
@@ -551,7 +551,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
return this;
}
/**
* <code>.CompoundQueueData compoundQueueData = 4;</code>
* <code>.CompoundQueueData compoundQueueData = 7;</code>
*/
public Builder setCompoundQueueData(
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder builderForValue) {
@@ -565,7 +565,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
return this;
}
/**
* <code>.CompoundQueueData compoundQueueData = 4;</code>
* <code>.CompoundQueueData compoundQueueData = 7;</code>
*/
public Builder mergeCompoundQueueData(emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData value) {
if (compoundQueueDataBuilder_ == null) {
@@ -583,7 +583,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
return this;
}
/**
* <code>.CompoundQueueData compoundQueueData = 4;</code>
* <code>.CompoundQueueData compoundQueueData = 7;</code>
*/
public Builder clearCompoundQueueData() {
if (compoundQueueDataBuilder_ == null) {
@@ -597,7 +597,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
return this;
}
/**
* <code>.CompoundQueueData compoundQueueData = 4;</code>
* <code>.CompoundQueueData compoundQueueData = 7;</code>
*/
public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder getCompoundQueueDataBuilder() {
@@ -605,7 +605,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
return getCompoundQueueDataFieldBuilder().getBuilder();
}
/**
* <code>.CompoundQueueData compoundQueueData = 4;</code>
* <code>.CompoundQueueData compoundQueueData = 7;</code>
*/
public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder getCompoundQueueDataOrBuilder() {
if (compoundQueueDataBuilder_ != null) {
@@ -616,7 +616,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
}
}
/**
* <code>.CompoundQueueData compoundQueueData = 4;</code>
* <code>.CompoundQueueData compoundQueueData = 7;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder>
@@ -634,7 +634,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
private int retcode_ ;
/**
* <code>int32 retcode = 13;</code>
* <code>int32 retcode = 10;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -642,7 +642,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 13;</code>
* <code>int32 retcode = 10;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -653,7 +653,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 13;</code>
* <code>int32 retcode = 10;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -731,8 +731,8 @@ public final class PlayerCompoundMaterialRspOuterClass {
java.lang.String[] descriptorData = {
"\n\037PlayerCompoundMaterialRsp.proto\032\027Compo" +
"undQueueData.proto\"[\n\031PlayerCompoundMate" +
"rialRsp\022-\n\021compoundQueueData\030\004 \001(\0132\022.Com" +
"poundQueueData\022\017\n\007retcode\030\r \001(\005B\033\n\031emu.g" +
"rialRsp\022-\n\021compoundQueueData\030\007 \001(\0132\022.Com" +
"poundQueueData\022\017\n\007retcode\030\n \001(\005B\033\n\031emu.g" +
"rasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor