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

Add support for v3.5.0 (#2090)

Browse Source 
* Fix Dvalin battle

See https://github.com/Anime-Game-Servers/Grasscutter-Quests/pull/25.

This is entirely untested and there's a 99% chance it's broken, I'm just submitting it as a draft PR so that I don't forget about its existence.

Co-Authored-By: mjolsic <21289772+mjolsic@users.noreply.github.com>

* Update protos

* 3.4 protos

* Fix

Now builds successfully, don't have the time to check if I should have specified true instead of false for withChildQuests, or if this functions as intended.

* Change from false to true

Per what smileoflove has been told on Discord

* 3.5

* Remove the Dvalin crap from this PR

Git is so confusing

* Update version

* Apply README changes from `origin/development`

* Remove unnecessary debugging information

---------

Co-authored-by: mjolsic <21289772+mjolsic@users.noreply.github.com>
Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
This commit is contained in:
Colleiflower
2023-03-31 19:13:32 +00:00
committed by GitHub
Unverified
parent 922f7bca51
commit 516e5975e1
1383 changed files with 167226 additions and 586936 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/CityInfoOuterClass.java
+132 -124
View File
@@ -19,24 +19,28 @@ public final class CityInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 crystalNum = 15;</code>
* @return The crystalNum.
* <code>uint32 level = 14;</code>
* @return The level.
*/
int getCrystalNum();
int getLevel();
/**
* <code>uint32 cityId = 6;</code>
* <code>uint32 city_id = 13;</code>
* @return The cityId.
*/
int getCityId();
/**
* <code>uint32 level = 11;</code>
* @return The level.
* <code>uint32 crystal_num = 10;</code>
* @return The crystalNum.
*/
int getLevel();
int getCrystalNum();
}
/**
* <pre>
* Name: GGDCLBEFCNO
* </pre>
*
* Protobuf type {@code CityInfo}
*/
public static final class CityInfo extends
@@ -81,21 +85,21 @@ public final class CityInfoOuterClass {
case 0:
done = true;
break;
case 48: {
case 80: {
crystalNum_ = input.readUInt32();
break;
}
case 104: {
cityId_ = input.readUInt32();
break;
}
case 88: {
case 112: {
level_ = input.readUInt32();
break;
}
case 120: {
crystalNum_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -128,21 +132,21 @@ public final class CityInfoOuterClass {
emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.class, emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder.class);
}
public static final int CRYSTALNUM_FIELD_NUMBER = 15;
private int crystalNum_;
public static final int LEVEL_FIELD_NUMBER = 14;
private int level_;
/**
* <code>uint32 crystalNum = 15;</code>
* @return The crystalNum.
* <code>uint32 level = 14;</code>
* @return The level.
*/
@java.lang.Override
public int getCrystalNum() {
return crystalNum_;
public int getLevel() {
return level_;
}
public static final int CITYID_FIELD_NUMBER = 6;
public static final int CITY_ID_FIELD_NUMBER = 13;
private int cityId_;
/**
* <code>uint32 cityId = 6;</code>
* <code>uint32 city_id = 13;</code>
* @return The cityId.
*/
@java.lang.Override
@@ -150,15 +154,15 @@ public final class CityInfoOuterClass {
return cityId_;
}
public static final int LEVEL_FIELD_NUMBER = 11;
private int level_;
public static final int CRYSTAL_NUM_FIELD_NUMBER = 10;
private int crystalNum_;
/**
* <code>uint32 level = 11;</code>
* @return The level.
* <code>uint32 crystal_num = 10;</code>
* @return The crystalNum.
*/
@java.lang.Override
public int getLevel() {
return level_;
public int getCrystalNum() {
return crystalNum_;
}
private byte memoizedIsInitialized = -1;
@@ -175,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(6, cityId_);
output.writeUInt32(13, cityId_);
}
if (level_ != 0) {
output.writeUInt32(11, level_);
}
if (crystalNum_ != 0) {
output.writeUInt32(15, crystalNum_);
output.writeUInt32(14, level_);
}
unknownFields.writeTo(output);
}
@@ -193,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(6, cityId_);
.computeUInt32Size(13, cityId_);
}
if (level_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, level_);
}
if (crystalNum_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, crystalNum_);
.computeUInt32Size(14, level_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -220,12 +224,12 @@ public final class CityInfoOuterClass {
}
emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo other = (emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo) obj;
if (getCrystalNum()
!= other.getCrystalNum()) return false;
if (getCityId()
!= other.getCityId()) return false;
if (getLevel()
!= other.getLevel()) return false;
if (getCityId()
!= other.getCityId()) return false;
if (getCrystalNum()
!= other.getCrystalNum()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -237,12 +241,12 @@ public final class CityInfoOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + CRYSTALNUM_FIELD_NUMBER;
hash = (53 * hash) + getCrystalNum();
hash = (37 * hash) + CITYID_FIELD_NUMBER;
hash = (53 * hash) + getCityId();
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 = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -339,6 +343,10 @@ public final class CityInfoOuterClass {
return builder;
}
/**
* <pre>
* Name: GGDCLBEFCNO
* </pre>
*
* Protobuf type {@code CityInfo}
*/
public static final class Builder extends
@@ -376,11 +384,11 @@ public final class CityInfoOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
crystalNum_ = 0;
level_ = 0;
cityId_ = 0;
level_ = 0;
crystalNum_ = 0;
return this;
}
@@ -408,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.crystalNum_ = crystalNum_;
result.cityId_ = cityId_;
result.level_ = level_;
result.cityId_ = cityId_;
result.crystalNum_ = crystalNum_;
onBuilt();
return result;
}
@@ -459,14 +467,14 @@ 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.getCrystalNum() != 0) {
setCrystalNum(other.getCrystalNum());
if (other.getLevel() != 0) {
setLevel(other.getLevel());
}
if (other.getCityId() != 0) {
setCityId(other.getCityId());
}
if (other.getLevel() != 0) {
setLevel(other.getLevel());
if (other.getCrystalNum() != 0) {
setCrystalNum(other.getCrystalNum());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -497,71 +505,9 @@ public final class CityInfoOuterClass {
return this;
}
private int crystalNum_ ;
/**
* <code>uint32 crystalNum = 15;</code>
* @return The crystalNum.
*/
@java.lang.Override
public int getCrystalNum() {
return crystalNum_;
}
/**
* <code>uint32 crystalNum = 15;</code>
* @param value The crystalNum to set.
* @return This builder for chaining.
*/
public Builder setCrystalNum(int value) {
crystalNum_ = value;
onChanged();
return this;
}
/**
* <code>uint32 crystalNum = 15;</code>
* @return This builder for chaining.
*/
public Builder clearCrystalNum() {
crystalNum_ = 0;
onChanged();
return this;
}
private int cityId_ ;
/**
* <code>uint32 cityId = 6;</code>
* @return The cityId.
*/
@java.lang.Override
public int getCityId() {
return cityId_;
}
/**
* <code>uint32 cityId = 6;</code>
* @param value The cityId to set.
* @return This builder for chaining.
*/
public Builder setCityId(int value) {
cityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 cityId = 6;</code>
* @return This builder for chaining.
*/
public Builder clearCityId() {
cityId_ = 0;
onChanged();
return this;
}
private int level_ ;
/**
* <code>uint32 level = 11;</code>
* <code>uint32 level = 14;</code>
* @return The level.
*/
@java.lang.Override
@@ -569,7 +515,7 @@ public final class CityInfoOuterClass {
return level_;
}
/**
* <code>uint32 level = 11;</code>
* <code>uint32 level = 14;</code>
* @param value The level to set.
* @return This builder for chaining.
*/
@@ -580,7 +526,7 @@ public final class CityInfoOuterClass {
return this;
}
/**
* <code>uint32 level = 11;</code>
* <code>uint32 level = 14;</code>
* @return This builder for chaining.
*/
public Builder clearLevel() {
@@ -589,6 +535,68 @@ public final class CityInfoOuterClass {
onChanged();
return this;
}
private int cityId_ ;
/**
* <code>uint32 city_id = 13;</code>
* @return The cityId.
*/
@java.lang.Override
public int getCityId() {
return cityId_;
}
/**
* <code>uint32 city_id = 13;</code>
* @param value The cityId to set.
* @return This builder for chaining.
*/
public Builder setCityId(int value) {
cityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 city_id = 13;</code>
* @return This builder for chaining.
*/
public Builder clearCityId() {
cityId_ = 0;
onChanged();
return this;
}
private int crystalNum_ ;
/**
* <code>uint32 crystal_num = 10;</code>
* @return The crystalNum.
*/
@java.lang.Override
public int getCrystalNum() {
return crystalNum_;
}
/**
* <code>uint32 crystal_num = 10;</code>
* @param value The crystalNum to set.
* @return This builder for chaining.
*/
public Builder setCrystalNum(int value) {
crystalNum_ = value;
onChanged();
return this;
}
/**
* <code>uint32 crystal_num = 10;</code>
* @return This builder for chaining.
*/
public Builder clearCrystalNum() {
crystalNum_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -656,9 +664,9 @@ public final class CityInfoOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\016CityInfo.proto\"=\n\010CityInfo\022\022\n\ncrystalN" +
"um\030\017 \001(\r\022\016\n\006cityId\030\006 \001(\r\022\r\n\005level\030\013 \001(\rB" +
"\033\n\031emu.grasscutter.net.protob\006proto3"
"\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(" +
"\rB\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -669,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[] { "CrystalNum", "CityId", "Level", });
new java.lang.String[] { "Level", "CityId", "CrystalNum", });
}
// @@protoc_insertion_point(outer_class_scope)