Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 10:55:02 +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/TanukiTravelLevelDataOuterClass.java
+135 -127
View File
@@ -19,24 +19,28 @@ public final class TanukiTravelLevelDataOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>bool isFinish = 2;</code>
* @return The isFinish.
* <code>bool is_open = 7;</code>
* @return The isOpen.
*/
boolean getIsFinish();
boolean getIsOpen();
/**
* <code>uint32 routeId = 1;</code>
* <code>uint32 route_id = 5;</code>
* @return The routeId.
*/
int getRouteId();
/**
* <code>bool isOpen = 8;</code>
* @return The isOpen.
* <code>bool is_finish = 9;</code>
* @return The isFinish.
*/
boolean getIsOpen();
boolean getIsFinish();
}
/**
* <pre>
* Name: CCIIHPEKIPM
* </pre>
*
* Protobuf type {@code TanukiTravelLevelData}
*/
public static final class TanukiTravelLevelData extends
@@ -81,21 +85,21 @@ public final class TanukiTravelLevelDataOuterClass {
case 0:
done = true;
break;
case 8: {
case 40: {
routeId_ = input.readUInt32();
break;
}
case 16: {
isFinish_ = input.readBool();
break;
}
case 64: {
case 56: {
isOpen_ = input.readBool();
break;
}
case 72: {
isFinish_ = input.readBool();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -128,21 +132,21 @@ public final class TanukiTravelLevelDataOuterClass {
emu.grasscutter.net.proto.TanukiTravelLevelDataOuterClass.TanukiTravelLevelData.class, emu.grasscutter.net.proto.TanukiTravelLevelDataOuterClass.TanukiTravelLevelData.Builder.class);
}
public static final int ISFINISH_FIELD_NUMBER = 2;
private boolean isFinish_;
public static final int IS_OPEN_FIELD_NUMBER = 7;
private boolean isOpen_;
/**
* <code>bool isFinish = 2;</code>
* @return The isFinish.
* <code>bool is_open = 7;</code>
* @return The isOpen.
*/
@java.lang.Override
public boolean getIsFinish() {
return isFinish_;
public boolean getIsOpen() {
return isOpen_;
}
public static final int ROUTEID_FIELD_NUMBER = 1;
public static final int ROUTE_ID_FIELD_NUMBER = 5;
private int routeId_;
/**
* <code>uint32 routeId = 1;</code>
* <code>uint32 route_id = 5;</code>
* @return The routeId.
*/
@java.lang.Override
@@ -150,15 +154,15 @@ public final class TanukiTravelLevelDataOuterClass {
return routeId_;
}
public static final int ISOPEN_FIELD_NUMBER = 8;
private boolean isOpen_;
public static final int IS_FINISH_FIELD_NUMBER = 9;
private boolean isFinish_;
/**
* <code>bool isOpen = 8;</code>
* @return The isOpen.
* <code>bool is_finish = 9;</code>
* @return The isFinish.
*/
@java.lang.Override
public boolean getIsOpen() {
return isOpen_;
public boolean getIsFinish() {
return isFinish_;
}
private byte memoizedIsInitialized = -1;
@@ -176,13 +180,13 @@ public final class TanukiTravelLevelDataOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (routeId_ != 0) {
output.writeUInt32(1, routeId_);
}
if (isFinish_ != false) {
output.writeBool(2, isFinish_);
output.writeUInt32(5, routeId_);
}
if (isOpen_ != false) {
output.writeBool(8, isOpen_);
output.writeBool(7, isOpen_);
}
if (isFinish_ != false) {
output.writeBool(9, isFinish_);
}
unknownFields.writeTo(output);
}
@@ -195,15 +199,15 @@ public final class TanukiTravelLevelDataOuterClass {
size = 0;
if (routeId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, routeId_);
}
if (isFinish_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(2, isFinish_);
.computeUInt32Size(5, routeId_);
}
if (isOpen_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(8, isOpen_);
.computeBoolSize(7, isOpen_);
}
if (isFinish_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(9, isFinish_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -220,12 +224,12 @@ public final class TanukiTravelLevelDataOuterClass {
}
emu.grasscutter.net.proto.TanukiTravelLevelDataOuterClass.TanukiTravelLevelData other = (emu.grasscutter.net.proto.TanukiTravelLevelDataOuterClass.TanukiTravelLevelData) obj;
if (getIsFinish()
!= other.getIsFinish()) return false;
if (getRouteId()
!= other.getRouteId()) return false;
if (getIsOpen()
!= other.getIsOpen()) return false;
if (getRouteId()
!= other.getRouteId()) return false;
if (getIsFinish()
!= other.getIsFinish()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -237,14 +241,14 @@ public final class TanukiTravelLevelDataOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + ISFINISH_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsFinish());
hash = (37 * hash) + ROUTEID_FIELD_NUMBER;
hash = (53 * hash) + getRouteId();
hash = (37 * hash) + ISOPEN_FIELD_NUMBER;
hash = (37 * hash) + IS_OPEN_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsOpen());
hash = (37 * hash) + ROUTE_ID_FIELD_NUMBER;
hash = (53 * hash) + getRouteId();
hash = (37 * hash) + IS_FINISH_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsFinish());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -341,6 +345,10 @@ public final class TanukiTravelLevelDataOuterClass {
return builder;
}
/**
* <pre>
* Name: CCIIHPEKIPM
* </pre>
*
* Protobuf type {@code TanukiTravelLevelData}
*/
public static final class Builder extends
@@ -378,11 +386,11 @@ public final class TanukiTravelLevelDataOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
isFinish_ = false;
isOpen_ = false;
routeId_ = 0;
isOpen_ = false;
isFinish_ = false;
return this;
}
@@ -410,9 +418,9 @@ public final class TanukiTravelLevelDataOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.TanukiTravelLevelDataOuterClass.TanukiTravelLevelData buildPartial() {
emu.grasscutter.net.proto.TanukiTravelLevelDataOuterClass.TanukiTravelLevelData result = new emu.grasscutter.net.proto.TanukiTravelLevelDataOuterClass.TanukiTravelLevelData(this);
result.isFinish_ = isFinish_;
result.routeId_ = routeId_;
result.isOpen_ = isOpen_;
result.routeId_ = routeId_;
result.isFinish_ = isFinish_;
onBuilt();
return result;
}
@@ -461,14 +469,14 @@ public final class TanukiTravelLevelDataOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.TanukiTravelLevelDataOuterClass.TanukiTravelLevelData other) {
if (other == emu.grasscutter.net.proto.TanukiTravelLevelDataOuterClass.TanukiTravelLevelData.getDefaultInstance()) return this;
if (other.getIsFinish() != false) {
setIsFinish(other.getIsFinish());
if (other.getIsOpen() != false) {
setIsOpen(other.getIsOpen());
}
if (other.getRouteId() != 0) {
setRouteId(other.getRouteId());
}
if (other.getIsOpen() != false) {
setIsOpen(other.getIsOpen());
if (other.getIsFinish() != false) {
setIsFinish(other.getIsFinish());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -499,71 +507,9 @@ public final class TanukiTravelLevelDataOuterClass {
return this;
}
private boolean isFinish_ ;
/**
* <code>bool isFinish = 2;</code>
* @return The isFinish.
*/
@java.lang.Override
public boolean getIsFinish() {
return isFinish_;
}
/**
* <code>bool isFinish = 2;</code>
* @param value The isFinish to set.
* @return This builder for chaining.
*/
public Builder setIsFinish(boolean value) {
isFinish_ = value;
onChanged();
return this;
}
/**
* <code>bool isFinish = 2;</code>
* @return This builder for chaining.
*/
public Builder clearIsFinish() {
isFinish_ = false;
onChanged();
return this;
}
private int routeId_ ;
/**
* <code>uint32 routeId = 1;</code>
* @return The routeId.
*/
@java.lang.Override
public int getRouteId() {
return routeId_;
}
/**
* <code>uint32 routeId = 1;</code>
* @param value The routeId to set.
* @return This builder for chaining.
*/
public Builder setRouteId(int value) {
routeId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 routeId = 1;</code>
* @return This builder for chaining.
*/
public Builder clearRouteId() {
routeId_ = 0;
onChanged();
return this;
}
private boolean isOpen_ ;
/**
* <code>bool isOpen = 8;</code>
* <code>bool is_open = 7;</code>
* @return The isOpen.
*/
@java.lang.Override
@@ -571,7 +517,7 @@ public final class TanukiTravelLevelDataOuterClass {
return isOpen_;
}
/**
* <code>bool isOpen = 8;</code>
* <code>bool is_open = 7;</code>
* @param value The isOpen to set.
* @return This builder for chaining.
*/
@@ -582,7 +528,7 @@ public final class TanukiTravelLevelDataOuterClass {
return this;
}
/**
* <code>bool isOpen = 8;</code>
* <code>bool is_open = 7;</code>
* @return This builder for chaining.
*/
public Builder clearIsOpen() {
@@ -591,6 +537,68 @@ public final class TanukiTravelLevelDataOuterClass {
onChanged();
return this;
}
private int routeId_ ;
/**
* <code>uint32 route_id = 5;</code>
* @return The routeId.
*/
@java.lang.Override
public int getRouteId() {
return routeId_;
}
/**
* <code>uint32 route_id = 5;</code>
* @param value The routeId to set.
* @return This builder for chaining.
*/
public Builder setRouteId(int value) {
routeId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 route_id = 5;</code>
* @return This builder for chaining.
*/
public Builder clearRouteId() {
routeId_ = 0;
onChanged();
return this;
}
private boolean isFinish_ ;
/**
* <code>bool is_finish = 9;</code>
* @return The isFinish.
*/
@java.lang.Override
public boolean getIsFinish() {
return isFinish_;
}
/**
* <code>bool is_finish = 9;</code>
* @param value The isFinish to set.
* @return This builder for chaining.
*/
public Builder setIsFinish(boolean value) {
isFinish_ = value;
onChanged();
return this;
}
/**
* <code>bool is_finish = 9;</code>
* @return This builder for chaining.
*/
public Builder clearIsFinish() {
isFinish_ = false;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -658,10 +666,10 @@ public final class TanukiTravelLevelDataOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\033TanukiTravelLevelData.proto\"J\n\025TanukiT" +
"ravelLevelData\022\020\n\010isFinish\030\002 \001(\010\022\017\n\007rout" +
"eId\030\001 \001(\r\022\016\n\006isOpen\030\010 \001(\010B\033\n\031emu.grasscu" +
"tter.net.protob\006proto3"
"\n\033TanukiTravelLevelData.proto\"M\n\025TanukiT" +
"ravelLevelData\022\017\n\007is_open\030\007 \001(\010\022\020\n\010route" +
"_id\030\005 \001(\r\022\021\n\tis_finish\030\t \001(\010B\033\n\031emu.gras" +
"scutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -672,7 +680,7 @@ public final class TanukiTravelLevelDataOuterClass {
internal_static_TanukiTravelLevelData_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_TanukiTravelLevelData_descriptor,
new java.lang.String[] { "IsFinish", "RouteId", "IsOpen", });
new java.lang.String[] { "IsOpen", "RouteId", "IsFinish", });
}
// @@protoc_insertion_point(outer_class_scope)