Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 05:43:33 +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/FurnitureMakeDataOuterClass.java
+168 -168
View File
@@ -19,44 +19,44 @@ public final class FurnitureMakeDataOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 avatar_id = 5;</code>
* @return The avatarId.
*/
int getAvatarId();
/**
* <code>uint32 begin_time = 3;</code>
* <code>fixed32 begin_time = 9;</code>
* @return The beginTime.
*/
int getBeginTime();
/**
* <code>uint32 durTime = 15;</code>
* <code>uint32 dur_time = 7;</code>
* @return The durTime.
*/
int getDurTime();
/**
* <code>uint32 accelerateTime = 6;</code>
* <code>fixed32 accelerate_time = 14;</code>
* @return The accelerateTime.
*/
int getAccelerateTime();
/**
* <code>uint32 index = 12;</code>
* @return The index.
* <code>uint32 avatar_id = 11;</code>
* @return The avatarId.
*/
int getIndex();
int getAvatarId();
/**
* <code>uint32 make_id = 4;</code>
* <code>uint32 make_id = 5;</code>
* @return The makeId.
*/
int getMakeId();
/**
* <code>uint32 index = 13;</code>
* @return The index.
*/
int getIndex();
}
/**
* <pre>
* Name: MIEFECKEOMK
* Name: GADICHLBHOI
* </pre>
*
* Protobuf type {@code FurnitureMakeData}
@@ -103,34 +103,34 @@ public final class FurnitureMakeDataOuterClass {
case 0:
done = true;
break;
case 24: {
beginTime_ = input.readUInt32();
break;
}
case 32: {
case 40: {
makeId_ = input.readUInt32();
break;
}
case 40: {
case 56: {
durTime_ = input.readUInt32();
break;
}
case 77: {
beginTime_ = input.readFixed32();
break;
}
case 88: {
avatarId_ = input.readUInt32();
break;
}
case 48: {
accelerateTime_ = input.readUInt32();
break;
}
case 96: {
case 104: {
index_ = input.readUInt32();
break;
}
case 120: {
case 117: {
durTime_ = input.readUInt32();
accelerateTime_ = input.readFixed32();
break;
}
default: {
@@ -165,21 +165,10 @@ public final class FurnitureMakeDataOuterClass {
emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData.class, emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData.Builder.class);
}
public static final int AVATAR_ID_FIELD_NUMBER = 5;
private int avatarId_;
/**
* <code>uint32 avatar_id = 5;</code>
* @return The avatarId.
*/
@java.lang.Override
public int getAvatarId() {
return avatarId_;
}
public static final int BEGIN_TIME_FIELD_NUMBER = 3;
public static final int BEGIN_TIME_FIELD_NUMBER = 9;
private int beginTime_;
/**
* <code>uint32 begin_time = 3;</code>
* <code>fixed32 begin_time = 9;</code>
* @return The beginTime.
*/
@java.lang.Override
@@ -187,10 +176,10 @@ public final class FurnitureMakeDataOuterClass {
return beginTime_;
}
public static final int DURTIME_FIELD_NUMBER = 15;
public static final int DUR_TIME_FIELD_NUMBER = 7;
private int durTime_;
/**
* <code>uint32 durTime = 15;</code>
* <code>uint32 dur_time = 7;</code>
* @return The durTime.
*/
@java.lang.Override
@@ -198,10 +187,10 @@ public final class FurnitureMakeDataOuterClass {
return durTime_;
}
public static final int ACCELERATETIME_FIELD_NUMBER = 6;
public static final int ACCELERATE_TIME_FIELD_NUMBER = 14;
private int accelerateTime_;
/**
* <code>uint32 accelerateTime = 6;</code>
* <code>fixed32 accelerate_time = 14;</code>
* @return The accelerateTime.
*/
@java.lang.Override
@@ -209,21 +198,21 @@ public final class FurnitureMakeDataOuterClass {
return accelerateTime_;
}
public static final int INDEX_FIELD_NUMBER = 12;
private int index_;
public static final int AVATAR_ID_FIELD_NUMBER = 11;
private int avatarId_;
/**
* <code>uint32 index = 12;</code>
* @return The index.
* <code>uint32 avatar_id = 11;</code>
* @return The avatarId.
*/
@java.lang.Override
public int getIndex() {
return index_;
public int getAvatarId() {
return avatarId_;
}
public static final int MAKE_ID_FIELD_NUMBER = 4;
public static final int MAKE_ID_FIELD_NUMBER = 5;
private int makeId_;
/**
* <code>uint32 make_id = 4;</code>
* <code>uint32 make_id = 5;</code>
* @return The makeId.
*/
@java.lang.Override
@@ -231,6 +220,17 @@ public final class FurnitureMakeDataOuterClass {
return makeId_;
}
public static final int INDEX_FIELD_NUMBER = 13;
private int index_;
/**
* <code>uint32 index = 13;</code>
* @return The index.
*/
@java.lang.Override
public int getIndex() {
return index_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -245,23 +245,23 @@ public final class FurnitureMakeDataOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (beginTime_ != 0) {
output.writeUInt32(3, beginTime_);
}
if (makeId_ != 0) {
output.writeUInt32(4, makeId_);
}
if (avatarId_ != 0) {
output.writeUInt32(5, avatarId_);
}
if (accelerateTime_ != 0) {
output.writeUInt32(6, accelerateTime_);
}
if (index_ != 0) {
output.writeUInt32(12, index_);
output.writeUInt32(5, makeId_);
}
if (durTime_ != 0) {
output.writeUInt32(15, durTime_);
output.writeUInt32(7, durTime_);
}
if (beginTime_ != 0) {
output.writeFixed32(9, beginTime_);
}
if (avatarId_ != 0) {
output.writeUInt32(11, avatarId_);
}
if (index_ != 0) {
output.writeUInt32(13, index_);
}
if (accelerateTime_ != 0) {
output.writeFixed32(14, accelerateTime_);
}
unknownFields.writeTo(output);
}
@@ -272,29 +272,29 @@ public final class FurnitureMakeDataOuterClass {
if (size != -1) return size;
size = 0;
if (beginTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, beginTime_);
}
if (makeId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(4, makeId_);
}
if (avatarId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, avatarId_);
}
if (accelerateTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, accelerateTime_);
}
if (index_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(12, index_);
.computeUInt32Size(5, makeId_);
}
if (durTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, durTime_);
.computeUInt32Size(7, durTime_);
}
if (beginTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeFixed32Size(9, beginTime_);
}
if (avatarId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, avatarId_);
}
if (index_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, index_);
}
if (accelerateTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeFixed32Size(14, accelerateTime_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -311,18 +311,18 @@ public final class FurnitureMakeDataOuterClass {
}
emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData other = (emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData) obj;
if (getAvatarId()
!= other.getAvatarId()) return false;
if (getBeginTime()
!= other.getBeginTime()) return false;
if (getDurTime()
!= other.getDurTime()) return false;
if (getAccelerateTime()
!= other.getAccelerateTime()) return false;
if (getIndex()
!= other.getIndex()) return false;
if (getAvatarId()
!= other.getAvatarId()) return false;
if (getMakeId()
!= other.getMakeId()) return false;
if (getIndex()
!= other.getIndex()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -334,18 +334,18 @@ public final class FurnitureMakeDataOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
hash = (53 * hash) + getAvatarId();
hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
hash = (53 * hash) + getBeginTime();
hash = (37 * hash) + DURTIME_FIELD_NUMBER;
hash = (37 * hash) + DUR_TIME_FIELD_NUMBER;
hash = (53 * hash) + getDurTime();
hash = (37 * hash) + ACCELERATETIME_FIELD_NUMBER;
hash = (37 * hash) + ACCELERATE_TIME_FIELD_NUMBER;
hash = (53 * hash) + getAccelerateTime();
hash = (37 * hash) + INDEX_FIELD_NUMBER;
hash = (53 * hash) + getIndex();
hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
hash = (53 * hash) + getAvatarId();
hash = (37 * hash) + MAKE_ID_FIELD_NUMBER;
hash = (53 * hash) + getMakeId();
hash = (37 * hash) + INDEX_FIELD_NUMBER;
hash = (53 * hash) + getIndex();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -443,7 +443,7 @@ public final class FurnitureMakeDataOuterClass {
}
/**
* <pre>
* Name: MIEFECKEOMK
* Name: GADICHLBHOI
* </pre>
*
* Protobuf type {@code FurnitureMakeData}
@@ -483,18 +483,18 @@ public final class FurnitureMakeDataOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
avatarId_ = 0;
beginTime_ = 0;
durTime_ = 0;
accelerateTime_ = 0;
index_ = 0;
avatarId_ = 0;
makeId_ = 0;
index_ = 0;
return this;
}
@@ -521,12 +521,12 @@ public final class FurnitureMakeDataOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData buildPartial() {
emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData result = new emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData(this);
result.avatarId_ = avatarId_;
result.beginTime_ = beginTime_;
result.durTime_ = durTime_;
result.accelerateTime_ = accelerateTime_;
result.index_ = index_;
result.avatarId_ = avatarId_;
result.makeId_ = makeId_;
result.index_ = index_;
onBuilt();
return result;
}
@@ -575,9 +575,6 @@ public final class FurnitureMakeDataOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData other) {
if (other == emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData.getDefaultInstance()) return this;
if (other.getAvatarId() != 0) {
setAvatarId(other.getAvatarId());
}
if (other.getBeginTime() != 0) {
setBeginTime(other.getBeginTime());
}
@@ -587,12 +584,15 @@ public final class FurnitureMakeDataOuterClass {
if (other.getAccelerateTime() != 0) {
setAccelerateTime(other.getAccelerateTime());
}
if (other.getIndex() != 0) {
setIndex(other.getIndex());
if (other.getAvatarId() != 0) {
setAvatarId(other.getAvatarId());
}
if (other.getMakeId() != 0) {
setMakeId(other.getMakeId());
}
if (other.getIndex() != 0) {
setIndex(other.getIndex());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -622,40 +622,9 @@ public final class FurnitureMakeDataOuterClass {
return this;
}
private int avatarId_ ;
/**
* <code>uint32 avatar_id = 5;</code>
* @return The avatarId.
*/
@java.lang.Override
public int getAvatarId() {
return avatarId_;
}
/**
* <code>uint32 avatar_id = 5;</code>
* @param value The avatarId to set.
* @return This builder for chaining.
*/
public Builder setAvatarId(int value) {
avatarId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 avatar_id = 5;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarId() {
avatarId_ = 0;
onChanged();
return this;
}
private int beginTime_ ;
/**
* <code>uint32 begin_time = 3;</code>
* <code>fixed32 begin_time = 9;</code>
* @return The beginTime.
*/
@java.lang.Override
@@ -663,7 +632,7 @@ public final class FurnitureMakeDataOuterClass {
return beginTime_;
}
/**
* <code>uint32 begin_time = 3;</code>
* <code>fixed32 begin_time = 9;</code>
* @param value The beginTime to set.
* @return This builder for chaining.
*/
@@ -674,7 +643,7 @@ public final class FurnitureMakeDataOuterClass {
return this;
}
/**
* <code>uint32 begin_time = 3;</code>
* <code>fixed32 begin_time = 9;</code>
* @return This builder for chaining.
*/
public Builder clearBeginTime() {
@@ -686,7 +655,7 @@ public final class FurnitureMakeDataOuterClass {
private int durTime_ ;
/**
* <code>uint32 durTime = 15;</code>
* <code>uint32 dur_time = 7;</code>
* @return The durTime.
*/
@java.lang.Override
@@ -694,7 +663,7 @@ public final class FurnitureMakeDataOuterClass {
return durTime_;
}
/**
* <code>uint32 durTime = 15;</code>
* <code>uint32 dur_time = 7;</code>
* @param value The durTime to set.
* @return This builder for chaining.
*/
@@ -705,7 +674,7 @@ public final class FurnitureMakeDataOuterClass {
return this;
}
/**
* <code>uint32 durTime = 15;</code>
* <code>uint32 dur_time = 7;</code>
* @return This builder for chaining.
*/
public Builder clearDurTime() {
@@ -717,7 +686,7 @@ public final class FurnitureMakeDataOuterClass {
private int accelerateTime_ ;
/**
* <code>uint32 accelerateTime = 6;</code>
* <code>fixed32 accelerate_time = 14;</code>
* @return The accelerateTime.
*/
@java.lang.Override
@@ -725,7 +694,7 @@ public final class FurnitureMakeDataOuterClass {
return accelerateTime_;
}
/**
* <code>uint32 accelerateTime = 6;</code>
* <code>fixed32 accelerate_time = 14;</code>
* @param value The accelerateTime to set.
* @return This builder for chaining.
*/
@@ -736,7 +705,7 @@ public final class FurnitureMakeDataOuterClass {
return this;
}
/**
* <code>uint32 accelerateTime = 6;</code>
* <code>fixed32 accelerate_time = 14;</code>
* @return This builder for chaining.
*/
public Builder clearAccelerateTime() {
@@ -746,40 +715,40 @@ public final class FurnitureMakeDataOuterClass {
return this;
}
private int index_ ;
private int avatarId_ ;
/**
* <code>uint32 index = 12;</code>
* @return The index.
* <code>uint32 avatar_id = 11;</code>
* @return The avatarId.
*/
@java.lang.Override
public int getIndex() {
return index_;
public int getAvatarId() {
return avatarId_;
}
/**
* <code>uint32 index = 12;</code>
* @param value The index to set.
* <code>uint32 avatar_id = 11;</code>
* @param value The avatarId to set.
* @return This builder for chaining.
*/
public Builder setIndex(int value) {
public Builder setAvatarId(int value) {
index_ = value;
avatarId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 index = 12;</code>
* <code>uint32 avatar_id = 11;</code>
* @return This builder for chaining.
*/
public Builder clearIndex() {
public Builder clearAvatarId() {
index_ = 0;
avatarId_ = 0;
onChanged();
return this;
}
private int makeId_ ;
/**
* <code>uint32 make_id = 4;</code>
* <code>uint32 make_id = 5;</code>
* @return The makeId.
*/
@java.lang.Override
@@ -787,7 +756,7 @@ public final class FurnitureMakeDataOuterClass {
return makeId_;
}
/**
* <code>uint32 make_id = 4;</code>
* <code>uint32 make_id = 5;</code>
* @param value The makeId to set.
* @return This builder for chaining.
*/
@@ -798,7 +767,7 @@ public final class FurnitureMakeDataOuterClass {
return this;
}
/**
* <code>uint32 make_id = 4;</code>
* <code>uint32 make_id = 5;</code>
* @return This builder for chaining.
*/
public Builder clearMakeId() {
@@ -807,6 +776,37 @@ public final class FurnitureMakeDataOuterClass {
onChanged();
return this;
}
private int index_ ;
/**
* <code>uint32 index = 13;</code>
* @return The index.
*/
@java.lang.Override
public int getIndex() {
return index_;
}
/**
* <code>uint32 index = 13;</code>
* @param value The index to set.
* @return This builder for chaining.
*/
public Builder setIndex(int value) {
index_ = value;
onChanged();
return this;
}
/**
* <code>uint32 index = 13;</code>
* @return This builder for chaining.
*/
public Builder clearIndex() {
index_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -874,11 +874,11 @@ public final class FurnitureMakeDataOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\027FurnitureMakeData.proto\"\203\001\n\021FurnitureM" +
"akeData\022\021\n\tavatar_id\030\005 \001(\r\022\022\n\nbegin_time" +
"\030\003 \001(\r\022\017\n\007durTime\030\017 \001(\r\022\026\n\016accelerateTim" +
"e\030\006 \001(\r\022\r\n\005index\030\014 \001(\r\022\017\n\007make_id\030\004 \001(\rB" +
"\033\n\031emu.grasscutter.net.protob\006proto3"
"\n\027FurnitureMakeData.proto\"\205\001\n\021FurnitureM" +
"akeData\022\022\n\nbegin_time\030\t \001(\007\022\020\n\010dur_time\030" +
"\007 \001(\r\022\027\n\017accelerate_time\030\016 \001(\007\022\021\n\tavatar" +
"_id\030\013 \001(\r\022\017\n\007make_id\030\005 \001(\r\022\r\n\005index\030\r \001(" +
"\rB\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -889,7 +889,7 @@ public final class FurnitureMakeDataOuterClass {
internal_static_FurnitureMakeData_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_FurnitureMakeData_descriptor,
new java.lang.String[] { "AvatarId", "BeginTime", "DurTime", "AccelerateTime", "Index", "MakeId", });
new java.lang.String[] { "BeginTime", "DurTime", "AccelerateTime", "AvatarId", "MakeId", "Index", });
}
// @@protoc_insertion_point(outer_class_scope)