Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 21:49:54 +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/EntityEnvironmentInfoOuterClass.java
+26 -18
View File
@@ -19,18 +19,22 @@ public final class EntityEnvironmentInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 jsonClimateType = 1;</code>
* <code>uint32 json_climate_type = 1;</code>
* @return The jsonClimateType.
*/
int getJsonClimateType();
/**
* <code>uint32 climateAreaId = 2;</code>
* <code>uint32 climate_area_id = 2;</code>
* @return The climateAreaId.
*/
int getClimateAreaId();
}
/**
* <pre>
* Name: CPDBIKEOEDK
* </pre>
*
* Protobuf type {@code EntityEnvironmentInfo}
*/
public static final class EntityEnvironmentInfo extends
@@ -117,10 +121,10 @@ public final class EntityEnvironmentInfoOuterClass {
emu.grasscutter.net.proto.EntityEnvironmentInfoOuterClass.EntityEnvironmentInfo.class, emu.grasscutter.net.proto.EntityEnvironmentInfoOuterClass.EntityEnvironmentInfo.Builder.class);
}
public static final int JSONCLIMATETYPE_FIELD_NUMBER = 1;
public static final int JSON_CLIMATE_TYPE_FIELD_NUMBER = 1;
private int jsonClimateType_;
/**
* <code>uint32 jsonClimateType = 1;</code>
* <code>uint32 json_climate_type = 1;</code>
* @return The jsonClimateType.
*/
@java.lang.Override
@@ -128,10 +132,10 @@ public final class EntityEnvironmentInfoOuterClass {
return jsonClimateType_;
}
public static final int CLIMATEAREAID_FIELD_NUMBER = 2;
public static final int CLIMATE_AREA_ID_FIELD_NUMBER = 2;
private int climateAreaId_;
/**
* <code>uint32 climateAreaId = 2;</code>
* <code>uint32 climate_area_id = 2;</code>
* @return The climateAreaId.
*/
@java.lang.Override
@@ -206,9 +210,9 @@ public final class EntityEnvironmentInfoOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + JSONCLIMATETYPE_FIELD_NUMBER;
hash = (37 * hash) + JSON_CLIMATE_TYPE_FIELD_NUMBER;
hash = (53 * hash) + getJsonClimateType();
hash = (37 * hash) + CLIMATEAREAID_FIELD_NUMBER;
hash = (37 * hash) + CLIMATE_AREA_ID_FIELD_NUMBER;
hash = (53 * hash) + getClimateAreaId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
@@ -306,6 +310,10 @@ public final class EntityEnvironmentInfoOuterClass {
return builder;
}
/**
* <pre>
* Name: CPDBIKEOEDK
* </pre>
*
* Protobuf type {@code EntityEnvironmentInfo}
*/
public static final class Builder extends
@@ -460,7 +468,7 @@ public final class EntityEnvironmentInfoOuterClass {
private int jsonClimateType_ ;
/**
* <code>uint32 jsonClimateType = 1;</code>
* <code>uint32 json_climate_type = 1;</code>
* @return The jsonClimateType.
*/
@java.lang.Override
@@ -468,7 +476,7 @@ public final class EntityEnvironmentInfoOuterClass {
return jsonClimateType_;
}
/**
* <code>uint32 jsonClimateType = 1;</code>
* <code>uint32 json_climate_type = 1;</code>
* @param value The jsonClimateType to set.
* @return This builder for chaining.
*/
@@ -479,7 +487,7 @@ public final class EntityEnvironmentInfoOuterClass {
return this;
}
/**
* <code>uint32 jsonClimateType = 1;</code>
* <code>uint32 json_climate_type = 1;</code>
* @return This builder for chaining.
*/
public Builder clearJsonClimateType() {
@@ -491,7 +499,7 @@ public final class EntityEnvironmentInfoOuterClass {
private int climateAreaId_ ;
/**
* <code>uint32 climateAreaId = 2;</code>
* <code>uint32 climate_area_id = 2;</code>
* @return The climateAreaId.
*/
@java.lang.Override
@@ -499,7 +507,7 @@ public final class EntityEnvironmentInfoOuterClass {
return climateAreaId_;
}
/**
* <code>uint32 climateAreaId = 2;</code>
* <code>uint32 climate_area_id = 2;</code>
* @param value The climateAreaId to set.
* @return This builder for chaining.
*/
@@ -510,7 +518,7 @@ public final class EntityEnvironmentInfoOuterClass {
return this;
}
/**
* <code>uint32 climateAreaId = 2;</code>
* <code>uint32 climate_area_id = 2;</code>
* @return This builder for chaining.
*/
public Builder clearClimateAreaId() {
@@ -586,10 +594,10 @@ public final class EntityEnvironmentInfoOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\033EntityEnvironmentInfo.proto\"G\n\025EntityE" +
"nvironmentInfo\022\027\n\017jsonClimateType\030\001 \001(\r\022" +
"\025\n\rclimateAreaId\030\002 \001(\rB\033\n\031emu.grasscutte" +
"r.net.protob\006proto3"
"\n\033EntityEnvironmentInfo.proto\"K\n\025EntityE" +
"nvironmentInfo\022\031\n\021json_climate_type\030\001 \001(" +
"\r\022\027\n\017climate_area_id\030\002 \001(\rB\033\n\031emu.grassc" +
"utter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,