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

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/AvatarPropNotifyOuterClass.java
+99 -99
View File
@@ -19,11 +19,17 @@ public final class AvatarPropNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
* <code>uint64 avatar_guid = 1;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
/**
* <code>map&lt;uint32, int64&gt; prop_map = 7;</code>
*/
int getPropMapCount();
/**
* <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
* <code>map&lt;uint32, int64&gt; prop_map = 7;</code>
*/
boolean containsPropMap(
int key);
@@ -34,34 +40,28 @@ public final class AvatarPropNotifyOuterClass {
java.util.Map<java.lang.Integer, java.lang.Long>
getPropMap();
/**
* <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
* <code>map&lt;uint32, int64&gt; prop_map = 7;</code>
*/
java.util.Map<java.lang.Integer, java.lang.Long>
getPropMapMap();
/**
* <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
* <code>map&lt;uint32, int64&gt; prop_map = 7;</code>
*/
long getPropMapOrDefault(
int key,
long defaultValue);
/**
* <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
* <code>map&lt;uint32, int64&gt; prop_map = 7;</code>
*/
long getPropMapOrThrow(
int key);
/**
* <code>uint64 avatar_guid = 13;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
}
/**
* <pre>
* CmdId: 1259
* Name: LKOECLGEAJN
* CmdId: 1284
* Obf: JEKDLLGKIMN
* </pre>
*
* Protobuf type {@code AvatarPropNotify}
@@ -109,7 +109,12 @@ public final class AvatarPropNotifyOuterClass {
case 0:
done = true;
break;
case 66: {
case 8: {
avatarGuid_ = input.readUInt64();
break;
}
case 58: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
propMap_ = com.google.protobuf.MapField.newMapField(
PropMapDefaultEntryHolder.defaultEntry);
@@ -122,11 +127,6 @@ public final class AvatarPropNotifyOuterClass {
propMap__.getKey(), propMap__.getValue());
break;
}
case 104: {
avatarGuid_ = input.readUInt64();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -156,7 +156,7 @@ public final class AvatarPropNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 8:
case 7:
return internalGetPropMap();
default:
throw new RuntimeException(
@@ -171,7 +171,18 @@ public final class AvatarPropNotifyOuterClass {
emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify.class, emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify.Builder.class);
}
public static final int PROP_MAP_FIELD_NUMBER = 8;
public static final int AVATAR_GUID_FIELD_NUMBER = 1;
private long avatarGuid_;
/**
* <code>uint64 avatar_guid = 1;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
public static final int PROP_MAP_FIELD_NUMBER = 7;
private static final class PropMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry<
java.lang.Integer, java.lang.Long> defaultEntry =
@@ -198,7 +209,7 @@ public final class AvatarPropNotifyOuterClass {
return internalGetPropMap().getMap().size();
}
/**
* <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
* <code>map&lt;uint32, int64&gt; prop_map = 7;</code>
*/
@java.lang.Override
@@ -216,7 +227,7 @@ public final class AvatarPropNotifyOuterClass {
return getPropMapMap();
}
/**
* <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
* <code>map&lt;uint32, int64&gt; prop_map = 7;</code>
*/
@java.lang.Override
@@ -224,7 +235,7 @@ public final class AvatarPropNotifyOuterClass {
return internalGetPropMap().getMap();
}
/**
* <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
* <code>map&lt;uint32, int64&gt; prop_map = 7;</code>
*/
@java.lang.Override
@@ -237,7 +248,7 @@ public final class AvatarPropNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
* <code>map&lt;uint32, int64&gt; prop_map = 7;</code>
*/
@java.lang.Override
@@ -252,17 +263,6 @@ public final class AvatarPropNotifyOuterClass {
return map.get(key);
}
public static final int AVATAR_GUID_FIELD_NUMBER = 13;
private long avatarGuid_;
/**
* <code>uint64 avatar_guid = 13;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -277,15 +277,15 @@ public final class AvatarPropNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (avatarGuid_ != 0L) {
output.writeUInt64(1, avatarGuid_);
}
com.google.protobuf.GeneratedMessageV3
.serializeIntegerMapTo(
output,
internalGetPropMap(),
PropMapDefaultEntryHolder.defaultEntry,
8);
if (avatarGuid_ != 0L) {
output.writeUInt64(13, avatarGuid_);
}
7);
unknownFields.writeTo(output);
}
@@ -295,6 +295,10 @@ public final class AvatarPropNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(1, avatarGuid_);
}
for (java.util.Map.Entry<java.lang.Integer, java.lang.Long> entry
: internalGetPropMap().getMap().entrySet()) {
com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Long>
@@ -303,11 +307,7 @@ public final class AvatarPropNotifyOuterClass {
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(8, propMap__);
}
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(13, avatarGuid_);
.computeMessageSize(7, propMap__);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -324,10 +324,10 @@ public final class AvatarPropNotifyOuterClass {
}
emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify other = (emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify) obj;
if (!internalGetPropMap().equals(
other.internalGetPropMap())) return false;
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (!internalGetPropMap().equals(
other.internalGetPropMap())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -339,13 +339,13 @@ public final class AvatarPropNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
if (!internalGetPropMap().getMap().isEmpty()) {
hash = (37 * hash) + PROP_MAP_FIELD_NUMBER;
hash = (53 * hash) + internalGetPropMap().hashCode();
}
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -443,8 +443,8 @@ public final class AvatarPropNotifyOuterClass {
}
/**
* <pre>
* CmdId: 1259
* Name: LKOECLGEAJN
* CmdId: 1284
* Obf: JEKDLLGKIMN
* </pre>
*
* Protobuf type {@code AvatarPropNotify}
@@ -462,7 +462,7 @@ public final class AvatarPropNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 8:
case 7:
return internalGetPropMap();
default:
throw new RuntimeException(
@@ -473,7 +473,7 @@ public final class AvatarPropNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMutableMapField(
int number) {
switch (number) {
case 8:
case 7:
return internalGetMutablePropMap();
default:
throw new RuntimeException(
@@ -506,9 +506,9 @@ public final class AvatarPropNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
internalGetMutablePropMap().clear();
avatarGuid_ = 0L;
internalGetMutablePropMap().clear();
return this;
}
@@ -536,9 +536,9 @@ public final class AvatarPropNotifyOuterClass {
public emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify buildPartial() {
emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify result = new emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify(this);
int from_bitField0_ = bitField0_;
result.avatarGuid_ = avatarGuid_;
result.propMap_ = internalGetPropMap();
result.propMap_.makeImmutable();
result.avatarGuid_ = avatarGuid_;
onBuilt();
return result;
}
@@ -587,11 +587,11 @@ public final class AvatarPropNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify other) {
if (other == emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify.getDefaultInstance()) return this;
internalGetMutablePropMap().mergeFrom(
other.internalGetPropMap());
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
}
internalGetMutablePropMap().mergeFrom(
other.internalGetPropMap());
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -622,6 +622,37 @@ public final class AvatarPropNotifyOuterClass {
}
private int bitField0_;
private long avatarGuid_ ;
/**
* <code>uint64 avatar_guid = 1;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
/**
* <code>uint64 avatar_guid = 1;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
public Builder setAvatarGuid(long value) {
avatarGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 avatar_guid = 1;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
avatarGuid_ = 0L;
onChanged();
return this;
}
private com.google.protobuf.MapField<
java.lang.Integer, java.lang.Long> propMap_;
private com.google.protobuf.MapField<java.lang.Integer, java.lang.Long>
@@ -649,7 +680,7 @@ public final class AvatarPropNotifyOuterClass {
return internalGetPropMap().getMap().size();
}
/**
* <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
* <code>map&lt;uint32, int64&gt; prop_map = 7;</code>
*/
@java.lang.Override
@@ -667,7 +698,7 @@ public final class AvatarPropNotifyOuterClass {
return getPropMapMap();
}
/**
* <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
* <code>map&lt;uint32, int64&gt; prop_map = 7;</code>
*/
@java.lang.Override
@@ -675,7 +706,7 @@ public final class AvatarPropNotifyOuterClass {
return internalGetPropMap().getMap();
}
/**
* <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
* <code>map&lt;uint32, int64&gt; prop_map = 7;</code>
*/
@java.lang.Override
@@ -688,7 +719,7 @@ public final class AvatarPropNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
* <code>map&lt;uint32, int64&gt; prop_map = 7;</code>
*/
@java.lang.Override
@@ -709,7 +740,7 @@ public final class AvatarPropNotifyOuterClass {
return this;
}
/**
* <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
* <code>map&lt;uint32, int64&gt; prop_map = 7;</code>
*/
public Builder removePropMap(
@@ -728,7 +759,7 @@ public final class AvatarPropNotifyOuterClass {
return internalGetMutablePropMap().getMutableMap();
}
/**
* <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
* <code>map&lt;uint32, int64&gt; prop_map = 7;</code>
*/
public Builder putPropMap(
int key,
@@ -740,7 +771,7 @@ public final class AvatarPropNotifyOuterClass {
return this;
}
/**
* <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
* <code>map&lt;uint32, int64&gt; prop_map = 7;</code>
*/
public Builder putAllPropMap(
@@ -749,37 +780,6 @@ public final class AvatarPropNotifyOuterClass {
.putAll(values);
return this;
}
private long avatarGuid_ ;
/**
* <code>uint64 avatar_guid = 13;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
/**
* <code>uint64 avatar_guid = 13;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
public Builder setAvatarGuid(long value) {
avatarGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 avatar_guid = 13;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
avatarGuid_ = 0L;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -853,8 +853,8 @@ public final class AvatarPropNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\026AvatarPropNotify.proto\"\211\001\n\020AvatarPropN" +
"otify\0220\n\010prop_map\030\010 \003(\0132\036.AvatarPropNoti" +
"fy.PropMapEntry\022\023\n\013avatar_guid\030\r \001(\004\032.\n\014" +
"otify\022\023\n\013avatar_guid\030\001 \001(\004\0220\n\010prop_map\030\007" +
" \003(\0132\036.AvatarPropNotify.PropMapEntry\032.\n\014" +
"PropMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\003" +
":\0028\001B\033\n\031emu.grasscutter.net.protob\006proto" +
"3"
@@ -868,7 +868,7 @@ public final class AvatarPropNotifyOuterClass {
internal_static_AvatarPropNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AvatarPropNotify_descriptor,
new java.lang.String[] { "PropMap", "AvatarGuid", });
new java.lang.String[] { "AvatarGuid", "PropMap", });
internal_static_AvatarPropNotify_PropMapEntry_descriptor =
internal_static_AvatarPropNotify_descriptor.getNestedTypes().get(0);
internal_static_AvatarPropNotify_PropMapEntry_fieldAccessorTable = new