Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 12:37:36 +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/TowerTeamOuterClass.java
+100 -92
View File
@@ -19,29 +19,33 @@ public final class TowerTeamOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>repeated uint64 avatarGuidList = 4;</code>
* <code>uint32 tower_team_id = 10;</code>
* @return The towerTeamId.
*/
int getTowerTeamId();
/**
* <code>repeated uint64 avatar_guid_list = 14;</code>
* @return A list containing the avatarGuidList.
*/
java.util.List<java.lang.Long> getAvatarGuidListList();
/**
* <code>repeated uint64 avatarGuidList = 4;</code>
* <code>repeated uint64 avatar_guid_list = 14;</code>
* @return The count of avatarGuidList.
*/
int getAvatarGuidListCount();
/**
* <code>repeated uint64 avatarGuidList = 4;</code>
* <code>repeated uint64 avatar_guid_list = 14;</code>
* @param index The index of the element to return.
* @return The avatarGuidList at the given index.
*/
long getAvatarGuidList(int index);
/**
* <code>uint32 towerTeamId = 10;</code>
* @return The towerTeamId.
*/
int getTowerTeamId();
}
/**
* <pre>
* Name: COFIOGPCLNN
* </pre>
*
* Protobuf type {@code TowerTeam}
*/
public static final class TowerTeam extends
@@ -88,7 +92,12 @@ public final class TowerTeamOuterClass {
case 0:
done = true;
break;
case 32: {
case 80: {
towerTeamId_ = input.readUInt32();
break;
}
case 112: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
avatarGuidList_ = newLongList();
mutable_bitField0_ |= 0x00000001;
@@ -96,7 +105,7 @@ public final class TowerTeamOuterClass {
avatarGuidList_.addLong(input.readUInt64());
break;
}
case 34: {
case 114: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -109,11 +118,6 @@ public final class TowerTeamOuterClass {
input.popLimit(limit);
break;
}
case 80: {
towerTeamId_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -149,10 +153,21 @@ public final class TowerTeamOuterClass {
emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.class, emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.Builder.class);
}
public static final int AVATARGUIDLIST_FIELD_NUMBER = 4;
public static final int TOWER_TEAM_ID_FIELD_NUMBER = 10;
private int towerTeamId_;
/**
* <code>uint32 tower_team_id = 10;</code>
* @return The towerTeamId.
*/
@java.lang.Override
public int getTowerTeamId() {
return towerTeamId_;
}
public static final int AVATAR_GUID_LIST_FIELD_NUMBER = 14;
private com.google.protobuf.Internal.LongList avatarGuidList_;
/**
* <code>repeated uint64 avatarGuidList = 4;</code>
* <code>repeated uint64 avatar_guid_list = 14;</code>
* @return A list containing the avatarGuidList.
*/
@java.lang.Override
@@ -161,14 +176,14 @@ public final class TowerTeamOuterClass {
return avatarGuidList_;
}
/**
* <code>repeated uint64 avatarGuidList = 4;</code>
* <code>repeated uint64 avatar_guid_list = 14;</code>
* @return The count of avatarGuidList.
*/
public int getAvatarGuidListCount() {
return avatarGuidList_.size();
}
/**
* <code>repeated uint64 avatarGuidList = 4;</code>
* <code>repeated uint64 avatar_guid_list = 14;</code>
* @param index The index of the element to return.
* @return The avatarGuidList at the given index.
*/
@@ -177,17 +192,6 @@ public final class TowerTeamOuterClass {
}
private int avatarGuidListMemoizedSerializedSize = -1;
public static final int TOWERTEAMID_FIELD_NUMBER = 10;
private int towerTeamId_;
/**
* <code>uint32 towerTeamId = 10;</code>
* @return The towerTeamId.
*/
@java.lang.Override
public int getTowerTeamId() {
return towerTeamId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -203,16 +207,16 @@ public final class TowerTeamOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (towerTeamId_ != 0) {
output.writeUInt32(10, towerTeamId_);
}
if (getAvatarGuidListList().size() > 0) {
output.writeUInt32NoTag(34);
output.writeUInt32NoTag(114);
output.writeUInt32NoTag(avatarGuidListMemoizedSerializedSize);
}
for (int i = 0; i < avatarGuidList_.size(); i++) {
output.writeUInt64NoTag(avatarGuidList_.getLong(i));
}
if (towerTeamId_ != 0) {
output.writeUInt32(10, towerTeamId_);
}
unknownFields.writeTo(output);
}
@@ -222,6 +226,10 @@ public final class TowerTeamOuterClass {
if (size != -1) return size;
size = 0;
if (towerTeamId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, towerTeamId_);
}
{
int dataSize = 0;
for (int i = 0; i < avatarGuidList_.size(); i++) {
@@ -236,10 +244,6 @@ public final class TowerTeamOuterClass {
}
avatarGuidListMemoizedSerializedSize = dataSize;
}
if (towerTeamId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, towerTeamId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -255,10 +259,10 @@ public final class TowerTeamOuterClass {
}
emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam other = (emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam) obj;
if (!getAvatarGuidListList()
.equals(other.getAvatarGuidListList())) return false;
if (getTowerTeamId()
!= other.getTowerTeamId()) return false;
if (!getAvatarGuidListList()
.equals(other.getAvatarGuidListList())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -270,12 +274,12 @@ public final class TowerTeamOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + TOWER_TEAM_ID_FIELD_NUMBER;
hash = (53 * hash) + getTowerTeamId();
if (getAvatarGuidListCount() > 0) {
hash = (37 * hash) + AVATARGUIDLIST_FIELD_NUMBER;
hash = (37 * hash) + AVATAR_GUID_LIST_FIELD_NUMBER;
hash = (53 * hash) + getAvatarGuidListList().hashCode();
}
hash = (37 * hash) + TOWERTEAMID_FIELD_NUMBER;
hash = (53 * hash) + getTowerTeamId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -372,6 +376,10 @@ public final class TowerTeamOuterClass {
return builder;
}
/**
* <pre>
* Name: COFIOGPCLNN
* </pre>
*
* Protobuf type {@code TowerTeam}
*/
public static final class Builder extends
@@ -409,10 +417,10 @@ public final class TowerTeamOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
avatarGuidList_ = emptyLongList();
bitField0_ = (bitField0_ & ~0x00000001);
towerTeamId_ = 0;
avatarGuidList_ = emptyLongList();
bitField0_ = (bitField0_ & ~0x00000001);
return this;
}
@@ -440,12 +448,12 @@ public final class TowerTeamOuterClass {
public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam buildPartial() {
emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam result = new emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam(this);
int from_bitField0_ = bitField0_;
result.towerTeamId_ = towerTeamId_;
if (((bitField0_ & 0x00000001) != 0)) {
avatarGuidList_.makeImmutable();
bitField0_ = (bitField0_ & ~0x00000001);
}
result.avatarGuidList_ = avatarGuidList_;
result.towerTeamId_ = towerTeamId_;
onBuilt();
return result;
}
@@ -494,6 +502,9 @@ public final class TowerTeamOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam other) {
if (other == emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.getDefaultInstance()) return this;
if (other.getTowerTeamId() != 0) {
setTowerTeamId(other.getTowerTeamId());
}
if (!other.avatarGuidList_.isEmpty()) {
if (avatarGuidList_.isEmpty()) {
avatarGuidList_ = other.avatarGuidList_;
@@ -504,9 +515,6 @@ public final class TowerTeamOuterClass {
}
onChanged();
}
if (other.getTowerTeamId() != 0) {
setTowerTeamId(other.getTowerTeamId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -537,6 +545,37 @@ public final class TowerTeamOuterClass {
}
private int bitField0_;
private int towerTeamId_ ;
/**
* <code>uint32 tower_team_id = 10;</code>
* @return The towerTeamId.
*/
@java.lang.Override
public int getTowerTeamId() {
return towerTeamId_;
}
/**
* <code>uint32 tower_team_id = 10;</code>
* @param value The towerTeamId to set.
* @return This builder for chaining.
*/
public Builder setTowerTeamId(int value) {
towerTeamId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 tower_team_id = 10;</code>
* @return This builder for chaining.
*/
public Builder clearTowerTeamId() {
towerTeamId_ = 0;
onChanged();
return this;
}
private com.google.protobuf.Internal.LongList avatarGuidList_ = emptyLongList();
private void ensureAvatarGuidListIsMutable() {
if (!((bitField0_ & 0x00000001) != 0)) {
@@ -545,7 +584,7 @@ public final class TowerTeamOuterClass {
}
}
/**
* <code>repeated uint64 avatarGuidList = 4;</code>
* <code>repeated uint64 avatar_guid_list = 14;</code>
* @return A list containing the avatarGuidList.
*/
public java.util.List<java.lang.Long>
@@ -554,14 +593,14 @@ public final class TowerTeamOuterClass {
java.util.Collections.unmodifiableList(avatarGuidList_) : avatarGuidList_;
}
/**
* <code>repeated uint64 avatarGuidList = 4;</code>
* <code>repeated uint64 avatar_guid_list = 14;</code>
* @return The count of avatarGuidList.
*/
public int getAvatarGuidListCount() {
return avatarGuidList_.size();
}
/**
* <code>repeated uint64 avatarGuidList = 4;</code>
* <code>repeated uint64 avatar_guid_list = 14;</code>
* @param index The index of the element to return.
* @return The avatarGuidList at the given index.
*/
@@ -569,7 +608,7 @@ public final class TowerTeamOuterClass {
return avatarGuidList_.getLong(index);
}
/**
* <code>repeated uint64 avatarGuidList = 4;</code>
* <code>repeated uint64 avatar_guid_list = 14;</code>
* @param index The index to set the value at.
* @param value The avatarGuidList to set.
* @return This builder for chaining.
@@ -582,7 +621,7 @@ public final class TowerTeamOuterClass {
return this;
}
/**
* <code>repeated uint64 avatarGuidList = 4;</code>
* <code>repeated uint64 avatar_guid_list = 14;</code>
* @param value The avatarGuidList to add.
* @return This builder for chaining.
*/
@@ -593,7 +632,7 @@ public final class TowerTeamOuterClass {
return this;
}
/**
* <code>repeated uint64 avatarGuidList = 4;</code>
* <code>repeated uint64 avatar_guid_list = 14;</code>
* @param values The avatarGuidList to add.
* @return This builder for chaining.
*/
@@ -606,7 +645,7 @@ public final class TowerTeamOuterClass {
return this;
}
/**
* <code>repeated uint64 avatarGuidList = 4;</code>
* <code>repeated uint64 avatar_guid_list = 14;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuidList() {
@@ -615,37 +654,6 @@ public final class TowerTeamOuterClass {
onChanged();
return this;
}
private int towerTeamId_ ;
/**
* <code>uint32 towerTeamId = 10;</code>
* @return The towerTeamId.
*/
@java.lang.Override
public int getTowerTeamId() {
return towerTeamId_;
}
/**
* <code>uint32 towerTeamId = 10;</code>
* @param value The towerTeamId to set.
* @return This builder for chaining.
*/
public Builder setTowerTeamId(int value) {
towerTeamId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 towerTeamId = 10;</code>
* @return This builder for chaining.
*/
public Builder clearTowerTeamId() {
towerTeamId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -713,9 +721,9 @@ public final class TowerTeamOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\017TowerTeam.proto\"8\n\tTowerTeam\022\026\n\016avatar" +
"GuidList\030\004 \003(\004\022\023\n\013towerTeamId\030\n \001(\rB\033\n\031e" +
"mu.grasscutter.net.protob\006proto3"
"\n\017TowerTeam.proto\"<\n\tTowerTeam\022\025\n\rtower_" +
"team_id\030\n \001(\r\022\030\n\020avatar_guid_list\030\016 \003(\004B" +
"\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -726,7 +734,7 @@ public final class TowerTeamOuterClass {
internal_static_TowerTeam_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_TowerTeam_descriptor,
new java.lang.String[] { "AvatarGuidList", "TowerTeamId", });
new java.lang.String[] { "TowerTeamId", "AvatarGuidList", });
}
// @@protoc_insertion_point(outer_class_scope)