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

Upgrade to REL3.7 (#2164)

Browse Source 
* Remove hardcoded quest data

* Remove deprecated fields

* Try to fix packet

* Apply fix for token exchange

* Upgrade to REL3.7

* Add obfuscated protocol definitions

* Add missing enum (other protos too maybe)

* Re-add field setters and add note on removal
This commit is contained in:
Magix
2023-05-26 21:29:02 -07:00
committed by GitHub
Unverified
parent 19bf2dfc69
commit 71f6198361
1382 changed files with 227149 additions and 199653 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/AvatarExpeditionCallBackRspOuterClass.java
+99 -99
View File
@@ -19,17 +19,11 @@ public final class AvatarExpeditionCallBackRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>int32 retcode = 11;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 2;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 12;</code>
*/
int getExpeditionInfoMapCount();
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 2;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 12;</code>
*/
boolean containsExpeditionInfoMap(
long key);
@@ -40,28 +34,34 @@ 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 = 2;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 12;</code>
*/
java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo>
getExpeditionInfoMapMap();
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 2;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 12;</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 = 2;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 12;</code>
*/
emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo getExpeditionInfoMapOrThrow(
long key);
/**
* <code>int32 retcode = 8;</code>
* @return The retcode.
*/
int getRetcode();
}
/**
* <pre>
* CmdId: 1672
* Name: BNPGCGPLPOB
* CmdId: 1708
* Obf: CJLJANJBPEI
* </pre>
*
* Protobuf type {@code AvatarExpeditionCallBackRsp}
@@ -109,7 +109,12 @@ public final class AvatarExpeditionCallBackRspOuterClass {
case 0:
done = true;
break;
case 18: {
case 64: {
retcode_ = input.readInt32();
break;
}
case 98: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
expeditionInfoMap_ = com.google.protobuf.MapField.newMapField(
ExpeditionInfoMapDefaultEntryHolder.defaultEntry);
@@ -122,11 +127,6 @@ public final class AvatarExpeditionCallBackRspOuterClass {
expeditionInfoMap__.getKey(), expeditionInfoMap__.getValue());
break;
}
case 88: {
retcode_ = input.readInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -156,7 +156,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 2:
case 12:
return internalGetExpeditionInfoMap();
default:
throw new RuntimeException(
@@ -171,18 +171,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
emu.grasscutter.net.proto.AvatarExpeditionCallBackRspOuterClass.AvatarExpeditionCallBackRsp.class, emu.grasscutter.net.proto.AvatarExpeditionCallBackRspOuterClass.AvatarExpeditionCallBackRsp.Builder.class);
}
public static final int RETCODE_FIELD_NUMBER = 11;
private int retcode_;
/**
* <code>int32 retcode = 11;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
public static final int EXPEDITION_INFO_MAP_FIELD_NUMBER = 2;
public static final int EXPEDITION_INFO_MAP_FIELD_NUMBER = 12;
private static final class ExpeditionInfoMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry<
java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo> defaultEntry =
@@ -209,7 +198,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return internalGetExpeditionInfoMap().getMap().size();
}
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 2;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 12;</code>
*/
@java.lang.Override
@@ -227,7 +216,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return getExpeditionInfoMapMap();
}
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 2;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 12;</code>
*/
@java.lang.Override
@@ -235,7 +224,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return internalGetExpeditionInfoMap().getMap();
}
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 2;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 12;</code>
*/
@java.lang.Override
@@ -248,7 +237,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 2;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 12;</code>
*/
@java.lang.Override
@@ -263,6 +252,17 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return map.get(key);
}
public static final int RETCODE_FIELD_NUMBER = 8;
private int retcode_;
/**
* <code>int32 retcode = 8;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -277,15 +277,15 @@ public final class AvatarExpeditionCallBackRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(8, retcode_);
}
com.google.protobuf.GeneratedMessageV3
.serializeLongMapTo(
output,
internalGetExpeditionInfoMap(),
ExpeditionInfoMapDefaultEntryHolder.defaultEntry,
2);
if (retcode_ != 0) {
output.writeInt32(11, retcode_);
}
12);
unknownFields.writeTo(output);
}
@@ -295,6 +295,10 @@ public final class AvatarExpeditionCallBackRspOuterClass {
if (size != -1) return size;
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(8, retcode_);
}
for (java.util.Map.Entry<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo> entry
: internalGetExpeditionInfoMap().getMap().entrySet()) {
com.google.protobuf.MapEntry<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo>
@@ -303,11 +307,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(2, expeditionInfoMap__);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(11, retcode_);
.computeMessageSize(12, expeditionInfoMap__);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -324,10 +324,10 @@ public final class AvatarExpeditionCallBackRspOuterClass {
}
emu.grasscutter.net.proto.AvatarExpeditionCallBackRspOuterClass.AvatarExpeditionCallBackRsp other = (emu.grasscutter.net.proto.AvatarExpeditionCallBackRspOuterClass.AvatarExpeditionCallBackRsp) obj;
if (getRetcode()
!= other.getRetcode()) return false;
if (!internalGetExpeditionInfoMap().equals(
other.internalGetExpeditionInfoMap())) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -339,12 +339,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;
@@ -442,8 +442,8 @@ public final class AvatarExpeditionCallBackRspOuterClass {
}
/**
* <pre>
* CmdId: 1672
* Name: BNPGCGPLPOB
* CmdId: 1708
* Obf: CJLJANJBPEI
* </pre>
*
* Protobuf type {@code AvatarExpeditionCallBackRsp}
@@ -461,7 +461,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 2:
case 12:
return internalGetExpeditionInfoMap();
default:
throw new RuntimeException(
@@ -472,7 +472,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
protected com.google.protobuf.MapField internalGetMutableMapField(
int number) {
switch (number) {
case 2:
case 12:
return internalGetMutableExpeditionInfoMap();
default:
throw new RuntimeException(
@@ -505,9 +505,9 @@ public final class AvatarExpeditionCallBackRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
internalGetMutableExpeditionInfoMap().clear();
retcode_ = 0;
internalGetMutableExpeditionInfoMap().clear();
return this;
}
@@ -535,9 +535,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;
}
@@ -586,11 +586,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;
@@ -621,37 +621,6 @@ public final class AvatarExpeditionCallBackRspOuterClass {
}
private int bitField0_;
private int retcode_ ;
/**
* <code>int32 retcode = 11;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 11;</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 = 11;</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>
@@ -679,7 +648,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return internalGetExpeditionInfoMap().getMap().size();
}
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 2;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 12;</code>
*/
@java.lang.Override
@@ -697,7 +666,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return getExpeditionInfoMapMap();
}
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 2;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 12;</code>
*/
@java.lang.Override
@@ -705,7 +674,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return internalGetExpeditionInfoMap().getMap();
}
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 2;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 12;</code>
*/
@java.lang.Override
@@ -718,7 +687,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 2;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 12;</code>
*/
@java.lang.Override
@@ -739,7 +708,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return this;
}
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 2;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 12;</code>
*/
public Builder removeExpeditionInfoMap(
@@ -758,7 +727,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return internalGetMutableExpeditionInfoMap().getMutableMap();
}
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 2;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 12;</code>
*/
public Builder putExpeditionInfoMap(
long key,
@@ -770,7 +739,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
return this;
}
/**
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 2;</code>
* <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 12;</code>
*/
public Builder putAllExpeditionInfoMap(
@@ -779,6 +748,37 @@ public final class AvatarExpeditionCallBackRspOuterClass {
.putAll(values);
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 8;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 8;</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 = 8;</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) {
@@ -853,9 +853,9 @@ public final class AvatarExpeditionCallBackRspOuterClass {
java.lang.String[] descriptorData = {
"\n!AvatarExpeditionCallBackRsp.proto\032\032Ava" +
"tarExpeditionInfo.proto\"\321\001\n\033AvatarExpedi" +
"tionCallBackRsp\022\017\n\007retcode\030\013 \001(\005\022P\n\023expe" +
"dition_info_map\030\002 \003(\01323.AvatarExpedition" +
"CallBackRsp.ExpeditionInfoMapEntry\032O\n\026Ex" +
"tionCallBackRsp\022P\n\023expedition_info_map\030\014" +
" \003(\01323.AvatarExpeditionCallBackRsp.Exped" +
"itionInfoMapEntry\022\017\n\007retcode\030\010 \001(\005\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"
@@ -870,7 +870,7 @@ public final class AvatarExpeditionCallBackRspOuterClass {
internal_static_AvatarExpeditionCallBackRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AvatarExpeditionCallBackRsp_descriptor,
new java.lang.String[] { "Retcode", "ExpeditionInfoMap", });
new java.lang.String[] { "ExpeditionInfoMap", "Retcode", });
internal_static_AvatarExpeditionCallBackRsp_ExpeditionInfoMapEntry_descriptor =
internal_static_AvatarExpeditionCallBackRsp_descriptor.getNestedTypes().get(0);
internal_static_AvatarExpeditionCallBackRsp_ExpeditionInfoMapEntry_fieldAccessorTable = new