Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-22 23:40:54 +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/AvatarExpeditionCallBackRspOuterClass.java
+100 -94
View File
@@ -19,11 +19,17 @@ public final class AvatarExpeditionCallBackRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 9;</code>
* <code>int32 retcode = 2;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
*/
int getExpeditionInfoMapCount();
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 9;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
*/
boolean containsExpeditionInfoMap(
long key);
@@ -34,36 +40,33 @@ public final class AvatarExpeditionCallBackRspOuterClass {
java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo>
getExpeditionInfoMap();
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 9;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
*/
java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo>
getExpeditionInfoMapMap();
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 9;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
*/
emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo getExpeditionInfoMapOrDefault(
long key,
emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo defaultValue);
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 9;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
*/
emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo getExpeditionInfoMapOrThrow(
long key);
/**
* <code>int32 retcode = 5;</code>
* @return The retcode.
*/
int getRetcode();
}
/**
* <pre>
* CmdId: 1726
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1702;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code AvatarExpeditionCallBackRsp}
@@ -111,12 +114,12 @@ public final class AvatarExpeditionCallBackRspOuterClass {
case 0:
done = true;
break;
case 40: {
case 16: {
retcode_ = input.readInt32();
break;
}
case 74: {
case 58: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
expeditionInfoMap_ = com.google.protobuf.MapField.newMapField(
ExpeditionInfoMapDefaultEntryHolder.defaultEntry);
@@ -158,7 +161,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 9:
case 7:
return internalGetExpeditionInfoMap();
default:
throw new RuntimeException(
@@ -173,7 +176,18 @@ public final class AvatarExpeditionCallBackRspOuterClass {
emu.grasscutter.net.proto.AvatarExpeditionCallBackRspOuterClass.AvatarExpeditionCallBackRsp.class, emu.grasscutter.net.proto.AvatarExpeditionCallBackRspOuterClass.AvatarExpeditionCallBackRsp.Builder.class);
}
public static final int EXPEDITION_INFO_MAP_FIELD_NUMBER = 9;
public static final int RETCODE_FIELD_NUMBER = 2;
private int retcode_;
/**
* <code>int32 retcode = 2;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
public static final int EXPEDITION_INFO_MAP_FIELD_NUMBER = 7;
private static final class ExpeditionInfoMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry<
java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo> defaultEntry =
@@ -200,7 +214,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return internalGetExpeditionInfoMap().getMap().size();
}
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 9;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
*/
@java.lang.Override
@@ -218,7 +232,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return getExpeditionInfoMapMap();
}
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 9;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
*/
@java.lang.Override
@@ -226,7 +240,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return internalGetExpeditionInfoMap().getMap();
}
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 9;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
*/
@java.lang.Override
@@ -239,7 +253,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 9;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
*/
@java.lang.Override
@@ -254,17 +268,6 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return map.get(key);
}
public static final int RETCODE_FIELD_NUMBER = 5;
private int retcode_;
/**
* <code>int32 retcode = 5;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -280,14 +283,14 @@ public final class AvatarExpeditionCallBackRspOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(5, retcode_);
output.writeInt32(2, retcode_);
}
com.google.protobuf.GeneratedMessageV3
.serializeLongMapTo(
output,
internalGetExpeditionInfoMap(),
ExpeditionInfoMapDefaultEntryHolder.defaultEntry,
9);
7);
unknownFields.writeTo(output);
}
@@ -299,7 +302,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(5, retcode_);
.computeInt32Size(2, retcode_);
}
for (java.util.Map.Entry<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo> entry
: internalGetExpeditionInfoMap().getMap().entrySet()) {
@@ -309,7 +312,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(9, expeditionInfoMap__);
.computeMessageSize(7, expeditionInfoMap__);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -326,10 +329,10 @@ public final class AvatarExpeditionCallBackRspOuterClass {
}
emu.grasscutter.net.proto.AvatarExpeditionCallBackRspOuterClass.AvatarExpeditionCallBackRsp other = (emu.grasscutter.net.proto.AvatarExpeditionCallBackRspOuterClass.AvatarExpeditionCallBackRsp) obj;
if (!internalGetExpeditionInfoMap().equals(
other.internalGetExpeditionInfoMap())) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (!internalGetExpeditionInfoMap().equals(
other.internalGetExpeditionInfoMap())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -341,12 +344,12 @@ public final class AvatarExpeditionCallBackRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
if (!internalGetExpeditionInfoMap().getMap().isEmpty()) {
hash = (37 * hash) + EXPEDITION_INFO_MAP_FIELD_NUMBER;
hash = (53 * hash) + internalGetExpeditionInfoMap().hashCode();
}
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -444,10 +447,13 @@ public final class AvatarExpeditionCallBackRspOuterClass {
}
/**
* <pre>
* CmdId: 1726
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1702;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code AvatarExpeditionCallBackRsp}
@@ -465,7 +471,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 9:
case 7:
return internalGetExpeditionInfoMap();
default:
throw new RuntimeException(
@@ -476,7 +482,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
protected com.google.protobuf.MapField internalGetMutableMapField(
int number) {
switch (number) {
case 9:
case 7:
return internalGetMutableExpeditionInfoMap();
default:
throw new RuntimeException(
@@ -509,9 +515,9 @@ public final class AvatarExpeditionCallBackRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
internalGetMutableExpeditionInfoMap().clear();
retcode_ = 0;
internalGetMutableExpeditionInfoMap().clear();
return this;
}
@@ -539,9 +545,9 @@ public final class AvatarExpeditionCallBackRspOuterClass {
public emu.grasscutter.net.proto.AvatarExpeditionCallBackRspOuterClass.AvatarExpeditionCallBackRsp buildPartial() {
emu.grasscutter.net.proto.AvatarExpeditionCallBackRspOuterClass.AvatarExpeditionCallBackRsp result = new emu.grasscutter.net.proto.AvatarExpeditionCallBackRspOuterClass.AvatarExpeditionCallBackRsp(this);
int from_bitField0_ = bitField0_;
result.retcode_ = retcode_;
result.expeditionInfoMap_ = internalGetExpeditionInfoMap();
result.expeditionInfoMap_.makeImmutable();
result.retcode_ = retcode_;
onBuilt();
return result;
}
@@ -590,11 +596,11 @@ public final class AvatarExpeditionCallBackRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AvatarExpeditionCallBackRspOuterClass.AvatarExpeditionCallBackRsp other) {
if (other == emu.grasscutter.net.proto.AvatarExpeditionCallBackRspOuterClass.AvatarExpeditionCallBackRsp.getDefaultInstance()) return this;
internalGetMutableExpeditionInfoMap().mergeFrom(
other.internalGetExpeditionInfoMap());
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
internalGetMutableExpeditionInfoMap().mergeFrom(
other.internalGetExpeditionInfoMap());
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -625,6 +631,37 @@ public final class AvatarExpeditionCallBackRspOuterClass {
}
private int bitField0_;
private int retcode_ ;
/**
* <code>int32 retcode = 2;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 2;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
public Builder setRetcode(int value) {
retcode_ = value;
onChanged();
return this;
}
/**
* <code>int32 retcode = 2;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
private com.google.protobuf.MapField<
java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo> expeditionInfoMap_;
private com.google.protobuf.MapField<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo>
@@ -652,7 +689,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return internalGetExpeditionInfoMap().getMap().size();
}
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 9;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
*/
@java.lang.Override
@@ -670,7 +707,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return getExpeditionInfoMapMap();
}
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 9;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
*/
@java.lang.Override
@@ -678,7 +715,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return internalGetExpeditionInfoMap().getMap();
}
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 9;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
*/
@java.lang.Override
@@ -691,7 +728,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 9;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
*/
@java.lang.Override
@@ -712,7 +749,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return this;
}
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 9;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
*/
public Builder removeExpeditionInfoMap(
@@ -731,7 +768,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return internalGetMutableExpeditionInfoMap().getMutableMap();
}
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 9;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
*/
public Builder putExpeditionInfoMap(
long key,
@@ -743,7 +780,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return this;
}
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 9;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 7;</code>
*/
public Builder putAllExpeditionInfoMap(
@@ -752,37 +789,6 @@ public final class AvatarExpeditionCallBackRspOuterClass {
.putAll(values);
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 5;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 5;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
public Builder setRetcode(int value) {
retcode_ = value;
onChanged();
return this;
}
/**
* <code>int32 retcode = 5;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -857,9 +863,9 @@ public final class AvatarExpeditionCallBackRspOuterClass {
java.lang.String[] descriptorData = {
"\n!AvatarExpeditionCallBackRsp.proto\032\032Ava" +
"tarExpeditionInfo.proto\"\321\001\n\033AvatarExpedi" +
"tionCallBackRsp\022P\n\023expedition_info_map\030\t" +
" \003(\01323.AvatarExpeditionCallBackRsp.Exped" +
"itionInfoMapEntry\022\017\n\007retcode\030\005 \001(\005\032O\n\026Ex" +
"tionCallBackRsp\022\017\n\007retcode\030\002 \001(\005\022P\n\023expe" +
"dition_info_map\030\007 \003(\01323.AvatarExpedition" +
"CallBackRsp.ExpeditionInfoMapEntry\032O\n\026Ex" +
"peditionInfoMapEntry\022\013\n\003key\030\001 \001(\004\022$\n\005val" +
"ue\030\002 \001(\0132\025.AvatarExpeditionInfo:\0028\001B\033\n\031e" +
"mu.grasscutter.net.protob\006proto3"
@@ -874,7 +880,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
internal_static_AvatarExpeditionCallBackRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AvatarExpeditionCallBackRsp_descriptor,
new java.lang.String[] { "ExpeditionInfoMap", "Retcode", });
new java.lang.String[] { "Retcode", "ExpeditionInfoMap", });
internal_static_AvatarExpeditionCallBackRsp_ExpeditionInfoMapEntry_descriptor =
internal_static_AvatarExpeditionCallBackRsp_descriptor.getNestedTypes().get(0);
internal_static_AvatarExpeditionCallBackRsp_ExpeditionInfoMapEntry_fieldAccessorTable = new