Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 08:03:42 +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/PlayerWidgetInfoOuterClass.java
+107 -99
View File
@@ -19,36 +19,40 @@ public final class PlayerWidgetInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>uint32 uid = 4;</code>
* @return The uid.
*/
int getUid();
/**
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData>
getSlotListList();
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData getSlotList(int index);
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
int getSlotListCount();
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
java.util.List<? extends emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder>
getSlotListOrBuilderList();
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder getSlotListOrBuilder(
int index);
/**
* <code>uint32 uid = 10;</code>
* @return The uid.
*/
int getUid();
}
/**
* <pre>
* Name: PEBGLHDFPHB
* </pre>
*
* Protobuf type {@code PlayerWidgetInfo}
*/
public static final class PlayerWidgetInfo extends
@@ -95,12 +99,12 @@ public final class PlayerWidgetInfoOuterClass {
case 0:
done = true;
break;
case 80: {
case 32: {
uid_ = input.readUInt32();
break;
}
case 122: {
case 74: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
slotList_ = new java.util.ArrayList<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData>();
mutable_bitField0_ |= 0x00000001;
@@ -144,17 +148,28 @@ public final class PlayerWidgetInfoOuterClass {
emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.class, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder.class);
}
public static final int SLOTLIST_FIELD_NUMBER = 15;
public static final int UID_FIELD_NUMBER = 4;
private int uid_;
/**
* <code>uint32 uid = 4;</code>
* @return The uid.
*/
@java.lang.Override
public int getUid() {
return uid_;
}
public static final int SLOT_LIST_FIELD_NUMBER = 9;
private java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> slotList_;
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
@java.lang.Override
public java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> getSlotListList() {
return slotList_;
}
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
@java.lang.Override
public java.util.List<? extends emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder>
@@ -162,21 +177,21 @@ public final class PlayerWidgetInfoOuterClass {
return slotList_;
}
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
@java.lang.Override
public int getSlotListCount() {
return slotList_.size();
}
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData getSlotList(int index) {
return slotList_.get(index);
}
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder getSlotListOrBuilder(
@@ -184,17 +199,6 @@ public final class PlayerWidgetInfoOuterClass {
return slotList_.get(index);
}
public static final int UID_FIELD_NUMBER = 10;
private int uid_;
/**
* <code>uint32 uid = 10;</code>
* @return The uid.
*/
@java.lang.Override
public int getUid() {
return uid_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -210,10 +214,10 @@ public final class PlayerWidgetInfoOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (uid_ != 0) {
output.writeUInt32(10, uid_);
output.writeUInt32(4, uid_);
}
for (int i = 0; i < slotList_.size(); i++) {
output.writeMessage(15, slotList_.get(i));
output.writeMessage(9, slotList_.get(i));
}
unknownFields.writeTo(output);
}
@@ -226,11 +230,11 @@ public final class PlayerWidgetInfoOuterClass {
size = 0;
if (uid_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, uid_);
.computeUInt32Size(4, uid_);
}
for (int i = 0; i < slotList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(15, slotList_.get(i));
.computeMessageSize(9, slotList_.get(i));
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -247,10 +251,10 @@ public final class PlayerWidgetInfoOuterClass {
}
emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo other = (emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo) obj;
if (!getSlotListList()
.equals(other.getSlotListList())) return false;
if (getUid()
!= other.getUid()) return false;
if (!getSlotListList()
.equals(other.getSlotListList())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -262,12 +266,12 @@ public final class PlayerWidgetInfoOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
if (getSlotListCount() > 0) {
hash = (37 * hash) + SLOTLIST_FIELD_NUMBER;
hash = (53 * hash) + getSlotListList().hashCode();
}
hash = (37 * hash) + UID_FIELD_NUMBER;
hash = (53 * hash) + getUid();
if (getSlotListCount() > 0) {
hash = (37 * hash) + SLOT_LIST_FIELD_NUMBER;
hash = (53 * hash) + getSlotListList().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -364,6 +368,10 @@ public final class PlayerWidgetInfoOuterClass {
return builder;
}
/**
* <pre>
* Name: PEBGLHDFPHB
* </pre>
*
* Protobuf type {@code PlayerWidgetInfo}
*/
public static final class Builder extends
@@ -402,14 +410,14 @@ public final class PlayerWidgetInfoOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
uid_ = 0;
if (slotListBuilder_ == null) {
slotList_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001);
} else {
slotListBuilder_.clear();
}
uid_ = 0;
return this;
}
@@ -437,6 +445,7 @@ public final class PlayerWidgetInfoOuterClass {
public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo buildPartial() {
emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo result = new emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo(this);
int from_bitField0_ = bitField0_;
result.uid_ = uid_;
if (slotListBuilder_ == null) {
if (((bitField0_ & 0x00000001) != 0)) {
slotList_ = java.util.Collections.unmodifiableList(slotList_);
@@ -446,7 +455,6 @@ public final class PlayerWidgetInfoOuterClass {
} else {
result.slotList_ = slotListBuilder_.build();
}
result.uid_ = uid_;
onBuilt();
return result;
}
@@ -495,6 +503,9 @@ public final class PlayerWidgetInfoOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo other) {
if (other == emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.getDefaultInstance()) return this;
if (other.getUid() != 0) {
setUid(other.getUid());
}
if (slotListBuilder_ == null) {
if (!other.slotList_.isEmpty()) {
if (slotList_.isEmpty()) {
@@ -521,9 +532,6 @@ public final class PlayerWidgetInfoOuterClass {
}
}
}
if (other.getUid() != 0) {
setUid(other.getUid());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -554,6 +562,37 @@ public final class PlayerWidgetInfoOuterClass {
}
private int bitField0_;
private int uid_ ;
/**
* <code>uint32 uid = 4;</code>
* @return The uid.
*/
@java.lang.Override
public int getUid() {
return uid_;
}
/**
* <code>uint32 uid = 4;</code>
* @param value The uid to set.
* @return This builder for chaining.
*/
public Builder setUid(int value) {
uid_ = value;
onChanged();
return this;
}
/**
* <code>uint32 uid = 4;</code>
* @return This builder for chaining.
*/
public Builder clearUid() {
uid_ = 0;
onChanged();
return this;
}
private java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> slotList_ =
java.util.Collections.emptyList();
private void ensureSlotListIsMutable() {
@@ -567,7 +606,7 @@ public final class PlayerWidgetInfoOuterClass {
emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder> slotListBuilder_;
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
public java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> getSlotListList() {
if (slotListBuilder_ == null) {
@@ -577,7 +616,7 @@ public final class PlayerWidgetInfoOuterClass {
}
}
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
public int getSlotListCount() {
if (slotListBuilder_ == null) {
@@ -587,7 +626,7 @@ public final class PlayerWidgetInfoOuterClass {
}
}
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData getSlotList(int index) {
if (slotListBuilder_ == null) {
@@ -597,7 +636,7 @@ public final class PlayerWidgetInfoOuterClass {
}
}
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
public Builder setSlotList(
int index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData value) {
@@ -614,7 +653,7 @@ public final class PlayerWidgetInfoOuterClass {
return this;
}
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
public Builder setSlotList(
int index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder builderForValue) {
@@ -628,7 +667,7 @@ public final class PlayerWidgetInfoOuterClass {
return this;
}
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
public Builder addSlotList(emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData value) {
if (slotListBuilder_ == null) {
@@ -644,7 +683,7 @@ public final class PlayerWidgetInfoOuterClass {
return this;
}
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
public Builder addSlotList(
int index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData value) {
@@ -661,7 +700,7 @@ public final class PlayerWidgetInfoOuterClass {
return this;
}
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
public Builder addSlotList(
emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder builderForValue) {
@@ -675,7 +714,7 @@ public final class PlayerWidgetInfoOuterClass {
return this;
}
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
public Builder addSlotList(
int index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder builderForValue) {
@@ -689,7 +728,7 @@ public final class PlayerWidgetInfoOuterClass {
return this;
}
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
public Builder addAllSlotList(
java.lang.Iterable<? extends emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> values) {
@@ -704,7 +743,7 @@ public final class PlayerWidgetInfoOuterClass {
return this;
}
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
public Builder clearSlotList() {
if (slotListBuilder_ == null) {
@@ -717,7 +756,7 @@ public final class PlayerWidgetInfoOuterClass {
return this;
}
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
public Builder removeSlotList(int index) {
if (slotListBuilder_ == null) {
@@ -730,14 +769,14 @@ public final class PlayerWidgetInfoOuterClass {
return this;
}
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder getSlotListBuilder(
int index) {
return getSlotListFieldBuilder().getBuilder(index);
}
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder getSlotListOrBuilder(
int index) {
@@ -747,7 +786,7 @@ public final class PlayerWidgetInfoOuterClass {
}
}
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
public java.util.List<? extends emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder>
getSlotListOrBuilderList() {
@@ -758,14 +797,14 @@ public final class PlayerWidgetInfoOuterClass {
}
}
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder addSlotListBuilder() {
return getSlotListFieldBuilder().addBuilder(
emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.getDefaultInstance());
}
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder addSlotListBuilder(
int index) {
@@ -773,7 +812,7 @@ public final class PlayerWidgetInfoOuterClass {
index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.getDefaultInstance());
}
/**
* <code>repeated .WidgetSlotData slotList = 15;</code>
* <code>repeated .WidgetSlotData slot_list = 9;</code>
*/
public java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder>
getSlotListBuilderList() {
@@ -793,37 +832,6 @@ public final class PlayerWidgetInfoOuterClass {
}
return slotListBuilder_;
}
private int uid_ ;
/**
* <code>uint32 uid = 10;</code>
* @return The uid.
*/
@java.lang.Override
public int getUid() {
return uid_;
}
/**
* <code>uint32 uid = 10;</code>
* @param value The uid to set.
* @return This builder for chaining.
*/
public Builder setUid(int value) {
uid_ = value;
onChanged();
return this;
}
/**
* <code>uint32 uid = 10;</code>
* @return This builder for chaining.
*/
public Builder clearUid() {
uid_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -892,9 +900,9 @@ public final class PlayerWidgetInfoOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\026PlayerWidgetInfo.proto\032\024WidgetSlotData" +
".proto\"B\n\020PlayerWidgetInfo\022!\n\010slotList\030\017" +
" \003(\0132\017.WidgetSlotData\022\013\n\003uid\030\n \001(\rB\033\n\031em" +
"u.grasscutter.net.protob\006proto3"
".proto\"C\n\020PlayerWidgetInfo\022\013\n\003uid\030\004 \001(\r\022" +
"\"\n\tslot_list\030\t \003(\0132\017.WidgetSlotDataB\033\n\031e" +
"mu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -906,7 +914,7 @@ public final class PlayerWidgetInfoOuterClass {
internal_static_PlayerWidgetInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_PlayerWidgetInfo_descriptor,
new java.lang.String[] { "SlotList", "Uid", });
new java.lang.String[] { "Uid", "SlotList", });
emu.grasscutter.net.proto.WidgetSlotDataOuterClass.getDescriptor();
}