Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-27 03:33:36 +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/AvatarSkillInfoNotifyOuterClass.java
+38 -32
View File
@@ -19,11 +19,11 @@ public final class AvatarSkillInfoNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 6;</code>
*/
int getSkillMapCount();
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 6;</code>
*/
boolean containsSkillMap(
int key);
@@ -34,19 +34,19 @@ public final class AvatarSkillInfoNotifyOuterClass {
java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo>
getSkillMap();
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 6;</code>
*/
java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo>
getSkillMapMap();
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 6;</code>
*/
emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo getSkillMapOrDefault(
int key,
emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo defaultValue);
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 6;</code>
*/
emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo getSkillMapOrThrow(
@@ -60,10 +60,13 @@ public final class AvatarSkillInfoNotifyOuterClass {
}
/**
* <pre>
* CmdId: 1090
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1047;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code AvatarSkillInfoNotify}
@@ -116,7 +119,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
guid_ = input.readUInt64();
break;
}
case 90: {
case 50: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
skillMap_ = com.google.protobuf.MapField.newMapField(
SkillMapDefaultEntryHolder.defaultEntry);
@@ -158,7 +161,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 11:
case 6:
return internalGetSkillMap();
default:
throw new RuntimeException(
@@ -173,7 +176,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
emu.grasscutter.net.proto.AvatarSkillInfoNotifyOuterClass.AvatarSkillInfoNotify.class, emu.grasscutter.net.proto.AvatarSkillInfoNotifyOuterClass.AvatarSkillInfoNotify.Builder.class);
}
public static final int SKILL_MAP_FIELD_NUMBER = 11;
public static final int SKILL_MAP_FIELD_NUMBER = 6;
private static final class SkillMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry<
java.lang.Integer, emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo> defaultEntry =
@@ -200,7 +203,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return internalGetSkillMap().getMap().size();
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 6;</code>
*/
@java.lang.Override
@@ -218,7 +221,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return getSkillMapMap();
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 6;</code>
*/
@java.lang.Override
@@ -226,7 +229,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return internalGetSkillMap().getMap();
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 6;</code>
*/
@java.lang.Override
@@ -239,7 +242,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 6;</code>
*/
@java.lang.Override
@@ -287,7 +290,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
output,
internalGetSkillMap(),
SkillMapDefaultEntryHolder.defaultEntry,
11);
6);
unknownFields.writeTo(output);
}
@@ -309,7 +312,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(11, skillMap__);
.computeMessageSize(6, skillMap__);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -445,10 +448,13 @@ public final class AvatarSkillInfoNotifyOuterClass {
}
/**
* <pre>
* CmdId: 1090
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1047;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code AvatarSkillInfoNotify}
@@ -466,7 +472,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 11:
case 6:
return internalGetSkillMap();
default:
throw new RuntimeException(
@@ -477,7 +483,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMutableMapField(
int number) {
switch (number) {
case 11:
case 6:
return internalGetMutableSkillMap();
default:
throw new RuntimeException(
@@ -653,7 +659,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return internalGetSkillMap().getMap().size();
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 6;</code>
*/
@java.lang.Override
@@ -671,7 +677,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return getSkillMapMap();
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 6;</code>
*/
@java.lang.Override
@@ -679,7 +685,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return internalGetSkillMap().getMap();
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 6;</code>
*/
@java.lang.Override
@@ -692,7 +698,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 6;</code>
*/
@java.lang.Override
@@ -713,7 +719,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return this;
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 6;</code>
*/
public Builder removeSkillMap(
@@ -732,7 +738,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return internalGetMutableSkillMap().getMutableMap();
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 6;</code>
*/
public Builder putSkillMap(
int key,
@@ -744,7 +750,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return this;
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 6;</code>
*/
public Builder putAllSkillMap(
@@ -858,7 +864,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
java.lang.String[] descriptorData = {
"\n\033AvatarSkillInfoNotify.proto\032\025AvatarSki" +
"llInfo.proto\"\241\001\n\025AvatarSkillInfoNotify\0227" +
"\n\tskill_map\030\013 \003(\0132$.AvatarSkillInfoNotif" +
"\n\tskill_map\030\006 \003(\0132$.AvatarSkillInfoNotif" +
"y.SkillMapEntry\022\014\n\004guid\030\004 \001(\004\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." +