Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 21:09:55 +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/SceneFishInfoOuterClass.java
+59 -51
View File
@@ -19,45 +19,49 @@ public final class SceneFishInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 fishId = 1;</code>
* <code>uint32 fish_id = 1;</code>
* @return The fishId.
*/
int getFishId();
/**
* <code>uint32 fishPoolEntityId = 2;</code>
* <code>uint32 fish_pool_entity_id = 2;</code>
* @return The fishPoolEntityId.
*/
int getFishPoolEntityId();
/**
* <code>.Vector fishPoolPos = 3;</code>
* <code>.Vector fish_pool_pos = 3;</code>
* @return Whether the fishPoolPos field is set.
*/
boolean hasFishPoolPos();
/**
* <code>.Vector fishPoolPos = 3;</code>
* <code>.Vector fish_pool_pos = 3;</code>
* @return The fishPoolPos.
*/
emu.grasscutter.net.proto.VectorOuterClass.Vector getFishPoolPos();
/**
* <code>.Vector fishPoolPos = 3;</code>
* <code>.Vector fish_pool_pos = 3;</code>
*/
emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getFishPoolPosOrBuilder();
/**
* <code>uint32 fishPoolGadgetId = 4;</code>
* <code>uint32 fish_pool_gadget_id = 4;</code>
* @return The fishPoolGadgetId.
*/
int getFishPoolGadgetId();
/**
* <code>uint32 lastShockTime = 5;</code>
* <code>uint32 last_shock_time = 5;</code>
* @return The lastShockTime.
*/
int getLastShockTime();
}
/**
* <pre>
* Name: PBOJPLIHGGO
* </pre>
*
* Protobuf type {@code SceneFishInfo}
*/
public static final class SceneFishInfo extends
@@ -167,10 +171,10 @@ public final class SceneFishInfoOuterClass {
emu.grasscutter.net.proto.SceneFishInfoOuterClass.SceneFishInfo.class, emu.grasscutter.net.proto.SceneFishInfoOuterClass.SceneFishInfo.Builder.class);
}
public static final int FISHID_FIELD_NUMBER = 1;
public static final int FISH_ID_FIELD_NUMBER = 1;
private int fishId_;
/**
* <code>uint32 fishId = 1;</code>
* <code>uint32 fish_id = 1;</code>
* @return The fishId.
*/
@java.lang.Override
@@ -178,10 +182,10 @@ public final class SceneFishInfoOuterClass {
return fishId_;
}
public static final int FISHPOOLENTITYID_FIELD_NUMBER = 2;
public static final int FISH_POOL_ENTITY_ID_FIELD_NUMBER = 2;
private int fishPoolEntityId_;
/**
* <code>uint32 fishPoolEntityId = 2;</code>
* <code>uint32 fish_pool_entity_id = 2;</code>
* @return The fishPoolEntityId.
*/
@java.lang.Override
@@ -189,10 +193,10 @@ public final class SceneFishInfoOuterClass {
return fishPoolEntityId_;
}
public static final int FISHPOOLPOS_FIELD_NUMBER = 3;
public static final int FISH_POOL_POS_FIELD_NUMBER = 3;
private emu.grasscutter.net.proto.VectorOuterClass.Vector fishPoolPos_;
/**
* <code>.Vector fishPoolPos = 3;</code>
* <code>.Vector fish_pool_pos = 3;</code>
* @return Whether the fishPoolPos field is set.
*/
@java.lang.Override
@@ -200,7 +204,7 @@ public final class SceneFishInfoOuterClass {
return fishPoolPos_ != null;
}
/**
* <code>.Vector fishPoolPos = 3;</code>
* <code>.Vector fish_pool_pos = 3;</code>
* @return The fishPoolPos.
*/
@java.lang.Override
@@ -208,17 +212,17 @@ public final class SceneFishInfoOuterClass {
return fishPoolPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : fishPoolPos_;
}
/**
* <code>.Vector fishPoolPos = 3;</code>
* <code>.Vector fish_pool_pos = 3;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getFishPoolPosOrBuilder() {
return getFishPoolPos();
}
public static final int FISHPOOLGADGETID_FIELD_NUMBER = 4;
public static final int FISH_POOL_GADGET_ID_FIELD_NUMBER = 4;
private int fishPoolGadgetId_;
/**
* <code>uint32 fishPoolGadgetId = 4;</code>
* <code>uint32 fish_pool_gadget_id = 4;</code>
* @return The fishPoolGadgetId.
*/
@java.lang.Override
@@ -226,10 +230,10 @@ public final class SceneFishInfoOuterClass {
return fishPoolGadgetId_;
}
public static final int LASTSHOCKTIME_FIELD_NUMBER = 5;
public static final int LAST_SHOCK_TIME_FIELD_NUMBER = 5;
private int lastShockTime_;
/**
* <code>uint32 lastShockTime = 5;</code>
* <code>uint32 last_shock_time = 5;</code>
* @return The lastShockTime.
*/
@java.lang.Override
@@ -334,17 +338,17 @@ public final class SceneFishInfoOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + FISHID_FIELD_NUMBER;
hash = (37 * hash) + FISH_ID_FIELD_NUMBER;
hash = (53 * hash) + getFishId();
hash = (37 * hash) + FISHPOOLENTITYID_FIELD_NUMBER;
hash = (37 * hash) + FISH_POOL_ENTITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getFishPoolEntityId();
if (hasFishPoolPos()) {
hash = (37 * hash) + FISHPOOLPOS_FIELD_NUMBER;
hash = (37 * hash) + FISH_POOL_POS_FIELD_NUMBER;
hash = (53 * hash) + getFishPoolPos().hashCode();
}
hash = (37 * hash) + FISHPOOLGADGETID_FIELD_NUMBER;
hash = (37 * hash) + FISH_POOL_GADGET_ID_FIELD_NUMBER;
hash = (53 * hash) + getFishPoolGadgetId();
hash = (37 * hash) + LASTSHOCKTIME_FIELD_NUMBER;
hash = (37 * hash) + LAST_SHOCK_TIME_FIELD_NUMBER;
hash = (53 * hash) + getLastShockTime();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
@@ -442,6 +446,10 @@ public final class SceneFishInfoOuterClass {
return builder;
}
/**
* <pre>
* Name: PBOJPLIHGGO
* </pre>
*
* Protobuf type {@code SceneFishInfo}
*/
public static final class Builder extends
@@ -622,7 +630,7 @@ public final class SceneFishInfoOuterClass {
private int fishId_ ;
/**
* <code>uint32 fishId = 1;</code>
* <code>uint32 fish_id = 1;</code>
* @return The fishId.
*/
@java.lang.Override
@@ -630,7 +638,7 @@ public final class SceneFishInfoOuterClass {
return fishId_;
}
/**
* <code>uint32 fishId = 1;</code>
* <code>uint32 fish_id = 1;</code>
* @param value The fishId to set.
* @return This builder for chaining.
*/
@@ -641,7 +649,7 @@ public final class SceneFishInfoOuterClass {
return this;
}
/**
* <code>uint32 fishId = 1;</code>
* <code>uint32 fish_id = 1;</code>
* @return This builder for chaining.
*/
public Builder clearFishId() {
@@ -653,7 +661,7 @@ public final class SceneFishInfoOuterClass {
private int fishPoolEntityId_ ;
/**
* <code>uint32 fishPoolEntityId = 2;</code>
* <code>uint32 fish_pool_entity_id = 2;</code>
* @return The fishPoolEntityId.
*/
@java.lang.Override
@@ -661,7 +669,7 @@ public final class SceneFishInfoOuterClass {
return fishPoolEntityId_;
}
/**
* <code>uint32 fishPoolEntityId = 2;</code>
* <code>uint32 fish_pool_entity_id = 2;</code>
* @param value The fishPoolEntityId to set.
* @return This builder for chaining.
*/
@@ -672,7 +680,7 @@ public final class SceneFishInfoOuterClass {
return this;
}
/**
* <code>uint32 fishPoolEntityId = 2;</code>
* <code>uint32 fish_pool_entity_id = 2;</code>
* @return This builder for chaining.
*/
public Builder clearFishPoolEntityId() {
@@ -686,14 +694,14 @@ public final class SceneFishInfoOuterClass {
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> fishPoolPosBuilder_;
/**
* <code>.Vector fishPoolPos = 3;</code>
* <code>.Vector fish_pool_pos = 3;</code>
* @return Whether the fishPoolPos field is set.
*/
public boolean hasFishPoolPos() {
return fishPoolPosBuilder_ != null || fishPoolPos_ != null;
}
/**
* <code>.Vector fishPoolPos = 3;</code>
* <code>.Vector fish_pool_pos = 3;</code>
* @return The fishPoolPos.
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector getFishPoolPos() {
@@ -704,7 +712,7 @@ public final class SceneFishInfoOuterClass {
}
}
/**
* <code>.Vector fishPoolPos = 3;</code>
* <code>.Vector fish_pool_pos = 3;</code>
*/
public Builder setFishPoolPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (fishPoolPosBuilder_ == null) {
@@ -720,7 +728,7 @@ public final class SceneFishInfoOuterClass {
return this;
}
/**
* <code>.Vector fishPoolPos = 3;</code>
* <code>.Vector fish_pool_pos = 3;</code>
*/
public Builder setFishPoolPos(
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -734,7 +742,7 @@ public final class SceneFishInfoOuterClass {
return this;
}
/**
* <code>.Vector fishPoolPos = 3;</code>
* <code>.Vector fish_pool_pos = 3;</code>
*/
public Builder mergeFishPoolPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (fishPoolPosBuilder_ == null) {
@@ -752,7 +760,7 @@ public final class SceneFishInfoOuterClass {
return this;
}
/**
* <code>.Vector fishPoolPos = 3;</code>
* <code>.Vector fish_pool_pos = 3;</code>
*/
public Builder clearFishPoolPos() {
if (fishPoolPosBuilder_ == null) {
@@ -766,7 +774,7 @@ public final class SceneFishInfoOuterClass {
return this;
}
/**
* <code>.Vector fishPoolPos = 3;</code>
* <code>.Vector fish_pool_pos = 3;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getFishPoolPosBuilder() {
@@ -774,7 +782,7 @@ public final class SceneFishInfoOuterClass {
return getFishPoolPosFieldBuilder().getBuilder();
}
/**
* <code>.Vector fishPoolPos = 3;</code>
* <code>.Vector fish_pool_pos = 3;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getFishPoolPosOrBuilder() {
if (fishPoolPosBuilder_ != null) {
@@ -785,7 +793,7 @@ public final class SceneFishInfoOuterClass {
}
}
/**
* <code>.Vector fishPoolPos = 3;</code>
* <code>.Vector fish_pool_pos = 3;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>
@@ -803,7 +811,7 @@ public final class SceneFishInfoOuterClass {
private int fishPoolGadgetId_ ;
/**
* <code>uint32 fishPoolGadgetId = 4;</code>
* <code>uint32 fish_pool_gadget_id = 4;</code>
* @return The fishPoolGadgetId.
*/
@java.lang.Override
@@ -811,7 +819,7 @@ public final class SceneFishInfoOuterClass {
return fishPoolGadgetId_;
}
/**
* <code>uint32 fishPoolGadgetId = 4;</code>
* <code>uint32 fish_pool_gadget_id = 4;</code>
* @param value The fishPoolGadgetId to set.
* @return This builder for chaining.
*/
@@ -822,7 +830,7 @@ public final class SceneFishInfoOuterClass {
return this;
}
/**
* <code>uint32 fishPoolGadgetId = 4;</code>
* <code>uint32 fish_pool_gadget_id = 4;</code>
* @return This builder for chaining.
*/
public Builder clearFishPoolGadgetId() {
@@ -834,7 +842,7 @@ public final class SceneFishInfoOuterClass {
private int lastShockTime_ ;
/**
* <code>uint32 lastShockTime = 5;</code>
* <code>uint32 last_shock_time = 5;</code>
* @return The lastShockTime.
*/
@java.lang.Override
@@ -842,7 +850,7 @@ public final class SceneFishInfoOuterClass {
return lastShockTime_;
}
/**
* <code>uint32 lastShockTime = 5;</code>
* <code>uint32 last_shock_time = 5;</code>
* @param value The lastShockTime to set.
* @return This builder for chaining.
*/
@@ -853,7 +861,7 @@ public final class SceneFishInfoOuterClass {
return this;
}
/**
* <code>uint32 lastShockTime = 5;</code>
* <code>uint32 last_shock_time = 5;</code>
* @return This builder for chaining.
*/
public Builder clearLastShockTime() {
@@ -929,12 +937,12 @@ public final class SceneFishInfoOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\023SceneFishInfo.proto\032\014Vector.proto\"\210\001\n\r" +
"SceneFishInfo\022\016\n\006fishId\030\001 \001(\r\022\030\n\020fishPoo" +
"lEntityId\030\002 \001(\r\022\034\n\013fishPoolPos\030\003 \001(\0132\007.V" +
"ector\022\030\n\020fishPoolGadgetId\030\004 \001(\r\022\025\n\rlastS" +
"hockTime\030\005 \001(\rB\033\n\031emu.grasscutter.net.pr" +
"otob\006proto3"
"\n\023SceneFishInfo.proto\032\014Vector.proto\"\223\001\n\r" +
"SceneFishInfo\022\017\n\007fish_id\030\001 \001(\r\022\033\n\023fish_p" +
"ool_entity_id\030\002 \001(\r\022\036\n\rfish_pool_pos\030\003 \001" +
"(\0132\007.Vector\022\033\n\023fish_pool_gadget_id\030\004 \001(\r" +
"\022\027\n\017last_shock_time\030\005 \001(\rB\033\n\031emu.grasscu" +
"tter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,