Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 04:55:01 +08:00
Code Issues Projects Releases Wiki Activity

Add support for game version 3.6 (#2110)

Browse Source 
* Update to game version `3.6.0` (pt. 1)

not complete!

* Update to game version `3.6.0` (pt. 2)

not complete!

* Update compiled definitions
This commit is contained in:
Magix
2023-04-30 19:08:54 -07:00
committed by GitHub
Unverified
parent 60e8106b01
commit c4f1208f45
1323 changed files with 434863 additions and 141164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/LevelupCityReqOuterClass.java
+129 -129
View File
@@ -19,27 +19,27 @@ public final class LevelupCityReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 scene_id = 5;</code>
* @return The sceneId.
* <code>uint32 item_num = 13;</code>
* @return The itemNum.
*/
int getSceneId();
int getItemNum();
/**
* <code>uint32 area_id = 7;</code>
* <code>uint32 area_id = 3;</code>
* @return The areaId.
*/
int getAreaId();
/**
* <code>uint32 item_num = 9;</code>
* @return The itemNum.
* <code>uint32 scene_id = 5;</code>
* @return The sceneId.
*/
int getItemNum();
int getSceneId();
}
/**
* <pre>
* Name: JBMLBNBOFDM
* CmdId: 243
* CmdId: 237
* Name: FMMDGBFOCNN
* </pre>
*
* Protobuf type {@code LevelupCityReq}
@@ -86,17 +86,17 @@ public final class LevelupCityReqOuterClass {
case 0:
done = true;
break;
case 24: {
areaId_ = input.readUInt32();
break;
}
case 40: {
sceneId_ = input.readUInt32();
break;
}
case 56: {
areaId_ = input.readUInt32();
break;
}
case 72: {
case 104: {
itemNum_ = input.readUInt32();
break;
@@ -133,6 +133,28 @@ 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;
private int itemNum_;
/**
* <code>uint32 item_num = 13;</code>
* @return The itemNum.
*/
@java.lang.Override
public int getItemNum() {
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;
private int sceneId_;
/**
@@ -144,28 +166,6 @@ public final class LevelupCityReqOuterClass {
return sceneId_;
}
public static final int AREA_ID_FIELD_NUMBER = 7;
private int areaId_;
/**
* <code>uint32 area_id = 7;</code>
* @return The areaId.
*/
@java.lang.Override
public int getAreaId() {
return areaId_;
}
public static final int ITEM_NUM_FIELD_NUMBER = 9;
private int itemNum_;
/**
* <code>uint32 item_num = 9;</code>
* @return The itemNum.
*/
@java.lang.Override
public int getItemNum() {
return itemNum_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -180,14 +180,14 @@ public final class LevelupCityReqOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (areaId_ != 0) {
output.writeUInt32(3, areaId_);
}
if (sceneId_ != 0) {
output.writeUInt32(5, sceneId_);
}
if (areaId_ != 0) {
output.writeUInt32(7, areaId_);
}
if (itemNum_ != 0) {
output.writeUInt32(9, itemNum_);
output.writeUInt32(13, itemNum_);
}
unknownFields.writeTo(output);
}
@@ -198,17 +198,17 @@ public final class LevelupCityReqOuterClass {
if (size != -1) return size;
size = 0;
if (areaId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, areaId_);
}
if (sceneId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, sceneId_);
}
if (areaId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(7, areaId_);
}
if (itemNum_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, itemNum_);
.computeUInt32Size(13, itemNum_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -225,12 +225,12 @@ public final class LevelupCityReqOuterClass {
}
emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq other = (emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq) obj;
if (getSceneId()
!= other.getSceneId()) return false;
if (getAreaId()
!= other.getAreaId()) return false;
if (getItemNum()
!= other.getItemNum()) return false;
if (getAreaId()
!= other.getAreaId()) return false;
if (getSceneId()
!= other.getSceneId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -242,12 +242,12 @@ public final class LevelupCityReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
hash = (53 * hash) + getSceneId();
hash = (37 * hash) + AREA_ID_FIELD_NUMBER;
hash = (53 * hash) + getAreaId();
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 = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -345,8 +345,8 @@ public final class LevelupCityReqOuterClass {
}
/**
* <pre>
* Name: JBMLBNBOFDM
* CmdId: 243
* CmdId: 237
* Name: FMMDGBFOCNN
* </pre>
*
* Protobuf type {@code LevelupCityReq}
@@ -386,11 +386,11 @@ public final class LevelupCityReqOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
sceneId_ = 0;
itemNum_ = 0;
areaId_ = 0;
itemNum_ = 0;
sceneId_ = 0;
return this;
}
@@ -418,9 +418,9 @@ public final class LevelupCityReqOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq buildPartial() {
emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq result = new emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq(this);
result.sceneId_ = sceneId_;
result.areaId_ = areaId_;
result.itemNum_ = itemNum_;
result.areaId_ = areaId_;
result.sceneId_ = sceneId_;
onBuilt();
return result;
}
@@ -469,14 +469,14 @@ public final class LevelupCityReqOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq other) {
if (other == emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq.getDefaultInstance()) return this;
if (other.getSceneId() != 0) {
setSceneId(other.getSceneId());
if (other.getItemNum() != 0) {
setItemNum(other.getItemNum());
}
if (other.getAreaId() != 0) {
setAreaId(other.getAreaId());
}
if (other.getItemNum() != 0) {
setItemNum(other.getItemNum());
if (other.getSceneId() != 0) {
setSceneId(other.getSceneId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -507,6 +507,68 @@ public final class LevelupCityReqOuterClass {
return this;
}
private int itemNum_ ;
/**
* <code>uint32 item_num = 13;</code>
* @return The itemNum.
*/
@java.lang.Override
public int getItemNum() {
return itemNum_;
}
/**
* <code>uint32 item_num = 13;</code>
* @param value The itemNum to set.
* @return This builder for chaining.
*/
public Builder setItemNum(int value) {
itemNum_ = value;
onChanged();
return this;
}
/**
* <code>uint32 item_num = 13;</code>
* @return This builder for chaining.
*/
public Builder clearItemNum() {
itemNum_ = 0;
onChanged();
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>
@@ -537,68 +599,6 @@ public final class LevelupCityReqOuterClass {
onChanged();
return this;
}
private int areaId_ ;
/**
* <code>uint32 area_id = 7;</code>
* @return The areaId.
*/
@java.lang.Override
public int getAreaId() {
return areaId_;
}
/**
* <code>uint32 area_id = 7;</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 = 7;</code>
* @return This builder for chaining.
*/
public Builder clearAreaId() {
areaId_ = 0;
onChanged();
return this;
}
private int itemNum_ ;
/**
* <code>uint32 item_num = 9;</code>
* @return The itemNum.
*/
@java.lang.Override
public int getItemNum() {
return itemNum_;
}
/**
* <code>uint32 item_num = 9;</code>
* @param value The itemNum to set.
* @return This builder for chaining.
*/
public Builder setItemNum(int value) {
itemNum_ = value;
onChanged();
return this;
}
/**
* <code>uint32 item_num = 9;</code>
* @return This builder for chaining.
*/
public Builder clearItemNum() {
itemNum_ = 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\010scene_id\030\005 \001(\r\022\017\n\007area_id\030\007 \001(\r\022\020\n\010i" +
"tem_num\030\t \001(\rB\033\n\031emu.grasscutter.net.pro" +
"\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" +
"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[] { "SceneId", "AreaId", "ItemNum", });
new java.lang.String[] { "ItemNum", "AreaId", "SceneId", });
}
// @@protoc_insertion_point(outer_class_scope)