mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-23 18:39:54 +08:00
Add support for v3.5.0 (#2090)
* 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
committed by
GitHub
Unverified
GitHub
parent
922f7bca51
commit
516e5975e1
@@ -19,29 +19,33 @@ public final class WidgetGadgetDataOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>repeated uint32 gadgetEntityIdList = 15;</code>
|
||||
* <code>repeated uint32 gadget_entity_id_list = 1;</code>
|
||||
* @return A list containing the gadgetEntityIdList.
|
||||
*/
|
||||
java.util.List<java.lang.Integer> getGadgetEntityIdListList();
|
||||
/**
|
||||
* <code>repeated uint32 gadgetEntityIdList = 15;</code>
|
||||
* <code>repeated uint32 gadget_entity_id_list = 1;</code>
|
||||
* @return The count of gadgetEntityIdList.
|
||||
*/
|
||||
int getGadgetEntityIdListCount();
|
||||
/**
|
||||
* <code>repeated uint32 gadgetEntityIdList = 15;</code>
|
||||
* <code>repeated uint32 gadget_entity_id_list = 1;</code>
|
||||
* @param index The index of the element to return.
|
||||
* @return The gadgetEntityIdList at the given index.
|
||||
*/
|
||||
int getGadgetEntityIdList(int index);
|
||||
|
||||
/**
|
||||
* <code>uint32 gadgetId = 9;</code>
|
||||
* <code>uint32 gadget_id = 15;</code>
|
||||
* @return The gadgetId.
|
||||
*/
|
||||
int getGadgetId();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: KOJOFGNALFB
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code WidgetGadgetData}
|
||||
*/
|
||||
public static final class WidgetGadgetData extends
|
||||
@@ -88,12 +92,7 @@ public final class WidgetGadgetDataOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 72: {
|
||||
|
||||
gadgetId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 120: {
|
||||
case 8: {
|
||||
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
|
||||
gadgetEntityIdList_ = newIntList();
|
||||
mutable_bitField0_ |= 0x00000001;
|
||||
@@ -101,7 +100,7 @@ public final class WidgetGadgetDataOuterClass {
|
||||
gadgetEntityIdList_.addInt(input.readUInt32());
|
||||
break;
|
||||
}
|
||||
case 122: {
|
||||
case 10: {
|
||||
int length = input.readRawVarint32();
|
||||
int limit = input.pushLimit(length);
|
||||
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
|
||||
@@ -114,6 +113,11 @@ public final class WidgetGadgetDataOuterClass {
|
||||
input.popLimit(limit);
|
||||
break;
|
||||
}
|
||||
case 120: {
|
||||
|
||||
gadgetId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
if (!parseUnknownField(
|
||||
input, unknownFields, extensionRegistry, tag)) {
|
||||
@@ -149,10 +153,10 @@ public final class WidgetGadgetDataOuterClass {
|
||||
emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData.class, emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData.Builder.class);
|
||||
}
|
||||
|
||||
public static final int GADGETENTITYIDLIST_FIELD_NUMBER = 15;
|
||||
public static final int GADGET_ENTITY_ID_LIST_FIELD_NUMBER = 1;
|
||||
private com.google.protobuf.Internal.IntList gadgetEntityIdList_;
|
||||
/**
|
||||
* <code>repeated uint32 gadgetEntityIdList = 15;</code>
|
||||
* <code>repeated uint32 gadget_entity_id_list = 1;</code>
|
||||
* @return A list containing the gadgetEntityIdList.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -161,14 +165,14 @@ public final class WidgetGadgetDataOuterClass {
|
||||
return gadgetEntityIdList_;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 gadgetEntityIdList = 15;</code>
|
||||
* <code>repeated uint32 gadget_entity_id_list = 1;</code>
|
||||
* @return The count of gadgetEntityIdList.
|
||||
*/
|
||||
public int getGadgetEntityIdListCount() {
|
||||
return gadgetEntityIdList_.size();
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 gadgetEntityIdList = 15;</code>
|
||||
* <code>repeated uint32 gadget_entity_id_list = 1;</code>
|
||||
* @param index The index of the element to return.
|
||||
* @return The gadgetEntityIdList at the given index.
|
||||
*/
|
||||
@@ -177,10 +181,10 @@ public final class WidgetGadgetDataOuterClass {
|
||||
}
|
||||
private int gadgetEntityIdListMemoizedSerializedSize = -1;
|
||||
|
||||
public static final int GADGETID_FIELD_NUMBER = 9;
|
||||
public static final int GADGET_ID_FIELD_NUMBER = 15;
|
||||
private int gadgetId_;
|
||||
/**
|
||||
* <code>uint32 gadgetId = 9;</code>
|
||||
* <code>uint32 gadget_id = 15;</code>
|
||||
* @return The gadgetId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -203,16 +207,16 @@ public final class WidgetGadgetDataOuterClass {
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
getSerializedSize();
|
||||
if (gadgetId_ != 0) {
|
||||
output.writeUInt32(9, gadgetId_);
|
||||
}
|
||||
if (getGadgetEntityIdListList().size() > 0) {
|
||||
output.writeUInt32NoTag(122);
|
||||
output.writeUInt32NoTag(10);
|
||||
output.writeUInt32NoTag(gadgetEntityIdListMemoizedSerializedSize);
|
||||
}
|
||||
for (int i = 0; i < gadgetEntityIdList_.size(); i++) {
|
||||
output.writeUInt32NoTag(gadgetEntityIdList_.getInt(i));
|
||||
}
|
||||
if (gadgetId_ != 0) {
|
||||
output.writeUInt32(15, gadgetId_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
|
||||
@@ -222,10 +226,6 @@ public final class WidgetGadgetDataOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (gadgetId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(9, gadgetId_);
|
||||
}
|
||||
{
|
||||
int dataSize = 0;
|
||||
for (int i = 0; i < gadgetEntityIdList_.size(); i++) {
|
||||
@@ -240,6 +240,10 @@ public final class WidgetGadgetDataOuterClass {
|
||||
}
|
||||
gadgetEntityIdListMemoizedSerializedSize = dataSize;
|
||||
}
|
||||
if (gadgetId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(15, gadgetId_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
return size;
|
||||
@@ -271,10 +275,10 @@ public final class WidgetGadgetDataOuterClass {
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
if (getGadgetEntityIdListCount() > 0) {
|
||||
hash = (37 * hash) + GADGETENTITYIDLIST_FIELD_NUMBER;
|
||||
hash = (37 * hash) + GADGET_ENTITY_ID_LIST_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getGadgetEntityIdListList().hashCode();
|
||||
}
|
||||
hash = (37 * hash) + GADGETID_FIELD_NUMBER;
|
||||
hash = (37 * hash) + GADGET_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getGadgetId();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
@@ -372,6 +376,10 @@ public final class WidgetGadgetDataOuterClass {
|
||||
return builder;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: KOJOFGNALFB
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code WidgetGadgetData}
|
||||
*/
|
||||
public static final class Builder extends
|
||||
@@ -545,7 +553,7 @@ public final class WidgetGadgetDataOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 gadgetEntityIdList = 15;</code>
|
||||
* <code>repeated uint32 gadget_entity_id_list = 1;</code>
|
||||
* @return A list containing the gadgetEntityIdList.
|
||||
*/
|
||||
public java.util.List<java.lang.Integer>
|
||||
@@ -554,14 +562,14 @@ public final class WidgetGadgetDataOuterClass {
|
||||
java.util.Collections.unmodifiableList(gadgetEntityIdList_) : gadgetEntityIdList_;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 gadgetEntityIdList = 15;</code>
|
||||
* <code>repeated uint32 gadget_entity_id_list = 1;</code>
|
||||
* @return The count of gadgetEntityIdList.
|
||||
*/
|
||||
public int getGadgetEntityIdListCount() {
|
||||
return gadgetEntityIdList_.size();
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 gadgetEntityIdList = 15;</code>
|
||||
* <code>repeated uint32 gadget_entity_id_list = 1;</code>
|
||||
* @param index The index of the element to return.
|
||||
* @return The gadgetEntityIdList at the given index.
|
||||
*/
|
||||
@@ -569,7 +577,7 @@ public final class WidgetGadgetDataOuterClass {
|
||||
return gadgetEntityIdList_.getInt(index);
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 gadgetEntityIdList = 15;</code>
|
||||
* <code>repeated uint32 gadget_entity_id_list = 1;</code>
|
||||
* @param index The index to set the value at.
|
||||
* @param value The gadgetEntityIdList to set.
|
||||
* @return This builder for chaining.
|
||||
@@ -582,7 +590,7 @@ public final class WidgetGadgetDataOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 gadgetEntityIdList = 15;</code>
|
||||
* <code>repeated uint32 gadget_entity_id_list = 1;</code>
|
||||
* @param value The gadgetEntityIdList to add.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -593,7 +601,7 @@ public final class WidgetGadgetDataOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 gadgetEntityIdList = 15;</code>
|
||||
* <code>repeated uint32 gadget_entity_id_list = 1;</code>
|
||||
* @param values The gadgetEntityIdList to add.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -606,7 +614,7 @@ public final class WidgetGadgetDataOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint32 gadgetEntityIdList = 15;</code>
|
||||
* <code>repeated uint32 gadget_entity_id_list = 1;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearGadgetEntityIdList() {
|
||||
@@ -618,7 +626,7 @@ public final class WidgetGadgetDataOuterClass {
|
||||
|
||||
private int gadgetId_ ;
|
||||
/**
|
||||
* <code>uint32 gadgetId = 9;</code>
|
||||
* <code>uint32 gadget_id = 15;</code>
|
||||
* @return The gadgetId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -626,7 +634,7 @@ public final class WidgetGadgetDataOuterClass {
|
||||
return gadgetId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 gadgetId = 9;</code>
|
||||
* <code>uint32 gadget_id = 15;</code>
|
||||
* @param value The gadgetId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -637,7 +645,7 @@ public final class WidgetGadgetDataOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 gadgetId = 9;</code>
|
||||
* <code>uint32 gadget_id = 15;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearGadgetId() {
|
||||
@@ -713,10 +721,10 @@ public final class WidgetGadgetDataOuterClass {
|
||||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\026WidgetGadgetData.proto\"@\n\020WidgetGadget" +
|
||||
"Data\022\032\n\022gadgetEntityIdList\030\017 \003(\r\022\020\n\010gadg" +
|
||||
"etId\030\t \001(\rB\033\n\031emu.grasscutter.net.protob" +
|
||||
"\006proto3"
|
||||
"\n\026WidgetGadgetData.proto\"D\n\020WidgetGadget" +
|
||||
"Data\022\035\n\025gadget_entity_id_list\030\001 \003(\r\022\021\n\tg" +
|
||||
"adget_id\030\017 \001(\rB\033\n\031emu.grasscutter.net.pr" +
|
||||
"otob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
|
||||
Reference in New Issue
Block a user