Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-24 03:19:50 +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/CityInfoOuterClass.java
+93 -93
View File
@@ -19,26 +19,26 @@ public final class CityInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 level = 14;</code>
* @return The level.
*/
int getLevel();
/**
* <code>uint32 city_id = 13;</code>
* <code>uint32 city_id = 1;</code>
* @return The cityId.
*/
int getCityId();
/**
* <code>uint32 crystal_num = 10;</code>
* <code>uint32 crystal_num = 9;</code>
* @return The crystalNum.
*/
int getCrystalNum();
/**
* <code>uint32 level = 5;</code>
* @return The level.
*/
int getLevel();
}
/**
* <pre>
* Name: GGDCLBEFCNO
* Name: HIOHLMOBFND
* </pre>
*
* Protobuf type {@code CityInfo}
@@ -85,21 +85,21 @@ public final class CityInfoOuterClass {
case 0:
done = true;
break;
case 80: {
crystalNum_ = input.readUInt32();
break;
}
case 104: {
case 8: {
cityId_ = input.readUInt32();
break;
}
case 112: {
case 40: {
level_ = input.readUInt32();
break;
}
case 72: {
crystalNum_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -132,21 +132,10 @@ public final class CityInfoOuterClass {
emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.class, emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder.class);
}
public static final int LEVEL_FIELD_NUMBER = 14;
private int level_;
/**
* <code>uint32 level = 14;</code>
* @return The level.
*/
@java.lang.Override
public int getLevel() {
return level_;
}
public static final int CITY_ID_FIELD_NUMBER = 13;
public static final int CITY_ID_FIELD_NUMBER = 1;
private int cityId_;
/**
* <code>uint32 city_id = 13;</code>
* <code>uint32 city_id = 1;</code>
* @return The cityId.
*/
@java.lang.Override
@@ -154,10 +143,10 @@ public final class CityInfoOuterClass {
return cityId_;
}
public static final int CRYSTAL_NUM_FIELD_NUMBER = 10;
public static final int CRYSTAL_NUM_FIELD_NUMBER = 9;
private int crystalNum_;
/**
* <code>uint32 crystal_num = 10;</code>
* <code>uint32 crystal_num = 9;</code>
* @return The crystalNum.
*/
@java.lang.Override
@@ -165,6 +154,17 @@ public final class CityInfoOuterClass {
return crystalNum_;
}
public static final int LEVEL_FIELD_NUMBER = 5;
private int level_;
/**
* <code>uint32 level = 5;</code>
* @return The level.
*/
@java.lang.Override
public int getLevel() {
return level_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -179,14 +179,14 @@ public final class CityInfoOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (crystalNum_ != 0) {
output.writeUInt32(10, crystalNum_);
}
if (cityId_ != 0) {
output.writeUInt32(13, cityId_);
output.writeUInt32(1, cityId_);
}
if (level_ != 0) {
output.writeUInt32(14, level_);
output.writeUInt32(5, level_);
}
if (crystalNum_ != 0) {
output.writeUInt32(9, crystalNum_);
}
unknownFields.writeTo(output);
}
@@ -197,17 +197,17 @@ public final class CityInfoOuterClass {
if (size != -1) return size;
size = 0;
if (crystalNum_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, crystalNum_);
}
if (cityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, cityId_);
.computeUInt32Size(1, cityId_);
}
if (level_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, level_);
.computeUInt32Size(5, level_);
}
if (crystalNum_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, crystalNum_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -224,12 +224,12 @@ public final class CityInfoOuterClass {
}
emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo other = (emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo) obj;
if (getLevel()
!= other.getLevel()) return false;
if (getCityId()
!= other.getCityId()) return false;
if (getCrystalNum()
!= other.getCrystalNum()) return false;
if (getLevel()
!= other.getLevel()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -241,12 +241,12 @@ public final class CityInfoOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + LEVEL_FIELD_NUMBER;
hash = (53 * hash) + getLevel();
hash = (37 * hash) + CITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getCityId();
hash = (37 * hash) + CRYSTAL_NUM_FIELD_NUMBER;
hash = (53 * hash) + getCrystalNum();
hash = (37 * hash) + LEVEL_FIELD_NUMBER;
hash = (53 * hash) + getLevel();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -344,7 +344,7 @@ public final class CityInfoOuterClass {
}
/**
* <pre>
* Name: GGDCLBEFCNO
* Name: HIOHLMOBFND
* </pre>
*
* Protobuf type {@code CityInfo}
@@ -384,12 +384,12 @@ public final class CityInfoOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
level_ = 0;
cityId_ = 0;
crystalNum_ = 0;
level_ = 0;
return this;
}
@@ -416,9 +416,9 @@ public final class CityInfoOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo buildPartial() {
emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo result = new emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo(this);
result.level_ = level_;
result.cityId_ = cityId_;
result.crystalNum_ = crystalNum_;
result.level_ = level_;
onBuilt();
return result;
}
@@ -467,15 +467,15 @@ public final class CityInfoOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo other) {
if (other == emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.getDefaultInstance()) return this;
if (other.getLevel() != 0) {
setLevel(other.getLevel());
}
if (other.getCityId() != 0) {
setCityId(other.getCityId());
}
if (other.getCrystalNum() != 0) {
setCrystalNum(other.getCrystalNum());
}
if (other.getLevel() != 0) {
setLevel(other.getLevel());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -505,40 +505,9 @@ public final class CityInfoOuterClass {
return this;
}
private int level_ ;
/**
* <code>uint32 level = 14;</code>
* @return The level.
*/
@java.lang.Override
public int getLevel() {
return level_;
}
/**
* <code>uint32 level = 14;</code>
* @param value The level to set.
* @return This builder for chaining.
*/
public Builder setLevel(int value) {
level_ = value;
onChanged();
return this;
}
/**
* <code>uint32 level = 14;</code>
* @return This builder for chaining.
*/
public Builder clearLevel() {
level_ = 0;
onChanged();
return this;
}
private int cityId_ ;
/**
* <code>uint32 city_id = 13;</code>
* <code>uint32 city_id = 1;</code>
* @return The cityId.
*/
@java.lang.Override
@@ -546,7 +515,7 @@ public final class CityInfoOuterClass {
return cityId_;
}
/**
* <code>uint32 city_id = 13;</code>
* <code>uint32 city_id = 1;</code>
* @param value The cityId to set.
* @return This builder for chaining.
*/
@@ -557,7 +526,7 @@ public final class CityInfoOuterClass {
return this;
}
/**
* <code>uint32 city_id = 13;</code>
* <code>uint32 city_id = 1;</code>
* @return This builder for chaining.
*/
public Builder clearCityId() {
@@ -569,7 +538,7 @@ public final class CityInfoOuterClass {
private int crystalNum_ ;
/**
* <code>uint32 crystal_num = 10;</code>
* <code>uint32 crystal_num = 9;</code>
* @return The crystalNum.
*/
@java.lang.Override
@@ -577,7 +546,7 @@ public final class CityInfoOuterClass {
return crystalNum_;
}
/**
* <code>uint32 crystal_num = 10;</code>
* <code>uint32 crystal_num = 9;</code>
* @param value The crystalNum to set.
* @return This builder for chaining.
*/
@@ -588,7 +557,7 @@ public final class CityInfoOuterClass {
return this;
}
/**
* <code>uint32 crystal_num = 10;</code>
* <code>uint32 crystal_num = 9;</code>
* @return This builder for chaining.
*/
public Builder clearCrystalNum() {
@@ -597,6 +566,37 @@ public final class CityInfoOuterClass {
onChanged();
return this;
}
private int level_ ;
/**
* <code>uint32 level = 5;</code>
* @return The level.
*/
@java.lang.Override
public int getLevel() {
return level_;
}
/**
* <code>uint32 level = 5;</code>
* @param value The level to set.
* @return This builder for chaining.
*/
public Builder setLevel(int value) {
level_ = value;
onChanged();
return this;
}
/**
* <code>uint32 level = 5;</code>
* @return This builder for chaining.
*/
public Builder clearLevel() {
level_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -664,8 +664,8 @@ public final class CityInfoOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\016CityInfo.proto\"?\n\010CityInfo\022\r\n\005level\030\016 " +
"\001(\r\022\017\n\007city_id\030\r \001(\r\022\023\n\013crystal_num\030\n \001(" +
"\n\016CityInfo.proto\"?\n\010CityInfo\022\017\n\007city_id\030" +
"\001 \001(\r\022\023\n\013crystal_num\030\t \001(\r\022\r\n\005level\030\005 \001(" +
"\rB\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -677,7 +677,7 @@ public final class CityInfoOuterClass {
internal_static_CityInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_CityInfo_descriptor,
new java.lang.String[] { "Level", "CityId", "CrystalNum", });
new java.lang.String[] { "CityId", "CrystalNum", "Level", });
}
// @@protoc_insertion_point(outer_class_scope)