Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-09 05:55:04 +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/AvatarFightPropUpdateNotifyOuterClass.java
+111 -234
View File
@@ -19,17 +19,11 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint64 avatarGuid = 8;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
/**
* <code>map&lt;uint32, float&gt; fightPropMap = 10;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 6;</code>
*/
int getFightPropMapCount();
/**
* <code>map&lt;uint32, float&gt; fightPropMap = 10;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 6;</code>
*/
boolean containsFightPropMap(
int key);
@@ -40,25 +34,36 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
java.util.Map<java.lang.Integer, java.lang.Float>
getFightPropMap();
/**
* <code>map&lt;uint32, float&gt; fightPropMap = 10;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 6;</code>
*/
java.util.Map<java.lang.Integer, java.lang.Float>
getFightPropMapMap();
/**
* <code>map&lt;uint32, float&gt; fightPropMap = 10;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 6;</code>
*/
float getFightPropMapOrDefault(
int key,
float defaultValue);
/**
* <code>map&lt;uint32, float&gt; fightPropMap = 10;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 6;</code>
*/
float getFightPropMapOrThrow(
int key);
/**
* <code>uint64 avatar_guid = 13;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
}
/**
* <pre>
* Name: DBDANALHILN
* CmdId: 1234
* </pre>
*
* Protobuf type {@code AvatarFightPropUpdateNotify}
*/
public static final class AvatarFightPropUpdateNotify extends
@@ -104,12 +109,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
case 0:
done = true;
break;
case 64: {
avatarGuid_ = input.readUInt64();
break;
}
case 82: {
case 50: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
fightPropMap_ = com.google.protobuf.MapField.newMapField(
FightPropMapDefaultEntryHolder.defaultEntry);
@@ -122,6 +122,11 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
fightPropMap__.getKey(), fightPropMap__.getValue());
break;
}
case 104: {
avatarGuid_ = input.readUInt64();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -151,7 +156,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 10:
case 6:
return internalGetFightPropMap();
default:
throw new RuntimeException(
@@ -166,149 +171,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify.class, emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify.Builder.class);
}
/**
* Protobuf enum {@code AvatarFightPropUpdateNotify.HMBDFKEJKAN}
*/
public enum HMBDFKEJKAN
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 1274;</code>
*/
PEPPOHPHJOJ(1, 1274),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final HMBDFKEJKAN DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 1274;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 1274;
/**
* <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 HMBDFKEJKAN 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 HMBDFKEJKAN forNumber(int value) {
switch (value) {
case 0: return NONE;
case 1274: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<HMBDFKEJKAN>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
HMBDFKEJKAN> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<HMBDFKEJKAN>() {
public HMBDFKEJKAN findValueByNumber(int number) {
return HMBDFKEJKAN.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.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify.getDescriptor().getEnumTypes().get(0);
}
private static final HMBDFKEJKAN[] VALUES = getStaticValuesArray();
private static HMBDFKEJKAN[] getStaticValuesArray() {
return new HMBDFKEJKAN[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static HMBDFKEJKAN 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 HMBDFKEJKAN(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:AvatarFightPropUpdateNotify.HMBDFKEJKAN)
}
public static final int AVATARGUID_FIELD_NUMBER = 8;
private long avatarGuid_;
/**
* <code>uint64 avatarGuid = 8;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
public static final int FIGHTPROPMAP_FIELD_NUMBER = 10;
public static final int FIGHT_PROP_MAP_FIELD_NUMBER = 6;
private static final class FightPropMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry<
java.lang.Integer, java.lang.Float> defaultEntry =
@@ -335,7 +198,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
return internalGetFightPropMap().getMap().size();
}
/**
* <code>map&lt;uint32, float&gt; fightPropMap = 10;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 6;</code>
*/
@java.lang.Override
@@ -353,7 +216,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
return getFightPropMapMap();
}
/**
* <code>map&lt;uint32, float&gt; fightPropMap = 10;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 6;</code>
*/
@java.lang.Override
@@ -361,7 +224,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
return internalGetFightPropMap().getMap();
}
/**
* <code>map&lt;uint32, float&gt; fightPropMap = 10;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 6;</code>
*/
@java.lang.Override
@@ -374,7 +237,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, float&gt; fightPropMap = 10;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 6;</code>
*/
@java.lang.Override
@@ -389,6 +252,17 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
return map.get(key);
}
public static final int AVATAR_GUID_FIELD_NUMBER = 13;
private long avatarGuid_;
/**
* <code>uint64 avatar_guid = 13;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -403,15 +277,15 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (avatarGuid_ != 0L) {
output.writeUInt64(8, avatarGuid_);
}
com.google.protobuf.GeneratedMessageV3
.serializeIntegerMapTo(
output,
internalGetFightPropMap(),
FightPropMapDefaultEntryHolder.defaultEntry,
10);
6);
if (avatarGuid_ != 0L) {
output.writeUInt64(13, avatarGuid_);
}
unknownFields.writeTo(output);
}
@@ -421,10 +295,6 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(8, avatarGuid_);
}
for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry
: internalGetFightPropMap().getMap().entrySet()) {
com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
@@ -433,7 +303,11 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(10, fightPropMap__);
.computeMessageSize(6, fightPropMap__);
}
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(13, avatarGuid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -450,10 +324,10 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
}
emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify other = (emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify) obj;
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (!internalGetFightPropMap().equals(
other.internalGetFightPropMap())) return false;
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -465,13 +339,13 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + AVATARGUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
if (!internalGetFightPropMap().getMap().isEmpty()) {
hash = (37 * hash) + FIGHTPROPMAP_FIELD_NUMBER;
hash = (37 * hash) + FIGHT_PROP_MAP_FIELD_NUMBER;
hash = (53 * hash) + internalGetFightPropMap().hashCode();
}
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -568,6 +442,11 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: DBDANALHILN
* CmdId: 1234
* </pre>
*
* Protobuf type {@code AvatarFightPropUpdateNotify}
*/
public static final class Builder extends
@@ -583,7 +462,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 10:
case 6:
return internalGetFightPropMap();
default:
throw new RuntimeException(
@@ -594,7 +473,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMutableMapField(
int number) {
switch (number) {
case 10:
case 6:
return internalGetMutableFightPropMap();
default:
throw new RuntimeException(
@@ -627,9 +506,9 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
internalGetMutableFightPropMap().clear();
avatarGuid_ = 0L;
internalGetMutableFightPropMap().clear();
return this;
}
@@ -657,9 +536,9 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
public emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify buildPartial() {
emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify result = new emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify(this);
int from_bitField0_ = bitField0_;
result.avatarGuid_ = avatarGuid_;
result.fightPropMap_ = internalGetFightPropMap();
result.fightPropMap_.makeImmutable();
result.avatarGuid_ = avatarGuid_;
onBuilt();
return result;
}
@@ -708,11 +587,11 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify other) {
if (other == emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify.getDefaultInstance()) return this;
internalGetMutableFightPropMap().mergeFrom(
other.internalGetFightPropMap());
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
}
internalGetMutableFightPropMap().mergeFrom(
other.internalGetFightPropMap());
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -743,37 +622,6 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
}
private int bitField0_;
private long avatarGuid_ ;
/**
* <code>uint64 avatarGuid = 8;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
/**
* <code>uint64 avatarGuid = 8;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
public Builder setAvatarGuid(long value) {
avatarGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 avatarGuid = 8;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
avatarGuid_ = 0L;
onChanged();
return this;
}
private com.google.protobuf.MapField<
java.lang.Integer, java.lang.Float> fightPropMap_;
private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
@@ -801,7 +649,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
return internalGetFightPropMap().getMap().size();
}
/**
* <code>map&lt;uint32, float&gt; fightPropMap = 10;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 6;</code>
*/
@java.lang.Override
@@ -819,7 +667,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
return getFightPropMapMap();
}
/**
* <code>map&lt;uint32, float&gt; fightPropMap = 10;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 6;</code>
*/
@java.lang.Override
@@ -827,7 +675,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
return internalGetFightPropMap().getMap();
}
/**
* <code>map&lt;uint32, float&gt; fightPropMap = 10;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 6;</code>
*/
@java.lang.Override
@@ -840,7 +688,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, float&gt; fightPropMap = 10;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 6;</code>
*/
@java.lang.Override
@@ -861,7 +709,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
return this;
}
/**
* <code>map&lt;uint32, float&gt; fightPropMap = 10;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 6;</code>
*/
public Builder removeFightPropMap(
@@ -880,7 +728,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
return internalGetMutableFightPropMap().getMutableMap();
}
/**
* <code>map&lt;uint32, float&gt; fightPropMap = 10;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 6;</code>
*/
public Builder putFightPropMap(
int key,
@@ -892,7 +740,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
return this;
}
/**
* <code>map&lt;uint32, float&gt; fightPropMap = 10;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 6;</code>
*/
public Builder putAllFightPropMap(
@@ -901,6 +749,37 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
.putAll(values);
return this;
}
private long avatarGuid_ ;
/**
* <code>uint64 avatar_guid = 13;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
/**
* <code>uint64 avatar_guid = 13;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
public Builder setAvatarGuid(long value) {
avatarGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 avatar_guid = 13;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
avatarGuid_ = 0L;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -973,15 +852,13 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n!AvatarFightPropUpdateNotify.proto\"\375\001\n\033" +
"AvatarFightPropUpdateNotify\022\022\n\navatarGui" +
"d\030\010 \001(\004\022D\n\014fightPropMap\030\n \003(\0132..AvatarFi" +
"ghtPropUpdateNotify.FightPropMapEntry\0323\n" +
"\021FightPropMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value" +
"\030\002 \001(\002:\0028\001\"O\n\013HMBDFKEJKAN\022\010\n\004NONE\020\000\022\020\n\013P" +
"EPPOHPHJOJ\020\372\t\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!AvatarFightPropUpdateNotify.proto\"\257\001\n\033" +
"AvatarFightPropUpdateNotify\022F\n\016fight_pro" +
"p_map\030\006 \003(\0132..AvatarFightPropUpdateNotif" +
"y.FightPropMapEntry\022\023\n\013avatar_guid\030\r \001(\004" +
"\0323\n\021FightPropMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005va" +
"lue\030\002 \001(\002:\0028\001B\033\n\031emu.grasscutter.net.pro" +
"tob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -992,7 +869,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
internal_static_AvatarFightPropUpdateNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AvatarFightPropUpdateNotify_descriptor,
new java.lang.String[] { "AvatarGuid", "FightPropMap", });
new java.lang.String[] { "FightPropMap", "AvatarGuid", });
internal_static_AvatarFightPropUpdateNotify_FightPropMapEntry_descriptor =
internal_static_AvatarFightPropUpdateNotify_descriptor.getNestedTypes().get(0);
internal_static_AvatarFightPropUpdateNotify_FightPropMapEntry_fieldAccessorTable = new