Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-19 02:29:55 +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/PlayerCookReqOuterClass.java
+269 -321
View File
@@ -19,30 +19,51 @@ public final class PlayerCookReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 recipeId = 15;</code>
* <pre>
* HHKAPMHMHFI
* </pre>
*
* <code>uint32 cook_count = 9;</code>
* @return The cookCount.
*/
int getCookCount();
/**
* <pre>
* DIIJPMJFNOL
* </pre>
*
* <code>uint32 recipe_id = 5;</code>
* @return The recipeId.
*/
int getRecipeId();
/**
* <code>uint32 assistAvatar = 6;</code>
* @return The assistAvatar.
*/
int getAssistAvatar();
/**
* <code>uint32 qteQuality = 13;</code>
* <pre>
* IFLJGHHBGMP
* </pre>
*
* <code>uint32 qte_quality = 15;</code>
* @return The qteQuality.
*/
int getQteQuality();
/**
* <code>uint32 cookCount = 3;</code>
* @return The cookCount.
* <pre>
* OMPOMKPPLEH
* </pre>
*
* <code>uint32 assist_avatar = 3;</code>
* @return The assistAvatar.
*/
int getCookCount();
int getAssistAvatar();
}
/**
* <pre>
* Name: IFIIKECOADA
* CmdId: 184
* </pre>
*
* Protobuf type {@code PlayerCookReq}
*/
public static final class PlayerCookReq extends
@@ -89,22 +110,22 @@ public final class PlayerCookReqOuterClass {
break;
case 24: {
cookCount_ = input.readUInt32();
break;
}
case 48: {
assistAvatar_ = input.readUInt32();
break;
}
case 104: {
case 40: {
qteQuality_ = input.readUInt32();
recipeId_ = input.readUInt32();
break;
}
case 72: {
cookCount_ = input.readUInt32();
break;
}
case 120: {
recipeId_ = input.readUInt32();
qteQuality_ = input.readUInt32();
break;
}
default: {
@@ -139,149 +160,29 @@ public final class PlayerCookReqOuterClass {
emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq.class, emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq.Builder.class);
}
public static final int COOK_COUNT_FIELD_NUMBER = 9;
private int cookCount_;
/**
* Protobuf enum {@code PlayerCookReq.IKLLJNNFHEM}
* <pre>
* HHKAPMHMHFI
* </pre>
*
* <code>uint32 cook_count = 9;</code>
* @return The cookCount.
*/
public enum IKLLJNNFHEM
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 175;</code>
*/
PEPPOHPHJOJ(1, 175),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final IKLLJNNFHEM DCDNILFDFLB = NONE;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final IKLLJNNFHEM EAJIABGAOCI = NNBKOLMPOEA;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 175;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 175;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final int DCDNILFDFLB_VALUE = 0;
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
public static final int NNBKOLMPOEA_VALUE = 1;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final int EAJIABGAOCI_VALUE = 1;
public final int getNumber() {
if (index == -1) {
throw new java.lang.IllegalArgumentException(
"Can't get the number of an unknown enum value.");
}
return value;
}
/**
* @param value The numeric wire value of the corresponding enum entry.
* @return The enum associated with the given numeric wire value.
* @deprecated Use {@link #forNumber(int)} instead.
*/
@java.lang.Deprecated
public static IKLLJNNFHEM valueOf(int value) {
return forNumber(value);
}
/**
* @param value The numeric wire value of the corresponding enum entry.
* @return The enum associated with the given numeric wire value.
*/
public static IKLLJNNFHEM forNumber(int value) {
switch (value) {
case 0: return NONE;
case 175: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<IKLLJNNFHEM>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
IKLLJNNFHEM> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<IKLLJNNFHEM>() {
public IKLLJNNFHEM findValueByNumber(int number) {
return IKLLJNNFHEM.forNumber(number);
}
};
public final com.google.protobuf.Descriptors.EnumValueDescriptor
getValueDescriptor() {
if (index == -1) {
throw new java.lang.IllegalStateException(
"Can't get the descriptor of an unrecognized enum value.");
}
return getDescriptor().getValues().get(index);
}
public final com.google.protobuf.Descriptors.EnumDescriptor
getDescriptorForType() {
return getDescriptor();
}
public static final com.google.protobuf.Descriptors.EnumDescriptor
getDescriptor() {
return emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq.getDescriptor().getEnumTypes().get(0);
}
private static final IKLLJNNFHEM[] VALUES = getStaticValuesArray();
private static IKLLJNNFHEM[] getStaticValuesArray() {
return new IKLLJNNFHEM[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
};
}
public static IKLLJNNFHEM valueOf(
com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
if (desc.getType() != getDescriptor()) {
throw new java.lang.IllegalArgumentException(
"EnumValueDescriptor is not for this type.");
}
if (desc.getIndex() == -1) {
return UNRECOGNIZED;
}
return VALUES[desc.getIndex()];
}
private final int index;
private final int value;
private IKLLJNNFHEM(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:PlayerCookReq.IKLLJNNFHEM)
@java.lang.Override
public int getCookCount() {
return cookCount_;
}
public static final int RECIPEID_FIELD_NUMBER = 15;
public static final int RECIPE_ID_FIELD_NUMBER = 5;
private int recipeId_;
/**
* <code>uint32 recipeId = 15;</code>
* <pre>
* DIIJPMJFNOL
* </pre>
*
* <code>uint32 recipe_id = 5;</code>
* @return The recipeId.
*/
@java.lang.Override
@@ -289,21 +190,14 @@ public final class PlayerCookReqOuterClass {
return recipeId_;
}
public static final int ASSISTAVATAR_FIELD_NUMBER = 6;
private int assistAvatar_;
/**
* <code>uint32 assistAvatar = 6;</code>
* @return The assistAvatar.
*/
@java.lang.Override
public int getAssistAvatar() {
return assistAvatar_;
}
public static final int QTEQUALITY_FIELD_NUMBER = 13;
public static final int QTE_QUALITY_FIELD_NUMBER = 15;
private int qteQuality_;
/**
* <code>uint32 qteQuality = 13;</code>
* <pre>
* IFLJGHHBGMP
* </pre>
*
* <code>uint32 qte_quality = 15;</code>
* @return The qteQuality.
*/
@java.lang.Override
@@ -311,15 +205,19 @@ public final class PlayerCookReqOuterClass {
return qteQuality_;
}
public static final int COOKCOUNT_FIELD_NUMBER = 3;
private int cookCount_;
public static final int ASSIST_AVATAR_FIELD_NUMBER = 3;
private int assistAvatar_;
/**
* <code>uint32 cookCount = 3;</code>
* @return The cookCount.
* <pre>
* OMPOMKPPLEH
* </pre>
*
* <code>uint32 assist_avatar = 3;</code>
* @return The assistAvatar.
*/
@java.lang.Override
public int getCookCount() {
return cookCount_;
public int getAssistAvatar() {
return assistAvatar_;
}
private byte memoizedIsInitialized = -1;
@@ -336,17 +234,17 @@ public final class PlayerCookReqOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (cookCount_ != 0) {
output.writeUInt32(3, cookCount_);
}
if (assistAvatar_ != 0) {
output.writeUInt32(6, assistAvatar_);
}
if (qteQuality_ != 0) {
output.writeUInt32(13, qteQuality_);
output.writeUInt32(3, assistAvatar_);
}
if (recipeId_ != 0) {
output.writeUInt32(15, recipeId_);
output.writeUInt32(5, recipeId_);
}
if (cookCount_ != 0) {
output.writeUInt32(9, cookCount_);
}
if (qteQuality_ != 0) {
output.writeUInt32(15, qteQuality_);
}
unknownFields.writeTo(output);
}
@@ -357,21 +255,21 @@ public final class PlayerCookReqOuterClass {
if (size != -1) return size;
size = 0;
if (cookCount_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, cookCount_);
}
if (assistAvatar_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, assistAvatar_);
}
if (qteQuality_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, qteQuality_);
.computeUInt32Size(3, assistAvatar_);
}
if (recipeId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, recipeId_);
.computeUInt32Size(5, recipeId_);
}
if (cookCount_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, cookCount_);
}
if (qteQuality_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, qteQuality_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -388,14 +286,14 @@ public final class PlayerCookReqOuterClass {
}
emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq other = (emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq) obj;
if (getRecipeId()
!= other.getRecipeId()) return false;
if (getAssistAvatar()
!= other.getAssistAvatar()) return false;
if (getQteQuality()
!= other.getQteQuality()) return false;
if (getCookCount()
!= other.getCookCount()) return false;
if (getRecipeId()
!= other.getRecipeId()) return false;
if (getQteQuality()
!= other.getQteQuality()) return false;
if (getAssistAvatar()
!= other.getAssistAvatar()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -407,14 +305,14 @@ public final class PlayerCookReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + RECIPEID_FIELD_NUMBER;
hash = (53 * hash) + getRecipeId();
hash = (37 * hash) + ASSISTAVATAR_FIELD_NUMBER;
hash = (53 * hash) + getAssistAvatar();
hash = (37 * hash) + QTEQUALITY_FIELD_NUMBER;
hash = (53 * hash) + getQteQuality();
hash = (37 * hash) + COOKCOUNT_FIELD_NUMBER;
hash = (37 * hash) + COOK_COUNT_FIELD_NUMBER;
hash = (53 * hash) + getCookCount();
hash = (37 * hash) + RECIPE_ID_FIELD_NUMBER;
hash = (53 * hash) + getRecipeId();
hash = (37 * hash) + QTE_QUALITY_FIELD_NUMBER;
hash = (53 * hash) + getQteQuality();
hash = (37 * hash) + ASSIST_AVATAR_FIELD_NUMBER;
hash = (53 * hash) + getAssistAvatar();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -511,6 +409,11 @@ public final class PlayerCookReqOuterClass {
return builder;
}
/**
* <pre>
* Name: IFIIKECOADA
* CmdId: 184
* </pre>
*
* Protobuf type {@code PlayerCookReq}
*/
public static final class Builder extends
@@ -548,13 +451,13 @@ public final class PlayerCookReqOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
recipeId_ = 0;
cookCount_ = 0;
assistAvatar_ = 0;
recipeId_ = 0;
qteQuality_ = 0;
cookCount_ = 0;
assistAvatar_ = 0;
return this;
}
@@ -582,10 +485,10 @@ public final class PlayerCookReqOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq buildPartial() {
emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq result = new emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq(this);
result.recipeId_ = recipeId_;
result.assistAvatar_ = assistAvatar_;
result.qteQuality_ = qteQuality_;
result.cookCount_ = cookCount_;
result.recipeId_ = recipeId_;
result.qteQuality_ = qteQuality_;
result.assistAvatar_ = assistAvatar_;
onBuilt();
return result;
}
@@ -634,17 +537,17 @@ public final class PlayerCookReqOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq other) {
if (other == emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq.getDefaultInstance()) return this;
if (other.getCookCount() != 0) {
setCookCount(other.getCookCount());
}
if (other.getRecipeId() != 0) {
setRecipeId(other.getRecipeId());
}
if (other.getAssistAvatar() != 0) {
setAssistAvatar(other.getAssistAvatar());
}
if (other.getQteQuality() != 0) {
setQteQuality(other.getQteQuality());
}
if (other.getCookCount() != 0) {
setCookCount(other.getCookCount());
if (other.getAssistAvatar() != 0) {
setAssistAvatar(other.getAssistAvatar());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -675,102 +578,13 @@ public final class PlayerCookReqOuterClass {
return this;
}
private int recipeId_ ;
/**
* <code>uint32 recipeId = 15;</code>
* @return The recipeId.
*/
@java.lang.Override
public int getRecipeId() {
return recipeId_;
}
/**
* <code>uint32 recipeId = 15;</code>
* @param value The recipeId to set.
* @return This builder for chaining.
*/
public Builder setRecipeId(int value) {
recipeId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 recipeId = 15;</code>
* @return This builder for chaining.
*/
public Builder clearRecipeId() {
recipeId_ = 0;
onChanged();
return this;
}
private int assistAvatar_ ;
/**
* <code>uint32 assistAvatar = 6;</code>
* @return The assistAvatar.
*/
@java.lang.Override
public int getAssistAvatar() {
return assistAvatar_;
}
/**
* <code>uint32 assistAvatar = 6;</code>
* @param value The assistAvatar to set.
* @return This builder for chaining.
*/
public Builder setAssistAvatar(int value) {
assistAvatar_ = value;
onChanged();
return this;
}
/**
* <code>uint32 assistAvatar = 6;</code>
* @return This builder for chaining.
*/
public Builder clearAssistAvatar() {
assistAvatar_ = 0;
onChanged();
return this;
}
private int qteQuality_ ;
/**
* <code>uint32 qteQuality = 13;</code>
* @return The qteQuality.
*/
@java.lang.Override
public int getQteQuality() {
return qteQuality_;
}
/**
* <code>uint32 qteQuality = 13;</code>
* @param value The qteQuality to set.
* @return This builder for chaining.
*/
public Builder setQteQuality(int value) {
qteQuality_ = value;
onChanged();
return this;
}
/**
* <code>uint32 qteQuality = 13;</code>
* @return This builder for chaining.
*/
public Builder clearQteQuality() {
qteQuality_ = 0;
onChanged();
return this;
}
private int cookCount_ ;
/**
* <code>uint32 cookCount = 3;</code>
* <pre>
* HHKAPMHMHFI
* </pre>
*
* <code>uint32 cook_count = 9;</code>
* @return The cookCount.
*/
@java.lang.Override
@@ -778,7 +592,11 @@ public final class PlayerCookReqOuterClass {
return cookCount_;
}
/**
* <code>uint32 cookCount = 3;</code>
* <pre>
* HHKAPMHMHFI
* </pre>
*
* <code>uint32 cook_count = 9;</code>
* @param value The cookCount to set.
* @return This builder for chaining.
*/
@@ -789,7 +607,11 @@ public final class PlayerCookReqOuterClass {
return this;
}
/**
* <code>uint32 cookCount = 3;</code>
* <pre>
* HHKAPMHMHFI
* </pre>
*
* <code>uint32 cook_count = 9;</code>
* @return This builder for chaining.
*/
public Builder clearCookCount() {
@@ -798,6 +620,135 @@ public final class PlayerCookReqOuterClass {
onChanged();
return this;
}
private int recipeId_ ;
/**
* <pre>
* DIIJPMJFNOL
* </pre>
*
* <code>uint32 recipe_id = 5;</code>
* @return The recipeId.
*/
@java.lang.Override
public int getRecipeId() {
return recipeId_;
}
/**
* <pre>
* DIIJPMJFNOL
* </pre>
*
* <code>uint32 recipe_id = 5;</code>
* @param value The recipeId to set.
* @return This builder for chaining.
*/
public Builder setRecipeId(int value) {
recipeId_ = value;
onChanged();
return this;
}
/**
* <pre>
* DIIJPMJFNOL
* </pre>
*
* <code>uint32 recipe_id = 5;</code>
* @return This builder for chaining.
*/
public Builder clearRecipeId() {
recipeId_ = 0;
onChanged();
return this;
}
private int qteQuality_ ;
/**
* <pre>
* IFLJGHHBGMP
* </pre>
*
* <code>uint32 qte_quality = 15;</code>
* @return The qteQuality.
*/
@java.lang.Override
public int getQteQuality() {
return qteQuality_;
}
/**
* <pre>
* IFLJGHHBGMP
* </pre>
*
* <code>uint32 qte_quality = 15;</code>
* @param value The qteQuality to set.
* @return This builder for chaining.
*/
public Builder setQteQuality(int value) {
qteQuality_ = value;
onChanged();
return this;
}
/**
* <pre>
* IFLJGHHBGMP
* </pre>
*
* <code>uint32 qte_quality = 15;</code>
* @return This builder for chaining.
*/
public Builder clearQteQuality() {
qteQuality_ = 0;
onChanged();
return this;
}
private int assistAvatar_ ;
/**
* <pre>
* OMPOMKPPLEH
* </pre>
*
* <code>uint32 assist_avatar = 3;</code>
* @return The assistAvatar.
*/
@java.lang.Override
public int getAssistAvatar() {
return assistAvatar_;
}
/**
* <pre>
* OMPOMKPPLEH
* </pre>
*
* <code>uint32 assist_avatar = 3;</code>
* @param value The assistAvatar to set.
* @return This builder for chaining.
*/
public Builder setAssistAvatar(int value) {
assistAvatar_ = value;
onChanged();
return this;
}
/**
* <pre>
* OMPOMKPPLEH
* </pre>
*
* <code>uint32 assist_avatar = 3;</code>
* @return This builder for chaining.
*/
public Builder clearAssistAvatar() {
assistAvatar_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -865,13 +816,10 @@ public final class PlayerCookReqOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\023PlayerCookReq.proto\"\300\001\n\rPlayerCookReq\022" +
"\020\n\010recipeId\030\017 \001(\r\022\024\n\014assistAvatar\030\006 \001(\r\022" +
"\022\n\nqteQuality\030\r \001(\r\022\021\n\tcookCount\030\003 \001(\r\"`" +
"\n\013IKLLJNNFHEM\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\257" +
"\001\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\022\017\n\013E" +
"AJIABGAOCI\020\001\032\002\020\001B\033\n\031emu.grasscutter.net." +
"protob\006proto3"
"\n\023PlayerCookReq.proto\"b\n\rPlayerCookReq\022\022" +
"\n\ncook_count\030\t \001(\r\022\021\n\trecipe_id\030\005 \001(\r\022\023\n" +
"\013qte_quality\030\017 \001(\r\022\025\n\rassist_avatar\030\003 \001(" +
"\rB\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -882,7 +830,7 @@ public final class PlayerCookReqOuterClass {
internal_static_PlayerCookReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_PlayerCookReq_descriptor,
new java.lang.String[] { "RecipeId", "AssistAvatar", "QteQuality", "CookCount", });
new java.lang.String[] { "CookCount", "RecipeId", "QteQuality", "AssistAvatar", });
}
// @@protoc_insertion_point(outer_class_scope)