mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-23 09:40:20 +08:00
Update gc to 3.3 (#1981)
* replace the deprecated api * update proto * delete music game * fixed codes * fix costume switch * fix mail bug * Bump version number. * Re-add max boss chest number Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
Unverified
parent
8b83dbf58c
commit
92fbaa8670
+38
-32
@@ -19,11 +19,11 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 15;</code>
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 2;</code>
|
||||
*/
|
||||
int getFetterInfoMapCount();
|
||||
/**
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 15;</code>
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 2;</code>
|
||||
*/
|
||||
boolean containsFetterInfoMap(
|
||||
long key);
|
||||
@@ -34,19 +34,19 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo>
|
||||
getFetterInfoMap();
|
||||
/**
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 15;</code>
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 2;</code>
|
||||
*/
|
||||
java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo>
|
||||
getFetterInfoMapMap();
|
||||
/**
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 15;</code>
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 2;</code>
|
||||
*/
|
||||
|
||||
emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo getFetterInfoMapOrDefault(
|
||||
long key,
|
||||
emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo defaultValue);
|
||||
/**
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 15;</code>
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 2;</code>
|
||||
*/
|
||||
|
||||
emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo getFetterInfoMapOrThrow(
|
||||
@@ -54,10 +54,13 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 1782
|
||||
* EnetChannelId: 0
|
||||
* EnetIsReliable: false
|
||||
* IsAllowClient: true
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 1617;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code AvatarFetterDataNotify}
|
||||
@@ -105,7 +108,7 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 122: {
|
||||
case 18: {
|
||||
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
|
||||
fetterInfoMap_ = com.google.protobuf.MapField.newMapField(
|
||||
FetterInfoMapDefaultEntryHolder.defaultEntry);
|
||||
@@ -147,7 +150,7 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
protected com.google.protobuf.MapField internalGetMapField(
|
||||
int number) {
|
||||
switch (number) {
|
||||
case 15:
|
||||
case 2:
|
||||
return internalGetFetterInfoMap();
|
||||
default:
|
||||
throw new RuntimeException(
|
||||
@@ -162,7 +165,7 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
emu.grasscutter.net.proto.AvatarFetterDataNotifyOuterClass.AvatarFetterDataNotify.class, emu.grasscutter.net.proto.AvatarFetterDataNotifyOuterClass.AvatarFetterDataNotify.Builder.class);
|
||||
}
|
||||
|
||||
public static final int FETTER_INFO_MAP_FIELD_NUMBER = 15;
|
||||
public static final int FETTER_INFO_MAP_FIELD_NUMBER = 2;
|
||||
private static final class FetterInfoMapDefaultEntryHolder {
|
||||
static final com.google.protobuf.MapEntry<
|
||||
java.lang.Long, emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo> defaultEntry =
|
||||
@@ -189,7 +192,7 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
return internalGetFetterInfoMap().getMap().size();
|
||||
}
|
||||
/**
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 15;</code>
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 2;</code>
|
||||
*/
|
||||
|
||||
@java.lang.Override
|
||||
@@ -207,7 +210,7 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
return getFetterInfoMapMap();
|
||||
}
|
||||
/**
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 15;</code>
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 2;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
|
||||
@@ -215,7 +218,7 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
return internalGetFetterInfoMap().getMap();
|
||||
}
|
||||
/**
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 15;</code>
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 2;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
|
||||
@@ -228,7 +231,7 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
return map.containsKey(key) ? map.get(key) : defaultValue;
|
||||
}
|
||||
/**
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 15;</code>
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 2;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
|
||||
@@ -262,7 +265,7 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
output,
|
||||
internalGetFetterInfoMap(),
|
||||
FetterInfoMapDefaultEntryHolder.defaultEntry,
|
||||
15);
|
||||
2);
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
|
||||
@@ -280,7 +283,7 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
.setValue(entry.getValue())
|
||||
.build();
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeMessageSize(15, fetterInfoMap__);
|
||||
.computeMessageSize(2, fetterInfoMap__);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -411,10 +414,13 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 1782
|
||||
* EnetChannelId: 0
|
||||
* EnetIsReliable: false
|
||||
* IsAllowClient: true
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 1617;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code AvatarFetterDataNotify}
|
||||
@@ -432,7 +438,7 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
protected com.google.protobuf.MapField internalGetMapField(
|
||||
int number) {
|
||||
switch (number) {
|
||||
case 15:
|
||||
case 2:
|
||||
return internalGetFetterInfoMap();
|
||||
default:
|
||||
throw new RuntimeException(
|
||||
@@ -443,7 +449,7 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
protected com.google.protobuf.MapField internalGetMutableMapField(
|
||||
int number) {
|
||||
switch (number) {
|
||||
case 15:
|
||||
case 2:
|
||||
return internalGetMutableFetterInfoMap();
|
||||
default:
|
||||
throw new RuntimeException(
|
||||
@@ -613,7 +619,7 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
return internalGetFetterInfoMap().getMap().size();
|
||||
}
|
||||
/**
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 15;</code>
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 2;</code>
|
||||
*/
|
||||
|
||||
@java.lang.Override
|
||||
@@ -631,7 +637,7 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
return getFetterInfoMapMap();
|
||||
}
|
||||
/**
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 15;</code>
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 2;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
|
||||
@@ -639,7 +645,7 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
return internalGetFetterInfoMap().getMap();
|
||||
}
|
||||
/**
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 15;</code>
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 2;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
|
||||
@@ -652,7 +658,7 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
return map.containsKey(key) ? map.get(key) : defaultValue;
|
||||
}
|
||||
/**
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 15;</code>
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 2;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
|
||||
@@ -673,7 +679,7 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 15;</code>
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 2;</code>
|
||||
*/
|
||||
|
||||
public Builder removeFetterInfoMap(
|
||||
@@ -692,7 +698,7 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
return internalGetMutableFetterInfoMap().getMutableMap();
|
||||
}
|
||||
/**
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 15;</code>
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 2;</code>
|
||||
*/
|
||||
public Builder putFetterInfoMap(
|
||||
long key,
|
||||
@@ -704,7 +710,7 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 15;</code>
|
||||
* <code>map<uint64, .AvatarFetterInfo> fetter_info_map = 2;</code>
|
||||
*/
|
||||
|
||||
public Builder putAllFetterInfoMap(
|
||||
@@ -787,7 +793,7 @@ public final class AvatarFetterDataNotifyOuterClass {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\034AvatarFetterDataNotify.proto\032\026AvatarFe" +
|
||||
"tterInfo.proto\"\246\001\n\026AvatarFetterDataNotif" +
|
||||
"y\022C\n\017fetter_info_map\030\017 \003(\0132*.AvatarFette" +
|
||||
"y\022C\n\017fetter_info_map\030\002 \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" +
|
||||
|
||||
Reference in New Issue
Block a user