Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-24 02:19: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/FurnitureMakeHelpDataOuterClass.java
+33 -25
View File
@@ -19,18 +19,22 @@ public final class FurnitureMakeHelpDataOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 times = 2;</code>
* <code>uint32 times = 3;</code>
* @return The times.
*/
int getTimes();
/**
* <code>uint32 uid = 6;</code>
* <code>uint32 uid = 2;</code>
* @return The uid.
*/
int getUid();
}
/**
* <pre>
* Name: DLNFNGEEJLG
* </pre>
*
* Protobuf type {@code FurnitureMakeHelpData}
*/
public static final class FurnitureMakeHelpData extends
@@ -77,12 +81,12 @@ public final class FurnitureMakeHelpDataOuterClass {
break;
case 16: {
times_ = input.readUInt32();
uid_ = input.readUInt32();
break;
}
case 48: {
case 24: {
uid_ = input.readUInt32();
times_ = input.readUInt32();
break;
}
default: {
@@ -117,10 +121,10 @@ public final class FurnitureMakeHelpDataOuterClass {
emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData.class, emu.grasscutter.net.proto.FurnitureMakeHelpDataOuterClass.FurnitureMakeHelpData.Builder.class);
}
public static final int TIMES_FIELD_NUMBER = 2;
public static final int TIMES_FIELD_NUMBER = 3;
private int times_;
/**
* <code>uint32 times = 2;</code>
* <code>uint32 times = 3;</code>
* @return The times.
*/
@java.lang.Override
@@ -128,10 +132,10 @@ public final class FurnitureMakeHelpDataOuterClass {
return times_;
}
public static final int UID_FIELD_NUMBER = 6;
public static final int UID_FIELD_NUMBER = 2;
private int uid_;
/**
* <code>uint32 uid = 6;</code>
* <code>uint32 uid = 2;</code>
* @return The uid.
*/
@java.lang.Override
@@ -153,11 +157,11 @@ public final class FurnitureMakeHelpDataOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (times_ != 0) {
output.writeUInt32(2, times_);
}
if (uid_ != 0) {
output.writeUInt32(6, uid_);
output.writeUInt32(2, uid_);
}
if (times_ != 0) {
output.writeUInt32(3, times_);
}
unknownFields.writeTo(output);
}
@@ -168,13 +172,13 @@ public final class FurnitureMakeHelpDataOuterClass {
if (size != -1) return size;
size = 0;
if (times_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(2, times_);
}
if (uid_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, uid_);
.computeUInt32Size(2, uid_);
}
if (times_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, times_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -306,6 +310,10 @@ public final class FurnitureMakeHelpDataOuterClass {
return builder;
}
/**
* <pre>
* Name: DLNFNGEEJLG
* </pre>
*
* Protobuf type {@code FurnitureMakeHelpData}
*/
public static final class Builder extends
@@ -460,7 +468,7 @@ public final class FurnitureMakeHelpDataOuterClass {
private int times_ ;
/**
* <code>uint32 times = 2;</code>
* <code>uint32 times = 3;</code>
* @return The times.
*/
@java.lang.Override
@@ -468,7 +476,7 @@ public final class FurnitureMakeHelpDataOuterClass {
return times_;
}
/**
* <code>uint32 times = 2;</code>
* <code>uint32 times = 3;</code>
* @param value The times to set.
* @return This builder for chaining.
*/
@@ -479,7 +487,7 @@ public final class FurnitureMakeHelpDataOuterClass {
return this;
}
/**
* <code>uint32 times = 2;</code>
* <code>uint32 times = 3;</code>
* @return This builder for chaining.
*/
public Builder clearTimes() {
@@ -491,7 +499,7 @@ public final class FurnitureMakeHelpDataOuterClass {
private int uid_ ;
/**
* <code>uint32 uid = 6;</code>
* <code>uint32 uid = 2;</code>
* @return The uid.
*/
@java.lang.Override
@@ -499,7 +507,7 @@ public final class FurnitureMakeHelpDataOuterClass {
return uid_;
}
/**
* <code>uint32 uid = 6;</code>
* <code>uint32 uid = 2;</code>
* @param value The uid to set.
* @return This builder for chaining.
*/
@@ -510,7 +518,7 @@ public final class FurnitureMakeHelpDataOuterClass {
return this;
}
/**
* <code>uint32 uid = 6;</code>
* <code>uint32 uid = 2;</code>
* @return This builder for chaining.
*/
public Builder clearUid() {
@@ -587,7 +595,7 @@ public final class FurnitureMakeHelpDataOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\033FurnitureMakeHelpData.proto\"3\n\025Furnitu" +
"reMakeHelpData\022\r\n\005times\030\002 \001(\r\022\013\n\003uid\030\006 \001" +
"reMakeHelpData\022\r\n\005times\030\003 \001(\r\022\013\n\003uid\030\002 \001" +
"(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor