Upgrade to REL3.7 (#2164)

* 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
@@ -19,20 +19,20 @@ public final class ArenaChallengeMonsterLevelOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 FCLFLMPGIKN = 4;</code>
* @return The fCLFLMPGIKN.
* <code>uint32 DBPEAEAANPG = 11;</code>
* @return The dBPEAEAANPG.
*/
int getFCLFLMPGIKN();
int getDBPEAEAANPG();
/**
* <code>uint32 GELFIDPMHLJ = 9;</code>
* @return The gELFIDPMHLJ.
* <code>uint32 PEPMDOACJNL = 13;</code>
* @return The pEPMDOACJNL.
*/
int getGELFIDPMHLJ();
int getPEPMDOACJNL();
}
/**
* <pre>
* Name: OKLFPJCHPDD
* Obf: DEOAPDFEJGL
* </pre>
*
* Protobuf type {@code ArenaChallengeMonsterLevel}
@@ -79,14 +79,14 @@ public final class ArenaChallengeMonsterLevelOuterClass {
case 0:
done = true;
break;
case 32: {
case 88: {
fCLFLMPGIKN_ = input.readUInt32();
dBPEAEAANPG_ = input.readUInt32();
break;
}
case 72: {
case 104: {
gELFIDPMHLJ_ = input.readUInt32();
pEPMDOACJNL_ = input.readUInt32();
break;
}
default: {
@@ -121,26 +121,26 @@ public final class ArenaChallengeMonsterLevelOuterClass {
emu.grasscutter.net.proto.ArenaChallengeMonsterLevelOuterClass.ArenaChallengeMonsterLevel.class, emu.grasscutter.net.proto.ArenaChallengeMonsterLevelOuterClass.ArenaChallengeMonsterLevel.Builder.class);
}
public static final int FCLFLMPGIKN_FIELD_NUMBER = 4;
private int fCLFLMPGIKN_;
public static final int DBPEAEAANPG_FIELD_NUMBER = 11;
private int dBPEAEAANPG_;
/**
* <code>uint32 FCLFLMPGIKN = 4;</code>
* @return The fCLFLMPGIKN.
* <code>uint32 DBPEAEAANPG = 11;</code>
* @return The dBPEAEAANPG.
*/
@java.lang.Override
public int getFCLFLMPGIKN() {
return fCLFLMPGIKN_;
public int getDBPEAEAANPG() {
return dBPEAEAANPG_;
}
public static final int GELFIDPMHLJ_FIELD_NUMBER = 9;
private int gELFIDPMHLJ_;
public static final int PEPMDOACJNL_FIELD_NUMBER = 13;
private int pEPMDOACJNL_;
/**
* <code>uint32 GELFIDPMHLJ = 9;</code>
* @return The gELFIDPMHLJ.
* <code>uint32 PEPMDOACJNL = 13;</code>
* @return The pEPMDOACJNL.
*/
@java.lang.Override
public int getGELFIDPMHLJ() {
return gELFIDPMHLJ_;
public int getPEPMDOACJNL() {
return pEPMDOACJNL_;
}
private byte memoizedIsInitialized = -1;
@@ -157,11 +157,11 @@ public final class ArenaChallengeMonsterLevelOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (fCLFLMPGIKN_ != 0) {
output.writeUInt32(4, fCLFLMPGIKN_);
if (dBPEAEAANPG_ != 0) {
output.writeUInt32(11, dBPEAEAANPG_);
}
if (gELFIDPMHLJ_ != 0) {
output.writeUInt32(9, gELFIDPMHLJ_);
if (pEPMDOACJNL_ != 0) {
output.writeUInt32(13, pEPMDOACJNL_);
}
unknownFields.writeTo(output);
}
@@ -172,13 +172,13 @@ public final class ArenaChallengeMonsterLevelOuterClass {
if (size != -1) return size;
size = 0;
if (fCLFLMPGIKN_ != 0) {
if (dBPEAEAANPG_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(4, fCLFLMPGIKN_);
.computeUInt32Size(11, dBPEAEAANPG_);
}
if (gELFIDPMHLJ_ != 0) {
if (pEPMDOACJNL_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, gELFIDPMHLJ_);
.computeUInt32Size(13, pEPMDOACJNL_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -195,10 +195,10 @@ public final class ArenaChallengeMonsterLevelOuterClass {
}
emu.grasscutter.net.proto.ArenaChallengeMonsterLevelOuterClass.ArenaChallengeMonsterLevel other = (emu.grasscutter.net.proto.ArenaChallengeMonsterLevelOuterClass.ArenaChallengeMonsterLevel) obj;
if (getFCLFLMPGIKN()
!= other.getFCLFLMPGIKN()) return false;
if (getGELFIDPMHLJ()
!= other.getGELFIDPMHLJ()) return false;
if (getDBPEAEAANPG()
!= other.getDBPEAEAANPG()) return false;
if (getPEPMDOACJNL()
!= other.getPEPMDOACJNL()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -210,10 +210,10 @@ public final class ArenaChallengeMonsterLevelOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + FCLFLMPGIKN_FIELD_NUMBER;
hash = (53 * hash) + getFCLFLMPGIKN();
hash = (37 * hash) + GELFIDPMHLJ_FIELD_NUMBER;
hash = (53 * hash) + getGELFIDPMHLJ();
hash = (37 * hash) + DBPEAEAANPG_FIELD_NUMBER;
hash = (53 * hash) + getDBPEAEAANPG();
hash = (37 * hash) + PEPMDOACJNL_FIELD_NUMBER;
hash = (53 * hash) + getPEPMDOACJNL();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -311,7 +311,7 @@ public final class ArenaChallengeMonsterLevelOuterClass {
}
/**
* <pre>
* Name: OKLFPJCHPDD
* Obf: DEOAPDFEJGL
* </pre>
*
* Protobuf type {@code ArenaChallengeMonsterLevel}
@@ -351,9 +351,9 @@ public final class ArenaChallengeMonsterLevelOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
fCLFLMPGIKN_ = 0;
dBPEAEAANPG_ = 0;
gELFIDPMHLJ_ = 0;
pEPMDOACJNL_ = 0;
return this;
}
@@ -381,8 +381,8 @@ public final class ArenaChallengeMonsterLevelOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.ArenaChallengeMonsterLevelOuterClass.ArenaChallengeMonsterLevel buildPartial() {
emu.grasscutter.net.proto.ArenaChallengeMonsterLevelOuterClass.ArenaChallengeMonsterLevel result = new emu.grasscutter.net.proto.ArenaChallengeMonsterLevelOuterClass.ArenaChallengeMonsterLevel(this);
result.fCLFLMPGIKN_ = fCLFLMPGIKN_;
result.gELFIDPMHLJ_ = gELFIDPMHLJ_;
result.dBPEAEAANPG_ = dBPEAEAANPG_;
result.pEPMDOACJNL_ = pEPMDOACJNL_;
onBuilt();
return result;
}
@@ -431,11 +431,11 @@ public final class ArenaChallengeMonsterLevelOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.ArenaChallengeMonsterLevelOuterClass.ArenaChallengeMonsterLevel other) {
if (other == emu.grasscutter.net.proto.ArenaChallengeMonsterLevelOuterClass.ArenaChallengeMonsterLevel.getDefaultInstance()) return this;
if (other.getFCLFLMPGIKN() != 0) {
setFCLFLMPGIKN(other.getFCLFLMPGIKN());
if (other.getDBPEAEAANPG() != 0) {
setDBPEAEAANPG(other.getDBPEAEAANPG());
}
if (other.getGELFIDPMHLJ() != 0) {
setGELFIDPMHLJ(other.getGELFIDPMHLJ());
if (other.getPEPMDOACJNL() != 0) {
setPEPMDOACJNL(other.getPEPMDOACJNL());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -466,64 +466,64 @@ public final class ArenaChallengeMonsterLevelOuterClass {
return this;
}
private int fCLFLMPGIKN_ ;
private int dBPEAEAANPG_ ;
/**
* <code>uint32 FCLFLMPGIKN = 4;</code>
* @return The fCLFLMPGIKN.
* <code>uint32 DBPEAEAANPG = 11;</code>
* @return The dBPEAEAANPG.
*/
@java.lang.Override
public int getFCLFLMPGIKN() {
return fCLFLMPGIKN_;
public int getDBPEAEAANPG() {
return dBPEAEAANPG_;
}
/**
* <code>uint32 FCLFLMPGIKN = 4;</code>
* @param value The fCLFLMPGIKN to set.
* <code>uint32 DBPEAEAANPG = 11;</code>
* @param value The dBPEAEAANPG to set.
* @return This builder for chaining.
*/
public Builder setFCLFLMPGIKN(int value) {
public Builder setDBPEAEAANPG(int value) {
fCLFLMPGIKN_ = value;
dBPEAEAANPG_ = value;
onChanged();
return this;
}
/**
* <code>uint32 FCLFLMPGIKN = 4;</code>
* <code>uint32 DBPEAEAANPG = 11;</code>
* @return This builder for chaining.
*/
public Builder clearFCLFLMPGIKN() {
public Builder clearDBPEAEAANPG() {
fCLFLMPGIKN_ = 0;
dBPEAEAANPG_ = 0;
onChanged();
return this;
}
private int gELFIDPMHLJ_ ;
private int pEPMDOACJNL_ ;
/**
* <code>uint32 GELFIDPMHLJ = 9;</code>
* @return The gELFIDPMHLJ.
* <code>uint32 PEPMDOACJNL = 13;</code>
* @return The pEPMDOACJNL.
*/
@java.lang.Override
public int getGELFIDPMHLJ() {
return gELFIDPMHLJ_;
public int getPEPMDOACJNL() {
return pEPMDOACJNL_;
}
/**
* <code>uint32 GELFIDPMHLJ = 9;</code>
* @param value The gELFIDPMHLJ to set.
* <code>uint32 PEPMDOACJNL = 13;</code>
* @param value The pEPMDOACJNL to set.
* @return This builder for chaining.
*/
public Builder setGELFIDPMHLJ(int value) {
public Builder setPEPMDOACJNL(int value) {
gELFIDPMHLJ_ = value;
pEPMDOACJNL_ = value;
onChanged();
return this;
}
/**
* <code>uint32 GELFIDPMHLJ = 9;</code>
* <code>uint32 PEPMDOACJNL = 13;</code>
* @return This builder for chaining.
*/
public Builder clearGELFIDPMHLJ() {
public Builder clearPEPMDOACJNL() {
gELFIDPMHLJ_ = 0;
pEPMDOACJNL_ = 0;
onChanged();
return this;
}
@@ -595,8 +595,8 @@ public final class ArenaChallengeMonsterLevelOuterClass {
static {
java.lang.String[] descriptorData = {
"\n ArenaChallengeMonsterLevel.proto\"F\n\032Ar" +
"enaChallengeMonsterLevel\022\023\n\013FCLFLMPGIKN\030" +
"\004 \001(\r\022\023\n\013GELFIDPMHLJ\030\t \001(\rB\033\n\031emu.grassc" +
"enaChallengeMonsterLevel\022\023\n\013DBPEAEAANPG\030" +
"\013 \001(\r\022\023\n\013PEPMDOACJNL\030\r \001(\rB\033\n\031emu.grassc" +
"utter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -608,7 +608,7 @@ public final class ArenaChallengeMonsterLevelOuterClass {
internal_static_ArenaChallengeMonsterLevel_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_ArenaChallengeMonsterLevel_descriptor,
new java.lang.String[] { "FCLFLMPGIKN", "GELFIDPMHLJ", });
new java.lang.String[] { "DBPEAEAANPG", "PEPMDOACJNL", });
}
// @@protoc_insertion_point(outer_class_scope)