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/JigsawPictureDataOuterClass.java
+181 -181
View File
@@ -19,32 +19,32 @@ public final class JigsawPictureDataOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 NJPEANGOAMC = 7;</code>
* @return The nJPEANGOAMC.
*/
int getNJPEANGOAMC();
/**
* <code>bool is_finished = 10;</code>
* @return The isFinished.
*/
boolean getIsFinished();
/**
* <code>bool is_open = 12;</code>
* <code>bool is_open = 8;</code>
* @return The isOpen.
*/
boolean getIsOpen();
/**
* <code>uint32 ACAPFNOLMKE = 15;</code>
* @return The aCAPFNOLMKE.
* <code>uint32 HKLBAPAMEOK = 14;</code>
* @return The hKLBAPAMEOK.
*/
int getACAPFNOLMKE();
int getHKLBAPAMEOK();
/**
* <code>uint32 APNDNCIJLKB = 15;</code>
* @return The aPNDNCIJLKB.
*/
int getAPNDNCIJLKB();
/**
* <code>bool is_finished = 1;</code>
* @return The isFinished.
*/
boolean getIsFinished();
}
/**
* <pre>
* Name: HMCBPDBJEOM
* Obf: MPBCMDGDHHA
* </pre>
*
* Protobuf type {@code JigsawPictureData}
@@ -91,24 +91,24 @@ public final class JigsawPictureDataOuterClass {
case 0:
done = true;
break;
case 56: {
nJPEANGOAMC_ = input.readUInt32();
break;
}
case 80: {
case 8: {
isFinished_ = input.readBool();
break;
}
case 96: {
case 64: {
isOpen_ = input.readBool();
break;
}
case 112: {
hKLBAPAMEOK_ = input.readUInt32();
break;
}
case 120: {
aCAPFNOLMKE_ = input.readUInt32();
aPNDNCIJLKB_ = input.readUInt32();
break;
}
default: {
@@ -143,32 +143,10 @@ public final class JigsawPictureDataOuterClass {
emu.grasscutter.net.proto.JigsawPictureDataOuterClass.JigsawPictureData.class, emu.grasscutter.net.proto.JigsawPictureDataOuterClass.JigsawPictureData.Builder.class);
}
public static final int NJPEANGOAMC_FIELD_NUMBER = 7;
private int nJPEANGOAMC_;
/**
* <code>uint32 NJPEANGOAMC = 7;</code>
* @return The nJPEANGOAMC.
*/
@java.lang.Override
public int getNJPEANGOAMC() {
return nJPEANGOAMC_;
}
public static final int IS_FINISHED_FIELD_NUMBER = 10;
private boolean isFinished_;
/**
* <code>bool is_finished = 10;</code>
* @return The isFinished.
*/
@java.lang.Override
public boolean getIsFinished() {
return isFinished_;
}
public static final int IS_OPEN_FIELD_NUMBER = 12;
public static final int IS_OPEN_FIELD_NUMBER = 8;
private boolean isOpen_;
/**
* <code>bool is_open = 12;</code>
* <code>bool is_open = 8;</code>
* @return The isOpen.
*/
@java.lang.Override
@@ -176,15 +154,37 @@ public final class JigsawPictureDataOuterClass {
return isOpen_;
}
public static final int ACAPFNOLMKE_FIELD_NUMBER = 15;
private int aCAPFNOLMKE_;
public static final int HKLBAPAMEOK_FIELD_NUMBER = 14;
private int hKLBAPAMEOK_;
/**
* <code>uint32 ACAPFNOLMKE = 15;</code>
* @return The aCAPFNOLMKE.
* <code>uint32 HKLBAPAMEOK = 14;</code>
* @return The hKLBAPAMEOK.
*/
@java.lang.Override
public int getACAPFNOLMKE() {
return aCAPFNOLMKE_;
public int getHKLBAPAMEOK() {
return hKLBAPAMEOK_;
}
public static final int APNDNCIJLKB_FIELD_NUMBER = 15;
private int aPNDNCIJLKB_;
/**
* <code>uint32 APNDNCIJLKB = 15;</code>
* @return The aPNDNCIJLKB.
*/
@java.lang.Override
public int getAPNDNCIJLKB() {
return aPNDNCIJLKB_;
}
public static final int IS_FINISHED_FIELD_NUMBER = 1;
private boolean isFinished_;
/**
* <code>bool is_finished = 1;</code>
* @return The isFinished.
*/
@java.lang.Override
public boolean getIsFinished() {
return isFinished_;
}
private byte memoizedIsInitialized = -1;
@@ -201,17 +201,17 @@ public final class JigsawPictureDataOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (nJPEANGOAMC_ != 0) {
output.writeUInt32(7, nJPEANGOAMC_);
}
if (isFinished_ != false) {
output.writeBool(10, isFinished_);
output.writeBool(1, isFinished_);
}
if (isOpen_ != false) {
output.writeBool(12, isOpen_);
output.writeBool(8, isOpen_);
}
if (aCAPFNOLMKE_ != 0) {
output.writeUInt32(15, aCAPFNOLMKE_);
if (hKLBAPAMEOK_ != 0) {
output.writeUInt32(14, hKLBAPAMEOK_);
}
if (aPNDNCIJLKB_ != 0) {
output.writeUInt32(15, aPNDNCIJLKB_);
}
unknownFields.writeTo(output);
}
@@ -222,21 +222,21 @@ public final class JigsawPictureDataOuterClass {
if (size != -1) return size;
size = 0;
if (nJPEANGOAMC_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(7, nJPEANGOAMC_);
}
if (isFinished_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(10, isFinished_);
.computeBoolSize(1, isFinished_);
}
if (isOpen_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(12, isOpen_);
.computeBoolSize(8, isOpen_);
}
if (aCAPFNOLMKE_ != 0) {
if (hKLBAPAMEOK_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, aCAPFNOLMKE_);
.computeUInt32Size(14, hKLBAPAMEOK_);
}
if (aPNDNCIJLKB_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, aPNDNCIJLKB_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -253,14 +253,14 @@ public final class JigsawPictureDataOuterClass {
}
emu.grasscutter.net.proto.JigsawPictureDataOuterClass.JigsawPictureData other = (emu.grasscutter.net.proto.JigsawPictureDataOuterClass.JigsawPictureData) obj;
if (getNJPEANGOAMC()
!= other.getNJPEANGOAMC()) return false;
if (getIsFinished()
!= other.getIsFinished()) return false;
if (getIsOpen()
!= other.getIsOpen()) return false;
if (getACAPFNOLMKE()
!= other.getACAPFNOLMKE()) return false;
if (getHKLBAPAMEOK()
!= other.getHKLBAPAMEOK()) return false;
if (getAPNDNCIJLKB()
!= other.getAPNDNCIJLKB()) return false;
if (getIsFinished()
!= other.getIsFinished()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -272,16 +272,16 @@ public final class JigsawPictureDataOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + NJPEANGOAMC_FIELD_NUMBER;
hash = (53 * hash) + getNJPEANGOAMC();
hash = (37 * hash) + IS_FINISHED_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsFinished());
hash = (37 * hash) + IS_OPEN_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsOpen());
hash = (37 * hash) + ACAPFNOLMKE_FIELD_NUMBER;
hash = (53 * hash) + getACAPFNOLMKE();
hash = (37 * hash) + HKLBAPAMEOK_FIELD_NUMBER;
hash = (53 * hash) + getHKLBAPAMEOK();
hash = (37 * hash) + APNDNCIJLKB_FIELD_NUMBER;
hash = (53 * hash) + getAPNDNCIJLKB();
hash = (37 * hash) + IS_FINISHED_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsFinished());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -379,7 +379,7 @@ public final class JigsawPictureDataOuterClass {
}
/**
* <pre>
* Name: HMCBPDBJEOM
* Obf: MPBCMDGDHHA
* </pre>
*
* Protobuf type {@code JigsawPictureData}
@@ -419,13 +419,13 @@ public final class JigsawPictureDataOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
nJPEANGOAMC_ = 0;
isFinished_ = false;
isOpen_ = false;
aCAPFNOLMKE_ = 0;
hKLBAPAMEOK_ = 0;
aPNDNCIJLKB_ = 0;
isFinished_ = false;
return this;
}
@@ -453,10 +453,10 @@ public final class JigsawPictureDataOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.JigsawPictureDataOuterClass.JigsawPictureData buildPartial() {
emu.grasscutter.net.proto.JigsawPictureDataOuterClass.JigsawPictureData result = new emu.grasscutter.net.proto.JigsawPictureDataOuterClass.JigsawPictureData(this);
result.nJPEANGOAMC_ = nJPEANGOAMC_;
result.isFinished_ = isFinished_;
result.isOpen_ = isOpen_;
result.aCAPFNOLMKE_ = aCAPFNOLMKE_;
result.hKLBAPAMEOK_ = hKLBAPAMEOK_;
result.aPNDNCIJLKB_ = aPNDNCIJLKB_;
result.isFinished_ = isFinished_;
onBuilt();
return result;
}
@@ -505,17 +505,17 @@ public final class JigsawPictureDataOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.JigsawPictureDataOuterClass.JigsawPictureData other) {
if (other == emu.grasscutter.net.proto.JigsawPictureDataOuterClass.JigsawPictureData.getDefaultInstance()) return this;
if (other.getNJPEANGOAMC() != 0) {
setNJPEANGOAMC(other.getNJPEANGOAMC());
}
if (other.getIsFinished() != false) {
setIsFinished(other.getIsFinished());
}
if (other.getIsOpen() != false) {
setIsOpen(other.getIsOpen());
}
if (other.getACAPFNOLMKE() != 0) {
setACAPFNOLMKE(other.getACAPFNOLMKE());
if (other.getHKLBAPAMEOK() != 0) {
setHKLBAPAMEOK(other.getHKLBAPAMEOK());
}
if (other.getAPNDNCIJLKB() != 0) {
setAPNDNCIJLKB(other.getAPNDNCIJLKB());
}
if (other.getIsFinished() != false) {
setIsFinished(other.getIsFinished());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -546,71 +546,9 @@ public final class JigsawPictureDataOuterClass {
return this;
}
private int nJPEANGOAMC_ ;
/**
* <code>uint32 NJPEANGOAMC = 7;</code>
* @return The nJPEANGOAMC.
*/
@java.lang.Override
public int getNJPEANGOAMC() {
return nJPEANGOAMC_;
}
/**
* <code>uint32 NJPEANGOAMC = 7;</code>
* @param value The nJPEANGOAMC to set.
* @return This builder for chaining.
*/
public Builder setNJPEANGOAMC(int value) {
nJPEANGOAMC_ = value;
onChanged();
return this;
}
/**
* <code>uint32 NJPEANGOAMC = 7;</code>
* @return This builder for chaining.
*/
public Builder clearNJPEANGOAMC() {
nJPEANGOAMC_ = 0;
onChanged();
return this;
}
private boolean isFinished_ ;
/**
* <code>bool is_finished = 10;</code>
* @return The isFinished.
*/
@java.lang.Override
public boolean getIsFinished() {
return isFinished_;
}
/**
* <code>bool is_finished = 10;</code>
* @param value The isFinished to set.
* @return This builder for chaining.
*/
public Builder setIsFinished(boolean value) {
isFinished_ = value;
onChanged();
return this;
}
/**
* <code>bool is_finished = 10;</code>
* @return This builder for chaining.
*/
public Builder clearIsFinished() {
isFinished_ = false;
onChanged();
return this;
}
private boolean isOpen_ ;
/**
* <code>bool is_open = 12;</code>
* <code>bool is_open = 8;</code>
* @return The isOpen.
*/
@java.lang.Override
@@ -618,7 +556,7 @@ public final class JigsawPictureDataOuterClass {
return isOpen_;
}
/**
* <code>bool is_open = 12;</code>
* <code>bool is_open = 8;</code>
* @param value The isOpen to set.
* @return This builder for chaining.
*/
@@ -629,7 +567,7 @@ public final class JigsawPictureDataOuterClass {
return this;
}
/**
* <code>bool is_open = 12;</code>
* <code>bool is_open = 8;</code>
* @return This builder for chaining.
*/
public Builder clearIsOpen() {
@@ -639,33 +577,95 @@ public final class JigsawPictureDataOuterClass {
return this;
}
private int aCAPFNOLMKE_ ;
private int hKLBAPAMEOK_ ;
/**
* <code>uint32 ACAPFNOLMKE = 15;</code>
* @return The aCAPFNOLMKE.
* <code>uint32 HKLBAPAMEOK = 14;</code>
* @return The hKLBAPAMEOK.
*/
@java.lang.Override
public int getACAPFNOLMKE() {
return aCAPFNOLMKE_;
public int getHKLBAPAMEOK() {
return hKLBAPAMEOK_;
}
/**
* <code>uint32 ACAPFNOLMKE = 15;</code>
* @param value The aCAPFNOLMKE to set.
* <code>uint32 HKLBAPAMEOK = 14;</code>
* @param value The hKLBAPAMEOK to set.
* @return This builder for chaining.
*/
public Builder setACAPFNOLMKE(int value) {
public Builder setHKLBAPAMEOK(int value) {
aCAPFNOLMKE_ = value;
hKLBAPAMEOK_ = value;
onChanged();
return this;
}
/**
* <code>uint32 ACAPFNOLMKE = 15;</code>
* <code>uint32 HKLBAPAMEOK = 14;</code>
* @return This builder for chaining.
*/
public Builder clearACAPFNOLMKE() {
public Builder clearHKLBAPAMEOK() {
aCAPFNOLMKE_ = 0;
hKLBAPAMEOK_ = 0;
onChanged();
return this;
}
private int aPNDNCIJLKB_ ;
/**
* <code>uint32 APNDNCIJLKB = 15;</code>
* @return The aPNDNCIJLKB.
*/
@java.lang.Override
public int getAPNDNCIJLKB() {
return aPNDNCIJLKB_;
}
/**
* <code>uint32 APNDNCIJLKB = 15;</code>
* @param value The aPNDNCIJLKB to set.
* @return This builder for chaining.
*/
public Builder setAPNDNCIJLKB(int value) {
aPNDNCIJLKB_ = value;
onChanged();
return this;
}
/**
* <code>uint32 APNDNCIJLKB = 15;</code>
* @return This builder for chaining.
*/
public Builder clearAPNDNCIJLKB() {
aPNDNCIJLKB_ = 0;
onChanged();
return this;
}
private boolean isFinished_ ;
/**
* <code>bool is_finished = 1;</code>
* @return The isFinished.
*/
@java.lang.Override
public boolean getIsFinished() {
return isFinished_;
}
/**
* <code>bool is_finished = 1;</code>
* @param value The isFinished to set.
* @return This builder for chaining.
*/
public Builder setIsFinished(boolean value) {
isFinished_ = value;
onChanged();
return this;
}
/**
* <code>bool is_finished = 1;</code>
* @return This builder for chaining.
*/
public Builder clearIsFinished() {
isFinished_ = false;
onChanged();
return this;
}
@@ -737,9 +737,9 @@ public final class JigsawPictureDataOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\027JigsawPictureData.proto\"c\n\021JigsawPictu" +
"reData\022\023\n\013NJPEANGOAMC\030\007 \001(\r\022\023\n\013is_finish" +
"ed\030\n \001(\010\022\017\n\007is_open\030\014 \001(\010\022\023\n\013ACAPFNOLMKE" +
"\030\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
"reData\022\017\n\007is_open\030\010 \001(\010\022\023\n\013HKLBAPAMEOK\030\016" +
" \001(\r\022\023\n\013APNDNCIJLKB\030\017 \001(\r\022\023\n\013is_finished" +
"\030\001 \001(\010B\033\n\031emu.grasscutter.net.protob\006pro" +
"to3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -751,7 +751,7 @@ public final class JigsawPictureDataOuterClass {
internal_static_JigsawPictureData_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_JigsawPictureData_descriptor,
new java.lang.String[] { "NJPEANGOAMC", "IsFinished", "IsOpen", "ACAPFNOLMKE", });
new java.lang.String[] { "IsOpen", "HKLBAPAMEOK", "APNDNCIJLKB", "IsFinished", });
}
// @@protoc_insertion_point(outer_class_scope)