Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-19 12:49:58 +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/AvatarAddNotifyOuterClass.java
+99 -222
View File
@@ -19,27 +19,32 @@ public final class AvatarAddNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.AvatarInfo avatar = 8;</code>
* <code>bool is_in_team = 1;</code>
* @return The isInTeam.
*/
boolean getIsInTeam();
/**
* <code>.AvatarInfo avatar = 6;</code>
* @return Whether the avatar field is set.
*/
boolean hasAvatar();
/**
* <code>.AvatarInfo avatar = 8;</code>
* <code>.AvatarInfo avatar = 6;</code>
* @return The avatar.
*/
emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatar();
/**
* <code>.AvatarInfo avatar = 8;</code>
* <code>.AvatarInfo avatar = 6;</code>
*/
emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarOrBuilder();
/**
* <code>bool isInTeam = 14;</code>
* @return The isInTeam.
*/
boolean getIsInTeam();
}
/**
* <pre>
* Name: JKFHGKAMAHH
* CmdId: 1756
* </pre>
*
* Protobuf type {@code AvatarAddNotify}
*/
public static final class AvatarAddNotify extends
@@ -84,7 +89,12 @@ public final class AvatarAddNotifyOuterClass {
case 0:
done = true;
break;
case 66: {
case 8: {
isInTeam_ = input.readBool();
break;
}
case 50: {
emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder subBuilder = null;
if (avatar_ != null) {
subBuilder = avatar_.toBuilder();
@@ -97,11 +107,6 @@ public final class AvatarAddNotifyOuterClass {
break;
}
case 112: {
isInTeam_ = input.readBool();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -134,141 +139,21 @@ public final class AvatarAddNotifyOuterClass {
emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify.class, emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify.Builder.class);
}
public static final int IS_IN_TEAM_FIELD_NUMBER = 1;
private boolean isInTeam_;
/**
* Protobuf enum {@code AvatarAddNotify.APNKIMFCJIH}
* <code>bool is_in_team = 1;</code>
* @return The isInTeam.
*/
public enum APNKIMFCJIH
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 1661;</code>
*/
PEPPOHPHJOJ(1, 1661),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final APNKIMFCJIH DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 1661;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 1661;
/**
* <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 APNKIMFCJIH 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 APNKIMFCJIH forNumber(int value) {
switch (value) {
case 0: return NONE;
case 1661: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<APNKIMFCJIH>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
APNKIMFCJIH> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<APNKIMFCJIH>() {
public APNKIMFCJIH findValueByNumber(int number) {
return APNKIMFCJIH.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.AvatarAddNotifyOuterClass.AvatarAddNotify.getDescriptor().getEnumTypes().get(0);
}
private static final APNKIMFCJIH[] VALUES = getStaticValuesArray();
private static APNKIMFCJIH[] getStaticValuesArray() {
return new APNKIMFCJIH[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static APNKIMFCJIH 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 APNKIMFCJIH(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:AvatarAddNotify.APNKIMFCJIH)
@java.lang.Override
public boolean getIsInTeam() {
return isInTeam_;
}
public static final int AVATAR_FIELD_NUMBER = 8;
public static final int AVATAR_FIELD_NUMBER = 6;
private emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo avatar_;
/**
* <code>.AvatarInfo avatar = 8;</code>
* <code>.AvatarInfo avatar = 6;</code>
* @return Whether the avatar field is set.
*/
@java.lang.Override
@@ -276,7 +161,7 @@ public final class AvatarAddNotifyOuterClass {
return avatar_ != null;
}
/**
* <code>.AvatarInfo avatar = 8;</code>
* <code>.AvatarInfo avatar = 6;</code>
* @return The avatar.
*/
@java.lang.Override
@@ -284,24 +169,13 @@ public final class AvatarAddNotifyOuterClass {
return avatar_ == null ? emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.getDefaultInstance() : avatar_;
}
/**
* <code>.AvatarInfo avatar = 8;</code>
* <code>.AvatarInfo avatar = 6;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarOrBuilder() {
return getAvatar();
}
public static final int ISINTEAM_FIELD_NUMBER = 14;
private boolean isInTeam_;
/**
* <code>bool isInTeam = 14;</code>
* @return The isInTeam.
*/
@java.lang.Override
public boolean getIsInTeam() {
return isInTeam_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -316,11 +190,11 @@ public final class AvatarAddNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (avatar_ != null) {
output.writeMessage(8, getAvatar());
}
if (isInTeam_ != false) {
output.writeBool(14, isInTeam_);
output.writeBool(1, isInTeam_);
}
if (avatar_ != null) {
output.writeMessage(6, getAvatar());
}
unknownFields.writeTo(output);
}
@@ -331,13 +205,13 @@ public final class AvatarAddNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (avatar_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(8, getAvatar());
}
if (isInTeam_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(14, isInTeam_);
.computeBoolSize(1, isInTeam_);
}
if (avatar_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(6, getAvatar());
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -354,13 +228,13 @@ public final class AvatarAddNotifyOuterClass {
}
emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify other = (emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify) obj;
if (getIsInTeam()
!= other.getIsInTeam()) return false;
if (hasAvatar() != other.hasAvatar()) return false;
if (hasAvatar()) {
if (!getAvatar()
.equals(other.getAvatar())) return false;
}
if (getIsInTeam()
!= other.getIsInTeam()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -372,13 +246,13 @@ public final class AvatarAddNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + IS_IN_TEAM_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsInTeam());
if (hasAvatar()) {
hash = (37 * hash) + AVATAR_FIELD_NUMBER;
hash = (53 * hash) + getAvatar().hashCode();
}
hash = (37 * hash) + ISINTEAM_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsInTeam());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -475,6 +349,11 @@ public final class AvatarAddNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: JKFHGKAMAHH
* CmdId: 1756
* </pre>
*
* Protobuf type {@code AvatarAddNotify}
*/
public static final class Builder extends
@@ -512,14 +391,14 @@ public final class AvatarAddNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
isInTeam_ = false;
if (avatarBuilder_ == null) {
avatar_ = null;
} else {
avatar_ = null;
avatarBuilder_ = null;
}
isInTeam_ = false;
return this;
}
@@ -546,12 +425,12 @@ public final class AvatarAddNotifyOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify buildPartial() {
emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify result = new emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify(this);
result.isInTeam_ = isInTeam_;
if (avatarBuilder_ == null) {
result.avatar_ = avatar_;
} else {
result.avatar_ = avatarBuilder_.build();
}
result.isInTeam_ = isInTeam_;
onBuilt();
return result;
}
@@ -600,12 +479,12 @@ public final class AvatarAddNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify other) {
if (other == emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify.getDefaultInstance()) return this;
if (other.hasAvatar()) {
mergeAvatar(other.getAvatar());
}
if (other.getIsInTeam() != false) {
setIsInTeam(other.getIsInTeam());
}
if (other.hasAvatar()) {
mergeAvatar(other.getAvatar());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -635,18 +514,49 @@ public final class AvatarAddNotifyOuterClass {
return this;
}
private boolean isInTeam_ ;
/**
* <code>bool is_in_team = 1;</code>
* @return The isInTeam.
*/
@java.lang.Override
public boolean getIsInTeam() {
return isInTeam_;
}
/**
* <code>bool is_in_team = 1;</code>
* @param value The isInTeam to set.
* @return This builder for chaining.
*/
public Builder setIsInTeam(boolean value) {
isInTeam_ = value;
onChanged();
return this;
}
/**
* <code>bool is_in_team = 1;</code>
* @return This builder for chaining.
*/
public Builder clearIsInTeam() {
isInTeam_ = false;
onChanged();
return this;
}
private emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo avatar_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder> avatarBuilder_;
/**
* <code>.AvatarInfo avatar = 8;</code>
* <code>.AvatarInfo avatar = 6;</code>
* @return Whether the avatar field is set.
*/
public boolean hasAvatar() {
return avatarBuilder_ != null || avatar_ != null;
}
/**
* <code>.AvatarInfo avatar = 8;</code>
* <code>.AvatarInfo avatar = 6;</code>
* @return The avatar.
*/
public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatar() {
@@ -657,7 +567,7 @@ public final class AvatarAddNotifyOuterClass {
}
}
/**
* <code>.AvatarInfo avatar = 8;</code>
* <code>.AvatarInfo avatar = 6;</code>
*/
public Builder setAvatar(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo value) {
if (avatarBuilder_ == null) {
@@ -673,7 +583,7 @@ public final class AvatarAddNotifyOuterClass {
return this;
}
/**
* <code>.AvatarInfo avatar = 8;</code>
* <code>.AvatarInfo avatar = 6;</code>
*/
public Builder setAvatar(
emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder builderForValue) {
@@ -687,7 +597,7 @@ public final class AvatarAddNotifyOuterClass {
return this;
}
/**
* <code>.AvatarInfo avatar = 8;</code>
* <code>.AvatarInfo avatar = 6;</code>
*/
public Builder mergeAvatar(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo value) {
if (avatarBuilder_ == null) {
@@ -705,7 +615,7 @@ public final class AvatarAddNotifyOuterClass {
return this;
}
/**
* <code>.AvatarInfo avatar = 8;</code>
* <code>.AvatarInfo avatar = 6;</code>
*/
public Builder clearAvatar() {
if (avatarBuilder_ == null) {
@@ -719,7 +629,7 @@ public final class AvatarAddNotifyOuterClass {
return this;
}
/**
* <code>.AvatarInfo avatar = 8;</code>
* <code>.AvatarInfo avatar = 6;</code>
*/
public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder getAvatarBuilder() {
@@ -727,7 +637,7 @@ public final class AvatarAddNotifyOuterClass {
return getAvatarFieldBuilder().getBuilder();
}
/**
* <code>.AvatarInfo avatar = 8;</code>
* <code>.AvatarInfo avatar = 6;</code>
*/
public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarOrBuilder() {
if (avatarBuilder_ != null) {
@@ -738,7 +648,7 @@ public final class AvatarAddNotifyOuterClass {
}
}
/**
* <code>.AvatarInfo avatar = 8;</code>
* <code>.AvatarInfo avatar = 6;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder>
@@ -753,37 +663,6 @@ public final class AvatarAddNotifyOuterClass {
}
return avatarBuilder_;
}
private boolean isInTeam_ ;
/**
* <code>bool isInTeam = 14;</code>
* @return The isInTeam.
*/
@java.lang.Override
public boolean getIsInTeam() {
return isInTeam_;
}
/**
* <code>bool isInTeam = 14;</code>
* @param value The isInTeam to set.
* @return This builder for chaining.
*/
public Builder setIsInTeam(boolean value) {
isInTeam_ = value;
onChanged();
return this;
}
/**
* <code>bool isInTeam = 14;</code>
* @return This builder for chaining.
*/
public Builder clearIsInTeam() {
isInTeam_ = false;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -852,10 +731,8 @@ public final class AvatarAddNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\025AvatarAddNotify.proto\032\020AvatarInfo.prot" +
"o\"\221\001\n\017AvatarAddNotify\022\033\n\006avatar\030\010 \001(\0132\013." +
"AvatarInfo\022\020\n\010isInTeam\030\016 \001(\010\"O\n\013APNKIMFC" +
"JIH\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\375\014\022\017\n\013DCDNI" +
"LFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.gra" +
"o\"B\n\017AvatarAddNotify\022\022\n\nis_in_team\030\001 \001(\010" +
"\022\033\n\006avatar\030\006 \001(\0132\013.AvatarInfoB\033\n\031emu.gra" +
"sscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -868,7 +745,7 @@ public final class AvatarAddNotifyOuterClass {
internal_static_AvatarAddNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AvatarAddNotify_descriptor,
new java.lang.String[] { "Avatar", "IsInTeam", });
new java.lang.String[] { "IsInTeam", "Avatar", });
emu.grasscutter.net.proto.AvatarInfoOuterClass.getDescriptor();
}