Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-26 22:50:48 +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/AvatarSkillInfoNotifyOuterClass.java
+38 -38
View File
@@ -19,11 +19,11 @@ public final class AvatarSkillInfoNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 1;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 4;</code>
*/
int getSkillMapCount();
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 1;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 4;</code>
*/
boolean containsSkillMap(
int key);
@@ -34,34 +34,34 @@ 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 = 1;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 4;</code>
*/
java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo>
getSkillMapMap();
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 1;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 4;</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 = 1;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 4;</code>
*/
emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo getSkillMapOrThrow(
int key);
/**
* <code>uint64 guid = 12;</code>
* <code>uint64 guid = 15;</code>
* @return The guid.
*/
long getGuid();
}
/**
* <pre>
* CmdId: 1072
* Name: IMODKAICNHM
* CmdId: 1035
* Obf: ECFIAOJHBFD
* </pre>
*
* Protobuf type {@code AvatarSkillInfoNotify}
@@ -109,7 +109,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
case 0:
done = true;
break;
case 10: {
case 34: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
skillMap_ = com.google.protobuf.MapField.newMapField(
SkillMapDefaultEntryHolder.defaultEntry);
@@ -122,7 +122,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
skillMap__.getKey(), skillMap__.getValue());
break;
}
case 96: {
case 120: {
guid_ = input.readUInt64();
break;
@@ -156,7 +156,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 1:
case 4:
return internalGetSkillMap();
default:
throw new RuntimeException(
@@ -171,7 +171,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 = 1;
public static final int SKILL_MAP_FIELD_NUMBER = 4;
private static final class SkillMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry<
java.lang.Integer, emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo> defaultEntry =
@@ -198,7 +198,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return internalGetSkillMap().getMap().size();
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 1;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 4;</code>
*/
@java.lang.Override
@@ -216,7 +216,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return getSkillMapMap();
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 1;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 4;</code>
*/
@java.lang.Override
@@ -224,7 +224,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return internalGetSkillMap().getMap();
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 1;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 4;</code>
*/
@java.lang.Override
@@ -237,7 +237,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 1;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 4;</code>
*/
@java.lang.Override
@@ -252,10 +252,10 @@ public final class AvatarSkillInfoNotifyOuterClass {
return map.get(key);
}
public static final int GUID_FIELD_NUMBER = 12;
public static final int GUID_FIELD_NUMBER = 15;
private long guid_;
/**
* <code>uint64 guid = 12;</code>
* <code>uint64 guid = 15;</code>
* @return The guid.
*/
@java.lang.Override
@@ -282,9 +282,9 @@ public final class AvatarSkillInfoNotifyOuterClass {
output,
internalGetSkillMap(),
SkillMapDefaultEntryHolder.defaultEntry,
1);
4);
if (guid_ != 0L) {
output.writeUInt64(12, guid_);
output.writeUInt64(15, guid_);
}
unknownFields.writeTo(output);
}
@@ -303,11 +303,11 @@ public final class AvatarSkillInfoNotifyOuterClass {
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(1, skillMap__);
.computeMessageSize(4, skillMap__);
}
if (guid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(12, guid_);
.computeUInt64Size(15, guid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -443,8 +443,8 @@ public final class AvatarSkillInfoNotifyOuterClass {
}
/**
* <pre>
* CmdId: 1072
* Name: IMODKAICNHM
* CmdId: 1035
* Obf: ECFIAOJHBFD
* </pre>
*
* Protobuf type {@code AvatarSkillInfoNotify}
@@ -462,7 +462,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 1:
case 4:
return internalGetSkillMap();
default:
throw new RuntimeException(
@@ -473,7 +473,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMutableMapField(
int number) {
switch (number) {
case 1:
case 4:
return internalGetMutableSkillMap();
default:
throw new RuntimeException(
@@ -649,7 +649,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return internalGetSkillMap().getMap().size();
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 1;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 4;</code>
*/
@java.lang.Override
@@ -667,7 +667,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return getSkillMapMap();
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 1;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 4;</code>
*/
@java.lang.Override
@@ -675,7 +675,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return internalGetSkillMap().getMap();
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 1;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 4;</code>
*/
@java.lang.Override
@@ -688,7 +688,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 1;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 4;</code>
*/
@java.lang.Override
@@ -709,7 +709,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return this;
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 1;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 4;</code>
*/
public Builder removeSkillMap(
@@ -728,7 +728,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return internalGetMutableSkillMap().getMutableMap();
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 1;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 4;</code>
*/
public Builder putSkillMap(
int key,
@@ -740,7 +740,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return this;
}
/**
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 1;</code>
* <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 4;</code>
*/
public Builder putAllSkillMap(
@@ -752,7 +752,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
private long guid_ ;
/**
* <code>uint64 guid = 12;</code>
* <code>uint64 guid = 15;</code>
* @return The guid.
*/
@java.lang.Override
@@ -760,7 +760,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return guid_;
}
/**
* <code>uint64 guid = 12;</code>
* <code>uint64 guid = 15;</code>
* @param value The guid to set.
* @return This builder for chaining.
*/
@@ -771,7 +771,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
return this;
}
/**
* <code>uint64 guid = 12;</code>
* <code>uint64 guid = 15;</code>
* @return This builder for chaining.
*/
public Builder clearGuid() {
@@ -854,8 +854,8 @@ public final class AvatarSkillInfoNotifyOuterClass {
java.lang.String[] descriptorData = {
"\n\033AvatarSkillInfoNotify.proto\032\025AvatarSki" +
"llInfo.proto\"\241\001\n\025AvatarSkillInfoNotify\0227" +
"\n\tskill_map\030\001 \003(\0132$.AvatarSkillInfoNotif" +
"y.SkillMapEntry\022\014\n\004guid\030\014 \001(\004\032A\n\rSkillMa" +
"\n\tskill_map\030\004 \003(\0132$.AvatarSkillInfoNotif" +
"y.SkillMapEntry\022\014\n\004guid\030\017 \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." +
"protob\006proto3"