Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 06:06:33 +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/TakeBackGivingItemReqOuterClass.java
+24 -218
View File
@@ -19,18 +19,17 @@ public final class TakeBackGivingItemReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 givingId = 3;</code>
* <code>uint32 giving_id = 2;</code>
* @return The givingId.
*/
int getGivingId();
/**
* <code>int32 retcode = 11;</code>
* @return The retcode.
*/
int getRetcode();
}
/**
* <pre>
* Name: BFIJDKCMHDM
* CmdId: 152
* </pre>
*
* Protobuf type {@code TakeBackGivingItemReq}
*/
public static final class TakeBackGivingItemReq extends
@@ -75,16 +74,11 @@ public final class TakeBackGivingItemReqOuterClass {
case 0:
done = true;
break;
case 24: {
case 16: {
givingId_ = input.readUInt32();
break;
}
case 88: {
retcode_ = input.readInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -117,141 +111,10 @@ public final class TakeBackGivingItemReqOuterClass {
emu.grasscutter.net.proto.TakeBackGivingItemReqOuterClass.TakeBackGivingItemReq.class, emu.grasscutter.net.proto.TakeBackGivingItemReqOuterClass.TakeBackGivingItemReq.Builder.class);
}
/**
* Protobuf enum {@code TakeBackGivingItemReq.CLKCHPKAOEC}
*/
public enum CLKCHPKAOEC
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 132;</code>
*/
PEPPOHPHJOJ(1, 132),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final CLKCHPKAOEC DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 132;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 132;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final int DCDNILFDFLB_VALUE = 0;
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
public static final int NNBKOLMPOEA_VALUE = 1;
public final int getNumber() {
if (index == -1) {
throw new java.lang.IllegalArgumentException(
"Can't get the number of an unknown enum value.");
}
return value;
}
/**
* @param value The numeric wire value of the corresponding enum entry.
* @return The enum associated with the given numeric wire value.
* @deprecated Use {@link #forNumber(int)} instead.
*/
@java.lang.Deprecated
public static CLKCHPKAOEC valueOf(int value) {
return forNumber(value);
}
/**
* @param value The numeric wire value of the corresponding enum entry.
* @return The enum associated with the given numeric wire value.
*/
public static CLKCHPKAOEC forNumber(int value) {
switch (value) {
case 0: return NONE;
case 132: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<CLKCHPKAOEC>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
CLKCHPKAOEC> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<CLKCHPKAOEC>() {
public CLKCHPKAOEC findValueByNumber(int number) {
return CLKCHPKAOEC.forNumber(number);
}
};
public final com.google.protobuf.Descriptors.EnumValueDescriptor
getValueDescriptor() {
if (index == -1) {
throw new java.lang.IllegalStateException(
"Can't get the descriptor of an unrecognized enum value.");
}
return getDescriptor().getValues().get(index);
}
public final com.google.protobuf.Descriptors.EnumDescriptor
getDescriptorForType() {
return getDescriptor();
}
public static final com.google.protobuf.Descriptors.EnumDescriptor
getDescriptor() {
return emu.grasscutter.net.proto.TakeBackGivingItemReqOuterClass.TakeBackGivingItemReq.getDescriptor().getEnumTypes().get(0);
}
private static final CLKCHPKAOEC[] VALUES = getStaticValuesArray();
private static CLKCHPKAOEC[] getStaticValuesArray() {
return new CLKCHPKAOEC[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static CLKCHPKAOEC valueOf(
com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
if (desc.getType() != getDescriptor()) {
throw new java.lang.IllegalArgumentException(
"EnumValueDescriptor is not for this type.");
}
if (desc.getIndex() == -1) {
return UNRECOGNIZED;
}
return VALUES[desc.getIndex()];
}
private final int index;
private final int value;
private CLKCHPKAOEC(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:TakeBackGivingItemReq.CLKCHPKAOEC)
}
public static final int GIVINGID_FIELD_NUMBER = 3;
public static final int GIVING_ID_FIELD_NUMBER = 2;
private int givingId_;
/**
* <code>uint32 givingId = 3;</code>
* <code>uint32 giving_id = 2;</code>
* @return The givingId.
*/
@java.lang.Override
@@ -259,17 +122,6 @@ public final class TakeBackGivingItemReqOuterClass {
return givingId_;
}
public static final int RETCODE_FIELD_NUMBER = 11;
private int retcode_;
/**
* <code>int32 retcode = 11;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -285,10 +137,7 @@ public final class TakeBackGivingItemReqOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (givingId_ != 0) {
output.writeUInt32(3, givingId_);
}
if (retcode_ != 0) {
output.writeInt32(11, retcode_);
output.writeUInt32(2, givingId_);
}
unknownFields.writeTo(output);
}
@@ -301,11 +150,7 @@ public final class TakeBackGivingItemReqOuterClass {
size = 0;
if (givingId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, givingId_);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(11, retcode_);
.computeUInt32Size(2, givingId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -324,8 +169,6 @@ public final class TakeBackGivingItemReqOuterClass {
if (getGivingId()
!= other.getGivingId()) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -337,10 +180,8 @@ public final class TakeBackGivingItemReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + GIVINGID_FIELD_NUMBER;
hash = (37 * hash) + GIVING_ID_FIELD_NUMBER;
hash = (53 * hash) + getGivingId();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -437,6 +278,11 @@ public final class TakeBackGivingItemReqOuterClass {
return builder;
}
/**
* <pre>
* Name: BFIJDKCMHDM
* CmdId: 152
* </pre>
*
* Protobuf type {@code TakeBackGivingItemReq}
*/
public static final class Builder extends
@@ -476,8 +322,6 @@ public final class TakeBackGivingItemReqOuterClass {
super.clear();
givingId_ = 0;
retcode_ = 0;
return this;
}
@@ -505,7 +349,6 @@ public final class TakeBackGivingItemReqOuterClass {
public emu.grasscutter.net.proto.TakeBackGivingItemReqOuterClass.TakeBackGivingItemReq buildPartial() {
emu.grasscutter.net.proto.TakeBackGivingItemReqOuterClass.TakeBackGivingItemReq result = new emu.grasscutter.net.proto.TakeBackGivingItemReqOuterClass.TakeBackGivingItemReq(this);
result.givingId_ = givingId_;
result.retcode_ = retcode_;
onBuilt();
return result;
}
@@ -557,9 +400,6 @@ public final class TakeBackGivingItemReqOuterClass {
if (other.getGivingId() != 0) {
setGivingId(other.getGivingId());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -591,7 +431,7 @@ public final class TakeBackGivingItemReqOuterClass {
private int givingId_ ;
/**
* <code>uint32 givingId = 3;</code>
* <code>uint32 giving_id = 2;</code>
* @return The givingId.
*/
@java.lang.Override
@@ -599,7 +439,7 @@ public final class TakeBackGivingItemReqOuterClass {
return givingId_;
}
/**
* <code>uint32 givingId = 3;</code>
* <code>uint32 giving_id = 2;</code>
* @param value The givingId to set.
* @return This builder for chaining.
*/
@@ -610,7 +450,7 @@ public final class TakeBackGivingItemReqOuterClass {
return this;
}
/**
* <code>uint32 givingId = 3;</code>
* <code>uint32 giving_id = 2;</code>
* @return This builder for chaining.
*/
public Builder clearGivingId() {
@@ -619,37 +459,6 @@ public final class TakeBackGivingItemReqOuterClass {
onChanged();
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 11;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 11;</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 = 11;</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) {
@@ -717,12 +526,9 @@ public final class TakeBackGivingItemReqOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\033TakeBackGivingItemReq.proto\"\213\001\n\025TakeBa" +
"ckGivingItemReq\022\020\n\010givingId\030\003 \001(\r\022\017\n\007ret" +
"code\030\013 \001(\005\"O\n\013CLKCHPKAOEC\022\010\n\004NONE\020\000\022\020\n\013P" +
"EPPOHPHJOJ\020\204\001\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKOL" +
"MPOEA\020\001\032\002\020\001B\033\n\031emu.grasscutter.net.proto" +
"b\006proto3"
"\n\033TakeBackGivingItemReq.proto\"*\n\025TakeBac" +
"kGivingItemReq\022\021\n\tgiving_id\030\002 \001(\rB\033\n\031emu" +
".grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -733,7 +539,7 @@ public final class TakeBackGivingItemReqOuterClass {
internal_static_TakeBackGivingItemReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_TakeBackGivingItemReq_descriptor,
new java.lang.String[] { "GivingId", "Retcode", });
new java.lang.String[] { "GivingId", });
}
// @@protoc_insertion_point(outer_class_scope)