Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-09 03:33:35 +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/WeaponPromoteRspOuterClass.java
+183 -266
View File
@@ -19,16 +19,14 @@ public final class WeaponPromoteRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 curPromoteLevel = 13;</code>
* @return The curPromoteLevel.
* <pre>
* PJGFEEMIPBL
* </pre>
*
* <code>uint32 old_promote_level = 5;</code>
* @return The oldPromoteLevel.
*/
int getCurPromoteLevel();
/**
* <code>uint64 targetWeaponGuid = 2;</code>
* @return The targetWeaponGuid.
*/
long getTargetWeaponGuid();
int getOldPromoteLevel();
/**
* <code>int32 retcode = 14;</code>
@@ -37,12 +35,27 @@ public final class WeaponPromoteRspOuterClass {
int getRetcode();
/**
* <code>uint32 oldPromoteLevel = 10;</code>
* @return The oldPromoteLevel.
* <pre>
* ONKINPFPNPJ
* </pre>
*
* <code>uint32 cur_promote_level = 2;</code>
* @return The curPromoteLevel.
*/
int getOldPromoteLevel();
int getCurPromoteLevel();
/**
* <code>uint64 target_weapon_guid = 10;</code>
* @return The targetWeaponGuid.
*/
long getTargetWeaponGuid();
}
/**
* <pre>
* Name: BNDJLIIFAAF
* CmdId: 644
* </pre>
*
* Protobuf type {@code WeaponPromoteRsp}
*/
public static final class WeaponPromoteRsp extends
@@ -89,17 +102,17 @@ public final class WeaponPromoteRspOuterClass {
break;
case 16: {
targetWeaponGuid_ = input.readUInt64();
curPromoteLevel_ = input.readUInt32();
break;
}
case 80: {
case 40: {
oldPromoteLevel_ = input.readUInt32();
break;
}
case 104: {
case 80: {
curPromoteLevel_ = input.readUInt32();
targetWeaponGuid_ = input.readUInt64();
break;
}
case 112: {
@@ -139,157 +152,19 @@ public final class WeaponPromoteRspOuterClass {
emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp.class, emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp.Builder.class);
}
public static final int OLD_PROMOTE_LEVEL_FIELD_NUMBER = 5;
private int oldPromoteLevel_;
/**
* Protobuf enum {@code WeaponPromoteRsp.IPJIMHOCLKL}
*/
public enum IPJIMHOCLKL
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 688;</code>
*/
PEPPOHPHJOJ(1, 688),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final IPJIMHOCLKL DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 688;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 688;
/**
* <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 IPJIMHOCLKL 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 IPJIMHOCLKL forNumber(int value) {
switch (value) {
case 0: return NONE;
case 688: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<IPJIMHOCLKL>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
IPJIMHOCLKL> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<IPJIMHOCLKL>() {
public IPJIMHOCLKL findValueByNumber(int number) {
return IPJIMHOCLKL.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.WeaponPromoteRspOuterClass.WeaponPromoteRsp.getDescriptor().getEnumTypes().get(0);
}
private static final IPJIMHOCLKL[] VALUES = getStaticValuesArray();
private static IPJIMHOCLKL[] getStaticValuesArray() {
return new IPJIMHOCLKL[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static IPJIMHOCLKL 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 IPJIMHOCLKL(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:WeaponPromoteRsp.IPJIMHOCLKL)
}
public static final int CURPROMOTELEVEL_FIELD_NUMBER = 13;
private int curPromoteLevel_;
/**
* <code>uint32 curPromoteLevel = 13;</code>
* @return The curPromoteLevel.
* <pre>
* PJGFEEMIPBL
* </pre>
*
* <code>uint32 old_promote_level = 5;</code>
* @return The oldPromoteLevel.
*/
@java.lang.Override
public int getCurPromoteLevel() {
return curPromoteLevel_;
}
public static final int TARGETWEAPONGUID_FIELD_NUMBER = 2;
private long targetWeaponGuid_;
/**
* <code>uint64 targetWeaponGuid = 2;</code>
* @return The targetWeaponGuid.
*/
@java.lang.Override
public long getTargetWeaponGuid() {
return targetWeaponGuid_;
public int getOldPromoteLevel() {
return oldPromoteLevel_;
}
public static final int RETCODE_FIELD_NUMBER = 14;
@@ -303,15 +178,30 @@ public final class WeaponPromoteRspOuterClass {
return retcode_;
}
public static final int OLDPROMOTELEVEL_FIELD_NUMBER = 10;
private int oldPromoteLevel_;
public static final int CUR_PROMOTE_LEVEL_FIELD_NUMBER = 2;
private int curPromoteLevel_;
/**
* <code>uint32 oldPromoteLevel = 10;</code>
* @return The oldPromoteLevel.
* <pre>
* ONKINPFPNPJ
* </pre>
*
* <code>uint32 cur_promote_level = 2;</code>
* @return The curPromoteLevel.
*/
@java.lang.Override
public int getOldPromoteLevel() {
return oldPromoteLevel_;
public int getCurPromoteLevel() {
return curPromoteLevel_;
}
public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 10;
private long targetWeaponGuid_;
/**
* <code>uint64 target_weapon_guid = 10;</code>
* @return The targetWeaponGuid.
*/
@java.lang.Override
public long getTargetWeaponGuid() {
return targetWeaponGuid_;
}
private byte memoizedIsInitialized = -1;
@@ -328,14 +218,14 @@ public final class WeaponPromoteRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (targetWeaponGuid_ != 0L) {
output.writeUInt64(2, targetWeaponGuid_);
if (curPromoteLevel_ != 0) {
output.writeUInt32(2, curPromoteLevel_);
}
if (oldPromoteLevel_ != 0) {
output.writeUInt32(10, oldPromoteLevel_);
output.writeUInt32(5, oldPromoteLevel_);
}
if (curPromoteLevel_ != 0) {
output.writeUInt32(13, curPromoteLevel_);
if (targetWeaponGuid_ != 0L) {
output.writeUInt64(10, targetWeaponGuid_);
}
if (retcode_ != 0) {
output.writeInt32(14, retcode_);
@@ -349,17 +239,17 @@ public final class WeaponPromoteRspOuterClass {
if (size != -1) return size;
size = 0;
if (targetWeaponGuid_ != 0L) {
if (curPromoteLevel_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(2, targetWeaponGuid_);
.computeUInt32Size(2, curPromoteLevel_);
}
if (oldPromoteLevel_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, oldPromoteLevel_);
.computeUInt32Size(5, oldPromoteLevel_);
}
if (curPromoteLevel_ != 0) {
if (targetWeaponGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, curPromoteLevel_);
.computeUInt64Size(10, targetWeaponGuid_);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
@@ -380,14 +270,14 @@ public final class WeaponPromoteRspOuterClass {
}
emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp other = (emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp) obj;
if (getOldPromoteLevel()
!= other.getOldPromoteLevel()) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (getCurPromoteLevel()
!= other.getCurPromoteLevel()) return false;
if (getTargetWeaponGuid()
!= other.getTargetWeaponGuid()) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (getOldPromoteLevel()
!= other.getOldPromoteLevel()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -399,15 +289,15 @@ public final class WeaponPromoteRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + CURPROMOTELEVEL_FIELD_NUMBER;
hash = (53 * hash) + getCurPromoteLevel();
hash = (37 * hash) + TARGETWEAPONGUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getTargetWeaponGuid());
hash = (37 * hash) + OLD_PROMOTE_LEVEL_FIELD_NUMBER;
hash = (53 * hash) + getOldPromoteLevel();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + OLDPROMOTELEVEL_FIELD_NUMBER;
hash = (53 * hash) + getOldPromoteLevel();
hash = (37 * hash) + CUR_PROMOTE_LEVEL_FIELD_NUMBER;
hash = (53 * hash) + getCurPromoteLevel();
hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getTargetWeaponGuid());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -504,6 +394,11 @@ public final class WeaponPromoteRspOuterClass {
return builder;
}
/**
* <pre>
* Name: BNDJLIIFAAF
* CmdId: 644
* </pre>
*
* Protobuf type {@code WeaponPromoteRsp}
*/
public static final class Builder extends
@@ -541,13 +436,13 @@ public final class WeaponPromoteRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
curPromoteLevel_ = 0;
targetWeaponGuid_ = 0L;
oldPromoteLevel_ = 0;
retcode_ = 0;
oldPromoteLevel_ = 0;
curPromoteLevel_ = 0;
targetWeaponGuid_ = 0L;
return this;
}
@@ -575,10 +470,10 @@ public final class WeaponPromoteRspOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp buildPartial() {
emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp result = new emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp(this);
result.oldPromoteLevel_ = oldPromoteLevel_;
result.retcode_ = retcode_;
result.curPromoteLevel_ = curPromoteLevel_;
result.targetWeaponGuid_ = targetWeaponGuid_;
result.retcode_ = retcode_;
result.oldPromoteLevel_ = oldPromoteLevel_;
onBuilt();
return result;
}
@@ -627,18 +522,18 @@ public final class WeaponPromoteRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp other) {
if (other == emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp.getDefaultInstance()) return this;
if (other.getOldPromoteLevel() != 0) {
setOldPromoteLevel(other.getOldPromoteLevel());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.getCurPromoteLevel() != 0) {
setCurPromoteLevel(other.getCurPromoteLevel());
}
if (other.getTargetWeaponGuid() != 0L) {
setTargetWeaponGuid(other.getTargetWeaponGuid());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.getOldPromoteLevel() != 0) {
setOldPromoteLevel(other.getOldPromoteLevel());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -668,64 +563,45 @@ public final class WeaponPromoteRspOuterClass {
return this;
}
private int curPromoteLevel_ ;
private int oldPromoteLevel_ ;
/**
* <code>uint32 curPromoteLevel = 13;</code>
* @return The curPromoteLevel.
* <pre>
* PJGFEEMIPBL
* </pre>
*
* <code>uint32 old_promote_level = 5;</code>
* @return The oldPromoteLevel.
*/
@java.lang.Override
public int getCurPromoteLevel() {
return curPromoteLevel_;
public int getOldPromoteLevel() {
return oldPromoteLevel_;
}
/**
* <code>uint32 curPromoteLevel = 13;</code>
* @param value The curPromoteLevel to set.
* <pre>
* PJGFEEMIPBL
* </pre>
*
* <code>uint32 old_promote_level = 5;</code>
* @param value The oldPromoteLevel to set.
* @return This builder for chaining.
*/
public Builder setCurPromoteLevel(int value) {
public Builder setOldPromoteLevel(int value) {
curPromoteLevel_ = value;
oldPromoteLevel_ = value;
onChanged();
return this;
}
/**
* <code>uint32 curPromoteLevel = 13;</code>
* <pre>
* PJGFEEMIPBL
* </pre>
*
* <code>uint32 old_promote_level = 5;</code>
* @return This builder for chaining.
*/
public Builder clearCurPromoteLevel() {
public Builder clearOldPromoteLevel() {
curPromoteLevel_ = 0;
onChanged();
return this;
}
private long targetWeaponGuid_ ;
/**
* <code>uint64 targetWeaponGuid = 2;</code>
* @return The targetWeaponGuid.
*/
@java.lang.Override
public long getTargetWeaponGuid() {
return targetWeaponGuid_;
}
/**
* <code>uint64 targetWeaponGuid = 2;</code>
* @param value The targetWeaponGuid to set.
* @return This builder for chaining.
*/
public Builder setTargetWeaponGuid(long value) {
targetWeaponGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 targetWeaponGuid = 2;</code>
* @return This builder for chaining.
*/
public Builder clearTargetWeaponGuid() {
targetWeaponGuid_ = 0L;
oldPromoteLevel_ = 0;
onChanged();
return this;
}
@@ -761,33 +637,76 @@ public final class WeaponPromoteRspOuterClass {
return this;
}
private int oldPromoteLevel_ ;
private int curPromoteLevel_ ;
/**
* <code>uint32 oldPromoteLevel = 10;</code>
* @return The oldPromoteLevel.
* <pre>
* ONKINPFPNPJ
* </pre>
*
* <code>uint32 cur_promote_level = 2;</code>
* @return The curPromoteLevel.
*/
@java.lang.Override
public int getOldPromoteLevel() {
return oldPromoteLevel_;
public int getCurPromoteLevel() {
return curPromoteLevel_;
}
/**
* <code>uint32 oldPromoteLevel = 10;</code>
* @param value The oldPromoteLevel to set.
* <pre>
* ONKINPFPNPJ
* </pre>
*
* <code>uint32 cur_promote_level = 2;</code>
* @param value The curPromoteLevel to set.
* @return This builder for chaining.
*/
public Builder setOldPromoteLevel(int value) {
public Builder setCurPromoteLevel(int value) {
oldPromoteLevel_ = value;
curPromoteLevel_ = value;
onChanged();
return this;
}
/**
* <code>uint32 oldPromoteLevel = 10;</code>
* <pre>
* ONKINPFPNPJ
* </pre>
*
* <code>uint32 cur_promote_level = 2;</code>
* @return This builder for chaining.
*/
public Builder clearOldPromoteLevel() {
public Builder clearCurPromoteLevel() {
oldPromoteLevel_ = 0;
curPromoteLevel_ = 0;
onChanged();
return this;
}
private long targetWeaponGuid_ ;
/**
* <code>uint64 target_weapon_guid = 10;</code>
* @return The targetWeaponGuid.
*/
@java.lang.Override
public long getTargetWeaponGuid() {
return targetWeaponGuid_;
}
/**
* <code>uint64 target_weapon_guid = 10;</code>
* @param value The targetWeaponGuid to set.
* @return This builder for chaining.
*/
public Builder setTargetWeaponGuid(long value) {
targetWeaponGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 target_weapon_guid = 10;</code>
* @return This builder for chaining.
*/
public Builder clearTargetWeaponGuid() {
targetWeaponGuid_ = 0L;
onChanged();
return this;
}
@@ -858,13 +777,11 @@ public final class WeaponPromoteRspOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\026WeaponPromoteRsp.proto\"\300\001\n\020WeaponPromo" +
"teRsp\022\027\n\017curPromoteLevel\030\r \001(\r\022\030\n\020target" +
"WeaponGuid\030\002 \001(\004\022\017\n\007retcode\030\016 \001(\005\022\027\n\017old" +
"PromoteLevel\030\n \001(\r\"O\n\013IPJIMHOCLKL\022\010\n\004NON" +
"E\020\000\022\020\n\013PEPPOHPHJOJ\020\260\005\022\017\n\013DCDNILFDFLB\020\000\022\017" +
"\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.grasscutter.n" +
"et.protob\006proto3"
"\n\026WeaponPromoteRsp.proto\"u\n\020WeaponPromot" +
"eRsp\022\031\n\021old_promote_level\030\005 \001(\r\022\017\n\007retco" +
"de\030\016 \001(\005\022\031\n\021cur_promote_level\030\002 \001(\r\022\032\n\022t" +
"arget_weapon_guid\030\n \001(\004B\033\n\031emu.grasscutt" +
"er.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -875,7 +792,7 @@ public final class WeaponPromoteRspOuterClass {
internal_static_WeaponPromoteRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_WeaponPromoteRsp_descriptor,
new java.lang.String[] { "CurPromoteLevel", "TargetWeaponGuid", "Retcode", "OldPromoteLevel", });
new java.lang.String[] { "OldPromoteLevel", "Retcode", "CurPromoteLevel", "TargetWeaponGuid", });
}
// @@protoc_insertion_point(outer_class_scope)