Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 17:01:21 +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/EntityAbilityInvokeEntryOuterClass.java
+115 -107
View File
@@ -19,36 +19,40 @@ public final class EntityAbilityInvokeEntryOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>uint32 entity_id = 7;</code>
* @return The entityId.
*/
int getEntityId();
/**
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry>
getInvokesList();
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index);
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
int getInvokesCount();
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder>
getInvokesOrBuilderList();
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
int index);
/**
* <code>uint32 entityId = 9;</code>
* @return The entityId.
*/
int getEntityId();
}
/**
* <pre>
* Name: LFJEGCDDKCK
* </pre>
*
* Protobuf type {@code EntityAbilityInvokeEntry}
*/
public static final class EntityAbilityInvokeEntry extends
@@ -95,7 +99,12 @@ public final class EntityAbilityInvokeEntryOuterClass {
case 0:
done = true;
break;
case 34: {
case 56: {
entityId_ = input.readUInt32();
break;
}
case 90: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
invokes_ = new java.util.ArrayList<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry>();
mutable_bitField0_ |= 0x00000001;
@@ -104,11 +113,6 @@ public final class EntityAbilityInvokeEntryOuterClass {
input.readMessage(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.parser(), extensionRegistry));
break;
}
case 72: {
entityId_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -144,17 +148,28 @@ public final class EntityAbilityInvokeEntryOuterClass {
emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry.class, emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry.Builder.class);
}
public static final int INVOKES_FIELD_NUMBER = 4;
public static final int ENTITY_ID_FIELD_NUMBER = 7;
private int entityId_;
/**
* <code>uint32 entity_id = 7;</code>
* @return The entityId.
*/
@java.lang.Override
public int getEntityId() {
return entityId_;
}
public static final int INVOKES_FIELD_NUMBER = 11;
private java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> invokes_;
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
@java.lang.Override
public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> getInvokesList() {
return invokes_;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
@java.lang.Override
public java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder>
@@ -162,21 +177,21 @@ public final class EntityAbilityInvokeEntryOuterClass {
return invokes_;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
@java.lang.Override
public int getInvokesCount() {
return invokes_.size();
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index) {
return invokes_.get(index);
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
@@ -184,17 +199,6 @@ public final class EntityAbilityInvokeEntryOuterClass {
return invokes_.get(index);
}
public static final int ENTITYID_FIELD_NUMBER = 9;
private int entityId_;
/**
* <code>uint32 entityId = 9;</code>
* @return The entityId.
*/
@java.lang.Override
public int getEntityId() {
return entityId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -209,11 +213,11 @@ public final class EntityAbilityInvokeEntryOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
for (int i = 0; i < invokes_.size(); i++) {
output.writeMessage(4, invokes_.get(i));
}
if (entityId_ != 0) {
output.writeUInt32(9, entityId_);
output.writeUInt32(7, entityId_);
}
for (int i = 0; i < invokes_.size(); i++) {
output.writeMessage(11, invokes_.get(i));
}
unknownFields.writeTo(output);
}
@@ -224,13 +228,13 @@ public final class EntityAbilityInvokeEntryOuterClass {
if (size != -1) return size;
size = 0;
for (int i = 0; i < invokes_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(4, invokes_.get(i));
}
if (entityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, entityId_);
.computeUInt32Size(7, entityId_);
}
for (int i = 0; i < invokes_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(11, invokes_.get(i));
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -247,10 +251,10 @@ public final class EntityAbilityInvokeEntryOuterClass {
}
emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry other = (emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry) obj;
if (!getInvokesList()
.equals(other.getInvokesList())) return false;
if (getEntityId()
!= other.getEntityId()) return false;
if (!getInvokesList()
.equals(other.getInvokesList())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -262,12 +266,12 @@ public final class EntityAbilityInvokeEntryOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getEntityId();
if (getInvokesCount() > 0) {
hash = (37 * hash) + INVOKES_FIELD_NUMBER;
hash = (53 * hash) + getInvokesList().hashCode();
}
hash = (37 * hash) + ENTITYID_FIELD_NUMBER;
hash = (53 * hash) + getEntityId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -364,6 +368,10 @@ public final class EntityAbilityInvokeEntryOuterClass {
return builder;
}
/**
* <pre>
* Name: LFJEGCDDKCK
* </pre>
*
* Protobuf type {@code EntityAbilityInvokeEntry}
*/
public static final class Builder extends
@@ -402,14 +410,14 @@ public final class EntityAbilityInvokeEntryOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
entityId_ = 0;
if (invokesBuilder_ == null) {
invokes_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001);
} else {
invokesBuilder_.clear();
}
entityId_ = 0;
return this;
}
@@ -437,6 +445,7 @@ public final class EntityAbilityInvokeEntryOuterClass {
public emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry buildPartial() {
emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry result = new emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry(this);
int from_bitField0_ = bitField0_;
result.entityId_ = entityId_;
if (invokesBuilder_ == null) {
if (((bitField0_ & 0x00000001) != 0)) {
invokes_ = java.util.Collections.unmodifiableList(invokes_);
@@ -446,7 +455,6 @@ public final class EntityAbilityInvokeEntryOuterClass {
} else {
result.invokes_ = invokesBuilder_.build();
}
result.entityId_ = entityId_;
onBuilt();
return result;
}
@@ -495,6 +503,9 @@ public final class EntityAbilityInvokeEntryOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry other) {
if (other == emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry.getDefaultInstance()) return this;
if (other.getEntityId() != 0) {
setEntityId(other.getEntityId());
}
if (invokesBuilder_ == null) {
if (!other.invokes_.isEmpty()) {
if (invokes_.isEmpty()) {
@@ -521,9 +532,6 @@ public final class EntityAbilityInvokeEntryOuterClass {
}
}
}
if (other.getEntityId() != 0) {
setEntityId(other.getEntityId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -554,6 +562,37 @@ public final class EntityAbilityInvokeEntryOuterClass {
}
private int bitField0_;
private int entityId_ ;
/**
* <code>uint32 entity_id = 7;</code>
* @return The entityId.
*/
@java.lang.Override
public int getEntityId() {
return entityId_;
}
/**
* <code>uint32 entity_id = 7;</code>
* @param value The entityId to set.
* @return This builder for chaining.
*/
public Builder setEntityId(int value) {
entityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 entity_id = 7;</code>
* @return This builder for chaining.
*/
public Builder clearEntityId() {
entityId_ = 0;
onChanged();
return this;
}
private java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> invokes_ =
java.util.Collections.emptyList();
private void ensureInvokesIsMutable() {
@@ -567,7 +606,7 @@ public final class EntityAbilityInvokeEntryOuterClass {
emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> invokesBuilder_;
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> getInvokesList() {
if (invokesBuilder_ == null) {
@@ -577,7 +616,7 @@ public final class EntityAbilityInvokeEntryOuterClass {
}
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
public int getInvokesCount() {
if (invokesBuilder_ == null) {
@@ -587,7 +626,7 @@ public final class EntityAbilityInvokeEntryOuterClass {
}
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index) {
if (invokesBuilder_ == null) {
@@ -597,7 +636,7 @@ public final class EntityAbilityInvokeEntryOuterClass {
}
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
public Builder setInvokes(
int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
@@ -614,7 +653,7 @@ public final class EntityAbilityInvokeEntryOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
public Builder setInvokes(
int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -628,7 +667,7 @@ public final class EntityAbilityInvokeEntryOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
public Builder addInvokes(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
if (invokesBuilder_ == null) {
@@ -644,7 +683,7 @@ public final class EntityAbilityInvokeEntryOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
public Builder addInvokes(
int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
@@ -661,7 +700,7 @@ public final class EntityAbilityInvokeEntryOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
public Builder addInvokes(
emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -675,7 +714,7 @@ public final class EntityAbilityInvokeEntryOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
public Builder addInvokes(
int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -689,7 +728,7 @@ public final class EntityAbilityInvokeEntryOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
public Builder addAllInvokes(
java.lang.Iterable<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> values) {
@@ -704,7 +743,7 @@ public final class EntityAbilityInvokeEntryOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
public Builder clearInvokes() {
if (invokesBuilder_ == null) {
@@ -717,7 +756,7 @@ public final class EntityAbilityInvokeEntryOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
public Builder removeInvokes(int index) {
if (invokesBuilder_ == null) {
@@ -730,14 +769,14 @@ public final class EntityAbilityInvokeEntryOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder getInvokesBuilder(
int index) {
return getInvokesFieldBuilder().getBuilder(index);
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
int index) {
@@ -747,7 +786,7 @@ public final class EntityAbilityInvokeEntryOuterClass {
}
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
public java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder>
getInvokesOrBuilderList() {
@@ -758,14 +797,14 @@ public final class EntityAbilityInvokeEntryOuterClass {
}
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder addInvokesBuilder() {
return getInvokesFieldBuilder().addBuilder(
emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance());
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder addInvokesBuilder(
int index) {
@@ -773,7 +812,7 @@ public final class EntityAbilityInvokeEntryOuterClass {
index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance());
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 4;</code>
* <code>repeated .AbilityInvokeEntry invokes = 11;</code>
*/
public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder>
getInvokesBuilderList() {
@@ -793,37 +832,6 @@ public final class EntityAbilityInvokeEntryOuterClass {
}
return invokesBuilder_;
}
private int entityId_ ;
/**
* <code>uint32 entityId = 9;</code>
* @return The entityId.
*/
@java.lang.Override
public int getEntityId() {
return entityId_;
}
/**
* <code>uint32 entityId = 9;</code>
* @param value The entityId to set.
* @return This builder for chaining.
*/
public Builder setEntityId(int value) {
entityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 entityId = 9;</code>
* @return This builder for chaining.
*/
public Builder clearEntityId() {
entityId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -892,10 +900,10 @@ public final class EntityAbilityInvokeEntryOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\036EntityAbilityInvokeEntry.proto\032\030Abilit" +
"yInvokeEntry.proto\"R\n\030EntityAbilityInvok" +
"eEntry\022$\n\007invokes\030\004 \003(\0132\023.AbilityInvokeE" +
"ntry\022\020\n\010entityId\030\t \001(\rB\033\n\031emu.grasscutte" +
"r.net.protob\006proto3"
"yInvokeEntry.proto\"S\n\030EntityAbilityInvok" +
"eEntry\022\021\n\tentity_id\030\007 \001(\r\022$\n\007invokes\030\013 \003" +
"(\0132\023.AbilityInvokeEntryB\033\n\031emu.grasscutt" +
"er.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -907,7 +915,7 @@ public final class EntityAbilityInvokeEntryOuterClass {
internal_static_EntityAbilityInvokeEntry_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_EntityAbilityInvokeEntry_descriptor,
new java.lang.String[] { "Invokes", "EntityId", });
new java.lang.String[] { "EntityId", "Invokes", });
emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.getDescriptor();
}