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 OpenStateChangeNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
* <code>map&lt;uint32, uint32&gt; open_state_map = 1;</code>
*/
int getOpenStateMapCount();
/**
* <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
* <code>map&lt;uint32, uint32&gt; open_state_map = 1;</code>
*/
boolean containsOpenStateMap(
int key);
@@ -34,19 +34,19 @@ public final class OpenStateChangeNotifyOuterClass {
java.util.Map<java.lang.Integer, java.lang.Integer>
getOpenStateMap();
/**
* <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
* <code>map&lt;uint32, uint32&gt; open_state_map = 1;</code>
*/
java.util.Map<java.lang.Integer, java.lang.Integer>
getOpenStateMapMap();
/**
* <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
* <code>map&lt;uint32, uint32&gt; open_state_map = 1;</code>
*/
int getOpenStateMapOrDefault(
int key,
int defaultValue);
/**
* <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
* <code>map&lt;uint32, uint32&gt; open_state_map = 1;</code>
*/
int getOpenStateMapOrThrow(
@@ -54,8 +54,8 @@ public final class OpenStateChangeNotifyOuterClass {
}
/**
* <pre>
* CmdId: 195
* Name: OMENAAMNHAF
* CmdId: 176
* Obf: ICNJPPNCHCD
* </pre>
*
* Protobuf type {@code OpenStateChangeNotify}
@@ -103,7 +103,7 @@ public final class OpenStateChangeNotifyOuterClass {
case 0:
done = true;
break;
case 90: {
case 10: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
openStateMap_ = com.google.protobuf.MapField.newMapField(
OpenStateMapDefaultEntryHolder.defaultEntry);
@@ -145,7 +145,7 @@ public final class OpenStateChangeNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 11:
case 1:
return internalGetOpenStateMap();
default:
throw new RuntimeException(
@@ -160,7 +160,7 @@ public final class OpenStateChangeNotifyOuterClass {
emu.grasscutter.net.proto.OpenStateChangeNotifyOuterClass.OpenStateChangeNotify.class, emu.grasscutter.net.proto.OpenStateChangeNotifyOuterClass.OpenStateChangeNotify.Builder.class);
}
public static final int OPEN_STATE_MAP_FIELD_NUMBER = 11;
public static final int OPEN_STATE_MAP_FIELD_NUMBER = 1;
private static final class OpenStateMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry<
java.lang.Integer, java.lang.Integer> defaultEntry =
@@ -187,7 +187,7 @@ public final class OpenStateChangeNotifyOuterClass {
return internalGetOpenStateMap().getMap().size();
}
/**
* <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
* <code>map&lt;uint32, uint32&gt; open_state_map = 1;</code>
*/
@java.lang.Override
@@ -205,7 +205,7 @@ public final class OpenStateChangeNotifyOuterClass {
return getOpenStateMapMap();
}
/**
* <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
* <code>map&lt;uint32, uint32&gt; open_state_map = 1;</code>
*/
@java.lang.Override
@@ -213,7 +213,7 @@ public final class OpenStateChangeNotifyOuterClass {
return internalGetOpenStateMap().getMap();
}
/**
* <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
* <code>map&lt;uint32, uint32&gt; open_state_map = 1;</code>
*/
@java.lang.Override
@@ -226,7 +226,7 @@ public final class OpenStateChangeNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
* <code>map&lt;uint32, uint32&gt; open_state_map = 1;</code>
*/
@java.lang.Override
@@ -260,7 +260,7 @@ public final class OpenStateChangeNotifyOuterClass {
output,
internalGetOpenStateMap(),
OpenStateMapDefaultEntryHolder.defaultEntry,
11);
1);
unknownFields.writeTo(output);
}
@@ -278,7 +278,7 @@ public final class OpenStateChangeNotifyOuterClass {
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(11, openStateMap__);
.computeMessageSize(1, openStateMap__);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -409,8 +409,8 @@ public final class OpenStateChangeNotifyOuterClass {
}
/**
* <pre>
* CmdId: 195
* Name: OMENAAMNHAF
* CmdId: 176
* Obf: ICNJPPNCHCD
* </pre>
*
* Protobuf type {@code OpenStateChangeNotify}
@@ -428,7 +428,7 @@ public final class OpenStateChangeNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 11:
case 1:
return internalGetOpenStateMap();
default:
throw new RuntimeException(
@@ -439,7 +439,7 @@ public final class OpenStateChangeNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMutableMapField(
int number) {
switch (number) {
case 11:
case 1:
return internalGetMutableOpenStateMap();
default:
throw new RuntimeException(
@@ -609,7 +609,7 @@ public final class OpenStateChangeNotifyOuterClass {
return internalGetOpenStateMap().getMap().size();
}
/**
* <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
* <code>map&lt;uint32, uint32&gt; open_state_map = 1;</code>
*/
@java.lang.Override
@@ -627,7 +627,7 @@ public final class OpenStateChangeNotifyOuterClass {
return getOpenStateMapMap();
}
/**
* <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
* <code>map&lt;uint32, uint32&gt; open_state_map = 1;</code>
*/
@java.lang.Override
@@ -635,7 +635,7 @@ public final class OpenStateChangeNotifyOuterClass {
return internalGetOpenStateMap().getMap();
}
/**
* <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
* <code>map&lt;uint32, uint32&gt; open_state_map = 1;</code>
*/
@java.lang.Override
@@ -648,7 +648,7 @@ public final class OpenStateChangeNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
* <code>map&lt;uint32, uint32&gt; open_state_map = 1;</code>
*/
@java.lang.Override
@@ -669,7 +669,7 @@ public final class OpenStateChangeNotifyOuterClass {
return this;
}
/**
* <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
* <code>map&lt;uint32, uint32&gt; open_state_map = 1;</code>
*/
public Builder removeOpenStateMap(
@@ -688,7 +688,7 @@ public final class OpenStateChangeNotifyOuterClass {
return internalGetMutableOpenStateMap().getMutableMap();
}
/**
* <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
* <code>map&lt;uint32, uint32&gt; open_state_map = 1;</code>
*/
public Builder putOpenStateMap(
int key,
@@ -700,7 +700,7 @@ public final class OpenStateChangeNotifyOuterClass {
return this;
}
/**
* <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
* <code>map&lt;uint32, uint32&gt; open_state_map = 1;</code>
*/
public Builder putAllOpenStateMap(
@@ -782,7 +782,7 @@ public final class OpenStateChangeNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\033OpenStateChangeNotify.proto\"\216\001\n\025OpenSt" +
"ateChangeNotify\022@\n\016open_state_map\030\013 \003(\0132" +
"ateChangeNotify\022@\n\016open_state_map\030\001 \003(\0132" +
"(.OpenStateChangeNotify.OpenStateMapEntr" +
"y\0323\n\021OpenStateMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005v" +
"alue\030\002 \001(\r:\0028\001B\033\n\031emu.grasscutter.net.pr" +