Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-08 21:25:47 +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/CharAmusementAvatarInfoOuterClass.java
+104 -96
View File
@@ -19,35 +19,39 @@ public final class CharAmusementAvatarInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 uid = 3;</code>
* <code>uint32 uid = 11;</code>
* @return The uid.
*/
int getUid();
/**
* <code>repeated uint32 avatarIdList = 11;</code>
* <code>uint32 punish_time = 2;</code>
* @return The punishTime.
*/
int getPunishTime();
/**
* <code>repeated uint32 avatar_id_list = 15;</code>
* @return A list containing the avatarIdList.
*/
java.util.List<java.lang.Integer> getAvatarIdListList();
/**
* <code>repeated uint32 avatarIdList = 11;</code>
* <code>repeated uint32 avatar_id_list = 15;</code>
* @return The count of avatarIdList.
*/
int getAvatarIdListCount();
/**
* <code>repeated uint32 avatarIdList = 11;</code>
* <code>repeated uint32 avatar_id_list = 15;</code>
* @param index The index of the element to return.
* @return The avatarIdList at the given index.
*/
int getAvatarIdList(int index);
/**
* <code>uint32 pmahgkplcgi = 1;</code>
* @return The pmahgkplcgi.
*/
int getPmahgkplcgi();
}
/**
* <pre>
* Name: EBCKHAKAFEN
* </pre>
*
* Protobuf type {@code CharAmusementAvatarInfo}
*/
public static final class CharAmusementAvatarInfo extends
@@ -94,17 +98,17 @@ public final class CharAmusementAvatarInfoOuterClass {
case 0:
done = true;
break;
case 8: {
case 16: {
pmahgkplcgi_ = input.readUInt32();
punishTime_ = input.readUInt32();
break;
}
case 24: {
case 88: {
uid_ = input.readUInt32();
break;
}
case 88: {
case 120: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
avatarIdList_ = newIntList();
mutable_bitField0_ |= 0x00000001;
@@ -112,7 +116,7 @@ public final class CharAmusementAvatarInfoOuterClass {
avatarIdList_.addInt(input.readUInt32());
break;
}
case 90: {
case 122: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -160,10 +164,10 @@ public final class CharAmusementAvatarInfoOuterClass {
emu.grasscutter.net.proto.CharAmusementAvatarInfoOuterClass.CharAmusementAvatarInfo.class, emu.grasscutter.net.proto.CharAmusementAvatarInfoOuterClass.CharAmusementAvatarInfo.Builder.class);
}
public static final int UID_FIELD_NUMBER = 3;
public static final int UID_FIELD_NUMBER = 11;
private int uid_;
/**
* <code>uint32 uid = 3;</code>
* <code>uint32 uid = 11;</code>
* @return The uid.
*/
@java.lang.Override
@@ -171,10 +175,21 @@ public final class CharAmusementAvatarInfoOuterClass {
return uid_;
}
public static final int AVATARIDLIST_FIELD_NUMBER = 11;
public static final int PUNISH_TIME_FIELD_NUMBER = 2;
private int punishTime_;
/**
* <code>uint32 punish_time = 2;</code>
* @return The punishTime.
*/
@java.lang.Override
public int getPunishTime() {
return punishTime_;
}
public static final int AVATAR_ID_LIST_FIELD_NUMBER = 15;
private com.google.protobuf.Internal.IntList avatarIdList_;
/**
* <code>repeated uint32 avatarIdList = 11;</code>
* <code>repeated uint32 avatar_id_list = 15;</code>
* @return A list containing the avatarIdList.
*/
@java.lang.Override
@@ -183,14 +198,14 @@ public final class CharAmusementAvatarInfoOuterClass {
return avatarIdList_;
}
/**
* <code>repeated uint32 avatarIdList = 11;</code>
* <code>repeated uint32 avatar_id_list = 15;</code>
* @return The count of avatarIdList.
*/
public int getAvatarIdListCount() {
return avatarIdList_.size();
}
/**
* <code>repeated uint32 avatarIdList = 11;</code>
* <code>repeated uint32 avatar_id_list = 15;</code>
* @param index The index of the element to return.
* @return The avatarIdList at the given index.
*/
@@ -199,17 +214,6 @@ public final class CharAmusementAvatarInfoOuterClass {
}
private int avatarIdListMemoizedSerializedSize = -1;
public static final int PMAHGKPLCGI_FIELD_NUMBER = 1;
private int pmahgkplcgi_;
/**
* <code>uint32 pmahgkplcgi = 1;</code>
* @return The pmahgkplcgi.
*/
@java.lang.Override
public int getPmahgkplcgi() {
return pmahgkplcgi_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -225,14 +229,14 @@ public final class CharAmusementAvatarInfoOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (pmahgkplcgi_ != 0) {
output.writeUInt32(1, pmahgkplcgi_);
if (punishTime_ != 0) {
output.writeUInt32(2, punishTime_);
}
if (uid_ != 0) {
output.writeUInt32(3, uid_);
output.writeUInt32(11, uid_);
}
if (getAvatarIdListList().size() > 0) {
output.writeUInt32NoTag(90);
output.writeUInt32NoTag(122);
output.writeUInt32NoTag(avatarIdListMemoizedSerializedSize);
}
for (int i = 0; i < avatarIdList_.size(); i++) {
@@ -247,13 +251,13 @@ public final class CharAmusementAvatarInfoOuterClass {
if (size != -1) return size;
size = 0;
if (pmahgkplcgi_ != 0) {
if (punishTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, pmahgkplcgi_);
.computeUInt32Size(2, punishTime_);
}
if (uid_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, uid_);
.computeUInt32Size(11, uid_);
}
{
int dataSize = 0;
@@ -286,10 +290,10 @@ public final class CharAmusementAvatarInfoOuterClass {
if (getUid()
!= other.getUid()) return false;
if (getPunishTime()
!= other.getPunishTime()) return false;
if (!getAvatarIdListList()
.equals(other.getAvatarIdListList())) return false;
if (getPmahgkplcgi()
!= other.getPmahgkplcgi()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -303,12 +307,12 @@ public final class CharAmusementAvatarInfoOuterClass {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + UID_FIELD_NUMBER;
hash = (53 * hash) + getUid();
hash = (37 * hash) + PUNISH_TIME_FIELD_NUMBER;
hash = (53 * hash) + getPunishTime();
if (getAvatarIdListCount() > 0) {
hash = (37 * hash) + AVATARIDLIST_FIELD_NUMBER;
hash = (37 * hash) + AVATAR_ID_LIST_FIELD_NUMBER;
hash = (53 * hash) + getAvatarIdListList().hashCode();
}
hash = (37 * hash) + PMAHGKPLCGI_FIELD_NUMBER;
hash = (53 * hash) + getPmahgkplcgi();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -405,6 +409,10 @@ public final class CharAmusementAvatarInfoOuterClass {
return builder;
}
/**
* <pre>
* Name: EBCKHAKAFEN
* </pre>
*
* Protobuf type {@code CharAmusementAvatarInfo}
*/
public static final class Builder extends
@@ -444,10 +452,10 @@ public final class CharAmusementAvatarInfoOuterClass {
super.clear();
uid_ = 0;
punishTime_ = 0;
avatarIdList_ = emptyIntList();
bitField0_ = (bitField0_ & ~0x00000001);
pmahgkplcgi_ = 0;
return this;
}
@@ -476,12 +484,12 @@ public final class CharAmusementAvatarInfoOuterClass {
emu.grasscutter.net.proto.CharAmusementAvatarInfoOuterClass.CharAmusementAvatarInfo result = new emu.grasscutter.net.proto.CharAmusementAvatarInfoOuterClass.CharAmusementAvatarInfo(this);
int from_bitField0_ = bitField0_;
result.uid_ = uid_;
result.punishTime_ = punishTime_;
if (((bitField0_ & 0x00000001) != 0)) {
avatarIdList_.makeImmutable();
bitField0_ = (bitField0_ & ~0x00000001);
}
result.avatarIdList_ = avatarIdList_;
result.pmahgkplcgi_ = pmahgkplcgi_;
onBuilt();
return result;
}
@@ -533,6 +541,9 @@ public final class CharAmusementAvatarInfoOuterClass {
if (other.getUid() != 0) {
setUid(other.getUid());
}
if (other.getPunishTime() != 0) {
setPunishTime(other.getPunishTime());
}
if (!other.avatarIdList_.isEmpty()) {
if (avatarIdList_.isEmpty()) {
avatarIdList_ = other.avatarIdList_;
@@ -543,9 +554,6 @@ public final class CharAmusementAvatarInfoOuterClass {
}
onChanged();
}
if (other.getPmahgkplcgi() != 0) {
setPmahgkplcgi(other.getPmahgkplcgi());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -578,7 +586,7 @@ public final class CharAmusementAvatarInfoOuterClass {
private int uid_ ;
/**
* <code>uint32 uid = 3;</code>
* <code>uint32 uid = 11;</code>
* @return The uid.
*/
@java.lang.Override
@@ -586,7 +594,7 @@ public final class CharAmusementAvatarInfoOuterClass {
return uid_;
}
/**
* <code>uint32 uid = 3;</code>
* <code>uint32 uid = 11;</code>
* @param value The uid to set.
* @return This builder for chaining.
*/
@@ -597,7 +605,7 @@ public final class CharAmusementAvatarInfoOuterClass {
return this;
}
/**
* <code>uint32 uid = 3;</code>
* <code>uint32 uid = 11;</code>
* @return This builder for chaining.
*/
public Builder clearUid() {
@@ -607,6 +615,37 @@ public final class CharAmusementAvatarInfoOuterClass {
return this;
}
private int punishTime_ ;
/**
* <code>uint32 punish_time = 2;</code>
* @return The punishTime.
*/
@java.lang.Override
public int getPunishTime() {
return punishTime_;
}
/**
* <code>uint32 punish_time = 2;</code>
* @param value The punishTime to set.
* @return This builder for chaining.
*/
public Builder setPunishTime(int value) {
punishTime_ = value;
onChanged();
return this;
}
/**
* <code>uint32 punish_time = 2;</code>
* @return This builder for chaining.
*/
public Builder clearPunishTime() {
punishTime_ = 0;
onChanged();
return this;
}
private com.google.protobuf.Internal.IntList avatarIdList_ = emptyIntList();
private void ensureAvatarIdListIsMutable() {
if (!((bitField0_ & 0x00000001) != 0)) {
@@ -615,7 +654,7 @@ public final class CharAmusementAvatarInfoOuterClass {
}
}
/**
* <code>repeated uint32 avatarIdList = 11;</code>
* <code>repeated uint32 avatar_id_list = 15;</code>
* @return A list containing the avatarIdList.
*/
public java.util.List<java.lang.Integer>
@@ -624,14 +663,14 @@ public final class CharAmusementAvatarInfoOuterClass {
java.util.Collections.unmodifiableList(avatarIdList_) : avatarIdList_;
}
/**
* <code>repeated uint32 avatarIdList = 11;</code>
* <code>repeated uint32 avatar_id_list = 15;</code>
* @return The count of avatarIdList.
*/
public int getAvatarIdListCount() {
return avatarIdList_.size();
}
/**
* <code>repeated uint32 avatarIdList = 11;</code>
* <code>repeated uint32 avatar_id_list = 15;</code>
* @param index The index of the element to return.
* @return The avatarIdList at the given index.
*/
@@ -639,7 +678,7 @@ public final class CharAmusementAvatarInfoOuterClass {
return avatarIdList_.getInt(index);
}
/**
* <code>repeated uint32 avatarIdList = 11;</code>
* <code>repeated uint32 avatar_id_list = 15;</code>
* @param index The index to set the value at.
* @param value The avatarIdList to set.
* @return This builder for chaining.
@@ -652,7 +691,7 @@ public final class CharAmusementAvatarInfoOuterClass {
return this;
}
/**
* <code>repeated uint32 avatarIdList = 11;</code>
* <code>repeated uint32 avatar_id_list = 15;</code>
* @param value The avatarIdList to add.
* @return This builder for chaining.
*/
@@ -663,7 +702,7 @@ public final class CharAmusementAvatarInfoOuterClass {
return this;
}
/**
* <code>repeated uint32 avatarIdList = 11;</code>
* <code>repeated uint32 avatar_id_list = 15;</code>
* @param values The avatarIdList to add.
* @return This builder for chaining.
*/
@@ -676,7 +715,7 @@ public final class CharAmusementAvatarInfoOuterClass {
return this;
}
/**
* <code>repeated uint32 avatarIdList = 11;</code>
* <code>repeated uint32 avatar_id_list = 15;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarIdList() {
@@ -685,37 +724,6 @@ public final class CharAmusementAvatarInfoOuterClass {
onChanged();
return this;
}
private int pmahgkplcgi_ ;
/**
* <code>uint32 pmahgkplcgi = 1;</code>
* @return The pmahgkplcgi.
*/
@java.lang.Override
public int getPmahgkplcgi() {
return pmahgkplcgi_;
}
/**
* <code>uint32 pmahgkplcgi = 1;</code>
* @param value The pmahgkplcgi to set.
* @return This builder for chaining.
*/
public Builder setPmahgkplcgi(int value) {
pmahgkplcgi_ = value;
onChanged();
return this;
}
/**
* <code>uint32 pmahgkplcgi = 1;</code>
* @return This builder for chaining.
*/
public Builder clearPmahgkplcgi() {
pmahgkplcgi_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -783,10 +791,10 @@ public final class CharAmusementAvatarInfoOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\035CharAmusementAvatarInfo.proto\"Q\n\027CharA" +
"musementAvatarInfo\022\013\n\003uid\030\003 \001(\r\022\024\n\014avata" +
"rIdList\030\013 \003(\r\022\023\n\013pmahgkplcgi\030\001 \001(\rB\033\n\031em" +
"u.grasscutter.net.protob\006proto3"
"\n\035CharAmusementAvatarInfo.proto\"S\n\027CharA" +
"musementAvatarInfo\022\013\n\003uid\030\013 \001(\r\022\023\n\013punis" +
"h_time\030\002 \001(\r\022\026\n\016avatar_id_list\030\017 \003(\rB\033\n\031" +
"emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -797,7 +805,7 @@ public final class CharAmusementAvatarInfoOuterClass {
internal_static_CharAmusementAvatarInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_CharAmusementAvatarInfo_descriptor,
new java.lang.String[] { "Uid", "AvatarIdList", "Pmahgkplcgi", });
new java.lang.String[] { "Uid", "PunishTime", "AvatarIdList", });
}
// @@protoc_insertion_point(outer_class_scope)