Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-18 07:39:50 +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/ActivityWatcherInfoOuterClass.java
+191 -183
View File
@@ -19,30 +19,34 @@ public final class ActivityWatcherInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 curProgress = 8;</code>
* <code>uint32 watcher_id = 14;</code>
* @return The watcherId.
*/
int getWatcherId();
/**
* <code>uint32 cur_progress = 1;</code>
* @return The curProgress.
*/
int getCurProgress();
/**
* <code>bool isTakenReward = 12;</code>
* @return The isTakenReward.
*/
boolean getIsTakenReward();
/**
* <code>uint32 totalProgress = 1;</code>
* <code>uint32 total_progress = 13;</code>
* @return The totalProgress.
*/
int getTotalProgress();
/**
* <code>uint32 watcherId = 10;</code>
* @return The watcherId.
* <code>bool is_taken_reward = 12;</code>
* @return The isTakenReward.
*/
int getWatcherId();
boolean getIsTakenReward();
}
/**
* <pre>
* Name: NACCPGOMNLE
* </pre>
*
* Protobuf type {@code ActivityWatcherInfo}
*/
public static final class ActivityWatcherInfo extends
@@ -89,24 +93,24 @@ public final class ActivityWatcherInfoOuterClass {
break;
case 8: {
totalProgress_ = input.readUInt32();
break;
}
case 64: {
curProgress_ = input.readUInt32();
break;
}
case 80: {
watcherId_ = input.readUInt32();
break;
}
case 96: {
isTakenReward_ = input.readBool();
break;
}
case 104: {
totalProgress_ = input.readUInt32();
break;
}
case 112: {
watcherId_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -139,10 +143,21 @@ public final class ActivityWatcherInfoOuterClass {
emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.class, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder.class);
}
public static final int CURPROGRESS_FIELD_NUMBER = 8;
public static final int WATCHER_ID_FIELD_NUMBER = 14;
private int watcherId_;
/**
* <code>uint32 watcher_id = 14;</code>
* @return The watcherId.
*/
@java.lang.Override
public int getWatcherId() {
return watcherId_;
}
public static final int CUR_PROGRESS_FIELD_NUMBER = 1;
private int curProgress_;
/**
* <code>uint32 curProgress = 8;</code>
* <code>uint32 cur_progress = 1;</code>
* @return The curProgress.
*/
@java.lang.Override
@@ -150,21 +165,10 @@ public final class ActivityWatcherInfoOuterClass {
return curProgress_;
}
public static final int ISTAKENREWARD_FIELD_NUMBER = 12;
private boolean isTakenReward_;
/**
* <code>bool isTakenReward = 12;</code>
* @return The isTakenReward.
*/
@java.lang.Override
public boolean getIsTakenReward() {
return isTakenReward_;
}
public static final int TOTALPROGRESS_FIELD_NUMBER = 1;
public static final int TOTAL_PROGRESS_FIELD_NUMBER = 13;
private int totalProgress_;
/**
* <code>uint32 totalProgress = 1;</code>
* <code>uint32 total_progress = 13;</code>
* @return The totalProgress.
*/
@java.lang.Override
@@ -172,15 +176,15 @@ public final class ActivityWatcherInfoOuterClass {
return totalProgress_;
}
public static final int WATCHERID_FIELD_NUMBER = 10;
private int watcherId_;
public static final int IS_TAKEN_REWARD_FIELD_NUMBER = 12;
private boolean isTakenReward_;
/**
* <code>uint32 watcherId = 10;</code>
* @return The watcherId.
* <code>bool is_taken_reward = 12;</code>
* @return The isTakenReward.
*/
@java.lang.Override
public int getWatcherId() {
return watcherId_;
public boolean getIsTakenReward() {
return isTakenReward_;
}
private byte memoizedIsInitialized = -1;
@@ -197,18 +201,18 @@ public final class ActivityWatcherInfoOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (totalProgress_ != 0) {
output.writeUInt32(1, totalProgress_);
}
if (curProgress_ != 0) {
output.writeUInt32(8, curProgress_);
}
if (watcherId_ != 0) {
output.writeUInt32(10, watcherId_);
output.writeUInt32(1, curProgress_);
}
if (isTakenReward_ != false) {
output.writeBool(12, isTakenReward_);
}
if (totalProgress_ != 0) {
output.writeUInt32(13, totalProgress_);
}
if (watcherId_ != 0) {
output.writeUInt32(14, watcherId_);
}
unknownFields.writeTo(output);
}
@@ -218,22 +222,22 @@ public final class ActivityWatcherInfoOuterClass {
if (size != -1) return size;
size = 0;
if (totalProgress_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, totalProgress_);
}
if (curProgress_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(8, curProgress_);
}
if (watcherId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, watcherId_);
.computeUInt32Size(1, curProgress_);
}
if (isTakenReward_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(12, isTakenReward_);
}
if (totalProgress_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, totalProgress_);
}
if (watcherId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, watcherId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -249,14 +253,14 @@ public final class ActivityWatcherInfoOuterClass {
}
emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo other = (emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo) obj;
if (getCurProgress()
!= other.getCurProgress()) return false;
if (getIsTakenReward()
!= other.getIsTakenReward()) return false;
if (getTotalProgress()
!= other.getTotalProgress()) return false;
if (getWatcherId()
!= other.getWatcherId()) return false;
if (getCurProgress()
!= other.getCurProgress()) return false;
if (getTotalProgress()
!= other.getTotalProgress()) return false;
if (getIsTakenReward()
!= other.getIsTakenReward()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -268,15 +272,15 @@ public final class ActivityWatcherInfoOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + CURPROGRESS_FIELD_NUMBER;
hash = (37 * hash) + WATCHER_ID_FIELD_NUMBER;
hash = (53 * hash) + getWatcherId();
hash = (37 * hash) + CUR_PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getCurProgress();
hash = (37 * hash) + ISTAKENREWARD_FIELD_NUMBER;
hash = (37 * hash) + TOTAL_PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getTotalProgress();
hash = (37 * hash) + IS_TAKEN_REWARD_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsTakenReward());
hash = (37 * hash) + TOTALPROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getTotalProgress();
hash = (37 * hash) + WATCHERID_FIELD_NUMBER;
hash = (53 * hash) + getWatcherId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -373,6 +377,10 @@ public final class ActivityWatcherInfoOuterClass {
return builder;
}
/**
* <pre>
* Name: NACCPGOMNLE
* </pre>
*
* Protobuf type {@code ActivityWatcherInfo}
*/
public static final class Builder extends
@@ -410,13 +418,13 @@ public final class ActivityWatcherInfoOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
curProgress_ = 0;
watcherId_ = 0;
isTakenReward_ = false;
curProgress_ = 0;
totalProgress_ = 0;
watcherId_ = 0;
isTakenReward_ = false;
return this;
}
@@ -444,10 +452,10 @@ public final class ActivityWatcherInfoOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo buildPartial() {
emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo result = new emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo(this);
result.curProgress_ = curProgress_;
result.isTakenReward_ = isTakenReward_;
result.totalProgress_ = totalProgress_;
result.watcherId_ = watcherId_;
result.curProgress_ = curProgress_;
result.totalProgress_ = totalProgress_;
result.isTakenReward_ = isTakenReward_;
onBuilt();
return result;
}
@@ -496,17 +504,17 @@ public final class ActivityWatcherInfoOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo other) {
if (other == emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.getDefaultInstance()) return this;
if (other.getWatcherId() != 0) {
setWatcherId(other.getWatcherId());
}
if (other.getCurProgress() != 0) {
setCurProgress(other.getCurProgress());
}
if (other.getIsTakenReward() != false) {
setIsTakenReward(other.getIsTakenReward());
}
if (other.getTotalProgress() != 0) {
setTotalProgress(other.getTotalProgress());
}
if (other.getWatcherId() != 0) {
setWatcherId(other.getWatcherId());
if (other.getIsTakenReward() != false) {
setIsTakenReward(other.getIsTakenReward());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -537,102 +545,9 @@ public final class ActivityWatcherInfoOuterClass {
return this;
}
private int curProgress_ ;
/**
* <code>uint32 curProgress = 8;</code>
* @return The curProgress.
*/
@java.lang.Override
public int getCurProgress() {
return curProgress_;
}
/**
* <code>uint32 curProgress = 8;</code>
* @param value The curProgress to set.
* @return This builder for chaining.
*/
public Builder setCurProgress(int value) {
curProgress_ = value;
onChanged();
return this;
}
/**
* <code>uint32 curProgress = 8;</code>
* @return This builder for chaining.
*/
public Builder clearCurProgress() {
curProgress_ = 0;
onChanged();
return this;
}
private boolean isTakenReward_ ;
/**
* <code>bool isTakenReward = 12;</code>
* @return The isTakenReward.
*/
@java.lang.Override
public boolean getIsTakenReward() {
return isTakenReward_;
}
/**
* <code>bool isTakenReward = 12;</code>
* @param value The isTakenReward to set.
* @return This builder for chaining.
*/
public Builder setIsTakenReward(boolean value) {
isTakenReward_ = value;
onChanged();
return this;
}
/**
* <code>bool isTakenReward = 12;</code>
* @return This builder for chaining.
*/
public Builder clearIsTakenReward() {
isTakenReward_ = false;
onChanged();
return this;
}
private int totalProgress_ ;
/**
* <code>uint32 totalProgress = 1;</code>
* @return The totalProgress.
*/
@java.lang.Override
public int getTotalProgress() {
return totalProgress_;
}
/**
* <code>uint32 totalProgress = 1;</code>
* @param value The totalProgress to set.
* @return This builder for chaining.
*/
public Builder setTotalProgress(int value) {
totalProgress_ = value;
onChanged();
return this;
}
/**
* <code>uint32 totalProgress = 1;</code>
* @return This builder for chaining.
*/
public Builder clearTotalProgress() {
totalProgress_ = 0;
onChanged();
return this;
}
private int watcherId_ ;
/**
* <code>uint32 watcherId = 10;</code>
* <code>uint32 watcher_id = 14;</code>
* @return The watcherId.
*/
@java.lang.Override
@@ -640,7 +555,7 @@ public final class ActivityWatcherInfoOuterClass {
return watcherId_;
}
/**
* <code>uint32 watcherId = 10;</code>
* <code>uint32 watcher_id = 14;</code>
* @param value The watcherId to set.
* @return This builder for chaining.
*/
@@ -651,7 +566,7 @@ public final class ActivityWatcherInfoOuterClass {
return this;
}
/**
* <code>uint32 watcherId = 10;</code>
* <code>uint32 watcher_id = 14;</code>
* @return This builder for chaining.
*/
public Builder clearWatcherId() {
@@ -660,6 +575,99 @@ public final class ActivityWatcherInfoOuterClass {
onChanged();
return this;
}
private int curProgress_ ;
/**
* <code>uint32 cur_progress = 1;</code>
* @return The curProgress.
*/
@java.lang.Override
public int getCurProgress() {
return curProgress_;
}
/**
* <code>uint32 cur_progress = 1;</code>
* @param value The curProgress to set.
* @return This builder for chaining.
*/
public Builder setCurProgress(int value) {
curProgress_ = value;
onChanged();
return this;
}
/**
* <code>uint32 cur_progress = 1;</code>
* @return This builder for chaining.
*/
public Builder clearCurProgress() {
curProgress_ = 0;
onChanged();
return this;
}
private int totalProgress_ ;
/**
* <code>uint32 total_progress = 13;</code>
* @return The totalProgress.
*/
@java.lang.Override
public int getTotalProgress() {
return totalProgress_;
}
/**
* <code>uint32 total_progress = 13;</code>
* @param value The totalProgress to set.
* @return This builder for chaining.
*/
public Builder setTotalProgress(int value) {
totalProgress_ = value;
onChanged();
return this;
}
/**
* <code>uint32 total_progress = 13;</code>
* @return This builder for chaining.
*/
public Builder clearTotalProgress() {
totalProgress_ = 0;
onChanged();
return this;
}
private boolean isTakenReward_ ;
/**
* <code>bool is_taken_reward = 12;</code>
* @return The isTakenReward.
*/
@java.lang.Override
public boolean getIsTakenReward() {
return isTakenReward_;
}
/**
* <code>bool is_taken_reward = 12;</code>
* @param value The isTakenReward to set.
* @return This builder for chaining.
*/
public Builder setIsTakenReward(boolean value) {
isTakenReward_ = value;
onChanged();
return this;
}
/**
* <code>bool is_taken_reward = 12;</code>
* @return This builder for chaining.
*/
public Builder clearIsTakenReward() {
isTakenReward_ = false;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -727,11 +735,11 @@ public final class ActivityWatcherInfoOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\031ActivityWatcherInfo.proto\"k\n\023ActivityW" +
"atcherInfo\022\023\n\013curProgress\030\010 \001(\r\022\025\n\risTak" +
"enReward\030\014 \001(\010\022\025\n\rtotalProgress\030\001 \001(\r\022\021\n" +
"\twatcherId\030\n \001(\rB\033\n\031emu.grasscutter.net." +
"protob\006proto3"
"\n\031ActivityWatcherInfo.proto\"p\n\023ActivityW" +
"atcherInfo\022\022\n\nwatcher_id\030\016 \001(\r\022\024\n\014cur_pr" +
"ogress\030\001 \001(\r\022\026\n\016total_progress\030\r \001(\r\022\027\n\017" +
"is_taken_reward\030\014 \001(\010B\033\n\031emu.grasscutter" +
".net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -742,7 +750,7 @@ public final class ActivityWatcherInfoOuterClass {
internal_static_ActivityWatcherInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_ActivityWatcherInfo_descriptor,
new java.lang.String[] { "CurProgress", "IsTakenReward", "TotalProgress", "WatcherId", });
new java.lang.String[] { "WatcherId", "CurProgress", "TotalProgress", "IsTakenReward", });
}
// @@protoc_insertion_point(outer_class_scope)