mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-06-05 10:33:34 +08:00
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:
@@ -19,11 +19,11 @@ public final class LunchBoxDataOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>map<uint32, uint32> slot_material_map = 10;</code>
|
||||
* <code>map<uint32, uint32> slot_material_map = 8;</code>
|
||||
*/
|
||||
int getSlotMaterialMapCount();
|
||||
/**
|
||||
* <code>map<uint32, uint32> slot_material_map = 10;</code>
|
||||
* <code>map<uint32, uint32> slot_material_map = 8;</code>
|
||||
*/
|
||||
boolean containsSlotMaterialMap(
|
||||
int key);
|
||||
@@ -34,19 +34,19 @@ public final class LunchBoxDataOuterClass {
|
||||
java.util.Map<java.lang.Integer, java.lang.Integer>
|
||||
getSlotMaterialMap();
|
||||
/**
|
||||
* <code>map<uint32, uint32> slot_material_map = 10;</code>
|
||||
* <code>map<uint32, uint32> slot_material_map = 8;</code>
|
||||
*/
|
||||
java.util.Map<java.lang.Integer, java.lang.Integer>
|
||||
getSlotMaterialMapMap();
|
||||
/**
|
||||
* <code>map<uint32, uint32> slot_material_map = 10;</code>
|
||||
* <code>map<uint32, uint32> slot_material_map = 8;</code>
|
||||
*/
|
||||
|
||||
int getSlotMaterialMapOrDefault(
|
||||
int key,
|
||||
int defaultValue);
|
||||
/**
|
||||
* <code>map<uint32, uint32> slot_material_map = 10;</code>
|
||||
* <code>map<uint32, uint32> slot_material_map = 8;</code>
|
||||
*/
|
||||
|
||||
int getSlotMaterialMapOrThrow(
|
||||
@@ -54,7 +54,7 @@ public final class LunchBoxDataOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: DBDCBIBLLAE
|
||||
* Obf: NMPOJEDAAMJ
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code LunchBoxData}
|
||||
@@ -102,7 +102,7 @@ public final class LunchBoxDataOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 82: {
|
||||
case 66: {
|
||||
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
|
||||
slotMaterialMap_ = com.google.protobuf.MapField.newMapField(
|
||||
SlotMaterialMapDefaultEntryHolder.defaultEntry);
|
||||
@@ -144,7 +144,7 @@ public final class LunchBoxDataOuterClass {
|
||||
protected com.google.protobuf.MapField internalGetMapField(
|
||||
int number) {
|
||||
switch (number) {
|
||||
case 10:
|
||||
case 8:
|
||||
return internalGetSlotMaterialMap();
|
||||
default:
|
||||
throw new RuntimeException(
|
||||
@@ -159,7 +159,7 @@ public final class LunchBoxDataOuterClass {
|
||||
emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxData.class, emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxData.Builder.class);
|
||||
}
|
||||
|
||||
public static final int SLOT_MATERIAL_MAP_FIELD_NUMBER = 10;
|
||||
public static final int SLOT_MATERIAL_MAP_FIELD_NUMBER = 8;
|
||||
private static final class SlotMaterialMapDefaultEntryHolder {
|
||||
static final com.google.protobuf.MapEntry<
|
||||
java.lang.Integer, java.lang.Integer> defaultEntry =
|
||||
@@ -186,7 +186,7 @@ public final class LunchBoxDataOuterClass {
|
||||
return internalGetSlotMaterialMap().getMap().size();
|
||||
}
|
||||
/**
|
||||
* <code>map<uint32, uint32> slot_material_map = 10;</code>
|
||||
* <code>map<uint32, uint32> slot_material_map = 8;</code>
|
||||
*/
|
||||
|
||||
@java.lang.Override
|
||||
@@ -204,7 +204,7 @@ public final class LunchBoxDataOuterClass {
|
||||
return getSlotMaterialMapMap();
|
||||
}
|
||||
/**
|
||||
* <code>map<uint32, uint32> slot_material_map = 10;</code>
|
||||
* <code>map<uint32, uint32> slot_material_map = 8;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
|
||||
@@ -212,7 +212,7 @@ public final class LunchBoxDataOuterClass {
|
||||
return internalGetSlotMaterialMap().getMap();
|
||||
}
|
||||
/**
|
||||
* <code>map<uint32, uint32> slot_material_map = 10;</code>
|
||||
* <code>map<uint32, uint32> slot_material_map = 8;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
|
||||
@@ -225,7 +225,7 @@ public final class LunchBoxDataOuterClass {
|
||||
return map.containsKey(key) ? map.get(key) : defaultValue;
|
||||
}
|
||||
/**
|
||||
* <code>map<uint32, uint32> slot_material_map = 10;</code>
|
||||
* <code>map<uint32, uint32> slot_material_map = 8;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
|
||||
@@ -259,7 +259,7 @@ public final class LunchBoxDataOuterClass {
|
||||
output,
|
||||
internalGetSlotMaterialMap(),
|
||||
SlotMaterialMapDefaultEntryHolder.defaultEntry,
|
||||
10);
|
||||
8);
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
|
||||
@@ -277,7 +277,7 @@ public final class LunchBoxDataOuterClass {
|
||||
.setValue(entry.getValue())
|
||||
.build();
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeMessageSize(10, slotMaterialMap__);
|
||||
.computeMessageSize(8, slotMaterialMap__);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -408,7 +408,7 @@ public final class LunchBoxDataOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: DBDCBIBLLAE
|
||||
* Obf: NMPOJEDAAMJ
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code LunchBoxData}
|
||||
@@ -426,7 +426,7 @@ public final class LunchBoxDataOuterClass {
|
||||
protected com.google.protobuf.MapField internalGetMapField(
|
||||
int number) {
|
||||
switch (number) {
|
||||
case 10:
|
||||
case 8:
|
||||
return internalGetSlotMaterialMap();
|
||||
default:
|
||||
throw new RuntimeException(
|
||||
@@ -437,7 +437,7 @@ public final class LunchBoxDataOuterClass {
|
||||
protected com.google.protobuf.MapField internalGetMutableMapField(
|
||||
int number) {
|
||||
switch (number) {
|
||||
case 10:
|
||||
case 8:
|
||||
return internalGetMutableSlotMaterialMap();
|
||||
default:
|
||||
throw new RuntimeException(
|
||||
@@ -607,7 +607,7 @@ public final class LunchBoxDataOuterClass {
|
||||
return internalGetSlotMaterialMap().getMap().size();
|
||||
}
|
||||
/**
|
||||
* <code>map<uint32, uint32> slot_material_map = 10;</code>
|
||||
* <code>map<uint32, uint32> slot_material_map = 8;</code>
|
||||
*/
|
||||
|
||||
@java.lang.Override
|
||||
@@ -625,7 +625,7 @@ public final class LunchBoxDataOuterClass {
|
||||
return getSlotMaterialMapMap();
|
||||
}
|
||||
/**
|
||||
* <code>map<uint32, uint32> slot_material_map = 10;</code>
|
||||
* <code>map<uint32, uint32> slot_material_map = 8;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
|
||||
@@ -633,7 +633,7 @@ public final class LunchBoxDataOuterClass {
|
||||
return internalGetSlotMaterialMap().getMap();
|
||||
}
|
||||
/**
|
||||
* <code>map<uint32, uint32> slot_material_map = 10;</code>
|
||||
* <code>map<uint32, uint32> slot_material_map = 8;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
|
||||
@@ -646,7 +646,7 @@ public final class LunchBoxDataOuterClass {
|
||||
return map.containsKey(key) ? map.get(key) : defaultValue;
|
||||
}
|
||||
/**
|
||||
* <code>map<uint32, uint32> slot_material_map = 10;</code>
|
||||
* <code>map<uint32, uint32> slot_material_map = 8;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
|
||||
@@ -667,7 +667,7 @@ public final class LunchBoxDataOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>map<uint32, uint32> slot_material_map = 10;</code>
|
||||
* <code>map<uint32, uint32> slot_material_map = 8;</code>
|
||||
*/
|
||||
|
||||
public Builder removeSlotMaterialMap(
|
||||
@@ -686,7 +686,7 @@ public final class LunchBoxDataOuterClass {
|
||||
return internalGetMutableSlotMaterialMap().getMutableMap();
|
||||
}
|
||||
/**
|
||||
* <code>map<uint32, uint32> slot_material_map = 10;</code>
|
||||
* <code>map<uint32, uint32> slot_material_map = 8;</code>
|
||||
*/
|
||||
public Builder putSlotMaterialMap(
|
||||
int key,
|
||||
@@ -698,7 +698,7 @@ public final class LunchBoxDataOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>map<uint32, uint32> slot_material_map = 10;</code>
|
||||
* <code>map<uint32, uint32> slot_material_map = 8;</code>
|
||||
*/
|
||||
|
||||
public Builder putAllSlotMaterialMap(
|
||||
@@ -780,7 +780,7 @@ public final class LunchBoxDataOuterClass {
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\022LunchBoxData.proto\"\205\001\n\014LunchBoxData\022=\n" +
|
||||
"\021slot_material_map\030\n \003(\0132\".LunchBoxData." +
|
||||
"\021slot_material_map\030\010 \003(\0132\".LunchBoxData." +
|
||||
"SlotMaterialMapEntry\0326\n\024SlotMaterialMapE" +
|
||||
"ntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001B\033\n\031" +
|
||||
"emu.grasscutter.net.protob\006proto3"
|
||||
|
||||
Reference in New Issue
Block a user