Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 08:49:52 +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/AvatarFetterDataNotifyOuterClass.java
+40 -163
View File
@@ -19,11 +19,11 @@ public final class AvatarFetterDataNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetterInfoMap = 11;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
*/
int getFetterInfoMapCount();
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetterInfoMap = 11;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
*/
boolean containsFetterInfoMap(
long key);
@@ -34,25 +34,30 @@ public final class AvatarFetterDataNotifyOuterClass {
java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo>
getFetterInfoMap();
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetterInfoMap = 11;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
*/
java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo>
getFetterInfoMapMap();
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetterInfoMap = 11;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
*/
emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo getFetterInfoMapOrDefault(
long key,
emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo defaultValue);
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetterInfoMap = 11;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
*/
emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo getFetterInfoMapOrThrow(
long key);
}
/**
* <pre>
* Name: KKADAHCNCNG
* CmdId: 1648
* </pre>
*
* Protobuf type {@code AvatarFetterDataNotify}
*/
public static final class AvatarFetterDataNotify extends
@@ -98,7 +103,7 @@ public final class AvatarFetterDataNotifyOuterClass {
case 0:
done = true;
break;
case 90: {
case 66: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
fetterInfoMap_ = com.google.protobuf.MapField.newMapField(
FetterInfoMapDefaultEntryHolder.defaultEntry);
@@ -140,7 +145,7 @@ public final class AvatarFetterDataNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 11:
case 8:
return internalGetFetterInfoMap();
default:
throw new RuntimeException(
@@ -155,138 +160,7 @@ public final class AvatarFetterDataNotifyOuterClass {
emu.grasscutter.net.proto.AvatarFetterDataNotifyOuterClass.AvatarFetterDataNotify.class, emu.grasscutter.net.proto.AvatarFetterDataNotifyOuterClass.AvatarFetterDataNotify.Builder.class);
}
/**
* Protobuf enum {@code AvatarFetterDataNotify.GNEHOADIGHH}
*/
public enum GNEHOADIGHH
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 1772;</code>
*/
PEPPOHPHJOJ(1, 1772),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final GNEHOADIGHH DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 1772;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 1772;
/**
* <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 GNEHOADIGHH 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 GNEHOADIGHH forNumber(int value) {
switch (value) {
case 0: return NONE;
case 1772: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<GNEHOADIGHH>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
GNEHOADIGHH> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<GNEHOADIGHH>() {
public GNEHOADIGHH findValueByNumber(int number) {
return GNEHOADIGHH.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.AvatarFetterDataNotifyOuterClass.AvatarFetterDataNotify.getDescriptor().getEnumTypes().get(0);
}
private static final GNEHOADIGHH[] VALUES = getStaticValuesArray();
private static GNEHOADIGHH[] getStaticValuesArray() {
return new GNEHOADIGHH[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static GNEHOADIGHH 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 GNEHOADIGHH(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:AvatarFetterDataNotify.GNEHOADIGHH)
}
public static final int FETTERINFOMAP_FIELD_NUMBER = 11;
public static final int FETTER_INFO_MAP_FIELD_NUMBER = 8;
private static final class FetterInfoMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry<
java.lang.Long, emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo> defaultEntry =
@@ -313,7 +187,7 @@ public final class AvatarFetterDataNotifyOuterClass {
return internalGetFetterInfoMap().getMap().size();
}
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetterInfoMap = 11;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
*/
@java.lang.Override
@@ -331,7 +205,7 @@ public final class AvatarFetterDataNotifyOuterClass {
return getFetterInfoMapMap();
}
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetterInfoMap = 11;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
*/
@java.lang.Override
@@ -339,7 +213,7 @@ public final class AvatarFetterDataNotifyOuterClass {
return internalGetFetterInfoMap().getMap();
}
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetterInfoMap = 11;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
*/
@java.lang.Override
@@ -352,7 +226,7 @@ public final class AvatarFetterDataNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetterInfoMap = 11;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
*/
@java.lang.Override
@@ -386,7 +260,7 @@ public final class AvatarFetterDataNotifyOuterClass {
output,
internalGetFetterInfoMap(),
FetterInfoMapDefaultEntryHolder.defaultEntry,
11);
8);
unknownFields.writeTo(output);
}
@@ -404,7 +278,7 @@ public final class AvatarFetterDataNotifyOuterClass {
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(11, fetterInfoMap__);
.computeMessageSize(8, fetterInfoMap__);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -435,7 +309,7 @@ public final class AvatarFetterDataNotifyOuterClass {
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
if (!internalGetFetterInfoMap().getMap().isEmpty()) {
hash = (37 * hash) + FETTERINFOMAP_FIELD_NUMBER;
hash = (37 * hash) + FETTER_INFO_MAP_FIELD_NUMBER;
hash = (53 * hash) + internalGetFetterInfoMap().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
@@ -534,6 +408,11 @@ public final class AvatarFetterDataNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: KKADAHCNCNG
* CmdId: 1648
* </pre>
*
* Protobuf type {@code AvatarFetterDataNotify}
*/
public static final class Builder extends
@@ -549,7 +428,7 @@ public final class AvatarFetterDataNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 11:
case 8:
return internalGetFetterInfoMap();
default:
throw new RuntimeException(
@@ -560,7 +439,7 @@ public final class AvatarFetterDataNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMutableMapField(
int number) {
switch (number) {
case 11:
case 8:
return internalGetMutableFetterInfoMap();
default:
throw new RuntimeException(
@@ -730,7 +609,7 @@ public final class AvatarFetterDataNotifyOuterClass {
return internalGetFetterInfoMap().getMap().size();
}
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetterInfoMap = 11;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
*/
@java.lang.Override
@@ -748,7 +627,7 @@ public final class AvatarFetterDataNotifyOuterClass {
return getFetterInfoMapMap();
}
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetterInfoMap = 11;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
*/
@java.lang.Override
@@ -756,7 +635,7 @@ public final class AvatarFetterDataNotifyOuterClass {
return internalGetFetterInfoMap().getMap();
}
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetterInfoMap = 11;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
*/
@java.lang.Override
@@ -769,7 +648,7 @@ public final class AvatarFetterDataNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetterInfoMap = 11;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
*/
@java.lang.Override
@@ -790,7 +669,7 @@ public final class AvatarFetterDataNotifyOuterClass {
return this;
}
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetterInfoMap = 11;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
*/
public Builder removeFetterInfoMap(
@@ -809,7 +688,7 @@ public final class AvatarFetterDataNotifyOuterClass {
return internalGetMutableFetterInfoMap().getMutableMap();
}
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetterInfoMap = 11;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
*/
public Builder putFetterInfoMap(
long key,
@@ -821,7 +700,7 @@ public final class AvatarFetterDataNotifyOuterClass {
return this;
}
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetterInfoMap = 11;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
*/
public Builder putAllFetterInfoMap(
@@ -903,14 +782,12 @@ public final class AvatarFetterDataNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\034AvatarFetterDataNotify.proto\032\026AvatarFe" +
"tterInfo.proto\"\365\001\n\026AvatarFetterDataNotif" +
"y\022A\n\rfetterInfoMap\030\013 \003(\0132*.AvatarFetterD" +
"ataNotify.FetterInfoMapEntry\032G\n\022FetterIn" +
"foMapEntry\022\013\n\003key\030\001 \001(\004\022 \n\005value\030\002 \001(\0132\021" +
".AvatarFetterInfo:\0028\001\"O\n\013GNEHOADIGHH\022\010\n\004" +
"NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\354\r\022\017\n\013DCDNILFDFLB\020" +
"\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.grasscutte" +
"r.net.protob\006proto3"
"tterInfo.proto\"\246\001\n\026AvatarFetterDataNotif" +
"y\022C\n\017fetter_info_map\030\010 \003(\0132*.AvatarFette" +
"rDataNotify.FetterInfoMapEntry\032G\n\022Fetter" +
"InfoMapEntry\022\013\n\003key\030\001 \001(\004\022 \n\005value\030\002 \001(\013" +
"2\021.AvatarFetterInfo:\0028\001B\033\n\031emu.grasscutt" +
"er.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,