Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-27 02:50:03 +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/AvatarSkillInfoNotifyOuterClass.java
+105 -228
View File
@@ -19,11 +19,17 @@ public final class AvatarSkillInfoNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skillMap = 2;</code>
* <code>uint64 guid = 9;</code>
* @return The guid.
*/
long getGuid();
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 14;</code>
*/
int getSkillMapCount();
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skillMap = 2;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 14;</code>
*/
boolean containsSkillMap(
int key);
@@ -34,31 +40,30 @@ public final class AvatarSkillInfoNotifyOuterClass {
java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo>
getSkillMap();
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skillMap = 2;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 14;</code>
*/
java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo>
getSkillMapMap();
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skillMap = 2;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 14;</code>
*/
emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo getSkillMapOrDefault(
int key,
emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo defaultValue);
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skillMap = 2;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 14;</code>
*/
emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo getSkillMapOrThrow(
int key);
/**
* <code>uint64 guid = 4;</code>
* @return The guid.
*/
long getGuid();
}
/**
* <pre>
* Name: AJAPPFJJHMF
* CmdId: 1082
* </pre>
*
* Protobuf type {@code AvatarSkillInfoNotify}
*/
public static final class AvatarSkillInfoNotify extends
@@ -104,7 +109,12 @@ public final class AvatarSkillInfoNotifyOuterClass {
case 0:
done = true;
break;
case 18: {
case 72: {
guid_ = input.readUInt64();
break;
}
case 114: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
skillMap_ = com.google.protobuf.MapField.newMapField(
SkillMapDefaultEntryHolder.defaultEntry);
@@ -117,11 +127,6 @@ public final class AvatarSkillInfoNotifyOuterClass {
skillMap__.getKey(), skillMap__.getValue());
break;
}
case 32: {
guid_ = input.readUInt64();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -151,7 +156,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 2:
case 14:
return internalGetSkillMap();
default:
throw new RuntimeException(
@@ -166,138 +171,18 @@ public final class AvatarSkillInfoNotifyOuterClass {
emu.grasscutter.net.proto.AvatarSkillInfoNotifyOuterClass.AvatarSkillInfoNotify.class, emu.grasscutter.net.proto.AvatarSkillInfoNotifyOuterClass.AvatarSkillInfoNotify.Builder.class);
}
public static final int GUID_FIELD_NUMBER = 9;
private long guid_;
/**
* Protobuf enum {@code AvatarSkillInfoNotify.ECOIPGLJMMN}
* <code>uint64 guid = 9;</code>
* @return The guid.
*/
public enum ECOIPGLJMMN
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 1070;</code>
*/
PEPPOHPHJOJ(1, 1070),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final ECOIPGLJMMN DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 1070;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 1070;
/**
* <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 ECOIPGLJMMN 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 ECOIPGLJMMN forNumber(int value) {
switch (value) {
case 0: return NONE;
case 1070: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<ECOIPGLJMMN>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
ECOIPGLJMMN> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<ECOIPGLJMMN>() {
public ECOIPGLJMMN findValueByNumber(int number) {
return ECOIPGLJMMN.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.AvatarSkillInfoNotifyOuterClass.AvatarSkillInfoNotify.getDescriptor().getEnumTypes().get(0);
}
private static final ECOIPGLJMMN[] VALUES = getStaticValuesArray();
private static ECOIPGLJMMN[] getStaticValuesArray() {
return new ECOIPGLJMMN[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static ECOIPGLJMMN 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 ECOIPGLJMMN(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:AvatarSkillInfoNotify.ECOIPGLJMMN)
@java.lang.Override
public long getGuid() {
return guid_;
}
public static final int SKILLMAP_FIELD_NUMBER = 2;
public static final int SKILL_MAP_FIELD_NUMBER = 14;
private static final class SkillMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry<
java.lang.Integer, emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo> defaultEntry =
@@ -324,7 +209,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return internalGetSkillMap().getMap().size();
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skillMap = 2;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 14;</code>
*/
@java.lang.Override
@@ -342,7 +227,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return getSkillMapMap();
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skillMap = 2;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 14;</code>
*/
@java.lang.Override
@@ -350,7 +235,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return internalGetSkillMap().getMap();
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skillMap = 2;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 14;</code>
*/
@java.lang.Override
@@ -363,7 +248,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skillMap = 2;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 14;</code>
*/
@java.lang.Override
@@ -378,17 +263,6 @@ public final class AvatarSkillInfoNotifyOuterClass {
return map.get(key);
}
public static final int GUID_FIELD_NUMBER = 4;
private long guid_;
/**
* <code>uint64 guid = 4;</code>
* @return The guid.
*/
@java.lang.Override
public long getGuid() {
return guid_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -403,15 +277,15 @@ public final class AvatarSkillInfoNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (guid_ != 0L) {
output.writeUInt64(9, guid_);
}
com.google.protobuf.GeneratedMessageV3
.serializeIntegerMapTo(
output,
internalGetSkillMap(),
SkillMapDefaultEntryHolder.defaultEntry,
2);
if (guid_ != 0L) {
output.writeUInt64(4, guid_);
}
14);
unknownFields.writeTo(output);
}
@@ -421,6 +295,10 @@ public final class AvatarSkillInfoNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (guid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(9, guid_);
}
for (java.util.Map.Entry<java.lang.Integer, emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo> entry
: internalGetSkillMap().getMap().entrySet()) {
com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo>
@@ -429,11 +307,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(2, skillMap__);
}
if (guid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(4, guid_);
.computeMessageSize(14, skillMap__);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -450,10 +324,10 @@ public final class AvatarSkillInfoNotifyOuterClass {
}
emu.grasscutter.net.proto.AvatarSkillInfoNotifyOuterClass.AvatarSkillInfoNotify other = (emu.grasscutter.net.proto.AvatarSkillInfoNotifyOuterClass.AvatarSkillInfoNotify) obj;
if (!internalGetSkillMap().equals(
other.internalGetSkillMap())) return false;
if (getGuid()
!= other.getGuid()) return false;
if (!internalGetSkillMap().equals(
other.internalGetSkillMap())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -465,13 +339,13 @@ public final class AvatarSkillInfoNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
if (!internalGetSkillMap().getMap().isEmpty()) {
hash = (37 * hash) + SKILLMAP_FIELD_NUMBER;
hash = (53 * hash) + internalGetSkillMap().hashCode();
}
hash = (37 * hash) + GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getGuid());
if (!internalGetSkillMap().getMap().isEmpty()) {
hash = (37 * hash) + SKILL_MAP_FIELD_NUMBER;
hash = (53 * hash) + internalGetSkillMap().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -568,6 +442,11 @@ public final class AvatarSkillInfoNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: AJAPPFJJHMF
* CmdId: 1082
* </pre>
*
* Protobuf type {@code AvatarSkillInfoNotify}
*/
public static final class Builder extends
@@ -583,7 +462,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 2:
case 14:
return internalGetSkillMap();
default:
throw new RuntimeException(
@@ -594,7 +473,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMutableMapField(
int number) {
switch (number) {
case 2:
case 14:
return internalGetMutableSkillMap();
default:
throw new RuntimeException(
@@ -627,9 +506,9 @@ public final class AvatarSkillInfoNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
internalGetMutableSkillMap().clear();
guid_ = 0L;
internalGetMutableSkillMap().clear();
return this;
}
@@ -657,9 +536,9 @@ public final class AvatarSkillInfoNotifyOuterClass {
public emu.grasscutter.net.proto.AvatarSkillInfoNotifyOuterClass.AvatarSkillInfoNotify buildPartial() {
emu.grasscutter.net.proto.AvatarSkillInfoNotifyOuterClass.AvatarSkillInfoNotify result = new emu.grasscutter.net.proto.AvatarSkillInfoNotifyOuterClass.AvatarSkillInfoNotify(this);
int from_bitField0_ = bitField0_;
result.guid_ = guid_;
result.skillMap_ = internalGetSkillMap();
result.skillMap_.makeImmutable();
result.guid_ = guid_;
onBuilt();
return result;
}
@@ -708,11 +587,11 @@ public final class AvatarSkillInfoNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AvatarSkillInfoNotifyOuterClass.AvatarSkillInfoNotify other) {
if (other == emu.grasscutter.net.proto.AvatarSkillInfoNotifyOuterClass.AvatarSkillInfoNotify.getDefaultInstance()) return this;
internalGetMutableSkillMap().mergeFrom(
other.internalGetSkillMap());
if (other.getGuid() != 0L) {
setGuid(other.getGuid());
}
internalGetMutableSkillMap().mergeFrom(
other.internalGetSkillMap());
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -743,6 +622,37 @@ public final class AvatarSkillInfoNotifyOuterClass {
}
private int bitField0_;
private long guid_ ;
/**
* <code>uint64 guid = 9;</code>
* @return The guid.
*/
@java.lang.Override
public long getGuid() {
return guid_;
}
/**
* <code>uint64 guid = 9;</code>
* @param value The guid to set.
* @return This builder for chaining.
*/
public Builder setGuid(long value) {
guid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 guid = 9;</code>
* @return This builder for chaining.
*/
public Builder clearGuid() {
guid_ = 0L;
onChanged();
return this;
}
private com.google.protobuf.MapField<
java.lang.Integer, emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo> skillMap_;
private com.google.protobuf.MapField<java.lang.Integer, emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo>
@@ -770,7 +680,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return internalGetSkillMap().getMap().size();
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skillMap = 2;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 14;</code>
*/
@java.lang.Override
@@ -788,7 +698,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return getSkillMapMap();
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skillMap = 2;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 14;</code>
*/
@java.lang.Override
@@ -796,7 +706,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return internalGetSkillMap().getMap();
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skillMap = 2;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 14;</code>
*/
@java.lang.Override
@@ -809,7 +719,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skillMap = 2;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 14;</code>
*/
@java.lang.Override
@@ -830,7 +740,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return this;
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skillMap = 2;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 14;</code>
*/
public Builder removeSkillMap(
@@ -849,7 +759,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return internalGetMutableSkillMap().getMutableMap();
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skillMap = 2;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 14;</code>
*/
public Builder putSkillMap(
int key,
@@ -861,7 +771,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return this;
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skillMap = 2;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 14;</code>
*/
public Builder putAllSkillMap(
@@ -870,37 +780,6 @@ public final class AvatarSkillInfoNotifyOuterClass {
.putAll(values);
return this;
}
private long guid_ ;
/**
* <code>uint64 guid = 4;</code>
* @return The guid.
*/
@java.lang.Override
public long getGuid() {
return guid_;
}
/**
* <code>uint64 guid = 4;</code>
* @param value The guid to set.
* @return This builder for chaining.
*/
public Builder setGuid(long value) {
guid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 guid = 4;</code>
* @return This builder for chaining.
*/
public Builder clearGuid() {
guid_ = 0L;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -974,13 +853,11 @@ public final class AvatarSkillInfoNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\033AvatarSkillInfoNotify.proto\032\025AvatarSki" +
"llInfo.proto\"\361\001\n\025AvatarSkillInfoNotify\0226" +
"\n\010skillMap\030\002 \003(\0132$.AvatarSkillInfoNotify" +
".SkillMapEntry\022\014\n\004guid\030\004 \001(\004\032A\n\rSkillMap" +
"Entry\022\013\n\003key\030\001 \001(\r\022\037\n\005value\030\002 \001(\0132\020.Avat" +
"arSkillInfo:\0028\001\"O\n\013ECOIPGLJMMN\022\010\n\004NONE\020\000" +
"\022\020\n\013PEPPOHPHJOJ\020\256\010\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013N" +
"NBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.grasscutter.net." +
"llInfo.proto\"\241\001\n\025AvatarSkillInfoNotify\022\014" +
"\n\004guid\030\t \001(\004\0227\n\tskill_map\030\016 \003(\0132$.Avatar" +
"SkillInfoNotify.SkillMapEntry\032A\n\rSkillMa" +
"pEntry\022\013\n\003key\030\001 \001(\r\022\037\n\005value\030\002 \001(\0132\020.Ava" +
"tarSkillInfo:\0028\001B\033\n\031emu.grasscutter.net." +
"protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -993,7 +870,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
internal_static_AvatarSkillInfoNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AvatarSkillInfoNotify_descriptor,
new java.lang.String[] { "SkillMap", "Guid", });
new java.lang.String[] { "Guid", "SkillMap", });
internal_static_AvatarSkillInfoNotify_SkillMapEntry_descriptor =
internal_static_AvatarSkillInfoNotify_descriptor.getNestedTypes().get(0);
internal_static_AvatarSkillInfoNotify_SkillMapEntry_fieldAccessorTable = new