Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 06:12: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/DungeonSlipRevivePointActivateRspOuterClass.java
+82 -205
View File
@@ -19,18 +19,23 @@ public final class DungeonSlipRevivePointActivateRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 slipRevivePointId = 11;</code>
* @return The slipRevivePointId.
*/
int getSlipRevivePointId();
/**
* <code>int32 retcode = 5;</code>
* <code>int32 retcode = 9;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint32 slip_revive_point_id = 11;</code>
* @return The slipRevivePointId.
*/
int getSlipRevivePointId();
}
/**
* <pre>
* Name: OBALIOMGPBI
* CmdId: 960
* </pre>
*
* Protobuf type {@code DungeonSlipRevivePointActivateRsp}
*/
public static final class DungeonSlipRevivePointActivateRsp extends
@@ -75,7 +80,7 @@ public final class DungeonSlipRevivePointActivateRspOuterClass {
case 0:
done = true;
break;
case 40: {
case 72: {
retcode_ = input.readInt32();
break;
@@ -117,152 +122,10 @@ public final class DungeonSlipRevivePointActivateRspOuterClass {
emu.grasscutter.net.proto.DungeonSlipRevivePointActivateRspOuterClass.DungeonSlipRevivePointActivateRsp.class, emu.grasscutter.net.proto.DungeonSlipRevivePointActivateRspOuterClass.DungeonSlipRevivePointActivateRsp.Builder.class);
}
/**
* Protobuf enum {@code DungeonSlipRevivePointActivateRsp.ADCIMBHOHKB}
*/
public enum ADCIMBHOHKB
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 979;</code>
*/
PEPPOHPHJOJ(1, 979),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final ADCIMBHOHKB DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 979;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 979;
/**
* <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 ADCIMBHOHKB 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 ADCIMBHOHKB forNumber(int value) {
switch (value) {
case 0: return NONE;
case 979: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<ADCIMBHOHKB>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
ADCIMBHOHKB> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<ADCIMBHOHKB>() {
public ADCIMBHOHKB findValueByNumber(int number) {
return ADCIMBHOHKB.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.DungeonSlipRevivePointActivateRspOuterClass.DungeonSlipRevivePointActivateRsp.getDescriptor().getEnumTypes().get(0);
}
private static final ADCIMBHOHKB[] VALUES = getStaticValuesArray();
private static ADCIMBHOHKB[] getStaticValuesArray() {
return new ADCIMBHOHKB[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static ADCIMBHOHKB 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 ADCIMBHOHKB(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:DungeonSlipRevivePointActivateRsp.ADCIMBHOHKB)
}
public static final int SLIPREVIVEPOINTID_FIELD_NUMBER = 11;
private int slipRevivePointId_;
/**
* <code>uint32 slipRevivePointId = 11;</code>
* @return The slipRevivePointId.
*/
@java.lang.Override
public int getSlipRevivePointId() {
return slipRevivePointId_;
}
public static final int RETCODE_FIELD_NUMBER = 5;
public static final int RETCODE_FIELD_NUMBER = 9;
private int retcode_;
/**
* <code>int32 retcode = 5;</code>
* <code>int32 retcode = 9;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -270,6 +133,17 @@ public final class DungeonSlipRevivePointActivateRspOuterClass {
return retcode_;
}
public static final int SLIP_REVIVE_POINT_ID_FIELD_NUMBER = 11;
private int slipRevivePointId_;
/**
* <code>uint32 slip_revive_point_id = 11;</code>
* @return The slipRevivePointId.
*/
@java.lang.Override
public int getSlipRevivePointId() {
return slipRevivePointId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -285,7 +159,7 @@ public final class DungeonSlipRevivePointActivateRspOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(5, retcode_);
output.writeInt32(9, retcode_);
}
if (slipRevivePointId_ != 0) {
output.writeUInt32(11, slipRevivePointId_);
@@ -301,7 +175,7 @@ public final class DungeonSlipRevivePointActivateRspOuterClass {
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(5, retcode_);
.computeInt32Size(9, retcode_);
}
if (slipRevivePointId_ != 0) {
size += com.google.protobuf.CodedOutputStream
@@ -322,10 +196,10 @@ public final class DungeonSlipRevivePointActivateRspOuterClass {
}
emu.grasscutter.net.proto.DungeonSlipRevivePointActivateRspOuterClass.DungeonSlipRevivePointActivateRsp other = (emu.grasscutter.net.proto.DungeonSlipRevivePointActivateRspOuterClass.DungeonSlipRevivePointActivateRsp) obj;
if (getSlipRevivePointId()
!= other.getSlipRevivePointId()) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (getSlipRevivePointId()
!= other.getSlipRevivePointId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -337,10 +211,10 @@ public final class DungeonSlipRevivePointActivateRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + SLIPREVIVEPOINTID_FIELD_NUMBER;
hash = (53 * hash) + getSlipRevivePointId();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + SLIP_REVIVE_POINT_ID_FIELD_NUMBER;
hash = (53 * hash) + getSlipRevivePointId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -437,6 +311,11 @@ public final class DungeonSlipRevivePointActivateRspOuterClass {
return builder;
}
/**
* <pre>
* Name: OBALIOMGPBI
* CmdId: 960
* </pre>
*
* Protobuf type {@code DungeonSlipRevivePointActivateRsp}
*/
public static final class Builder extends
@@ -474,10 +353,10 @@ public final class DungeonSlipRevivePointActivateRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
slipRevivePointId_ = 0;
retcode_ = 0;
slipRevivePointId_ = 0;
return this;
}
@@ -504,8 +383,8 @@ public final class DungeonSlipRevivePointActivateRspOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.DungeonSlipRevivePointActivateRspOuterClass.DungeonSlipRevivePointActivateRsp buildPartial() {
emu.grasscutter.net.proto.DungeonSlipRevivePointActivateRspOuterClass.DungeonSlipRevivePointActivateRsp result = new emu.grasscutter.net.proto.DungeonSlipRevivePointActivateRspOuterClass.DungeonSlipRevivePointActivateRsp(this);
result.slipRevivePointId_ = slipRevivePointId_;
result.retcode_ = retcode_;
result.slipRevivePointId_ = slipRevivePointId_;
onBuilt();
return result;
}
@@ -554,12 +433,12 @@ public final class DungeonSlipRevivePointActivateRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.DungeonSlipRevivePointActivateRspOuterClass.DungeonSlipRevivePointActivateRsp other) {
if (other == emu.grasscutter.net.proto.DungeonSlipRevivePointActivateRspOuterClass.DungeonSlipRevivePointActivateRsp.getDefaultInstance()) return this;
if (other.getSlipRevivePointId() != 0) {
setSlipRevivePointId(other.getSlipRevivePointId());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.getSlipRevivePointId() != 0) {
setSlipRevivePointId(other.getSlipRevivePointId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -589,40 +468,9 @@ public final class DungeonSlipRevivePointActivateRspOuterClass {
return this;
}
private int slipRevivePointId_ ;
/**
* <code>uint32 slipRevivePointId = 11;</code>
* @return The slipRevivePointId.
*/
@java.lang.Override
public int getSlipRevivePointId() {
return slipRevivePointId_;
}
/**
* <code>uint32 slipRevivePointId = 11;</code>
* @param value The slipRevivePointId to set.
* @return This builder for chaining.
*/
public Builder setSlipRevivePointId(int value) {
slipRevivePointId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 slipRevivePointId = 11;</code>
* @return This builder for chaining.
*/
public Builder clearSlipRevivePointId() {
slipRevivePointId_ = 0;
onChanged();
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 5;</code>
* <code>int32 retcode = 9;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -630,7 +478,7 @@ public final class DungeonSlipRevivePointActivateRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 5;</code>
* <code>int32 retcode = 9;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -641,7 +489,7 @@ public final class DungeonSlipRevivePointActivateRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 5;</code>
* <code>int32 retcode = 9;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -650,6 +498,37 @@ public final class DungeonSlipRevivePointActivateRspOuterClass {
onChanged();
return this;
}
private int slipRevivePointId_ ;
/**
* <code>uint32 slip_revive_point_id = 11;</code>
* @return The slipRevivePointId.
*/
@java.lang.Override
public int getSlipRevivePointId() {
return slipRevivePointId_;
}
/**
* <code>uint32 slip_revive_point_id = 11;</code>
* @param value The slipRevivePointId to set.
* @return This builder for chaining.
*/
public Builder setSlipRevivePointId(int value) {
slipRevivePointId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 slip_revive_point_id = 11;</code>
* @return This builder for chaining.
*/
public Builder clearSlipRevivePointId() {
slipRevivePointId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -718,12 +597,10 @@ public final class DungeonSlipRevivePointActivateRspOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\'DungeonSlipRevivePointActivateRsp.prot" +
"o\"\240\001\n!DungeonSlipRevivePointActivateRsp\022" +
"\031\n\021slipRevivePointId\030\013 \001(\r\022\017\n\007retcode\030\005 " +
"\001(\005\"O\n\013ADCIMBHOHKB\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPH" +
"JOJ\020\323\007\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001" +
"\032\002\020\001B\033\n\031emu.grasscutter.net.protob\006proto" +
"3"
"o\"R\n!DungeonSlipRevivePointActivateRsp\022\017" +
"\n\007retcode\030\t \001(\005\022\034\n\024slip_revive_point_id\030" +
"\013 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
"o3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -734,7 +611,7 @@ public final class DungeonSlipRevivePointActivateRspOuterClass {
internal_static_DungeonSlipRevivePointActivateRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_DungeonSlipRevivePointActivateRsp_descriptor,
new java.lang.String[] { "SlipRevivePointId", "Retcode", });
new java.lang.String[] { "Retcode", "SlipRevivePointId", });
}
// @@protoc_insertion_point(outer_class_scope)