Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 09:31:18 +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/AddNoGachaAvatarCardTransferItemOuterClass.java
+103 -94
View File
@@ -19,24 +19,28 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 count = 10;</code>
* @return The count.
*/
int getCount();
/**
* <code>bool isNew = 11;</code>
* <code>bool is_new = 1;</code>
* @return The isNew.
*/
boolean getIsNew();
/**
* <code>uint32 itemId = 12;</code>
* <code>uint32 count = 9;</code>
* @return The count.
*/
int getCount();
/**
* <code>uint32 item_id = 14;</code>
* @return The itemId.
*/
int getItemId();
}
/**
* <pre>
* Name: CMDOHKNKFDH
* </pre>
*
* Protobuf type {@code AddNoGachaAvatarCardTransferItem}
*/
public static final class AddNoGachaAvatarCardTransferItem extends
@@ -81,17 +85,17 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
case 0:
done = true;
break;
case 80: {
count_ = input.readUInt32();
break;
}
case 88: {
case 8: {
isNew_ = input.readBool();
break;
}
case 96: {
case 72: {
count_ = input.readUInt32();
break;
}
case 112: {
itemId_ = input.readUInt32();
break;
@@ -128,21 +132,10 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.class, emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.Builder.class);
}
public static final int COUNT_FIELD_NUMBER = 10;
private int count_;
/**
* <code>uint32 count = 10;</code>
* @return The count.
*/
@java.lang.Override
public int getCount() {
return count_;
}
public static final int ISNEW_FIELD_NUMBER = 11;
public static final int IS_NEW_FIELD_NUMBER = 1;
private boolean isNew_;
/**
* <code>bool isNew = 11;</code>
* <code>bool is_new = 1;</code>
* @return The isNew.
*/
@java.lang.Override
@@ -150,10 +143,21 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
return isNew_;
}
public static final int ITEMID_FIELD_NUMBER = 12;
public static final int COUNT_FIELD_NUMBER = 9;
private int count_;
/**
* <code>uint32 count = 9;</code>
* @return The count.
*/
@java.lang.Override
public int getCount() {
return count_;
}
public static final int ITEM_ID_FIELD_NUMBER = 14;
private int itemId_;
/**
* <code>uint32 itemId = 12;</code>
* <code>uint32 item_id = 14;</code>
* @return The itemId.
*/
@java.lang.Override
@@ -175,14 +179,14 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (count_ != 0) {
output.writeUInt32(10, count_);
}
if (isNew_ != false) {
output.writeBool(11, isNew_);
output.writeBool(1, isNew_);
}
if (count_ != 0) {
output.writeUInt32(9, count_);
}
if (itemId_ != 0) {
output.writeUInt32(12, itemId_);
output.writeUInt32(14, itemId_);
}
unknownFields.writeTo(output);
}
@@ -193,17 +197,17 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
if (size != -1) return size;
size = 0;
if (count_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, count_);
}
if (isNew_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(11, isNew_);
.computeBoolSize(1, isNew_);
}
if (count_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, count_);
}
if (itemId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(12, itemId_);
.computeUInt32Size(14, itemId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -220,10 +224,10 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
}
emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem other = (emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem) obj;
if (getCount()
!= other.getCount()) return false;
if (getIsNew()
!= other.getIsNew()) return false;
if (getCount()
!= other.getCount()) return false;
if (getItemId()
!= other.getItemId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
@@ -237,12 +241,12 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + COUNT_FIELD_NUMBER;
hash = (53 * hash) + getCount();
hash = (37 * hash) + ISNEW_FIELD_NUMBER;
hash = (37 * hash) + IS_NEW_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsNew());
hash = (37 * hash) + ITEMID_FIELD_NUMBER;
hash = (37 * hash) + COUNT_FIELD_NUMBER;
hash = (53 * hash) + getCount();
hash = (37 * hash) + ITEM_ID_FIELD_NUMBER;
hash = (53 * hash) + getItemId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
@@ -340,6 +344,10 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
return builder;
}
/**
* <pre>
* Name: CMDOHKNKFDH
* </pre>
*
* Protobuf type {@code AddNoGachaAvatarCardTransferItem}
*/
public static final class Builder extends
@@ -377,10 +385,10 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
count_ = 0;
isNew_ = false;
count_ = 0;
itemId_ = 0;
return this;
@@ -409,8 +417,8 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem buildPartial() {
emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem result = new emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem(this);
result.count_ = count_;
result.isNew_ = isNew_;
result.count_ = count_;
result.itemId_ = itemId_;
onBuilt();
return result;
@@ -460,12 +468,12 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem other) {
if (other == emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.getDefaultInstance()) return this;
if (other.getCount() != 0) {
setCount(other.getCount());
}
if (other.getIsNew() != false) {
setIsNew(other.getIsNew());
}
if (other.getCount() != 0) {
setCount(other.getCount());
}
if (other.getItemId() != 0) {
setItemId(other.getItemId());
}
@@ -498,40 +506,9 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
return this;
}
private int count_ ;
/**
* <code>uint32 count = 10;</code>
* @return The count.
*/
@java.lang.Override
public int getCount() {
return count_;
}
/**
* <code>uint32 count = 10;</code>
* @param value The count to set.
* @return This builder for chaining.
*/
public Builder setCount(int value) {
count_ = value;
onChanged();
return this;
}
/**
* <code>uint32 count = 10;</code>
* @return This builder for chaining.
*/
public Builder clearCount() {
count_ = 0;
onChanged();
return this;
}
private boolean isNew_ ;
/**
* <code>bool isNew = 11;</code>
* <code>bool is_new = 1;</code>
* @return The isNew.
*/
@java.lang.Override
@@ -539,7 +516,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
return isNew_;
}
/**
* <code>bool isNew = 11;</code>
* <code>bool is_new = 1;</code>
* @param value The isNew to set.
* @return This builder for chaining.
*/
@@ -550,7 +527,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
return this;
}
/**
* <code>bool isNew = 11;</code>
* <code>bool is_new = 1;</code>
* @return This builder for chaining.
*/
public Builder clearIsNew() {
@@ -560,9 +537,40 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
return this;
}
private int count_ ;
/**
* <code>uint32 count = 9;</code>
* @return The count.
*/
@java.lang.Override
public int getCount() {
return count_;
}
/**
* <code>uint32 count = 9;</code>
* @param value The count to set.
* @return This builder for chaining.
*/
public Builder setCount(int value) {
count_ = value;
onChanged();
return this;
}
/**
* <code>uint32 count = 9;</code>
* @return This builder for chaining.
*/
public Builder clearCount() {
count_ = 0;
onChanged();
return this;
}
private int itemId_ ;
/**
* <code>uint32 itemId = 12;</code>
* <code>uint32 item_id = 14;</code>
* @return The itemId.
*/
@java.lang.Override
@@ -570,7 +578,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
return itemId_;
}
/**
* <code>uint32 itemId = 12;</code>
* <code>uint32 item_id = 14;</code>
* @param value The itemId to set.
* @return This builder for chaining.
*/
@@ -581,7 +589,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
return this;
}
/**
* <code>uint32 itemId = 12;</code>
* <code>uint32 item_id = 14;</code>
* @return This builder for chaining.
*/
public Builder clearItemId() {
@@ -658,9 +666,10 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
static {
java.lang.String[] descriptorData = {
"\n&AddNoGachaAvatarCardTransferItem.proto" +
"\"P\n AddNoGachaAvatarCardTransferItem\022\r\n\005" +
"count\030\n \001(\r\022\r\n\005isNew\030\013 \001(\010\022\016\n\006itemId\030\014 \001" +
"(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
"\"R\n AddNoGachaAvatarCardTransferItem\022\016\n\006" +
"is_new\030\001 \001(\010\022\r\n\005count\030\t \001(\r\022\017\n\007item_id\030\016" +
" \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
"3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -671,7 +680,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
internal_static_AddNoGachaAvatarCardTransferItem_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AddNoGachaAvatarCardTransferItem_descriptor,
new java.lang.String[] { "Count", "IsNew", "ItemId", });
new java.lang.String[] { "IsNew", "Count", "ItemId", });
}
// @@protoc_insertion_point(outer_class_scope)