Upgrade to REL3.7 (#2164)

* 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
@@ -19,11 +19,11 @@ public final class HachiActivityDetailInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 14;</code>
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 12;</code>
*/
int getStageMapCount();
/**
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 14;</code>
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 12;</code>
*/
boolean containsStageMap(
int key);
@@ -34,19 +34,19 @@ public final class HachiActivityDetailInfoOuterClass {
java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.HachiStageInfoOuterClass.HachiStageInfo>
getStageMap();
/**
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 14;</code>
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 12;</code>
*/
java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.HachiStageInfoOuterClass.HachiStageInfo>
getStageMapMap();
/**
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 14;</code>
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 12;</code>
*/
emu.grasscutter.net.proto.HachiStageInfoOuterClass.HachiStageInfo getStageMapOrDefault(
int key,
emu.grasscutter.net.proto.HachiStageInfoOuterClass.HachiStageInfo defaultValue);
/**
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 14;</code>
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 12;</code>
*/
emu.grasscutter.net.proto.HachiStageInfoOuterClass.HachiStageInfo getStageMapOrThrow(
@@ -54,7 +54,7 @@ public final class HachiActivityDetailInfoOuterClass {
}
/**
* <pre>
* Name: JNMCDCPDGAC
* Obf: LBGOIMEOFJG
* </pre>
*
* Protobuf type {@code HachiActivityDetailInfo}
@@ -102,7 +102,7 @@ public final class HachiActivityDetailInfoOuterClass {
case 0:
done = true;
break;
case 114: {
case 98: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
stageMap_ = com.google.protobuf.MapField.newMapField(
StageMapDefaultEntryHolder.defaultEntry);
@@ -144,7 +144,7 @@ public final class HachiActivityDetailInfoOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 14:
case 12:
return internalGetStageMap();
default:
throw new RuntimeException(
@@ -159,7 +159,7 @@ public final class HachiActivityDetailInfoOuterClass {
emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo.class, emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo.Builder.class);
}
public static final int STAGE_MAP_FIELD_NUMBER = 14;
public static final int STAGE_MAP_FIELD_NUMBER = 12;
private static final class StageMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry<
java.lang.Integer, emu.grasscutter.net.proto.HachiStageInfoOuterClass.HachiStageInfo> defaultEntry =
@@ -186,7 +186,7 @@ public final class HachiActivityDetailInfoOuterClass {
return internalGetStageMap().getMap().size();
}
/**
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 14;</code>
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 12;</code>
*/
@java.lang.Override
@@ -204,7 +204,7 @@ public final class HachiActivityDetailInfoOuterClass {
return getStageMapMap();
}
/**
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 14;</code>
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 12;</code>
*/
@java.lang.Override
@@ -212,7 +212,7 @@ public final class HachiActivityDetailInfoOuterClass {
return internalGetStageMap().getMap();
}
/**
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 14;</code>
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 12;</code>
*/
@java.lang.Override
@@ -225,7 +225,7 @@ public final class HachiActivityDetailInfoOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 14;</code>
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 12;</code>
*/
@java.lang.Override
@@ -259,7 +259,7 @@ public final class HachiActivityDetailInfoOuterClass {
output,
internalGetStageMap(),
StageMapDefaultEntryHolder.defaultEntry,
14);
12);
unknownFields.writeTo(output);
}
@@ -277,7 +277,7 @@ public final class HachiActivityDetailInfoOuterClass {
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(14, stageMap__);
.computeMessageSize(12, stageMap__);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -408,7 +408,7 @@ public final class HachiActivityDetailInfoOuterClass {
}
/**
* <pre>
* Name: JNMCDCPDGAC
* Obf: LBGOIMEOFJG
* </pre>
*
* Protobuf type {@code HachiActivityDetailInfo}
@@ -426,7 +426,7 @@ public final class HachiActivityDetailInfoOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 14:
case 12:
return internalGetStageMap();
default:
throw new RuntimeException(
@@ -437,7 +437,7 @@ public final class HachiActivityDetailInfoOuterClass {
protected com.google.protobuf.MapField internalGetMutableMapField(
int number) {
switch (number) {
case 14:
case 12:
return internalGetMutableStageMap();
default:
throw new RuntimeException(
@@ -607,7 +607,7 @@ public final class HachiActivityDetailInfoOuterClass {
return internalGetStageMap().getMap().size();
}
/**
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 14;</code>
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 12;</code>
*/
@java.lang.Override
@@ -625,7 +625,7 @@ public final class HachiActivityDetailInfoOuterClass {
return getStageMapMap();
}
/**
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 14;</code>
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 12;</code>
*/
@java.lang.Override
@@ -633,7 +633,7 @@ public final class HachiActivityDetailInfoOuterClass {
return internalGetStageMap().getMap();
}
/**
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 14;</code>
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 12;</code>
*/
@java.lang.Override
@@ -646,7 +646,7 @@ public final class HachiActivityDetailInfoOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 14;</code>
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 12;</code>
*/
@java.lang.Override
@@ -667,7 +667,7 @@ public final class HachiActivityDetailInfoOuterClass {
return this;
}
/**
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 14;</code>
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 12;</code>
*/
public Builder removeStageMap(
@@ -686,7 +686,7 @@ public final class HachiActivityDetailInfoOuterClass {
return internalGetMutableStageMap().getMutableMap();
}
/**
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 14;</code>
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 12;</code>
*/
public Builder putStageMap(
int key,
@@ -698,7 +698,7 @@ public final class HachiActivityDetailInfoOuterClass {
return this;
}
/**
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 14;</code>
* <code>map&lt;uint32, .HachiStageInfo&gt; stage_map = 12;</code>
*/
public Builder putAllStageMap(
@@ -781,7 +781,7 @@ public final class HachiActivityDetailInfoOuterClass {
java.lang.String[] descriptorData = {
"\n\035HachiActivityDetailInfo.proto\032\024HachiSt" +
"ageInfo.proto\"\226\001\n\027HachiActivityDetailInf" +
"o\0229\n\tstage_map\030\016 \003(\0132&.HachiActivityDeta" +
"o\0229\n\tstage_map\030\014 \003(\0132&.HachiActivityDeta" +
"ilInfo.StageMapEntry\032@\n\rStageMapEntry\022\013\n" +
"\003key\030\001 \001(\r\022\036\n\005value\030\002 \001(\0132\017.HachiStageIn" +
"fo:\0028\001B\033\n\031emu.grasscutter.net.protob\006pro" +