Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 10:33:34 +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/BonusOpActivityInfoOuterClass.java
+18 -10
View File
@@ -19,12 +19,16 @@ public final class BonusOpActivityInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 left_bonus_count = 8;</code>
* <code>uint32 left_bonus_count = 4;</code>
* @return The leftBonusCount.
*/
int getLeftBonusCount();
}
/**
* <pre>
* Name: MHBLMMJDAIF
* </pre>
*
* Protobuf type {@code BonusOpActivityInfo}
*/
public static final class BonusOpActivityInfo extends
@@ -69,7 +73,7 @@ public final class BonusOpActivityInfoOuterClass {
case 0:
done = true;
break;
case 64: {
case 32: {
leftBonusCount_ = input.readUInt32();
break;
@@ -106,10 +110,10 @@ public final class BonusOpActivityInfoOuterClass {
emu.grasscutter.net.proto.BonusOpActivityInfoOuterClass.BonusOpActivityInfo.class, emu.grasscutter.net.proto.BonusOpActivityInfoOuterClass.BonusOpActivityInfo.Builder.class);
}
public static final int LEFT_BONUS_COUNT_FIELD_NUMBER = 8;
public static final int LEFT_BONUS_COUNT_FIELD_NUMBER = 4;
private int leftBonusCount_;
/**
* <code>uint32 left_bonus_count = 8;</code>
* <code>uint32 left_bonus_count = 4;</code>
* @return The leftBonusCount.
*/
@java.lang.Override
@@ -132,7 +136,7 @@ public final class BonusOpActivityInfoOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (leftBonusCount_ != 0) {
output.writeUInt32(8, leftBonusCount_);
output.writeUInt32(4, leftBonusCount_);
}
unknownFields.writeTo(output);
}
@@ -145,7 +149,7 @@ public final class BonusOpActivityInfoOuterClass {
size = 0;
if (leftBonusCount_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(8, leftBonusCount_);
.computeUInt32Size(4, leftBonusCount_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -273,6 +277,10 @@ public final class BonusOpActivityInfoOuterClass {
return builder;
}
/**
* <pre>
* Name: MHBLMMJDAIF
* </pre>
*
* Protobuf type {@code BonusOpActivityInfo}
*/
public static final class Builder extends
@@ -421,7 +429,7 @@ public final class BonusOpActivityInfoOuterClass {
private int leftBonusCount_ ;
/**
* <code>uint32 left_bonus_count = 8;</code>
* <code>uint32 left_bonus_count = 4;</code>
* @return The leftBonusCount.
*/
@java.lang.Override
@@ -429,7 +437,7 @@ public final class BonusOpActivityInfoOuterClass {
return leftBonusCount_;
}
/**
* <code>uint32 left_bonus_count = 8;</code>
* <code>uint32 left_bonus_count = 4;</code>
* @param value The leftBonusCount to set.
* @return This builder for chaining.
*/
@@ -440,7 +448,7 @@ public final class BonusOpActivityInfoOuterClass {
return this;
}
/**
* <code>uint32 left_bonus_count = 8;</code>
* <code>uint32 left_bonus_count = 4;</code>
* @return This builder for chaining.
*/
public Builder clearLeftBonusCount() {
@@ -517,7 +525,7 @@ public final class BonusOpActivityInfoOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\031BonusOpActivityInfo.proto\"/\n\023BonusOpAc" +
"tivityInfo\022\030\n\020left_bonus_count\030\010 \001(\rB\033\n\031" +
"tivityInfo\022\030\n\020left_bonus_count\030\004 \001(\rB\033\n\031" +
"emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor