Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-08 22:44:47 +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/AvatarUpgradeReqOuterClass.java
+106 -237
View File
@@ -19,24 +19,29 @@ public final class AvatarUpgradeReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 itemId = 1;</code>
* <code>uint32 item_id = 12;</code>
* @return The itemId.
*/
int getItemId();
/**
* <code>uint32 count = 9;</code>
* @return The count.
*/
int getCount();
/**
* <code>uint64 avatarGuid = 12;</code>
* <code>uint64 avatar_guid = 5;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
/**
* <code>uint32 count = 15;</code>
* @return The count.
*/
int getCount();
}
/**
* <pre>
* Name: LLGEHHDIHFP
* CmdId: 1764
* </pre>
*
* Protobuf type {@code AvatarUpgradeReq}
*/
public static final class AvatarUpgradeReq extends
@@ -81,19 +86,19 @@ public final class AvatarUpgradeReqOuterClass {
case 0:
done = true;
break;
case 8: {
case 40: {
itemId_ = input.readUInt32();
break;
}
case 72: {
count_ = input.readUInt32();
avatarGuid_ = input.readUInt64();
break;
}
case 96: {
avatarGuid_ = input.readUInt64();
itemId_ = input.readUInt32();
break;
}
case 120: {
count_ = input.readUInt32();
break;
}
default: {
@@ -128,149 +133,10 @@ public final class AvatarUpgradeReqOuterClass {
emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq.class, emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq.Builder.class);
}
/**
* Protobuf enum {@code AvatarUpgradeReq.AJKBLCOOOKI}
*/
public enum AJKBLCOOOKI
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 1752;</code>
*/
PEPPOHPHJOJ(1, 1752),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final AJKBLCOOOKI DCDNILFDFLB = NONE;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final AJKBLCOOOKI EAJIABGAOCI = NNBKOLMPOEA;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 1752;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 1752;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final int DCDNILFDFLB_VALUE = 0;
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
public static final int NNBKOLMPOEA_VALUE = 1;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final int EAJIABGAOCI_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 AJKBLCOOOKI 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 AJKBLCOOOKI forNumber(int value) {
switch (value) {
case 0: return NONE;
case 1752: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<AJKBLCOOOKI>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
AJKBLCOOOKI> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<AJKBLCOOOKI>() {
public AJKBLCOOOKI findValueByNumber(int number) {
return AJKBLCOOOKI.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.AvatarUpgradeReqOuterClass.AvatarUpgradeReq.getDescriptor().getEnumTypes().get(0);
}
private static final AJKBLCOOOKI[] VALUES = getStaticValuesArray();
private static AJKBLCOOOKI[] getStaticValuesArray() {
return new AJKBLCOOOKI[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
};
}
public static AJKBLCOOOKI 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 AJKBLCOOOKI(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:AvatarUpgradeReq.AJKBLCOOOKI)
}
public static final int ITEMID_FIELD_NUMBER = 1;
public static final int ITEM_ID_FIELD_NUMBER = 12;
private int itemId_;
/**
* <code>uint32 itemId = 1;</code>
* <code>uint32 item_id = 12;</code>
* @return The itemId.
*/
@java.lang.Override
@@ -278,21 +144,10 @@ public final class AvatarUpgradeReqOuterClass {
return itemId_;
}
public static final int COUNT_FIELD_NUMBER = 9;
private int count_;
/**
* <code>uint32 count = 9;</code>
* @return The count.
*/
@java.lang.Override
public int getCount() {
return count_;
}
public static final int AVATARGUID_FIELD_NUMBER = 12;
public static final int AVATAR_GUID_FIELD_NUMBER = 5;
private long avatarGuid_;
/**
* <code>uint64 avatarGuid = 12;</code>
* <code>uint64 avatar_guid = 5;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -300,6 +155,17 @@ public final class AvatarUpgradeReqOuterClass {
return avatarGuid_;
}
public static final int COUNT_FIELD_NUMBER = 15;
private int count_;
/**
* <code>uint32 count = 15;</code>
* @return The count.
*/
@java.lang.Override
public int getCount() {
return count_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -314,14 +180,14 @@ public final class AvatarUpgradeReqOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (avatarGuid_ != 0L) {
output.writeUInt64(5, avatarGuid_);
}
if (itemId_ != 0) {
output.writeUInt32(1, itemId_);
output.writeUInt32(12, itemId_);
}
if (count_ != 0) {
output.writeUInt32(9, count_);
}
if (avatarGuid_ != 0L) {
output.writeUInt64(12, avatarGuid_);
output.writeUInt32(15, count_);
}
unknownFields.writeTo(output);
}
@@ -332,17 +198,17 @@ public final class AvatarUpgradeReqOuterClass {
if (size != -1) return size;
size = 0;
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(5, avatarGuid_);
}
if (itemId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, itemId_);
.computeUInt32Size(12, itemId_);
}
if (count_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, count_);
}
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(12, avatarGuid_);
.computeUInt32Size(15, count_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -361,10 +227,10 @@ public final class AvatarUpgradeReqOuterClass {
if (getItemId()
!= other.getItemId()) return false;
if (getCount()
!= other.getCount()) return false;
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (getCount()
!= other.getCount()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -376,13 +242,13 @@ public final class AvatarUpgradeReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + ITEMID_FIELD_NUMBER;
hash = (37 * hash) + ITEM_ID_FIELD_NUMBER;
hash = (53 * hash) + getItemId();
hash = (37 * hash) + COUNT_FIELD_NUMBER;
hash = (53 * hash) + getCount();
hash = (37 * hash) + AVATARGUID_FIELD_NUMBER;
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
hash = (37 * hash) + COUNT_FIELD_NUMBER;
hash = (53 * hash) + getCount();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -479,6 +345,11 @@ public final class AvatarUpgradeReqOuterClass {
return builder;
}
/**
* <pre>
* Name: LLGEHHDIHFP
* CmdId: 1764
* </pre>
*
* Protobuf type {@code AvatarUpgradeReq}
*/
public static final class Builder extends
@@ -518,10 +389,10 @@ public final class AvatarUpgradeReqOuterClass {
super.clear();
itemId_ = 0;
count_ = 0;
avatarGuid_ = 0L;
count_ = 0;
return this;
}
@@ -549,8 +420,8 @@ public final class AvatarUpgradeReqOuterClass {
public emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq buildPartial() {
emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq result = new emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq(this);
result.itemId_ = itemId_;
result.count_ = count_;
result.avatarGuid_ = avatarGuid_;
result.count_ = count_;
onBuilt();
return result;
}
@@ -602,12 +473,12 @@ public final class AvatarUpgradeReqOuterClass {
if (other.getItemId() != 0) {
setItemId(other.getItemId());
}
if (other.getCount() != 0) {
setCount(other.getCount());
}
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
}
if (other.getCount() != 0) {
setCount(other.getCount());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -639,7 +510,7 @@ public final class AvatarUpgradeReqOuterClass {
private int itemId_ ;
/**
* <code>uint32 itemId = 1;</code>
* <code>uint32 item_id = 12;</code>
* @return The itemId.
*/
@java.lang.Override
@@ -647,7 +518,7 @@ public final class AvatarUpgradeReqOuterClass {
return itemId_;
}
/**
* <code>uint32 itemId = 1;</code>
* <code>uint32 item_id = 12;</code>
* @param value The itemId to set.
* @return This builder for chaining.
*/
@@ -658,7 +529,7 @@ public final class AvatarUpgradeReqOuterClass {
return this;
}
/**
* <code>uint32 itemId = 1;</code>
* <code>uint32 item_id = 12;</code>
* @return This builder for chaining.
*/
public Builder clearItemId() {
@@ -668,40 +539,9 @@ public final class AvatarUpgradeReqOuterClass {
return this;
}
private int count_ ;
/**
* <code>uint32 count = 9;</code>
* @return The count.
*/
@java.lang.Override
public int getCount() {
return count_;
}
/**
* <code>uint32 count = 9;</code>
* @param value The count to set.
* @return This builder for chaining.
*/
public Builder setCount(int value) {
count_ = value;
onChanged();
return this;
}
/**
* <code>uint32 count = 9;</code>
* @return This builder for chaining.
*/
public Builder clearCount() {
count_ = 0;
onChanged();
return this;
}
private long avatarGuid_ ;
/**
* <code>uint64 avatarGuid = 12;</code>
* <code>uint64 avatar_guid = 5;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -709,7 +549,7 @@ public final class AvatarUpgradeReqOuterClass {
return avatarGuid_;
}
/**
* <code>uint64 avatarGuid = 12;</code>
* <code>uint64 avatar_guid = 5;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
@@ -720,7 +560,7 @@ public final class AvatarUpgradeReqOuterClass {
return this;
}
/**
* <code>uint64 avatarGuid = 12;</code>
* <code>uint64 avatar_guid = 5;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
@@ -729,6 +569,37 @@ public final class AvatarUpgradeReqOuterClass {
onChanged();
return this;
}
private int count_ ;
/**
* <code>uint32 count = 15;</code>
* @return The count.
*/
@java.lang.Override
public int getCount() {
return count_;
}
/**
* <code>uint32 count = 15;</code>
* @param value The count to set.
* @return This builder for chaining.
*/
public Builder setCount(int value) {
count_ = value;
onChanged();
return this;
}
/**
* <code>uint32 count = 15;</code>
* @return This builder for chaining.
*/
public Builder clearCount() {
count_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -796,12 +667,10 @@ public final class AvatarUpgradeReqOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\026AvatarUpgradeReq.proto\"\247\001\n\020AvatarUpgra" +
"deReq\022\016\n\006itemId\030\001 \001(\r\022\r\n\005count\030\t \001(\r\022\022\n\n" +
"avatarGuid\030\014 \001(\004\"`\n\013AJKBLCOOOKI\022\010\n\004NONE\020" +
"\000\022\020\n\013PEPPOHPHJOJ\020\330\r\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013" +
"NNBKOLMPOEA\020\001\022\017\n\013EAJIABGAOCI\020\001\032\002\020\001B\033\n\031em" +
"u.grasscutter.net.protob\006proto3"
"\n\026AvatarUpgradeReq.proto\"G\n\020AvatarUpgrad" +
"eReq\022\017\n\007item_id\030\014 \001(\r\022\023\n\013avatar_guid\030\005 \001" +
"(\004\022\r\n\005count\030\017 \001(\rB\033\n\031emu.grasscutter.net" +
".protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -812,7 +681,7 @@ public final class AvatarUpgradeReqOuterClass {
internal_static_AvatarUpgradeReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AvatarUpgradeReq_descriptor,
new java.lang.String[] { "ItemId", "Count", "AvatarGuid", });
new java.lang.String[] { "ItemId", "AvatarGuid", "Count", });
}
// @@protoc_insertion_point(outer_class_scope)