Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 20:49:57 +08:00
Code Issues Projects Releases Wiki Activity

Update gc to 3.3 (#1981)

Browse Source 
* 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:
Simplxs
2022-12-24 05:12:02 +08:00
committed by GitHub
Unverified
parent 8b83dbf58c
commit 92fbaa8670
1142 changed files with 474411 additions and 169883 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamUpdateNotifyOuterClass.java
+82 -76
View File
@@ -19,11 +19,11 @@ public final class AvatarTeamUpdateNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
*/
int getAvatarTeamMapCount();
/**
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
*/
boolean containsAvatarTeamMap(
int key);
@@ -34,36 +34,36 @@ public final class AvatarTeamUpdateNotifyOuterClass {
java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
getAvatarTeamMap();
/**
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
*/
java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
getAvatarTeamMapMap();
/**
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
*/
emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMapOrDefault(
int key,
emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam defaultValue);
/**
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
*/
emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMapOrThrow(
int key);
/**
* <code>repeated uint64 temp_avatar_guid_list = 13;</code>
* <code>repeated uint64 temp_avatar_guid_list = 10;</code>
* @return A list containing the tempAvatarGuidList.
*/
java.util.List<java.lang.Long> getTempAvatarGuidListList();
/**
* <code>repeated uint64 temp_avatar_guid_list = 13;</code>
* <code>repeated uint64 temp_avatar_guid_list = 10;</code>
* @return The count of tempAvatarGuidList.
*/
int getTempAvatarGuidListCount();
/**
* <code>repeated uint64 temp_avatar_guid_list = 13;</code>
* <code>repeated uint64 temp_avatar_guid_list = 10;</code>
* @param index The index of the element to return.
* @return The tempAvatarGuidList at the given index.
*/
@@ -71,10 +71,13 @@ public final class AvatarTeamUpdateNotifyOuterClass {
}
/**
* <pre>
* CmdId: 1706
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1739;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code AvatarTeamUpdateNotify}
@@ -123,20 +126,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
case 0:
done = true;
break;
case 18: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
avatarTeamMap_ = com.google.protobuf.MapField.newMapField(
AvatarTeamMapDefaultEntryHolder.defaultEntry);
mutable_bitField0_ |= 0x00000001;
}
com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
avatarTeamMap__ = input.readMessage(
AvatarTeamMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
avatarTeamMap_.getMutableMap().put(
avatarTeamMap__.getKey(), avatarTeamMap__.getValue());
break;
}
case 104: {
case 80: {
if (!((mutable_bitField0_ & 0x00000002) != 0)) {
tempAvatarGuidList_ = newLongList();
mutable_bitField0_ |= 0x00000002;
@@ -144,7 +134,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
tempAvatarGuidList_.addLong(input.readUInt64());
break;
}
case 106: {
case 82: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
@@ -157,6 +147,19 @@ public final class AvatarTeamUpdateNotifyOuterClass {
input.popLimit(limit);
break;
}
case 122: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
avatarTeamMap_ = com.google.protobuf.MapField.newMapField(
AvatarTeamMapDefaultEntryHolder.defaultEntry);
mutable_bitField0_ |= 0x00000001;
}
com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
avatarTeamMap__ = input.readMessage(
AvatarTeamMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
avatarTeamMap_.getMutableMap().put(
avatarTeamMap__.getKey(), avatarTeamMap__.getValue());
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -189,7 +192,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 2:
case 15:
return internalGetAvatarTeamMap();
default:
throw new RuntimeException(
@@ -204,7 +207,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
emu.grasscutter.net.proto.AvatarTeamUpdateNotifyOuterClass.AvatarTeamUpdateNotify.class, emu.grasscutter.net.proto.AvatarTeamUpdateNotifyOuterClass.AvatarTeamUpdateNotify.Builder.class);
}
public static final int AVATAR_TEAM_MAP_FIELD_NUMBER = 2;
public static final int AVATAR_TEAM_MAP_FIELD_NUMBER = 15;
private static final class AvatarTeamMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry<
java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam> defaultEntry =
@@ -231,7 +234,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
return internalGetAvatarTeamMap().getMap().size();
}
/**
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
*/
@java.lang.Override
@@ -249,7 +252,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
return getAvatarTeamMapMap();
}
/**
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
*/
@java.lang.Override
@@ -257,7 +260,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
return internalGetAvatarTeamMap().getMap();
}
/**
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
*/
@java.lang.Override
@@ -270,7 +273,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
*/
@java.lang.Override
@@ -285,10 +288,10 @@ public final class AvatarTeamUpdateNotifyOuterClass {
return map.get(key);
}
public static final int TEMP_AVATAR_GUID_LIST_FIELD_NUMBER = 13;
public static final int TEMP_AVATAR_GUID_LIST_FIELD_NUMBER = 10;
private com.google.protobuf.Internal.LongList tempAvatarGuidList_;
/**
* <code>repeated uint64 temp_avatar_guid_list = 13;</code>
* <code>repeated uint64 temp_avatar_guid_list = 10;</code>
* @return A list containing the tempAvatarGuidList.
*/
@java.lang.Override
@@ -297,14 +300,14 @@ public final class AvatarTeamUpdateNotifyOuterClass {
return tempAvatarGuidList_;
}
/**
* <code>repeated uint64 temp_avatar_guid_list = 13;</code>
* <code>repeated uint64 temp_avatar_guid_list = 10;</code>
* @return The count of tempAvatarGuidList.
*/
public int getTempAvatarGuidListCount() {
return tempAvatarGuidList_.size();
}
/**
* <code>repeated uint64 temp_avatar_guid_list = 13;</code>
* <code>repeated uint64 temp_avatar_guid_list = 10;</code>
* @param index The index of the element to return.
* @return The tempAvatarGuidList at the given index.
*/
@@ -328,19 +331,19 @@ public final class AvatarTeamUpdateNotifyOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
com.google.protobuf.GeneratedMessageV3
.serializeIntegerMapTo(
output,
internalGetAvatarTeamMap(),
AvatarTeamMapDefaultEntryHolder.defaultEntry,
2);
if (getTempAvatarGuidListList().size() > 0) {
output.writeUInt32NoTag(106);
output.writeUInt32NoTag(82);
output.writeUInt32NoTag(tempAvatarGuidListMemoizedSerializedSize);
}
for (int i = 0; i < tempAvatarGuidList_.size(); i++) {
output.writeUInt64NoTag(tempAvatarGuidList_.getLong(i));
}
com.google.protobuf.GeneratedMessageV3
.serializeIntegerMapTo(
output,
internalGetAvatarTeamMap(),
AvatarTeamMapDefaultEntryHolder.defaultEntry,
15);
unknownFields.writeTo(output);
}
@@ -350,16 +353,6 @@ public final class AvatarTeamUpdateNotifyOuterClass {
if (size != -1) return size;
size = 0;
for (java.util.Map.Entry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam> entry
: internalGetAvatarTeamMap().getMap().entrySet()) {
com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
avatarTeamMap__ = AvatarTeamMapDefaultEntryHolder.defaultEntry.newBuilderForType()
.setKey(entry.getKey())
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(2, avatarTeamMap__);
}
{
int dataSize = 0;
for (int i = 0; i < tempAvatarGuidList_.size(); i++) {
@@ -374,6 +367,16 @@ public final class AvatarTeamUpdateNotifyOuterClass {
}
tempAvatarGuidListMemoizedSerializedSize = dataSize;
}
for (java.util.Map.Entry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam> entry
: internalGetAvatarTeamMap().getMap().entrySet()) {
com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
avatarTeamMap__ = AvatarTeamMapDefaultEntryHolder.defaultEntry.newBuilderForType()
.setKey(entry.getKey())
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(15, avatarTeamMap__);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -509,10 +512,13 @@ public final class AvatarTeamUpdateNotifyOuterClass {
}
/**
* <pre>
* CmdId: 1706
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1739;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code AvatarTeamUpdateNotify}
@@ -530,7 +536,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 2:
case 15:
return internalGetAvatarTeamMap();
default:
throw new RuntimeException(
@@ -541,7 +547,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMutableMapField(
int number) {
switch (number) {
case 2:
case 15:
return internalGetMutableAvatarTeamMap();
default:
throw new RuntimeException(
@@ -728,7 +734,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
return internalGetAvatarTeamMap().getMap().size();
}
/**
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
*/
@java.lang.Override
@@ -746,7 +752,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
return getAvatarTeamMapMap();
}
/**
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
*/
@java.lang.Override
@@ -754,7 +760,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
return internalGetAvatarTeamMap().getMap();
}
/**
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
*/
@java.lang.Override
@@ -767,7 +773,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
*/
@java.lang.Override
@@ -788,7 +794,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
return this;
}
/**
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
*/
public Builder removeAvatarTeamMap(
@@ -807,7 +813,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
return internalGetMutableAvatarTeamMap().getMutableMap();
}
/**
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
*/
public Builder putAvatarTeamMap(
int key,
@@ -819,7 +825,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
return this;
}
/**
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
* <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
*/
public Builder putAllAvatarTeamMap(
@@ -837,7 +843,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
}
}
/**
* <code>repeated uint64 temp_avatar_guid_list = 13;</code>
* <code>repeated uint64 temp_avatar_guid_list = 10;</code>
* @return A list containing the tempAvatarGuidList.
*/
public java.util.List<java.lang.Long>
@@ -846,14 +852,14 @@ public final class AvatarTeamUpdateNotifyOuterClass {
java.util.Collections.unmodifiableList(tempAvatarGuidList_) : tempAvatarGuidList_;
}
/**
* <code>repeated uint64 temp_avatar_guid_list = 13;</code>
* <code>repeated uint64 temp_avatar_guid_list = 10;</code>
* @return The count of tempAvatarGuidList.
*/
public int getTempAvatarGuidListCount() {
return tempAvatarGuidList_.size();
}
/**
* <code>repeated uint64 temp_avatar_guid_list = 13;</code>
* <code>repeated uint64 temp_avatar_guid_list = 10;</code>
* @param index The index of the element to return.
* @return The tempAvatarGuidList at the given index.
*/
@@ -861,7 +867,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
return tempAvatarGuidList_.getLong(index);
}
/**
* <code>repeated uint64 temp_avatar_guid_list = 13;</code>
* <code>repeated uint64 temp_avatar_guid_list = 10;</code>
* @param index The index to set the value at.
* @param value The tempAvatarGuidList to set.
* @return This builder for chaining.
@@ -874,7 +880,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
return this;
}
/**
* <code>repeated uint64 temp_avatar_guid_list = 13;</code>
* <code>repeated uint64 temp_avatar_guid_list = 10;</code>
* @param value The tempAvatarGuidList to add.
* @return This builder for chaining.
*/
@@ -885,7 +891,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
return this;
}
/**
* <code>repeated uint64 temp_avatar_guid_list = 13;</code>
* <code>repeated uint64 temp_avatar_guid_list = 10;</code>
* @param values The tempAvatarGuidList to add.
* @return This builder for chaining.
*/
@@ -898,7 +904,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
return this;
}
/**
* <code>repeated uint64 temp_avatar_guid_list = 13;</code>
* <code>repeated uint64 temp_avatar_guid_list = 10;</code>
* @return This builder for chaining.
*/
public Builder clearTempAvatarGuidList() {
@@ -981,9 +987,9 @@ public final class AvatarTeamUpdateNotifyOuterClass {
java.lang.String[] descriptorData = {
"\n\034AvatarTeamUpdateNotify.proto\032\020AvatarTe" +
"am.proto\"\277\001\n\026AvatarTeamUpdateNotify\022C\n\017a" +
"vatar_team_map\030\002 \003(\0132*.AvatarTeamUpdateN" +
"vatar_team_map\030\017 \003(\0132*.AvatarTeamUpdateN" +
"otify.AvatarTeamMapEntry\022\035\n\025temp_avatar_" +
"guid_list\030\r \003(\004\032A\n\022AvatarTeamMapEntry\022\013\n" +
"guid_list\030\n \003(\004\032A\n\022AvatarTeamMapEntry\022\013\n" +
"\003key\030\001 \001(\r\022\032\n\005value\030\002 \001(\0132\013.AvatarTeam:\002" +
"8\001B\033\n\031emu.grasscutter.net.protob\006proto3"
};