Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-03 10:51:09 +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/AiSkillCdInfoOuterClass.java
+75 -75
View File
@@ -19,11 +19,11 @@ public final class AiSkillCdInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 15;</code>
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 1;</code>
*/
int getSkillCdMapCount();
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 15;</code>
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 1;</code>
*/
boolean containsSkillCdMap(
int key);
@@ -34,30 +34,30 @@ public final class AiSkillCdInfoOuterClass {
java.util.Map<java.lang.Integer, java.lang.Integer>
getSkillCdMap();
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 15;</code>
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 1;</code>
*/
java.util.Map<java.lang.Integer, java.lang.Integer>
getSkillCdMapMap();
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 15;</code>
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 1;</code>
*/
int getSkillCdMapOrDefault(
int key,
int defaultValue);
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 15;</code>
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 1;</code>
*/
int getSkillCdMapOrThrow(
int key);
/**
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 2;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
*/
int getSkillGroupCdMapCount();
/**
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 2;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
*/
boolean containsSkillGroupCdMap(
int key);
@@ -68,19 +68,19 @@ public final class AiSkillCdInfoOuterClass {
java.util.Map<java.lang.Integer, java.lang.Integer>
getSkillGroupCdMap();
/**
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 2;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
*/
java.util.Map<java.lang.Integer, java.lang.Integer>
getSkillGroupCdMapMap();
/**
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 2;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
*/
int getSkillGroupCdMapOrDefault(
int key,
int defaultValue);
/**
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 2;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
*/
int getSkillGroupCdMapOrThrow(
@@ -88,7 +88,7 @@ public final class AiSkillCdInfoOuterClass {
}
/**
* <pre>
* Name: HFEKCMGDEAI
* Obf: EIAFDAJNOBI
* </pre>
*
* Protobuf type {@code AiSkillCdInfo}
@@ -136,20 +136,7 @@ public final class AiSkillCdInfoOuterClass {
case 0:
done = true;
break;
case 18: {
if (!((mutable_bitField0_ & 0x00000002) != 0)) {
skillGroupCdMap_ = com.google.protobuf.MapField.newMapField(
SkillGroupCdMapDefaultEntryHolder.defaultEntry);
mutable_bitField0_ |= 0x00000002;
}
com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
skillGroupCdMap__ = input.readMessage(
SkillGroupCdMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
skillGroupCdMap_.getMutableMap().put(
skillGroupCdMap__.getKey(), skillGroupCdMap__.getValue());
break;
}
case 122: {
case 10: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
skillCdMap_ = com.google.protobuf.MapField.newMapField(
SkillCdMapDefaultEntryHolder.defaultEntry);
@@ -162,6 +149,19 @@ public final class AiSkillCdInfoOuterClass {
skillCdMap__.getKey(), skillCdMap__.getValue());
break;
}
case 50: {
if (!((mutable_bitField0_ & 0x00000002) != 0)) {
skillGroupCdMap_ = com.google.protobuf.MapField.newMapField(
SkillGroupCdMapDefaultEntryHolder.defaultEntry);
mutable_bitField0_ |= 0x00000002;
}
com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
skillGroupCdMap__ = input.readMessage(
SkillGroupCdMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
skillGroupCdMap_.getMutableMap().put(
skillGroupCdMap__.getKey(), skillGroupCdMap__.getValue());
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -191,9 +191,9 @@ public final class AiSkillCdInfoOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 15:
case 1:
return internalGetSkillCdMap();
case 2:
case 6:
return internalGetSkillGroupCdMap();
default:
throw new RuntimeException(
@@ -208,7 +208,7 @@ public final class AiSkillCdInfoOuterClass {
emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo.class, emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo.Builder.class);
}
public static final int SKILL_CD_MAP_FIELD_NUMBER = 15;
public static final int SKILL_CD_MAP_FIELD_NUMBER = 1;
private static final class SkillCdMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry<
java.lang.Integer, java.lang.Integer> defaultEntry =
@@ -235,7 +235,7 @@ public final class AiSkillCdInfoOuterClass {
return internalGetSkillCdMap().getMap().size();
}
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 15;</code>
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 1;</code>
*/
@java.lang.Override
@@ -253,7 +253,7 @@ public final class AiSkillCdInfoOuterClass {
return getSkillCdMapMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 15;</code>
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 1;</code>
*/
@java.lang.Override
@@ -261,7 +261,7 @@ public final class AiSkillCdInfoOuterClass {
return internalGetSkillCdMap().getMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 15;</code>
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 1;</code>
*/
@java.lang.Override
@@ -274,7 +274,7 @@ public final class AiSkillCdInfoOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 15;</code>
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 1;</code>
*/
@java.lang.Override
@@ -289,7 +289,7 @@ public final class AiSkillCdInfoOuterClass {
return map.get(key);
}
public static final int SKILL_GROUP_CD_MAP_FIELD_NUMBER = 2;
public static final int SKILL_GROUP_CD_MAP_FIELD_NUMBER = 6;
private static final class SkillGroupCdMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry<
java.lang.Integer, java.lang.Integer> defaultEntry =
@@ -316,7 +316,7 @@ public final class AiSkillCdInfoOuterClass {
return internalGetSkillGroupCdMap().getMap().size();
}
/**
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 2;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
*/
@java.lang.Override
@@ -334,7 +334,7 @@ public final class AiSkillCdInfoOuterClass {
return getSkillGroupCdMapMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 2;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
*/
@java.lang.Override
@@ -342,7 +342,7 @@ public final class AiSkillCdInfoOuterClass {
return internalGetSkillGroupCdMap().getMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 2;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
*/
@java.lang.Override
@@ -355,7 +355,7 @@ public final class AiSkillCdInfoOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 2;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
*/
@java.lang.Override
@@ -387,15 +387,15 @@ public final class AiSkillCdInfoOuterClass {
com.google.protobuf.GeneratedMessageV3
.serializeIntegerMapTo(
output,
internalGetSkillGroupCdMap(),
SkillGroupCdMapDefaultEntryHolder.defaultEntry,
2);
internalGetSkillCdMap(),
SkillCdMapDefaultEntryHolder.defaultEntry,
1);
com.google.protobuf.GeneratedMessageV3
.serializeIntegerMapTo(
output,
internalGetSkillCdMap(),
SkillCdMapDefaultEntryHolder.defaultEntry,
15);
internalGetSkillGroupCdMap(),
SkillGroupCdMapDefaultEntryHolder.defaultEntry,
6);
unknownFields.writeTo(output);
}
@@ -405,16 +405,6 @@ public final class AiSkillCdInfoOuterClass {
if (size != -1) return size;
size = 0;
for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
: internalGetSkillGroupCdMap().getMap().entrySet()) {
com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
skillGroupCdMap__ = SkillGroupCdMapDefaultEntryHolder.defaultEntry.newBuilderForType()
.setKey(entry.getKey())
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(2, skillGroupCdMap__);
}
for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
: internalGetSkillCdMap().getMap().entrySet()) {
com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
@@ -423,7 +413,17 @@ public final class AiSkillCdInfoOuterClass {
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(15, skillCdMap__);
.computeMessageSize(1, skillCdMap__);
}
for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
: internalGetSkillGroupCdMap().getMap().entrySet()) {
com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
skillGroupCdMap__ = SkillGroupCdMapDefaultEntryHolder.defaultEntry.newBuilderForType()
.setKey(entry.getKey())
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(6, skillGroupCdMap__);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -560,7 +560,7 @@ public final class AiSkillCdInfoOuterClass {
}
/**
* <pre>
* Name: HFEKCMGDEAI
* Obf: EIAFDAJNOBI
* </pre>
*
* Protobuf type {@code AiSkillCdInfo}
@@ -578,9 +578,9 @@ public final class AiSkillCdInfoOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 15:
case 1:
return internalGetSkillCdMap();
case 2:
case 6:
return internalGetSkillGroupCdMap();
default:
throw new RuntimeException(
@@ -591,9 +591,9 @@ public final class AiSkillCdInfoOuterClass {
protected com.google.protobuf.MapField internalGetMutableMapField(
int number) {
switch (number) {
case 15:
case 1:
return internalGetMutableSkillCdMap();
case 2:
case 6:
return internalGetMutableSkillGroupCdMap();
default:
throw new RuntimeException(
@@ -768,7 +768,7 @@ public final class AiSkillCdInfoOuterClass {
return internalGetSkillCdMap().getMap().size();
}
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 15;</code>
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 1;</code>
*/
@java.lang.Override
@@ -786,7 +786,7 @@ public final class AiSkillCdInfoOuterClass {
return getSkillCdMapMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 15;</code>
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 1;</code>
*/
@java.lang.Override
@@ -794,7 +794,7 @@ public final class AiSkillCdInfoOuterClass {
return internalGetSkillCdMap().getMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 15;</code>
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 1;</code>
*/
@java.lang.Override
@@ -807,7 +807,7 @@ public final class AiSkillCdInfoOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 15;</code>
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 1;</code>
*/
@java.lang.Override
@@ -828,7 +828,7 @@ public final class AiSkillCdInfoOuterClass {
return this;
}
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 15;</code>
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 1;</code>
*/
public Builder removeSkillCdMap(
@@ -847,7 +847,7 @@ public final class AiSkillCdInfoOuterClass {
return internalGetMutableSkillCdMap().getMutableMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 15;</code>
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 1;</code>
*/
public Builder putSkillCdMap(
int key,
@@ -859,7 +859,7 @@ public final class AiSkillCdInfoOuterClass {
return this;
}
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 15;</code>
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 1;</code>
*/
public Builder putAllSkillCdMap(
@@ -896,7 +896,7 @@ public final class AiSkillCdInfoOuterClass {
return internalGetSkillGroupCdMap().getMap().size();
}
/**
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 2;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
*/
@java.lang.Override
@@ -914,7 +914,7 @@ public final class AiSkillCdInfoOuterClass {
return getSkillGroupCdMapMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 2;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
*/
@java.lang.Override
@@ -922,7 +922,7 @@ public final class AiSkillCdInfoOuterClass {
return internalGetSkillGroupCdMap().getMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 2;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
*/
@java.lang.Override
@@ -935,7 +935,7 @@ public final class AiSkillCdInfoOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 2;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
*/
@java.lang.Override
@@ -956,7 +956,7 @@ public final class AiSkillCdInfoOuterClass {
return this;
}
/**
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 2;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
*/
public Builder removeSkillGroupCdMap(
@@ -975,7 +975,7 @@ public final class AiSkillCdInfoOuterClass {
return internalGetMutableSkillGroupCdMap().getMutableMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 2;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
*/
public Builder putSkillGroupCdMap(
int key,
@@ -987,7 +987,7 @@ public final class AiSkillCdInfoOuterClass {
return this;
}
/**
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 2;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 6;</code>
*/
public Builder putAllSkillGroupCdMap(
@@ -1074,8 +1074,8 @@ public final class AiSkillCdInfoOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\023AiSkillCdInfo.proto\"\361\001\n\rAiSkillCdInfo\022" +
"4\n\014skill_cd_map\030\017 \003(\0132\036.AiSkillCdInfo.Sk" +
"illCdMapEntry\022?\n\022skill_group_cd_map\030\002 \003(" +
"4\n\014skill_cd_map\030\001 \003(\0132\036.AiSkillCdInfo.Sk" +
"illCdMapEntry\022?\n\022skill_group_cd_map\030\006 \003(" +
"\0132#.AiSkillCdInfo.SkillGroupCdMapEntry\0321" +
"\n\017SkillCdMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030" +
"\002 \001(\r:\0028\001\0326\n\024SkillGroupCdMapEntry\022\013\n\003key" +