Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 09:59:50 +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/AvatarFetterDataNotifyOuterClass.java
+28 -28
View File
@@ -19,11 +19,11 @@ public final class AvatarFetterDataNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 4;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
*/
int getFetterInfoMapCount();
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 4;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
*/
boolean containsFetterInfoMap(
long key);
@@ -34,19 +34,19 @@ public final class AvatarFetterDataNotifyOuterClass {
java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo>
getFetterInfoMap();
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 4;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
*/
java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo>
getFetterInfoMapMap();
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 4;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
*/
emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo getFetterInfoMapOrDefault(
long key,
emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo defaultValue);
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 4;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
*/
emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo getFetterInfoMapOrThrow(
@@ -54,8 +54,8 @@ public final class AvatarFetterDataNotifyOuterClass {
}
/**
* <pre>
* CmdId: 1695
* Name: EJLLFPAADDN
* CmdId: 1775
* Obf: OGBCMAKENBC
* </pre>
*
* Protobuf type {@code AvatarFetterDataNotify}
@@ -103,7 +103,7 @@ public final class AvatarFetterDataNotifyOuterClass {
case 0:
done = true;
break;
case 34: {
case 98: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
fetterInfoMap_ = com.google.protobuf.MapField.newMapField(
FetterInfoMapDefaultEntryHolder.defaultEntry);
@@ -145,7 +145,7 @@ public final class AvatarFetterDataNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 4:
case 12:
return internalGetFetterInfoMap();
default:
throw new RuntimeException(
@@ -160,7 +160,7 @@ public final class AvatarFetterDataNotifyOuterClass {
emu.grasscutter.net.proto.AvatarFetterDataNotifyOuterClass.AvatarFetterDataNotify.class, emu.grasscutter.net.proto.AvatarFetterDataNotifyOuterClass.AvatarFetterDataNotify.Builder.class);
}
public static final int FETTER_INFO_MAP_FIELD_NUMBER = 4;
public static final int FETTER_INFO_MAP_FIELD_NUMBER = 12;
private static final class FetterInfoMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry<
java.lang.Long, emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo> defaultEntry =
@@ -187,7 +187,7 @@ public final class AvatarFetterDataNotifyOuterClass {
return internalGetFetterInfoMap().getMap().size();
}
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 4;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
*/
@java.lang.Override
@@ -205,7 +205,7 @@ public final class AvatarFetterDataNotifyOuterClass {
return getFetterInfoMapMap();
}
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 4;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
*/
@java.lang.Override
@@ -213,7 +213,7 @@ public final class AvatarFetterDataNotifyOuterClass {
return internalGetFetterInfoMap().getMap();
}
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 4;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
*/
@java.lang.Override
@@ -226,7 +226,7 @@ public final class AvatarFetterDataNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 4;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
*/
@java.lang.Override
@@ -260,7 +260,7 @@ public final class AvatarFetterDataNotifyOuterClass {
output,
internalGetFetterInfoMap(),
FetterInfoMapDefaultEntryHolder.defaultEntry,
4);
12);
unknownFields.writeTo(output);
}
@@ -278,7 +278,7 @@ public final class AvatarFetterDataNotifyOuterClass {
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(4, fetterInfoMap__);
.computeMessageSize(12, fetterInfoMap__);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -409,8 +409,8 @@ public final class AvatarFetterDataNotifyOuterClass {
}
/**
* <pre>
* CmdId: 1695
* Name: EJLLFPAADDN
* CmdId: 1775
* Obf: OGBCMAKENBC
* </pre>
*
* Protobuf type {@code AvatarFetterDataNotify}
@@ -428,7 +428,7 @@ public final class AvatarFetterDataNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 4:
case 12:
return internalGetFetterInfoMap();
default:
throw new RuntimeException(
@@ -439,7 +439,7 @@ public final class AvatarFetterDataNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMutableMapField(
int number) {
switch (number) {
case 4:
case 12:
return internalGetMutableFetterInfoMap();
default:
throw new RuntimeException(
@@ -609,7 +609,7 @@ public final class AvatarFetterDataNotifyOuterClass {
return internalGetFetterInfoMap().getMap().size();
}
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 4;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
*/
@java.lang.Override
@@ -627,7 +627,7 @@ public final class AvatarFetterDataNotifyOuterClass {
return getFetterInfoMapMap();
}
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 4;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
*/
@java.lang.Override
@@ -635,7 +635,7 @@ public final class AvatarFetterDataNotifyOuterClass {
return internalGetFetterInfoMap().getMap();
}
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 4;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
*/
@java.lang.Override
@@ -648,7 +648,7 @@ public final class AvatarFetterDataNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 4;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
*/
@java.lang.Override
@@ -669,7 +669,7 @@ public final class AvatarFetterDataNotifyOuterClass {
return this;
}
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 4;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
*/
public Builder removeFetterInfoMap(
@@ -688,7 +688,7 @@ public final class AvatarFetterDataNotifyOuterClass {
return internalGetMutableFetterInfoMap().getMutableMap();
}
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 4;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
*/
public Builder putFetterInfoMap(
long key,
@@ -700,7 +700,7 @@ public final class AvatarFetterDataNotifyOuterClass {
return this;
}
/**
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 4;</code>
* <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
*/
public Builder putAllFetterInfoMap(
@@ -783,7 +783,7 @@ public final class AvatarFetterDataNotifyOuterClass {
java.lang.String[] descriptorData = {
"\n\034AvatarFetterDataNotify.proto\032\026AvatarFe" +
"tterInfo.proto\"\246\001\n\026AvatarFetterDataNotif" +
"y\022C\n\017fetter_info_map\030\004 \003(\0132*.AvatarFette" +
"y\022C\n\017fetter_info_map\030\014 \003(\0132*.AvatarFette" +
"rDataNotify.FetterInfoMapEntry\032G\n\022Fetter" +
"InfoMapEntry\022\013\n\003key\030\001 \001(\004\022 \n\005value\030\002 \001(\013" +
"2\021.AvatarFetterInfo:\0028\001B\033\n\031emu.grasscutt" +