Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-16 23:52:37 +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/AbilityMetaReInitOverrideMapOuterClass.java
+41 -33
View File
@@ -19,30 +19,34 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
java.util.List<emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry>
getOverrideMapList();
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry getOverrideMap(int index);
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
int getOverrideMapCount();
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
java.util.List<? extends emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntryOrBuilder>
getOverrideMapOrBuilderList();
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntryOrBuilder getOverrideMapOrBuilder(
int index);
}
/**
* <pre>
* Name: EEACBNFBEHI
* </pre>
*
* Protobuf type {@code AbilityMetaReInitOverrideMap}
*/
public static final class AbilityMetaReInitOverrideMap extends
@@ -89,7 +93,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
case 0:
done = true;
break;
case 82: {
case 74: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
overrideMap_ = new java.util.ArrayList<emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry>();
mutable_bitField0_ |= 0x00000001;
@@ -133,17 +137,17 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
emu.grasscutter.net.proto.AbilityMetaReInitOverrideMapOuterClass.AbilityMetaReInitOverrideMap.class, emu.grasscutter.net.proto.AbilityMetaReInitOverrideMapOuterClass.AbilityMetaReInitOverrideMap.Builder.class);
}
public static final int OVERRIDE_MAP_FIELD_NUMBER = 10;
public static final int OVERRIDE_MAP_FIELD_NUMBER = 9;
private java.util.List<emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry> overrideMap_;
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
@java.lang.Override
public java.util.List<emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry> getOverrideMapList() {
return overrideMap_;
}
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
@java.lang.Override
public java.util.List<? extends emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntryOrBuilder>
@@ -151,21 +155,21 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
return overrideMap_;
}
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
@java.lang.Override
public int getOverrideMapCount() {
return overrideMap_.size();
}
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry getOverrideMap(int index) {
return overrideMap_.get(index);
}
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntryOrBuilder getOverrideMapOrBuilder(
@@ -188,7 +192,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
for (int i = 0; i < overrideMap_.size(); i++) {
output.writeMessage(10, overrideMap_.get(i));
output.writeMessage(9, overrideMap_.get(i));
}
unknownFields.writeTo(output);
}
@@ -201,7 +205,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
size = 0;
for (int i = 0; i < overrideMap_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(10, overrideMap_.get(i));
.computeMessageSize(9, overrideMap_.get(i));
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -331,6 +335,10 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
return builder;
}
/**
* <pre>
* Name: EEACBNFBEHI
* </pre>
*
* Protobuf type {@code AbilityMetaReInitOverrideMap}
*/
public static final class Builder extends
@@ -528,7 +536,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry, emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder, emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntryOrBuilder> overrideMapBuilder_;
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
public java.util.List<emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry> getOverrideMapList() {
if (overrideMapBuilder_ == null) {
@@ -538,7 +546,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
}
}
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
public int getOverrideMapCount() {
if (overrideMapBuilder_ == null) {
@@ -548,7 +556,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
}
}
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry getOverrideMap(int index) {
if (overrideMapBuilder_ == null) {
@@ -558,7 +566,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
}
}
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
public Builder setOverrideMap(
int index, emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry value) {
@@ -575,7 +583,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
return this;
}
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
public Builder setOverrideMap(
int index, emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder builderForValue) {
@@ -589,7 +597,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
return this;
}
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
public Builder addOverrideMap(emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry value) {
if (overrideMapBuilder_ == null) {
@@ -605,7 +613,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
return this;
}
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
public Builder addOverrideMap(
int index, emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry value) {
@@ -622,7 +630,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
return this;
}
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
public Builder addOverrideMap(
emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder builderForValue) {
@@ -636,7 +644,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
return this;
}
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
public Builder addOverrideMap(
int index, emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder builderForValue) {
@@ -650,7 +658,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
return this;
}
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
public Builder addAllOverrideMap(
java.lang.Iterable<? extends emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry> values) {
@@ -665,7 +673,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
return this;
}
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
public Builder clearOverrideMap() {
if (overrideMapBuilder_ == null) {
@@ -678,7 +686,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
return this;
}
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
public Builder removeOverrideMap(int index) {
if (overrideMapBuilder_ == null) {
@@ -691,14 +699,14 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
return this;
}
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder getOverrideMapBuilder(
int index) {
return getOverrideMapFieldBuilder().getBuilder(index);
}
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntryOrBuilder getOverrideMapOrBuilder(
int index) {
@@ -708,7 +716,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
}
}
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
public java.util.List<? extends emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntryOrBuilder>
getOverrideMapOrBuilderList() {
@@ -719,14 +727,14 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
}
}
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder addOverrideMapBuilder() {
return getOverrideMapFieldBuilder().addBuilder(
emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.getDefaultInstance());
}
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder addOverrideMapBuilder(
int index) {
@@ -734,7 +742,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
index, emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.getDefaultInstance());
}
/**
* <code>repeated .AbilityScalarValueEntry override_map = 10;</code>
* <code>repeated .AbilityScalarValueEntry override_map = 9;</code>
*/
public java.util.List<emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder>
getOverrideMapBuilderList() {
@@ -823,7 +831,7 @@ public final class AbilityMetaReInitOverrideMapOuterClass {
java.lang.String[] descriptorData = {
"\n\"AbilityMetaReInitOverrideMap.proto\032\035Ab" +
"ilityScalarValueEntry.proto\"N\n\034AbilityMe" +
"taReInitOverrideMap\022.\n\014override_map\030\n \003(" +
"taReInitOverrideMap\022.\n\014override_map\030\t \003(" +
"\0132\030.AbilityScalarValueEntryB\033\n\031emu.grass" +
"cutter.net.protob\006proto3"
};