Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 04:13:34 +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/ParentQuestRandomInfoOuterClass.java
+108 -100
View File
@@ -19,35 +19,39 @@ public final class ParentQuestRandomInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 entranceId = 1;</code>
* @return The entranceId.
*/
int getEntranceId();
/**
* <code>repeated uint32 factorList = 3;</code>
* <code>repeated uint32 factor_list = 9;</code>
* @return A list containing the factorList.
*/
java.util.List<java.lang.Integer> getFactorListList();
/**
* <code>repeated uint32 factorList = 3;</code>
* <code>repeated uint32 factor_list = 9;</code>
* @return The count of factorList.
*/
int getFactorListCount();
/**
* <code>repeated uint32 factorList = 3;</code>
* <code>repeated uint32 factor_list = 9;</code>
* @param index The index of the element to return.
* @return The factorList at the given index.
*/
int getFactorList(int index);
/**
* <code>uint32 templateId = 6;</code>
* <code>uint32 template_id = 4;</code>
* @return The templateId.
*/
int getTemplateId();
/**
* <code>uint32 entrance_id = 14;</code>
* @return The entranceId.
*/
int getEntranceId();
}
/**
* <pre>
* Name: JLADMBEDMHP
* </pre>
*
* Protobuf type {@code ParentQuestRandomInfo}
*/
public static final class ParentQuestRandomInfo extends
@@ -94,12 +98,12 @@ public final class ParentQuestRandomInfoOuterClass {
case 0:
done = true;
break;
case 8: {
case 32: {
entranceId_ = input.readUInt32();
templateId_ = input.readUInt32();
break;
}
case 24: {
case 72: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
factorList_ = newIntList();
mutable_bitField0_ |= 0x00000001;
@@ -107,7 +111,7 @@ public final class ParentQuestRandomInfoOuterClass {
factorList_.addInt(input.readUInt32());
break;
}
case 26: {
case 74: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -120,9 +124,9 @@ public final class ParentQuestRandomInfoOuterClass {
input.popLimit(limit);
break;
}
case 48: {
case 112: {
templateId_ = input.readUInt32();
entranceId_ = input.readUInt32();
break;
}
default: {
@@ -160,21 +164,10 @@ public final class ParentQuestRandomInfoOuterClass {
emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.class, emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.Builder.class);
}
public static final int ENTRANCEID_FIELD_NUMBER = 1;
private int entranceId_;
/**
* <code>uint32 entranceId = 1;</code>
* @return The entranceId.
*/
@java.lang.Override
public int getEntranceId() {
return entranceId_;
}
public static final int FACTORLIST_FIELD_NUMBER = 3;
public static final int FACTOR_LIST_FIELD_NUMBER = 9;
private com.google.protobuf.Internal.IntList factorList_;
/**
* <code>repeated uint32 factorList = 3;</code>
* <code>repeated uint32 factor_list = 9;</code>
* @return A list containing the factorList.
*/
@java.lang.Override
@@ -183,14 +176,14 @@ public final class ParentQuestRandomInfoOuterClass {
return factorList_;
}
/**
* <code>repeated uint32 factorList = 3;</code>
* <code>repeated uint32 factor_list = 9;</code>
* @return The count of factorList.
*/
public int getFactorListCount() {
return factorList_.size();
}
/**
* <code>repeated uint32 factorList = 3;</code>
* <code>repeated uint32 factor_list = 9;</code>
* @param index The index of the element to return.
* @return The factorList at the given index.
*/
@@ -199,10 +192,10 @@ public final class ParentQuestRandomInfoOuterClass {
}
private int factorListMemoizedSerializedSize = -1;
public static final int TEMPLATEID_FIELD_NUMBER = 6;
public static final int TEMPLATE_ID_FIELD_NUMBER = 4;
private int templateId_;
/**
* <code>uint32 templateId = 6;</code>
* <code>uint32 template_id = 4;</code>
* @return The templateId.
*/
@java.lang.Override
@@ -210,6 +203,17 @@ public final class ParentQuestRandomInfoOuterClass {
return templateId_;
}
public static final int ENTRANCE_ID_FIELD_NUMBER = 14;
private int entranceId_;
/**
* <code>uint32 entrance_id = 14;</code>
* @return The entranceId.
*/
@java.lang.Override
public int getEntranceId() {
return entranceId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -225,18 +229,18 @@ public final class ParentQuestRandomInfoOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (entranceId_ != 0) {
output.writeUInt32(1, entranceId_);
if (templateId_ != 0) {
output.writeUInt32(4, templateId_);
}
if (getFactorListList().size() > 0) {
output.writeUInt32NoTag(26);
output.writeUInt32NoTag(74);
output.writeUInt32NoTag(factorListMemoizedSerializedSize);
}
for (int i = 0; i < factorList_.size(); i++) {
output.writeUInt32NoTag(factorList_.getInt(i));
}
if (templateId_ != 0) {
output.writeUInt32(6, templateId_);
if (entranceId_ != 0) {
output.writeUInt32(14, entranceId_);
}
unknownFields.writeTo(output);
}
@@ -247,9 +251,9 @@ public final class ParentQuestRandomInfoOuterClass {
if (size != -1) return size;
size = 0;
if (entranceId_ != 0) {
if (templateId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, entranceId_);
.computeUInt32Size(4, templateId_);
}
{
int dataSize = 0;
@@ -265,9 +269,9 @@ public final class ParentQuestRandomInfoOuterClass {
}
factorListMemoizedSerializedSize = dataSize;
}
if (templateId_ != 0) {
if (entranceId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, templateId_);
.computeUInt32Size(14, entranceId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -284,12 +288,12 @@ public final class ParentQuestRandomInfoOuterClass {
}
emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo other = (emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo) obj;
if (getEntranceId()
!= other.getEntranceId()) return false;
if (!getFactorListList()
.equals(other.getFactorListList())) return false;
if (getTemplateId()
!= other.getTemplateId()) return false;
if (getEntranceId()
!= other.getEntranceId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -301,14 +305,14 @@ public final class ParentQuestRandomInfoOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + ENTRANCEID_FIELD_NUMBER;
hash = (53 * hash) + getEntranceId();
if (getFactorListCount() > 0) {
hash = (37 * hash) + FACTORLIST_FIELD_NUMBER;
hash = (37 * hash) + FACTOR_LIST_FIELD_NUMBER;
hash = (53 * hash) + getFactorListList().hashCode();
}
hash = (37 * hash) + TEMPLATEID_FIELD_NUMBER;
hash = (37 * hash) + TEMPLATE_ID_FIELD_NUMBER;
hash = (53 * hash) + getTemplateId();
hash = (37 * hash) + ENTRANCE_ID_FIELD_NUMBER;
hash = (53 * hash) + getEntranceId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -405,6 +409,10 @@ public final class ParentQuestRandomInfoOuterClass {
return builder;
}
/**
* <pre>
* Name: JLADMBEDMHP
* </pre>
*
* Protobuf type {@code ParentQuestRandomInfo}
*/
public static final class Builder extends
@@ -442,12 +450,12 @@ public final class ParentQuestRandomInfoOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
entranceId_ = 0;
factorList_ = emptyIntList();
bitField0_ = (bitField0_ & ~0x00000001);
templateId_ = 0;
entranceId_ = 0;
return this;
}
@@ -475,13 +483,13 @@ public final class ParentQuestRandomInfoOuterClass {
public emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo buildPartial() {
emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo result = new emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo(this);
int from_bitField0_ = bitField0_;
result.entranceId_ = entranceId_;
if (((bitField0_ & 0x00000001) != 0)) {
factorList_.makeImmutable();
bitField0_ = (bitField0_ & ~0x00000001);
}
result.factorList_ = factorList_;
result.templateId_ = templateId_;
result.entranceId_ = entranceId_;
onBuilt();
return result;
}
@@ -530,9 +538,6 @@ public final class ParentQuestRandomInfoOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo other) {
if (other == emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.getDefaultInstance()) return this;
if (other.getEntranceId() != 0) {
setEntranceId(other.getEntranceId());
}
if (!other.factorList_.isEmpty()) {
if (factorList_.isEmpty()) {
factorList_ = other.factorList_;
@@ -546,6 +551,9 @@ public final class ParentQuestRandomInfoOuterClass {
if (other.getTemplateId() != 0) {
setTemplateId(other.getTemplateId());
}
if (other.getEntranceId() != 0) {
setEntranceId(other.getEntranceId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -576,37 +584,6 @@ public final class ParentQuestRandomInfoOuterClass {
}
private int bitField0_;
private int entranceId_ ;
/**
* <code>uint32 entranceId = 1;</code>
* @return The entranceId.
*/
@java.lang.Override
public int getEntranceId() {
return entranceId_;
}
/**
* <code>uint32 entranceId = 1;</code>
* @param value The entranceId to set.
* @return This builder for chaining.
*/
public Builder setEntranceId(int value) {
entranceId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 entranceId = 1;</code>
* @return This builder for chaining.
*/
public Builder clearEntranceId() {
entranceId_ = 0;
onChanged();
return this;
}
private com.google.protobuf.Internal.IntList factorList_ = emptyIntList();
private void ensureFactorListIsMutable() {
if (!((bitField0_ & 0x00000001) != 0)) {
@@ -615,7 +592,7 @@ public final class ParentQuestRandomInfoOuterClass {
}
}
/**
* <code>repeated uint32 factorList = 3;</code>
* <code>repeated uint32 factor_list = 9;</code>
* @return A list containing the factorList.
*/
public java.util.List<java.lang.Integer>
@@ -624,14 +601,14 @@ public final class ParentQuestRandomInfoOuterClass {
java.util.Collections.unmodifiableList(factorList_) : factorList_;
}
/**
* <code>repeated uint32 factorList = 3;</code>
* <code>repeated uint32 factor_list = 9;</code>
* @return The count of factorList.
*/
public int getFactorListCount() {
return factorList_.size();
}
/**
* <code>repeated uint32 factorList = 3;</code>
* <code>repeated uint32 factor_list = 9;</code>
* @param index The index of the element to return.
* @return The factorList at the given index.
*/
@@ -639,7 +616,7 @@ public final class ParentQuestRandomInfoOuterClass {
return factorList_.getInt(index);
}
/**
* <code>repeated uint32 factorList = 3;</code>
* <code>repeated uint32 factor_list = 9;</code>
* @param index The index to set the value at.
* @param value The factorList to set.
* @return This builder for chaining.
@@ -652,7 +629,7 @@ public final class ParentQuestRandomInfoOuterClass {
return this;
}
/**
* <code>repeated uint32 factorList = 3;</code>
* <code>repeated uint32 factor_list = 9;</code>
* @param value The factorList to add.
* @return This builder for chaining.
*/
@@ -663,7 +640,7 @@ public final class ParentQuestRandomInfoOuterClass {
return this;
}
/**
* <code>repeated uint32 factorList = 3;</code>
* <code>repeated uint32 factor_list = 9;</code>
* @param values The factorList to add.
* @return This builder for chaining.
*/
@@ -676,7 +653,7 @@ public final class ParentQuestRandomInfoOuterClass {
return this;
}
/**
* <code>repeated uint32 factorList = 3;</code>
* <code>repeated uint32 factor_list = 9;</code>
* @return This builder for chaining.
*/
public Builder clearFactorList() {
@@ -688,7 +665,7 @@ public final class ParentQuestRandomInfoOuterClass {
private int templateId_ ;
/**
* <code>uint32 templateId = 6;</code>
* <code>uint32 template_id = 4;</code>
* @return The templateId.
*/
@java.lang.Override
@@ -696,7 +673,7 @@ public final class ParentQuestRandomInfoOuterClass {
return templateId_;
}
/**
* <code>uint32 templateId = 6;</code>
* <code>uint32 template_id = 4;</code>
* @param value The templateId to set.
* @return This builder for chaining.
*/
@@ -707,7 +684,7 @@ public final class ParentQuestRandomInfoOuterClass {
return this;
}
/**
* <code>uint32 templateId = 6;</code>
* <code>uint32 template_id = 4;</code>
* @return This builder for chaining.
*/
public Builder clearTemplateId() {
@@ -716,6 +693,37 @@ public final class ParentQuestRandomInfoOuterClass {
onChanged();
return this;
}
private int entranceId_ ;
/**
* <code>uint32 entrance_id = 14;</code>
* @return The entranceId.
*/
@java.lang.Override
public int getEntranceId() {
return entranceId_;
}
/**
* <code>uint32 entrance_id = 14;</code>
* @param value The entranceId to set.
* @return This builder for chaining.
*/
public Builder setEntranceId(int value) {
entranceId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 entrance_id = 14;</code>
* @return This builder for chaining.
*/
public Builder clearEntranceId() {
entranceId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -783,10 +791,10 @@ public final class ParentQuestRandomInfoOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\033ParentQuestRandomInfo.proto\"S\n\025ParentQ" +
"uestRandomInfo\022\022\n\nentranceId\030\001 \001(\r\022\022\n\nfa" +
"ctorList\030\003 \003(\r\022\022\n\ntemplateId\030\006 \001(\rB\033\n\031em" +
"u.grasscutter.net.protob\006proto3"
"\n\033ParentQuestRandomInfo.proto\"V\n\025ParentQ" +
"uestRandomInfo\022\023\n\013factor_list\030\t \003(\r\022\023\n\013t" +
"emplate_id\030\004 \001(\r\022\023\n\013entrance_id\030\016 \001(\rB\033\n" +
"\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -797,7 +805,7 @@ public final class ParentQuestRandomInfoOuterClass {
internal_static_ParentQuestRandomInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_ParentQuestRandomInfo_descriptor,
new java.lang.String[] { "EntranceId", "FactorList", "TemplateId", });
new java.lang.String[] { "FactorList", "TemplateId", "EntranceId", });
}
// @@protoc_insertion_point(outer_class_scope)