Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-09 01:04:00 +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/HomeResourceTakeFetterExpRspOuterClass.java
+91 -101
View File
@@ -19,35 +19,30 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.HomeResource fetterExp = 12;</code>
* <code>int32 retcode = 2;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>.HomeResource fetter_exp = 9;</code>
* @return Whether the fetterExp field is set.
*/
boolean hasFetterExp();
/**
* <code>.HomeResource fetterExp = 12;</code>
* <code>.HomeResource fetter_exp = 9;</code>
* @return The fetterExp.
*/
emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource getFetterExp();
/**
* <code>.HomeResource fetterExp = 12;</code>
* <code>.HomeResource fetter_exp = 9;</code>
*/
emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResourceOrBuilder getFetterExpOrBuilder();
/**
* <code>int32 retcode = 3;</code>
* @return The retcode.
*/
int getRetcode();
}
/**
* <pre>
*enum GGMAOEEILCK {
* option allow_alias= true;
* NONE = 0;
* PEPPOHPHJOJ = 4837;
* DCDNILFDFLB = 0;
* NNBKOLMPOEA = 1;
*}
* Name: IIGPCKJGACD
* CmdId: 4808
* </pre>
*
* Protobuf type {@code HomeResourceTakeFetterExpRsp}
@@ -94,12 +89,12 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
case 0:
done = true;
break;
case 24: {
case 16: {
retcode_ = input.readInt32();
break;
}
case 98: {
case 74: {
emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource.Builder subBuilder = null;
if (fetterExp_ != null) {
subBuilder = fetterExp_.toBuilder();
@@ -144,10 +139,21 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
emu.grasscutter.net.proto.HomeResourceTakeFetterExpRspOuterClass.HomeResourceTakeFetterExpRsp.class, emu.grasscutter.net.proto.HomeResourceTakeFetterExpRspOuterClass.HomeResourceTakeFetterExpRsp.Builder.class);
}
public static final int FETTEREXP_FIELD_NUMBER = 12;
public static final int RETCODE_FIELD_NUMBER = 2;
private int retcode_;
/**
* <code>int32 retcode = 2;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
public static final int FETTER_EXP_FIELD_NUMBER = 9;
private emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource fetterExp_;
/**
* <code>.HomeResource fetterExp = 12;</code>
* <code>.HomeResource fetter_exp = 9;</code>
* @return Whether the fetterExp field is set.
*/
@java.lang.Override
@@ -155,7 +161,7 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
return fetterExp_ != null;
}
/**
* <code>.HomeResource fetterExp = 12;</code>
* <code>.HomeResource fetter_exp = 9;</code>
* @return The fetterExp.
*/
@java.lang.Override
@@ -163,24 +169,13 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
return fetterExp_ == null ? emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource.getDefaultInstance() : fetterExp_;
}
/**
* <code>.HomeResource fetterExp = 12;</code>
* <code>.HomeResource fetter_exp = 9;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResourceOrBuilder getFetterExpOrBuilder() {
return getFetterExp();
}
public static final int RETCODE_FIELD_NUMBER = 3;
private int retcode_;
/**
* <code>int32 retcode = 3;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -196,10 +191,10 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(3, retcode_);
output.writeInt32(2, retcode_);
}
if (fetterExp_ != null) {
output.writeMessage(12, getFetterExp());
output.writeMessage(9, getFetterExp());
}
unknownFields.writeTo(output);
}
@@ -212,11 +207,11 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(3, retcode_);
.computeInt32Size(2, retcode_);
}
if (fetterExp_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(12, getFetterExp());
.computeMessageSize(9, getFetterExp());
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -233,13 +228,13 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
}
emu.grasscutter.net.proto.HomeResourceTakeFetterExpRspOuterClass.HomeResourceTakeFetterExpRsp other = (emu.grasscutter.net.proto.HomeResourceTakeFetterExpRspOuterClass.HomeResourceTakeFetterExpRsp) obj;
if (getRetcode()
!= other.getRetcode()) return false;
if (hasFetterExp() != other.hasFetterExp()) return false;
if (hasFetterExp()) {
if (!getFetterExp()
.equals(other.getFetterExp())) return false;
}
if (getRetcode()
!= other.getRetcode()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -251,12 +246,12 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
if (hasFetterExp()) {
hash = (37 * hash) + FETTEREXP_FIELD_NUMBER;
hash = (53 * hash) + getFetterExp().hashCode();
}
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
if (hasFetterExp()) {
hash = (37 * hash) + FETTER_EXP_FIELD_NUMBER;
hash = (53 * hash) + getFetterExp().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -354,13 +349,8 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
}
/**
* <pre>
*enum GGMAOEEILCK {
* option allow_alias= true;
* NONE = 0;
* PEPPOHPHJOJ = 4837;
* DCDNILFDFLB = 0;
* NNBKOLMPOEA = 1;
*}
* Name: IIGPCKJGACD
* CmdId: 4808
* </pre>
*
* Protobuf type {@code HomeResourceTakeFetterExpRsp}
@@ -400,14 +390,14 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
retcode_ = 0;
if (fetterExpBuilder_ == null) {
fetterExp_ = null;
} else {
fetterExp_ = null;
fetterExpBuilder_ = null;
}
retcode_ = 0;
return this;
}
@@ -434,12 +424,12 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.HomeResourceTakeFetterExpRspOuterClass.HomeResourceTakeFetterExpRsp buildPartial() {
emu.grasscutter.net.proto.HomeResourceTakeFetterExpRspOuterClass.HomeResourceTakeFetterExpRsp result = new emu.grasscutter.net.proto.HomeResourceTakeFetterExpRspOuterClass.HomeResourceTakeFetterExpRsp(this);
result.retcode_ = retcode_;
if (fetterExpBuilder_ == null) {
result.fetterExp_ = fetterExp_;
} else {
result.fetterExp_ = fetterExpBuilder_.build();
}
result.retcode_ = retcode_;
onBuilt();
return result;
}
@@ -488,12 +478,12 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.HomeResourceTakeFetterExpRspOuterClass.HomeResourceTakeFetterExpRsp other) {
if (other == emu.grasscutter.net.proto.HomeResourceTakeFetterExpRspOuterClass.HomeResourceTakeFetterExpRsp.getDefaultInstance()) return this;
if (other.hasFetterExp()) {
mergeFetterExp(other.getFetterExp());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.hasFetterExp()) {
mergeFetterExp(other.getFetterExp());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -523,18 +513,49 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 2;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 2;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
public Builder setRetcode(int value) {
retcode_ = value;
onChanged();
return this;
}
/**
* <code>int32 retcode = 2;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
private emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource fetterExp_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource, emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource.Builder, emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResourceOrBuilder> fetterExpBuilder_;
/**
* <code>.HomeResource fetterExp = 12;</code>
* <code>.HomeResource fetter_exp = 9;</code>
* @return Whether the fetterExp field is set.
*/
public boolean hasFetterExp() {
return fetterExpBuilder_ != null || fetterExp_ != null;
}
/**
* <code>.HomeResource fetterExp = 12;</code>
* <code>.HomeResource fetter_exp = 9;</code>
* @return The fetterExp.
*/
public emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource getFetterExp() {
@@ -545,7 +566,7 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
}
}
/**
* <code>.HomeResource fetterExp = 12;</code>
* <code>.HomeResource fetter_exp = 9;</code>
*/
public Builder setFetterExp(emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource value) {
if (fetterExpBuilder_ == null) {
@@ -561,7 +582,7 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
return this;
}
/**
* <code>.HomeResource fetterExp = 12;</code>
* <code>.HomeResource fetter_exp = 9;</code>
*/
public Builder setFetterExp(
emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource.Builder builderForValue) {
@@ -575,7 +596,7 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
return this;
}
/**
* <code>.HomeResource fetterExp = 12;</code>
* <code>.HomeResource fetter_exp = 9;</code>
*/
public Builder mergeFetterExp(emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource value) {
if (fetterExpBuilder_ == null) {
@@ -593,7 +614,7 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
return this;
}
/**
* <code>.HomeResource fetterExp = 12;</code>
* <code>.HomeResource fetter_exp = 9;</code>
*/
public Builder clearFetterExp() {
if (fetterExpBuilder_ == null) {
@@ -607,7 +628,7 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
return this;
}
/**
* <code>.HomeResource fetterExp = 12;</code>
* <code>.HomeResource fetter_exp = 9;</code>
*/
public emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource.Builder getFetterExpBuilder() {
@@ -615,7 +636,7 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
return getFetterExpFieldBuilder().getBuilder();
}
/**
* <code>.HomeResource fetterExp = 12;</code>
* <code>.HomeResource fetter_exp = 9;</code>
*/
public emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResourceOrBuilder getFetterExpOrBuilder() {
if (fetterExpBuilder_ != null) {
@@ -626,7 +647,7 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
}
}
/**
* <code>.HomeResource fetterExp = 12;</code>
* <code>.HomeResource fetter_exp = 9;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource, emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource.Builder, emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResourceOrBuilder>
@@ -641,37 +662,6 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
}
return fetterExpBuilder_;
}
private int retcode_ ;
/**
* <code>int32 retcode = 3;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 3;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
public Builder setRetcode(int value) {
retcode_ = value;
onChanged();
return this;
}
/**
* <code>int32 retcode = 3;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -740,10 +730,10 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\"HomeResourceTakeFetterExpRsp.proto\032\022Ho" +
"meResource.proto\"Q\n\034HomeResourceTakeFett" +
"erExpRsp\022 \n\tfetterExp\030\014 \001(\0132\r.HomeResour" +
"ce\022\017\n\007retcode\030\003 \001(\005B\033\n\031emu.grasscutter.n" +
"et.protob\006proto3"
"meResource.proto\"R\n\034HomeResourceTakeFett" +
"erExpRsp\022\017\n\007retcode\030\002 \001(\005\022!\n\nfetter_exp\030" +
"\t \001(\0132\r.HomeResourceB\033\n\031emu.grasscutter." +
"net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -755,7 +745,7 @@ public final class HomeResourceTakeFetterExpRspOuterClass {
internal_static_HomeResourceTakeFetterExpRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_HomeResourceTakeFetterExpRsp_descriptor,
new java.lang.String[] { "FetterExp", "Retcode", });
new java.lang.String[] { "Retcode", "FetterExp", });
emu.grasscutter.net.proto.HomeResourceOuterClass.getDescriptor();
}