Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 05:43:33 +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/WidgetDoBagRspOuterClass.java
+76 -76
View File
@@ -19,21 +19,21 @@ public final class WidgetDoBagRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>int32 retcode = 8;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint32 material_id = 9;</code>
* <code>uint32 material_id = 7;</code>
* @return The materialId.
*/
int getMaterialId();
/**
* <code>int32 retcode = 5;</code>
* @return The retcode.
*/
int getRetcode();
}
/**
* <pre>
* CmdId: 4279
* Name: PBKOFJACIMK
* CmdId: 4290
* Obf: FEPEMHCMCOL
* </pre>
*
* Protobuf type {@code WidgetDoBagRsp}
@@ -80,12 +80,12 @@ public final class WidgetDoBagRspOuterClass {
case 0:
done = true;
break;
case 64: {
case 40: {
retcode_ = input.readInt32();
break;
}
case 72: {
case 56: {
materialId_ = input.readUInt32();
break;
@@ -122,21 +122,10 @@ public final class WidgetDoBagRspOuterClass {
emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp.class, emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp.Builder.class);
}
public static final int RETCODE_FIELD_NUMBER = 8;
private int retcode_;
/**
* <code>int32 retcode = 8;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
public static final int MATERIAL_ID_FIELD_NUMBER = 9;
public static final int MATERIAL_ID_FIELD_NUMBER = 7;
private int materialId_;
/**
* <code>uint32 material_id = 9;</code>
* <code>uint32 material_id = 7;</code>
* @return The materialId.
*/
@java.lang.Override
@@ -144,6 +133,17 @@ public final class WidgetDoBagRspOuterClass {
return materialId_;
}
public static final int RETCODE_FIELD_NUMBER = 5;
private int retcode_;
/**
* <code>int32 retcode = 5;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -159,10 +159,10 @@ public final class WidgetDoBagRspOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(8, retcode_);
output.writeInt32(5, retcode_);
}
if (materialId_ != 0) {
output.writeUInt32(9, materialId_);
output.writeUInt32(7, materialId_);
}
unknownFields.writeTo(output);
}
@@ -175,11 +175,11 @@ public final class WidgetDoBagRspOuterClass {
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(8, retcode_);
.computeInt32Size(5, retcode_);
}
if (materialId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, materialId_);
.computeUInt32Size(7, materialId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -196,10 +196,10 @@ public final class WidgetDoBagRspOuterClass {
}
emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp other = (emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp) obj;
if (getRetcode()
!= other.getRetcode()) return false;
if (getMaterialId()
!= other.getMaterialId()) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -211,10 +211,10 @@ public final class WidgetDoBagRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + MATERIAL_ID_FIELD_NUMBER;
hash = (53 * hash) + getMaterialId();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -312,8 +312,8 @@ public final class WidgetDoBagRspOuterClass {
}
/**
* <pre>
* CmdId: 4279
* Name: PBKOFJACIMK
* CmdId: 4290
* Obf: FEPEMHCMCOL
* </pre>
*
* Protobuf type {@code WidgetDoBagRsp}
@@ -353,10 +353,10 @@ public final class WidgetDoBagRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
retcode_ = 0;
materialId_ = 0;
retcode_ = 0;
return this;
}
@@ -383,8 +383,8 @@ public final class WidgetDoBagRspOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp buildPartial() {
emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp result = new emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp(this);
result.retcode_ = retcode_;
result.materialId_ = materialId_;
result.retcode_ = retcode_;
onBuilt();
return result;
}
@@ -433,12 +433,12 @@ public final class WidgetDoBagRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp other) {
if (other == emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp.getDefaultInstance()) return this;
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.getMaterialId() != 0) {
setMaterialId(other.getMaterialId());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -468,40 +468,9 @@ public final class WidgetDoBagRspOuterClass {
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 8;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 8;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
public Builder setRetcode(int value) {
retcode_ = value;
onChanged();
return this;
}
/**
* <code>int32 retcode = 8;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
private int materialId_ ;
/**
* <code>uint32 material_id = 9;</code>
* <code>uint32 material_id = 7;</code>
* @return The materialId.
*/
@java.lang.Override
@@ -509,7 +478,7 @@ public final class WidgetDoBagRspOuterClass {
return materialId_;
}
/**
* <code>uint32 material_id = 9;</code>
* <code>uint32 material_id = 7;</code>
* @param value The materialId to set.
* @return This builder for chaining.
*/
@@ -520,7 +489,7 @@ public final class WidgetDoBagRspOuterClass {
return this;
}
/**
* <code>uint32 material_id = 9;</code>
* <code>uint32 material_id = 7;</code>
* @return This builder for chaining.
*/
public Builder clearMaterialId() {
@@ -529,6 +498,37 @@ public final class WidgetDoBagRspOuterClass {
onChanged();
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 5;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 5;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
public Builder setRetcode(int value) {
retcode_ = value;
onChanged();
return this;
}
/**
* <code>int32 retcode = 5;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -597,7 +597,7 @@ public final class WidgetDoBagRspOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\024WidgetDoBagRsp.proto\"6\n\016WidgetDoBagRsp" +
"\022\017\n\007retcode\030\010 \001(\005\022\023\n\013material_id\030\t \001(\rB\033" +
"\022\023\n\013material_id\030\007 \001(\r\022\017\n\007retcode\030\005 \001(\005B\033" +
"\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -609,7 +609,7 @@ public final class WidgetDoBagRspOuterClass {
internal_static_WidgetDoBagRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_WidgetDoBagRsp_descriptor,
new java.lang.String[] { "Retcode", "MaterialId", });
new java.lang.String[] { "MaterialId", "Retcode", });
}
// @@protoc_insertion_point(outer_class_scope)