Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 02:13:33 +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/LevelupCityReqOuterClass.java
+86 -86
View File
@@ -19,27 +19,27 @@ public final class LevelupCityReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 item_num = 13;</code>
* <code>uint32 item_num = 12;</code>
* @return The itemNum.
*/
int getItemNum();
/**
* <code>uint32 area_id = 3;</code>
* @return The areaId.
*/
int getAreaId();
/**
* <code>uint32 scene_id = 5;</code>
* <code>uint32 scene_id = 4;</code>
* @return The sceneId.
*/
int getSceneId();
/**
* <code>uint32 area_id = 1;</code>
* @return The areaId.
*/
int getAreaId();
}
/**
* <pre>
* CmdId: 237
* Name: FMMDGBFOCNN
* CmdId: 274
* Obf: BNHEFCDPKAM
* </pre>
*
* Protobuf type {@code LevelupCityReq}
@@ -86,17 +86,17 @@ public final class LevelupCityReqOuterClass {
case 0:
done = true;
break;
case 24: {
case 8: {
areaId_ = input.readUInt32();
break;
}
case 40: {
case 32: {
sceneId_ = input.readUInt32();
break;
}
case 104: {
case 96: {
itemNum_ = input.readUInt32();
break;
@@ -133,10 +133,10 @@ public final class LevelupCityReqOuterClass {
emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq.class, emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq.Builder.class);
}
public static final int ITEM_NUM_FIELD_NUMBER = 13;
public static final int ITEM_NUM_FIELD_NUMBER = 12;
private int itemNum_;
/**
* <code>uint32 item_num = 13;</code>
* <code>uint32 item_num = 12;</code>
* @return The itemNum.
*/
@java.lang.Override
@@ -144,21 +144,10 @@ public final class LevelupCityReqOuterClass {
return itemNum_;
}
public static final int AREA_ID_FIELD_NUMBER = 3;
private int areaId_;
/**
* <code>uint32 area_id = 3;</code>
* @return The areaId.
*/
@java.lang.Override
public int getAreaId() {
return areaId_;
}
public static final int SCENE_ID_FIELD_NUMBER = 5;
public static final int SCENE_ID_FIELD_NUMBER = 4;
private int sceneId_;
/**
* <code>uint32 scene_id = 5;</code>
* <code>uint32 scene_id = 4;</code>
* @return The sceneId.
*/
@java.lang.Override
@@ -166,6 +155,17 @@ public final class LevelupCityReqOuterClass {
return sceneId_;
}
public static final int AREA_ID_FIELD_NUMBER = 1;
private int areaId_;
/**
* <code>uint32 area_id = 1;</code>
* @return The areaId.
*/
@java.lang.Override
public int getAreaId() {
return areaId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -181,13 +181,13 @@ public final class LevelupCityReqOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (areaId_ != 0) {
output.writeUInt32(3, areaId_);
output.writeUInt32(1, areaId_);
}
if (sceneId_ != 0) {
output.writeUInt32(5, sceneId_);
output.writeUInt32(4, sceneId_);
}
if (itemNum_ != 0) {
output.writeUInt32(13, itemNum_);
output.writeUInt32(12, itemNum_);
}
unknownFields.writeTo(output);
}
@@ -200,15 +200,15 @@ public final class LevelupCityReqOuterClass {
size = 0;
if (areaId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, areaId_);
.computeUInt32Size(1, areaId_);
}
if (sceneId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, sceneId_);
.computeUInt32Size(4, sceneId_);
}
if (itemNum_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, itemNum_);
.computeUInt32Size(12, itemNum_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -227,10 +227,10 @@ public final class LevelupCityReqOuterClass {
if (getItemNum()
!= other.getItemNum()) return false;
if (getAreaId()
!= other.getAreaId()) return false;
if (getSceneId()
!= other.getSceneId()) return false;
if (getAreaId()
!= other.getAreaId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -244,10 +244,10 @@ public final class LevelupCityReqOuterClass {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + ITEM_NUM_FIELD_NUMBER;
hash = (53 * hash) + getItemNum();
hash = (37 * hash) + AREA_ID_FIELD_NUMBER;
hash = (53 * hash) + getAreaId();
hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
hash = (53 * hash) + getSceneId();
hash = (37 * hash) + AREA_ID_FIELD_NUMBER;
hash = (53 * hash) + getAreaId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -345,8 +345,8 @@ public final class LevelupCityReqOuterClass {
}
/**
* <pre>
* CmdId: 237
* Name: FMMDGBFOCNN
* CmdId: 274
* Obf: BNHEFCDPKAM
* </pre>
*
* Protobuf type {@code LevelupCityReq}
@@ -388,10 +388,10 @@ public final class LevelupCityReqOuterClass {
super.clear();
itemNum_ = 0;
areaId_ = 0;
sceneId_ = 0;
areaId_ = 0;
return this;
}
@@ -419,8 +419,8 @@ public final class LevelupCityReqOuterClass {
public emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq buildPartial() {
emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq result = new emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq(this);
result.itemNum_ = itemNum_;
result.areaId_ = areaId_;
result.sceneId_ = sceneId_;
result.areaId_ = areaId_;
onBuilt();
return result;
}
@@ -472,12 +472,12 @@ public final class LevelupCityReqOuterClass {
if (other.getItemNum() != 0) {
setItemNum(other.getItemNum());
}
if (other.getAreaId() != 0) {
setAreaId(other.getAreaId());
}
if (other.getSceneId() != 0) {
setSceneId(other.getSceneId());
}
if (other.getAreaId() != 0) {
setAreaId(other.getAreaId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -509,7 +509,7 @@ public final class LevelupCityReqOuterClass {
private int itemNum_ ;
/**
* <code>uint32 item_num = 13;</code>
* <code>uint32 item_num = 12;</code>
* @return The itemNum.
*/
@java.lang.Override
@@ -517,7 +517,7 @@ public final class LevelupCityReqOuterClass {
return itemNum_;
}
/**
* <code>uint32 item_num = 13;</code>
* <code>uint32 item_num = 12;</code>
* @param value The itemNum to set.
* @return This builder for chaining.
*/
@@ -528,7 +528,7 @@ public final class LevelupCityReqOuterClass {
return this;
}
/**
* <code>uint32 item_num = 13;</code>
* <code>uint32 item_num = 12;</code>
* @return This builder for chaining.
*/
public Builder clearItemNum() {
@@ -538,40 +538,9 @@ public final class LevelupCityReqOuterClass {
return this;
}
private int areaId_ ;
/**
* <code>uint32 area_id = 3;</code>
* @return The areaId.
*/
@java.lang.Override
public int getAreaId() {
return areaId_;
}
/**
* <code>uint32 area_id = 3;</code>
* @param value The areaId to set.
* @return This builder for chaining.
*/
public Builder setAreaId(int value) {
areaId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 area_id = 3;</code>
* @return This builder for chaining.
*/
public Builder clearAreaId() {
areaId_ = 0;
onChanged();
return this;
}
private int sceneId_ ;
/**
* <code>uint32 scene_id = 5;</code>
* <code>uint32 scene_id = 4;</code>
* @return The sceneId.
*/
@java.lang.Override
@@ -579,7 +548,7 @@ public final class LevelupCityReqOuterClass {
return sceneId_;
}
/**
* <code>uint32 scene_id = 5;</code>
* <code>uint32 scene_id = 4;</code>
* @param value The sceneId to set.
* @return This builder for chaining.
*/
@@ -590,7 +559,7 @@ public final class LevelupCityReqOuterClass {
return this;
}
/**
* <code>uint32 scene_id = 5;</code>
* <code>uint32 scene_id = 4;</code>
* @return This builder for chaining.
*/
public Builder clearSceneId() {
@@ -599,6 +568,37 @@ public final class LevelupCityReqOuterClass {
onChanged();
return this;
}
private int areaId_ ;
/**
* <code>uint32 area_id = 1;</code>
* @return The areaId.
*/
@java.lang.Override
public int getAreaId() {
return areaId_;
}
/**
* <code>uint32 area_id = 1;</code>
* @param value The areaId to set.
* @return This builder for chaining.
*/
public Builder setAreaId(int value) {
areaId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 area_id = 1;</code>
* @return This builder for chaining.
*/
public Builder clearAreaId() {
areaId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -667,8 +667,8 @@ public final class LevelupCityReqOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\024LevelupCityReq.proto\"E\n\016LevelupCityReq" +
"\022\020\n\010item_num\030\r \001(\r\022\017\n\007area_id\030\003 \001(\r\022\020\n\010s" +
"cene_id\030\005 \001(\rB\033\n\031emu.grasscutter.net.pro" +
"\022\020\n\010item_num\030\014 \001(\r\022\020\n\010scene_id\030\004 \001(\r\022\017\n\007" +
"area_id\030\001 \001(\rB\033\n\031emu.grasscutter.net.pro" +
"tob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +680,7 @@ public final class LevelupCityReqOuterClass {
internal_static_LevelupCityReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_LevelupCityReq_descriptor,
new java.lang.String[] { "ItemNum", "AreaId", "SceneId", });
new java.lang.String[] { "ItemNum", "SceneId", "AreaId", });
}
// @@protoc_insertion_point(outer_class_scope)