Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 15:59: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/ChildQuestOuterClass.java
+93 -93
View File
@@ -19,26 +19,26 @@ public final class ChildQuestOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 quest_id = 1;</code>
* <code>uint32 state = 1;</code>
* @return The state.
*/
int getState();
/**
* <code>uint32 quest_id = 11;</code>
* @return The questId.
*/
int getQuestId();
/**
* <code>uint32 quest_config_id = 3;</code>
* <code>uint32 quest_config_id = 5;</code>
* @return The questConfigId.
*/
int getQuestConfigId();
/**
* <code>uint32 state = 2;</code>
* @return The state.
*/
int getState();
}
/**
* <pre>
* Name: KPLGIKMFFHI
* Obf: PGDIMINOAPM
* </pre>
*
* Protobuf type {@code ChildQuest}
@@ -87,19 +87,19 @@ public final class ChildQuestOuterClass {
break;
case 8: {
questId_ = input.readUInt32();
break;
}
case 16: {
state_ = input.readUInt32();
break;
}
case 24: {
case 40: {
questConfigId_ = input.readUInt32();
break;
}
case 88: {
questId_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -132,10 +132,21 @@ public final class ChildQuestOuterClass {
emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.class, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder.class);
}
public static final int QUEST_ID_FIELD_NUMBER = 1;
public static final int STATE_FIELD_NUMBER = 1;
private int state_;
/**
* <code>uint32 state = 1;</code>
* @return The state.
*/
@java.lang.Override
public int getState() {
return state_;
}
public static final int QUEST_ID_FIELD_NUMBER = 11;
private int questId_;
/**
* <code>uint32 quest_id = 1;</code>
* <code>uint32 quest_id = 11;</code>
* @return The questId.
*/
@java.lang.Override
@@ -143,10 +154,10 @@ public final class ChildQuestOuterClass {
return questId_;
}
public static final int QUEST_CONFIG_ID_FIELD_NUMBER = 3;
public static final int QUEST_CONFIG_ID_FIELD_NUMBER = 5;
private int questConfigId_;
/**
* <code>uint32 quest_config_id = 3;</code>
* <code>uint32 quest_config_id = 5;</code>
* @return The questConfigId.
*/
@java.lang.Override
@@ -154,17 +165,6 @@ public final class ChildQuestOuterClass {
return questConfigId_;
}
public static final int STATE_FIELD_NUMBER = 2;
private int state_;
/**
* <code>uint32 state = 2;</code>
* @return The state.
*/
@java.lang.Override
public int getState() {
return state_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -179,14 +179,14 @@ public final class ChildQuestOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (questId_ != 0) {
output.writeUInt32(1, questId_);
}
if (state_ != 0) {
output.writeUInt32(2, state_);
output.writeUInt32(1, state_);
}
if (questConfigId_ != 0) {
output.writeUInt32(3, questConfigId_);
output.writeUInt32(5, questConfigId_);
}
if (questId_ != 0) {
output.writeUInt32(11, questId_);
}
unknownFields.writeTo(output);
}
@@ -197,17 +197,17 @@ public final class ChildQuestOuterClass {
if (size != -1) return size;
size = 0;
if (questId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, questId_);
}
if (state_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(2, state_);
.computeUInt32Size(1, state_);
}
if (questConfigId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, questConfigId_);
.computeUInt32Size(5, questConfigId_);
}
if (questId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, questId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -224,12 +224,12 @@ public final class ChildQuestOuterClass {
}
emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest other = (emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest) obj;
if (getState()
!= other.getState()) return false;
if (getQuestId()
!= other.getQuestId()) return false;
if (getQuestConfigId()
!= other.getQuestConfigId()) return false;
if (getState()
!= other.getState()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -241,12 +241,12 @@ public final class ChildQuestOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + STATE_FIELD_NUMBER;
hash = (53 * hash) + getState();
hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
hash = (53 * hash) + getQuestId();
hash = (37 * hash) + QUEST_CONFIG_ID_FIELD_NUMBER;
hash = (53 * hash) + getQuestConfigId();
hash = (37 * hash) + STATE_FIELD_NUMBER;
hash = (53 * hash) + getState();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -344,7 +344,7 @@ public final class ChildQuestOuterClass {
}
/**
* <pre>
* Name: KPLGIKMFFHI
* Obf: PGDIMINOAPM
* </pre>
*
* Protobuf type {@code ChildQuest}
@@ -384,12 +384,12 @@ public final class ChildQuestOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
state_ = 0;
questId_ = 0;
questConfigId_ = 0;
state_ = 0;
return this;
}
@@ -416,9 +416,9 @@ public final class ChildQuestOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest buildPartial() {
emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest result = new emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest(this);
result.state_ = state_;
result.questId_ = questId_;
result.questConfigId_ = questConfigId_;
result.state_ = state_;
onBuilt();
return result;
}
@@ -467,15 +467,15 @@ public final class ChildQuestOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest other) {
if (other == emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.getDefaultInstance()) return this;
if (other.getState() != 0) {
setState(other.getState());
}
if (other.getQuestId() != 0) {
setQuestId(other.getQuestId());
}
if (other.getQuestConfigId() != 0) {
setQuestConfigId(other.getQuestConfigId());
}
if (other.getState() != 0) {
setState(other.getState());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -505,9 +505,40 @@ public final class ChildQuestOuterClass {
return this;
}
private int state_ ;
/**
* <code>uint32 state = 1;</code>
* @return The state.
*/
@java.lang.Override
public int getState() {
return state_;
}
/**
* <code>uint32 state = 1;</code>
* @param value The state to set.
* @return This builder for chaining.
*/
public Builder setState(int value) {
state_ = value;
onChanged();
return this;
}
/**
* <code>uint32 state = 1;</code>
* @return This builder for chaining.
*/
public Builder clearState() {
state_ = 0;
onChanged();
return this;
}
private int questId_ ;
/**
* <code>uint32 quest_id = 1;</code>
* <code>uint32 quest_id = 11;</code>
* @return The questId.
*/
@java.lang.Override
@@ -515,7 +546,7 @@ public final class ChildQuestOuterClass {
return questId_;
}
/**
* <code>uint32 quest_id = 1;</code>
* <code>uint32 quest_id = 11;</code>
* @param value The questId to set.
* @return This builder for chaining.
*/
@@ -526,7 +557,7 @@ public final class ChildQuestOuterClass {
return this;
}
/**
* <code>uint32 quest_id = 1;</code>
* <code>uint32 quest_id = 11;</code>
* @return This builder for chaining.
*/
public Builder clearQuestId() {
@@ -538,7 +569,7 @@ public final class ChildQuestOuterClass {
private int questConfigId_ ;
/**
* <code>uint32 quest_config_id = 3;</code>
* <code>uint32 quest_config_id = 5;</code>
* @return The questConfigId.
*/
@java.lang.Override
@@ -546,7 +577,7 @@ public final class ChildQuestOuterClass {
return questConfigId_;
}
/**
* <code>uint32 quest_config_id = 3;</code>
* <code>uint32 quest_config_id = 5;</code>
* @param value The questConfigId to set.
* @return This builder for chaining.
*/
@@ -557,7 +588,7 @@ public final class ChildQuestOuterClass {
return this;
}
/**
* <code>uint32 quest_config_id = 3;</code>
* <code>uint32 quest_config_id = 5;</code>
* @return This builder for chaining.
*/
public Builder clearQuestConfigId() {
@@ -566,37 +597,6 @@ public final class ChildQuestOuterClass {
onChanged();
return this;
}
private int state_ ;
/**
* <code>uint32 state = 2;</code>
* @return The state.
*/
@java.lang.Override
public int getState() {
return state_;
}
/**
* <code>uint32 state = 2;</code>
* @param value The state to set.
* @return This builder for chaining.
*/
public Builder setState(int value) {
state_ = value;
onChanged();
return this;
}
/**
* <code>uint32 state = 2;</code>
* @return This builder for chaining.
*/
public Builder clearState() {
state_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -664,9 +664,9 @@ public final class ChildQuestOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\020ChildQuest.proto\"F\n\nChildQuest\022\020\n\010ques" +
"t_id\030\001 \001(\r\022\027\n\017quest_config_id\030\003 \001(\r\022\r\n\005s" +
"tate\030\002 \001(\rB\033\n\031emu.grasscutter.net.protob" +
"\n\020ChildQuest.proto\"F\n\nChildQuest\022\r\n\005stat" +
"e\030\001 \001(\r\022\020\n\010quest_id\030\013 \001(\r\022\027\n\017quest_confi" +
"g_id\030\005 \001(\rB\033\n\031emu.grasscutter.net.protob" +
"\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -678,7 +678,7 @@ public final class ChildQuestOuterClass {
internal_static_ChildQuest_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_ChildQuest_descriptor,
new java.lang.String[] { "QuestId", "QuestConfigId", "State", });
new java.lang.String[] { "State", "QuestId", "QuestConfigId", });
}
// @@protoc_insertion_point(outer_class_scope)