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

Add support for v3.5.0 (#2090)

Browse Source 
* Fix Dvalin battle

See https://github.com/Anime-Game-Servers/Grasscutter-Quests/pull/25.

This is entirely untested and there's a 99% chance it's broken, I'm just submitting it as a draft PR so that I don't forget about its existence.

Co-Authored-By: mjolsic <21289772+mjolsic@users.noreply.github.com>

* Update protos

* 3.4 protos

* Fix

Now builds successfully, don't have the time to check if I should have specified true instead of false for withChildQuests, or if this functions as intended.

* Change from false to true

Per what smileoflove has been told on Discord

* 3.5

* Remove the Dvalin crap from this PR

Git is so confusing

* Update version

* Apply README changes from `origin/development`

* Remove unnecessary debugging information

---------

Co-authored-by: mjolsic <21289772+mjolsic@users.noreply.github.com>
Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
This commit is contained in:
Colleiflower
2023-03-31 19:13:32 +00:00
committed by GitHub
Unverified
parent 922f7bca51
commit 516e5975e1
1383 changed files with 167226 additions and 586936 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/ChildQuestOuterClass.java
+133 -125
View File
@@ -19,24 +19,28 @@ public final class ChildQuestOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 questId = 5;</code>
* @return The questId.
* <code>uint32 state = 1;</code>
* @return The state.
*/
int getQuestId();
int getState();
/**
* <code>uint32 questConfigId = 10;</code>
* <code>uint32 quest_config_id = 14;</code>
* @return The questConfigId.
*/
int getQuestConfigId();
/**
* <code>uint32 state = 12;</code>
* @return The state.
* <code>uint32 quest_id = 8;</code>
* @return The questId.
*/
int getState();
int getQuestId();
}
/**
* <pre>
* Name: DDGEINCPPIK
* </pre>
*
* Protobuf type {@code ChildQuest}
*/
public static final class ChildQuest extends
@@ -81,21 +85,21 @@ public final class ChildQuestOuterClass {
case 0:
done = true;
break;
case 40: {
case 8: {
state_ = input.readUInt32();
break;
}
case 64: {
questId_ = input.readUInt32();
break;
}
case 80: {
case 112: {
questConfigId_ = input.readUInt32();
break;
}
case 96: {
state_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -128,21 +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 QUESTID_FIELD_NUMBER = 5;
private int questId_;
public static final int STATE_FIELD_NUMBER = 1;
private int state_;
/**
* <code>uint32 questId = 5;</code>
* @return The questId.
* <code>uint32 state = 1;</code>
* @return The state.
*/
@java.lang.Override
public int getQuestId() {
return questId_;
public int getState() {
return state_;
}
public static final int QUESTCONFIGID_FIELD_NUMBER = 10;
public static final int QUEST_CONFIG_ID_FIELD_NUMBER = 14;
private int questConfigId_;
/**
* <code>uint32 questConfigId = 10;</code>
* <code>uint32 quest_config_id = 14;</code>
* @return The questConfigId.
*/
@java.lang.Override
@@ -150,15 +154,15 @@ public final class ChildQuestOuterClass {
return questConfigId_;
}
public static final int STATE_FIELD_NUMBER = 12;
private int state_;
public static final int QUEST_ID_FIELD_NUMBER = 8;
private int questId_;
/**
* <code>uint32 state = 12;</code>
* @return The state.
* <code>uint32 quest_id = 8;</code>
* @return The questId.
*/
@java.lang.Override
public int getState() {
return state_;
public int getQuestId() {
return questId_;
}
private byte memoizedIsInitialized = -1;
@@ -175,14 +179,14 @@ public final class ChildQuestOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (state_ != 0) {
output.writeUInt32(1, state_);
}
if (questId_ != 0) {
output.writeUInt32(5, questId_);
output.writeUInt32(8, questId_);
}
if (questConfigId_ != 0) {
output.writeUInt32(10, questConfigId_);
}
if (state_ != 0) {
output.writeUInt32(12, state_);
output.writeUInt32(14, questConfigId_);
}
unknownFields.writeTo(output);
}
@@ -193,17 +197,17 @@ public final class ChildQuestOuterClass {
if (size != -1) return size;
size = 0;
if (state_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, state_);
}
if (questId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, questId_);
.computeUInt32Size(8, questId_);
}
if (questConfigId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, questConfigId_);
}
if (state_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(12, state_);
.computeUInt32Size(14, questConfigId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -220,12 +224,12 @@ public final class ChildQuestOuterClass {
}
emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest other = (emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest) obj;
if (getQuestId()
!= other.getQuestId()) return false;
if (getQuestConfigId()
!= other.getQuestConfigId()) return false;
if (getState()
!= other.getState()) return false;
if (getQuestConfigId()
!= other.getQuestConfigId()) return false;
if (getQuestId()
!= other.getQuestId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -237,12 +241,12 @@ public final class ChildQuestOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + QUESTID_FIELD_NUMBER;
hash = (53 * hash) + getQuestId();
hash = (37 * hash) + QUESTCONFIGID_FIELD_NUMBER;
hash = (53 * hash) + getQuestConfigId();
hash = (37 * hash) + STATE_FIELD_NUMBER;
hash = (53 * hash) + getState();
hash = (37 * hash) + QUEST_CONFIG_ID_FIELD_NUMBER;
hash = (53 * hash) + getQuestConfigId();
hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
hash = (53 * hash) + getQuestId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -339,6 +343,10 @@ public final class ChildQuestOuterClass {
return builder;
}
/**
* <pre>
* Name: DDGEINCPPIK
* </pre>
*
* Protobuf type {@code ChildQuest}
*/
public static final class Builder extends
@@ -376,11 +384,11 @@ public final class ChildQuestOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
questId_ = 0;
state_ = 0;
questConfigId_ = 0;
state_ = 0;
questId_ = 0;
return this;
}
@@ -408,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.questId_ = questId_;
result.questConfigId_ = questConfigId_;
result.state_ = state_;
result.questConfigId_ = questConfigId_;
result.questId_ = questId_;
onBuilt();
return result;
}
@@ -459,14 +467,14 @@ 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.getQuestId() != 0) {
setQuestId(other.getQuestId());
if (other.getState() != 0) {
setState(other.getState());
}
if (other.getQuestConfigId() != 0) {
setQuestConfigId(other.getQuestConfigId());
}
if (other.getState() != 0) {
setState(other.getState());
if (other.getQuestId() != 0) {
setQuestId(other.getQuestId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -497,71 +505,9 @@ public final class ChildQuestOuterClass {
return this;
}
private int questId_ ;
/**
* <code>uint32 questId = 5;</code>
* @return The questId.
*/
@java.lang.Override
public int getQuestId() {
return questId_;
}
/**
* <code>uint32 questId = 5;</code>
* @param value The questId to set.
* @return This builder for chaining.
*/
public Builder setQuestId(int value) {
questId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 questId = 5;</code>
* @return This builder for chaining.
*/
public Builder clearQuestId() {
questId_ = 0;
onChanged();
return this;
}
private int questConfigId_ ;
/**
* <code>uint32 questConfigId = 10;</code>
* @return The questConfigId.
*/
@java.lang.Override
public int getQuestConfigId() {
return questConfigId_;
}
/**
* <code>uint32 questConfigId = 10;</code>
* @param value The questConfigId to set.
* @return This builder for chaining.
*/
public Builder setQuestConfigId(int value) {
questConfigId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 questConfigId = 10;</code>
* @return This builder for chaining.
*/
public Builder clearQuestConfigId() {
questConfigId_ = 0;
onChanged();
return this;
}
private int state_ ;
/**
* <code>uint32 state = 12;</code>
* <code>uint32 state = 1;</code>
* @return The state.
*/
@java.lang.Override
@@ -569,7 +515,7 @@ public final class ChildQuestOuterClass {
return state_;
}
/**
* <code>uint32 state = 12;</code>
* <code>uint32 state = 1;</code>
* @param value The state to set.
* @return This builder for chaining.
*/
@@ -580,7 +526,7 @@ public final class ChildQuestOuterClass {
return this;
}
/**
* <code>uint32 state = 12;</code>
* <code>uint32 state = 1;</code>
* @return This builder for chaining.
*/
public Builder clearState() {
@@ -589,6 +535,68 @@ public final class ChildQuestOuterClass {
onChanged();
return this;
}
private int questConfigId_ ;
/**
* <code>uint32 quest_config_id = 14;</code>
* @return The questConfigId.
*/
@java.lang.Override
public int getQuestConfigId() {
return questConfigId_;
}
/**
* <code>uint32 quest_config_id = 14;</code>
* @param value The questConfigId to set.
* @return This builder for chaining.
*/
public Builder setQuestConfigId(int value) {
questConfigId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 quest_config_id = 14;</code>
* @return This builder for chaining.
*/
public Builder clearQuestConfigId() {
questConfigId_ = 0;
onChanged();
return this;
}
private int questId_ ;
/**
* <code>uint32 quest_id = 8;</code>
* @return The questId.
*/
@java.lang.Override
public int getQuestId() {
return questId_;
}
/**
* <code>uint32 quest_id = 8;</code>
* @param value The questId to set.
* @return This builder for chaining.
*/
public Builder setQuestId(int value) {
questId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 quest_id = 8;</code>
* @return This builder for chaining.
*/
public Builder clearQuestId() {
questId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -656,10 +664,10 @@ public final class ChildQuestOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\020ChildQuest.proto\"C\n\nChildQuest\022\017\n\007ques" +
"tId\030\005 \001(\r\022\025\n\rquestConfigId\030\n \001(\r\022\r\n\005stat" +
"e\030\014 \001(\rB\033\n\031emu.grasscutter.net.protob\006pr" +
"oto3"
"\n\020ChildQuest.proto\"F\n\nChildQuest\022\r\n\005stat" +
"e\030\001 \001(\r\022\027\n\017quest_config_id\030\016 \001(\r\022\020\n\010ques" +
"t_id\030\010 \001(\rB\033\n\031emu.grasscutter.net.protob" +
"\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -670,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", "QuestConfigId", "QuestId", });
}
// @@protoc_insertion_point(outer_class_scope)