Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 10:55:02 +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/EffigyChallengeDungeonResultInfoOuterClass.java
+155 -147
View File
@@ -19,36 +19,40 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 challengeMaxScore = 6;</code>
* <code>uint32 challenge_max_score = 10;</code>
* @return The challengeMaxScore.
*/
int getChallengeMaxScore();
/**
* <code>bool isInTimeLimit = 1;</code>
* <code>bool is_in_time_limit = 1;</code>
* @return The isInTimeLimit.
*/
boolean getIsInTimeLimit();
/**
* <code>uint32 challengeScore = 14;</code>
* @return The challengeScore.
* <code>uint32 challenge_id = 11;</code>
* @return The challengeId.
*/
int getChallengeScore();
int getChallengeId();
/**
* <code>bool isSuccess = 2;</code>
* <code>bool is_success = 5;</code>
* @return The isSuccess.
*/
boolean getIsSuccess();
/**
* <code>uint32 challengeId = 10;</code>
* @return The challengeId.
* <code>uint32 challenge_score = 9;</code>
* @return The challengeScore.
*/
int getChallengeId();
int getChallengeScore();
}
/**
* <pre>
* Name: HFHCNBEGKGP
* </pre>
*
* Protobuf type {@code EffigyChallengeDungeonResultInfo}
*/
public static final class EffigyChallengeDungeonResultInfo extends
@@ -98,24 +102,24 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
isInTimeLimit_ = input.readBool();
break;
}
case 16: {
case 40: {
isSuccess_ = input.readBool();
break;
}
case 48: {
case 72: {
challengeMaxScore_ = input.readUInt32();
challengeScore_ = input.readUInt32();
break;
}
case 80: {
challengeId_ = input.readUInt32();
challengeMaxScore_ = input.readUInt32();
break;
}
case 112: {
case 88: {
challengeScore_ = input.readUInt32();
challengeId_ = input.readUInt32();
break;
}
default: {
@@ -150,10 +154,10 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.class, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder.class);
}
public static final int CHALLENGEMAXSCORE_FIELD_NUMBER = 6;
public static final int CHALLENGE_MAX_SCORE_FIELD_NUMBER = 10;
private int challengeMaxScore_;
/**
* <code>uint32 challengeMaxScore = 6;</code>
* <code>uint32 challenge_max_score = 10;</code>
* @return The challengeMaxScore.
*/
@java.lang.Override
@@ -161,10 +165,10 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
return challengeMaxScore_;
}
public static final int ISINTIMELIMIT_FIELD_NUMBER = 1;
public static final int IS_IN_TIME_LIMIT_FIELD_NUMBER = 1;
private boolean isInTimeLimit_;
/**
* <code>bool isInTimeLimit = 1;</code>
* <code>bool is_in_time_limit = 1;</code>
* @return The isInTimeLimit.
*/
@java.lang.Override
@@ -172,21 +176,21 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
return isInTimeLimit_;
}
public static final int CHALLENGESCORE_FIELD_NUMBER = 14;
private int challengeScore_;
public static final int CHALLENGE_ID_FIELD_NUMBER = 11;
private int challengeId_;
/**
* <code>uint32 challengeScore = 14;</code>
* @return The challengeScore.
* <code>uint32 challenge_id = 11;</code>
* @return The challengeId.
*/
@java.lang.Override
public int getChallengeScore() {
return challengeScore_;
public int getChallengeId() {
return challengeId_;
}
public static final int ISSUCCESS_FIELD_NUMBER = 2;
public static final int IS_SUCCESS_FIELD_NUMBER = 5;
private boolean isSuccess_;
/**
* <code>bool isSuccess = 2;</code>
* <code>bool is_success = 5;</code>
* @return The isSuccess.
*/
@java.lang.Override
@@ -194,15 +198,15 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
return isSuccess_;
}
public static final int CHALLENGEID_FIELD_NUMBER = 10;
private int challengeId_;
public static final int CHALLENGE_SCORE_FIELD_NUMBER = 9;
private int challengeScore_;
/**
* <code>uint32 challengeId = 10;</code>
* @return The challengeId.
* <code>uint32 challenge_score = 9;</code>
* @return The challengeScore.
*/
@java.lang.Override
public int getChallengeId() {
return challengeId_;
public int getChallengeScore() {
return challengeScore_;
}
private byte memoizedIsInitialized = -1;
@@ -223,16 +227,16 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
output.writeBool(1, isInTimeLimit_);
}
if (isSuccess_ != false) {
output.writeBool(2, isSuccess_);
}
if (challengeMaxScore_ != 0) {
output.writeUInt32(6, challengeMaxScore_);
}
if (challengeId_ != 0) {
output.writeUInt32(10, challengeId_);
output.writeBool(5, isSuccess_);
}
if (challengeScore_ != 0) {
output.writeUInt32(14, challengeScore_);
output.writeUInt32(9, challengeScore_);
}
if (challengeMaxScore_ != 0) {
output.writeUInt32(10, challengeMaxScore_);
}
if (challengeId_ != 0) {
output.writeUInt32(11, challengeId_);
}
unknownFields.writeTo(output);
}
@@ -249,19 +253,19 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
}
if (isSuccess_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(2, isSuccess_);
}
if (challengeMaxScore_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, challengeMaxScore_);
}
if (challengeId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, challengeId_);
.computeBoolSize(5, isSuccess_);
}
if (challengeScore_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, challengeScore_);
.computeUInt32Size(9, challengeScore_);
}
if (challengeMaxScore_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, challengeMaxScore_);
}
if (challengeId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, challengeId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -282,12 +286,12 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
!= other.getChallengeMaxScore()) return false;
if (getIsInTimeLimit()
!= other.getIsInTimeLimit()) return false;
if (getChallengeScore()
!= other.getChallengeScore()) return false;
if (getIsSuccess()
!= other.getIsSuccess()) return false;
if (getChallengeId()
!= other.getChallengeId()) return false;
if (getIsSuccess()
!= other.getIsSuccess()) return false;
if (getChallengeScore()
!= other.getChallengeScore()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -299,18 +303,18 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + CHALLENGEMAXSCORE_FIELD_NUMBER;
hash = (37 * hash) + CHALLENGE_MAX_SCORE_FIELD_NUMBER;
hash = (53 * hash) + getChallengeMaxScore();
hash = (37 * hash) + ISINTIMELIMIT_FIELD_NUMBER;
hash = (37 * hash) + IS_IN_TIME_LIMIT_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsInTimeLimit());
hash = (37 * hash) + CHALLENGESCORE_FIELD_NUMBER;
hash = (53 * hash) + getChallengeScore();
hash = (37 * hash) + ISSUCCESS_FIELD_NUMBER;
hash = (37 * hash) + CHALLENGE_ID_FIELD_NUMBER;
hash = (53 * hash) + getChallengeId();
hash = (37 * hash) + IS_SUCCESS_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsSuccess());
hash = (37 * hash) + CHALLENGEID_FIELD_NUMBER;
hash = (53 * hash) + getChallengeId();
hash = (37 * hash) + CHALLENGE_SCORE_FIELD_NUMBER;
hash = (53 * hash) + getChallengeScore();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -407,6 +411,10 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
return builder;
}
/**
* <pre>
* Name: HFHCNBEGKGP
* </pre>
*
* Protobuf type {@code EffigyChallengeDungeonResultInfo}
*/
public static final class Builder extends
@@ -448,11 +456,11 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
isInTimeLimit_ = false;
challengeScore_ = 0;
challengeId_ = 0;
isSuccess_ = false;
challengeId_ = 0;
challengeScore_ = 0;
return this;
}
@@ -482,9 +490,9 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo result = new emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo(this);
result.challengeMaxScore_ = challengeMaxScore_;
result.isInTimeLimit_ = isInTimeLimit_;
result.challengeScore_ = challengeScore_;
result.isSuccess_ = isSuccess_;
result.challengeId_ = challengeId_;
result.isSuccess_ = isSuccess_;
result.challengeScore_ = challengeScore_;
onBuilt();
return result;
}
@@ -539,14 +547,14 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
if (other.getIsInTimeLimit() != false) {
setIsInTimeLimit(other.getIsInTimeLimit());
}
if (other.getChallengeScore() != 0) {
setChallengeScore(other.getChallengeScore());
if (other.getChallengeId() != 0) {
setChallengeId(other.getChallengeId());
}
if (other.getIsSuccess() != false) {
setIsSuccess(other.getIsSuccess());
}
if (other.getChallengeId() != 0) {
setChallengeId(other.getChallengeId());
if (other.getChallengeScore() != 0) {
setChallengeScore(other.getChallengeScore());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -579,7 +587,7 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
private int challengeMaxScore_ ;
/**
* <code>uint32 challengeMaxScore = 6;</code>
* <code>uint32 challenge_max_score = 10;</code>
* @return The challengeMaxScore.
*/
@java.lang.Override
@@ -587,7 +595,7 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
return challengeMaxScore_;
}
/**
* <code>uint32 challengeMaxScore = 6;</code>
* <code>uint32 challenge_max_score = 10;</code>
* @param value The challengeMaxScore to set.
* @return This builder for chaining.
*/
@@ -598,7 +606,7 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
return this;
}
/**
* <code>uint32 challengeMaxScore = 6;</code>
* <code>uint32 challenge_max_score = 10;</code>
* @return This builder for chaining.
*/
public Builder clearChallengeMaxScore() {
@@ -610,7 +618,7 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
private boolean isInTimeLimit_ ;
/**
* <code>bool isInTimeLimit = 1;</code>
* <code>bool is_in_time_limit = 1;</code>
* @return The isInTimeLimit.
*/
@java.lang.Override
@@ -618,7 +626,7 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
return isInTimeLimit_;
}
/**
* <code>bool isInTimeLimit = 1;</code>
* <code>bool is_in_time_limit = 1;</code>
* @param value The isInTimeLimit to set.
* @return This builder for chaining.
*/
@@ -629,7 +637,7 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
return this;
}
/**
* <code>bool isInTimeLimit = 1;</code>
* <code>bool is_in_time_limit = 1;</code>
* @return This builder for chaining.
*/
public Builder clearIsInTimeLimit() {
@@ -639,71 +647,9 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
return this;
}
private int challengeScore_ ;
/**
* <code>uint32 challengeScore = 14;</code>
* @return The challengeScore.
*/
@java.lang.Override
public int getChallengeScore() {
return challengeScore_;
}
/**
* <code>uint32 challengeScore = 14;</code>
* @param value The challengeScore to set.
* @return This builder for chaining.
*/
public Builder setChallengeScore(int value) {
challengeScore_ = value;
onChanged();
return this;
}
/**
* <code>uint32 challengeScore = 14;</code>
* @return This builder for chaining.
*/
public Builder clearChallengeScore() {
challengeScore_ = 0;
onChanged();
return this;
}
private boolean isSuccess_ ;
/**
* <code>bool isSuccess = 2;</code>
* @return The isSuccess.
*/
@java.lang.Override
public boolean getIsSuccess() {
return isSuccess_;
}
/**
* <code>bool isSuccess = 2;</code>
* @param value The isSuccess to set.
* @return This builder for chaining.
*/
public Builder setIsSuccess(boolean value) {
isSuccess_ = value;
onChanged();
return this;
}
/**
* <code>bool isSuccess = 2;</code>
* @return This builder for chaining.
*/
public Builder clearIsSuccess() {
isSuccess_ = false;
onChanged();
return this;
}
private int challengeId_ ;
/**
* <code>uint32 challengeId = 10;</code>
* <code>uint32 challenge_id = 11;</code>
* @return The challengeId.
*/
@java.lang.Override
@@ -711,7 +657,7 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
return challengeId_;
}
/**
* <code>uint32 challengeId = 10;</code>
* <code>uint32 challenge_id = 11;</code>
* @param value The challengeId to set.
* @return This builder for chaining.
*/
@@ -722,7 +668,7 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
return this;
}
/**
* <code>uint32 challengeId = 10;</code>
* <code>uint32 challenge_id = 11;</code>
* @return This builder for chaining.
*/
public Builder clearChallengeId() {
@@ -731,6 +677,68 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
onChanged();
return this;
}
private boolean isSuccess_ ;
/**
* <code>bool is_success = 5;</code>
* @return The isSuccess.
*/
@java.lang.Override
public boolean getIsSuccess() {
return isSuccess_;
}
/**
* <code>bool is_success = 5;</code>
* @param value The isSuccess to set.
* @return This builder for chaining.
*/
public Builder setIsSuccess(boolean value) {
isSuccess_ = value;
onChanged();
return this;
}
/**
* <code>bool is_success = 5;</code>
* @return This builder for chaining.
*/
public Builder clearIsSuccess() {
isSuccess_ = false;
onChanged();
return this;
}
private int challengeScore_ ;
/**
* <code>uint32 challenge_score = 9;</code>
* @return The challengeScore.
*/
@java.lang.Override
public int getChallengeScore() {
return challengeScore_;
}
/**
* <code>uint32 challenge_score = 9;</code>
* @param value The challengeScore to set.
* @return This builder for chaining.
*/
public Builder setChallengeScore(int value) {
challengeScore_ = value;
onChanged();
return this;
}
/**
* <code>uint32 challenge_score = 9;</code>
* @return This builder for chaining.
*/
public Builder clearChallengeScore() {
challengeScore_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -799,11 +807,11 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
static {
java.lang.String[] descriptorData = {
"\n&EffigyChallengeDungeonResultInfo.proto" +
"\"\224\001\n EffigyChallengeDungeonResultInfo\022\031\n" +
"\021challengeMaxScore\030\006 \001(\r\022\025\n\risInTimeLimi" +
"t\030\001 \001(\010\022\026\n\016challengeScore\030\016 \001(\r\022\021\n\tisSuc" +
"cess\030\002 \001(\010\022\023\n\013challengeId\030\n \001(\rB\033\n\031emu.g" +
"rasscutter.net.protob\006proto3"
"\"\234\001\n EffigyChallengeDungeonResultInfo\022\033\n" +
"\023challenge_max_score\030\n \001(\r\022\030\n\020is_in_time" +
"_limit\030\001 \001(\010\022\024\n\014challenge_id\030\013 \001(\r\022\022\n\nis" +
"_success\030\005 \001(\010\022\027\n\017challenge_score\030\t \001(\rB" +
"\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -814,7 +822,7 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
internal_static_EffigyChallengeDungeonResultInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_EffigyChallengeDungeonResultInfo_descriptor,
new java.lang.String[] { "ChallengeMaxScore", "IsInTimeLimit", "ChallengeScore", "IsSuccess", "ChallengeId", });
new java.lang.String[] { "ChallengeMaxScore", "IsInTimeLimit", "ChallengeId", "IsSuccess", "ChallengeScore", });
}
// @@protoc_insertion_point(outer_class_scope)