Commit d575d1cc authored by Benj's avatar Benj Committed by Luke H-W
Browse files

Update 3.0 protos

parent 5db73d28
...@@ -46,7 +46,8 @@ public final class ClientCollectorDataNotifyOuterClass { ...@@ -46,7 +46,8 @@ public final class ClientCollectorDataNotifyOuterClass {
* <pre> * <pre>
* CmdId: 4264 * CmdId: 4264
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code ClientCollectorDataNotify} * Protobuf type {@code ClientCollectorDataNotify}
...@@ -340,7 +341,8 @@ public final class ClientCollectorDataNotifyOuterClass { ...@@ -340,7 +341,8 @@ public final class ClientCollectorDataNotifyOuterClass {
* <pre> * <pre>
* CmdId: 4264 * CmdId: 4264
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code ClientCollectorDataNotify} * Protobuf type {@code ClientCollectorDataNotify}
......
...@@ -75,7 +75,8 @@ public final class CodexDataFullNotifyOuterClass { ...@@ -75,7 +75,8 @@ public final class CodexDataFullNotifyOuterClass {
* <pre> * <pre>
* CmdId: 4205 * CmdId: 4205
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CodexDataFullNotify} * Protobuf type {@code CodexDataFullNotify}
...@@ -504,7 +505,8 @@ public final class CodexDataFullNotifyOuterClass { ...@@ -504,7 +505,8 @@ public final class CodexDataFullNotifyOuterClass {
* <pre> * <pre>
* CmdId: 4205 * CmdId: 4205
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CodexDataFullNotify} * Protobuf type {@code CodexDataFullNotify}
......
...@@ -45,7 +45,8 @@ public final class CodexDataUpdateNotifyOuterClass { ...@@ -45,7 +45,8 @@ public final class CodexDataUpdateNotifyOuterClass {
* <pre> * <pre>
* CmdId: 4207 * CmdId: 4207
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CodexDataUpdateNotify} * Protobuf type {@code CodexDataUpdateNotify}
...@@ -362,7 +363,8 @@ public final class CodexDataUpdateNotifyOuterClass { ...@@ -362,7 +363,8 @@ public final class CodexDataUpdateNotifyOuterClass {
* <pre> * <pre>
* CmdId: 4207 * CmdId: 4207
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CodexDataUpdateNotify} * Protobuf type {@code CodexDataUpdateNotify}
......
...@@ -46,7 +46,7 @@ public final class CombatInvocationsNotifyOuterClass { ...@@ -46,7 +46,7 @@ public final class CombatInvocationsNotifyOuterClass {
* <pre> * <pre>
* CmdId: 319 * CmdId: 319
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true * IsAllowClient: true
* </pre> * </pre>
* *
...@@ -341,7 +341,7 @@ public final class CombatInvocationsNotifyOuterClass { ...@@ -341,7 +341,7 @@ public final class CombatInvocationsNotifyOuterClass {
* <pre> * <pre>
* CmdId: 319 * CmdId: 319
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true * IsAllowClient: true
* </pre> * </pre>
* *
......
...@@ -91,6 +91,10 @@ public final class CombatTypeArgumentOuterClass { ...@@ -91,6 +91,10 @@ public final class CombatTypeArgumentOuterClass {
* <code>COMBAT_TYPE_ARGUMENT_Unk2700_KPLOMOIALGF = 17;</code> * <code>COMBAT_TYPE_ARGUMENT_Unk2700_KPLOMOIALGF = 17;</code>
*/ */
COMBAT_TYPE_ARGUMENT_Unk2700_KPLOMOIALGF(17), COMBAT_TYPE_ARGUMENT_Unk2700_KPLOMOIALGF(17),
/**
* <code>COMBAT_TYPE_ARGUMENT_Unk3000_BJEHMPLCFHN = 18;</code>
*/
COMBAT_TYPE_ARGUMENT_Unk3000_BJEHMPLCFHN(18),
UNRECOGNIZED(-1), UNRECOGNIZED(-1),
; ;
...@@ -166,6 +170,10 @@ public final class CombatTypeArgumentOuterClass { ...@@ -166,6 +170,10 @@ public final class CombatTypeArgumentOuterClass {
* <code>COMBAT_TYPE_ARGUMENT_Unk2700_KPLOMOIALGF = 17;</code> * <code>COMBAT_TYPE_ARGUMENT_Unk2700_KPLOMOIALGF = 17;</code>
*/ */
public static final int COMBAT_TYPE_ARGUMENT_Unk2700_KPLOMOIALGF_VALUE = 17; public static final int COMBAT_TYPE_ARGUMENT_Unk2700_KPLOMOIALGF_VALUE = 17;
/**
* <code>COMBAT_TYPE_ARGUMENT_Unk3000_BJEHMPLCFHN = 18;</code>
*/
public static final int COMBAT_TYPE_ARGUMENT_Unk3000_BJEHMPLCFHN_VALUE = 18;
public final int getNumber() { public final int getNumber() {
...@@ -210,6 +218,7 @@ public final class CombatTypeArgumentOuterClass { ...@@ -210,6 +218,7 @@ public final class CombatTypeArgumentOuterClass {
case 15: return COMBAT_TYPE_ARGUMENT_LIGHT_CORE_MOVE; case 15: return COMBAT_TYPE_ARGUMENT_LIGHT_CORE_MOVE;
case 16: return COMBAT_TYPE_ARGUMENT_Unk2700_KPDNFKCMKPG; case 16: return COMBAT_TYPE_ARGUMENT_Unk2700_KPDNFKCMKPG;
case 17: return COMBAT_TYPE_ARGUMENT_Unk2700_KPLOMOIALGF; case 17: return COMBAT_TYPE_ARGUMENT_Unk2700_KPLOMOIALGF;
case 18: return COMBAT_TYPE_ARGUMENT_Unk3000_BJEHMPLCFHN;
default: return null; default: return null;
} }
} }
...@@ -275,7 +284,7 @@ public final class CombatTypeArgumentOuterClass { ...@@ -275,7 +284,7 @@ public final class CombatTypeArgumentOuterClass {
descriptor; descriptor;
static { static {
java.lang.String[] descriptorData = { java.lang.String[] descriptorData = {
"\n\030CombatTypeArgument.proto*\227\006\n\022CombatTyp" + "\n\030CombatTypeArgument.proto*\305\006\n\022CombatTyp" +
"eArgument\022\035\n\031COMBAT_TYPE_ARGUMENT_NONE\020\000" + "eArgument\022\035\n\031COMBAT_TYPE_ARGUMENT_NONE\020\000" +
"\022&\n\"COMBAT_TYPE_ARGUMENT_EVT_BEING_HIT\020\001" + "\022&\n\"COMBAT_TYPE_ARGUMENT_EVT_BEING_HIT\020\001" +
"\022/\n+COMBAT_TYPE_ARGUMENT_ANIMATOR_STATE_" + "\022/\n+COMBAT_TYPE_ARGUMENT_ANIMATOR_STATE_" +
...@@ -295,8 +304,9 @@ public final class CombatTypeArgumentOuterClass { ...@@ -295,8 +304,9 @@ public final class CombatTypeArgumentOuterClass {
"FORM\020\016\022(\n$COMBAT_TYPE_ARGUMENT_LIGHT_COR" + "FORM\020\016\022(\n$COMBAT_TYPE_ARGUMENT_LIGHT_COR" +
"E_MOVE\020\017\022,\n(COMBAT_TYPE_ARGUMENT_Unk2700" + "E_MOVE\020\017\022,\n(COMBAT_TYPE_ARGUMENT_Unk2700" +
"_KPDNFKCMKPG\020\020\022,\n(COMBAT_TYPE_ARGUMENT_U" + "_KPDNFKCMKPG\020\020\022,\n(COMBAT_TYPE_ARGUMENT_U" +
"nk2700_KPLOMOIALGF\020\021B\033\n\031emu.grasscutter." + "nk2700_KPLOMOIALGF\020\021\022,\n(COMBAT_TYPE_ARGU" +
"net.protob\006proto3" "MENT_Unk3000_BJEHMPLCFHN\020\022B\033\n\031emu.grassc" +
"utter.net.protob\006proto3"
}; };
descriptor = com.google.protobuf.Descriptors.FileDescriptor descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData, .internalBuildGeneratedFileFrom(descriptorData,
......
...@@ -39,7 +39,8 @@ public final class CombineDataNotifyOuterClass { ...@@ -39,7 +39,8 @@ public final class CombineDataNotifyOuterClass {
* <pre> * <pre>
* CmdId: 659 * CmdId: 659
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CombineDataNotify} * Protobuf type {@code CombineDataNotify}
...@@ -348,7 +349,8 @@ public final class CombineDataNotifyOuterClass { ...@@ -348,7 +349,8 @@ public final class CombineDataNotifyOuterClass {
* <pre> * <pre>
* CmdId: 659 * CmdId: 659
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CombineDataNotify} * Protobuf type {@code CombineDataNotify}
......
...@@ -34,7 +34,8 @@ public final class CombineFormulaDataNotifyOuterClass { ...@@ -34,7 +34,8 @@ public final class CombineFormulaDataNotifyOuterClass {
* <pre> * <pre>
* CmdId: 632 * CmdId: 632
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CombineFormulaDataNotify} * Protobuf type {@code CombineFormulaDataNotify}
...@@ -316,7 +317,8 @@ public final class CombineFormulaDataNotifyOuterClass { ...@@ -316,7 +317,8 @@ public final class CombineFormulaDataNotifyOuterClass {
* <pre> * <pre>
* CmdId: 632 * CmdId: 632
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CombineFormulaDataNotify} * Protobuf type {@code CombineFormulaDataNotify}
......
...@@ -40,7 +40,7 @@ public final class CombineReqOuterClass { ...@@ -40,7 +40,7 @@ public final class CombineReqOuterClass {
* <pre> * <pre>
* CmdId: 643 * CmdId: 643
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true * IsAllowClient: true
* </pre> * </pre>
* *
...@@ -350,7 +350,7 @@ public final class CombineReqOuterClass { ...@@ -350,7 +350,7 @@ public final class CombineReqOuterClass {
* <pre> * <pre>
* CmdId: 643 * CmdId: 643
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true * IsAllowClient: true
* </pre> * </pre>
* *
......
...@@ -166,7 +166,8 @@ public final class CombineRspOuterClass { ...@@ -166,7 +166,8 @@ public final class CombineRspOuterClass {
* <pre> * <pre>
* CmdId: 674 * CmdId: 674
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CombineRsp} * Protobuf type {@code CombineRsp}
...@@ -833,7 +834,8 @@ public final class CombineRspOuterClass { ...@@ -833,7 +834,8 @@ public final class CombineRspOuterClass {
* <pre> * <pre>
* CmdId: 674 * CmdId: 674
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CombineRsp} * Protobuf type {@code CombineRsp}
......
...@@ -18,12 +18,6 @@ public final class CookDataNotifyOuterClass { ...@@ -18,12 +18,6 @@ public final class CookDataNotifyOuterClass {
// @@protoc_insertion_point(interface_extends:CookDataNotify) // @@protoc_insertion_point(interface_extends:CookDataNotify)
com.google.protobuf.MessageOrBuilder { com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 grade = 11;</code>
* @return The grade.
*/
int getGrade();
/** /**
* <code>repeated .CookRecipeData recipe_data_list = 2;</code> * <code>repeated .CookRecipeData recipe_data_list = 2;</code>
*/ */
...@@ -47,12 +41,19 @@ public final class CookDataNotifyOuterClass { ...@@ -47,12 +41,19 @@ public final class CookDataNotifyOuterClass {
*/ */
emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeDataOrBuilder getRecipeDataListOrBuilder( emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeDataOrBuilder getRecipeDataListOrBuilder(
int index); int index);
/**
* <code>uint32 grade = 11;</code>
* @return The grade.
*/
int getGrade();
} }
/** /**
* <pre> * <pre>
* CmdId: 195 * CmdId: 195
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CookDataNotify} * Protobuf type {@code CookDataNotify}
...@@ -150,17 +151,6 @@ public final class CookDataNotifyOuterClass { ...@@ -150,17 +151,6 @@ public final class CookDataNotifyOuterClass {
emu.grasscutter.net.proto.CookDataNotifyOuterClass.CookDataNotify.class, emu.grasscutter.net.proto.CookDataNotifyOuterClass.CookDataNotify.Builder.class); emu.grasscutter.net.proto.CookDataNotifyOuterClass.CookDataNotify.class, emu.grasscutter.net.proto.CookDataNotifyOuterClass.CookDataNotify.Builder.class);
} }
public static final int GRADE_FIELD_NUMBER = 11;
private int grade_;
/**
* <code>uint32 grade = 11;</code>
* @return The grade.
*/
@java.lang.Override
public int getGrade() {
return grade_;
}
public static final int RECIPE_DATA_LIST_FIELD_NUMBER = 2; public static final int RECIPE_DATA_LIST_FIELD_NUMBER = 2;
private java.util.List<emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData> recipeDataList_; private java.util.List<emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData> recipeDataList_;
/** /**
...@@ -201,6 +191,17 @@ public final class CookDataNotifyOuterClass { ...@@ -201,6 +191,17 @@ public final class CookDataNotifyOuterClass {
return recipeDataList_.get(index); return recipeDataList_.get(index);
} }
public static final int GRADE_FIELD_NUMBER = 11;
private int grade_;
/**
* <code>uint32 grade = 11;</code>
* @return The grade.
*/
@java.lang.Override
public int getGrade() {
return grade_;
}
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
@java.lang.Override @java.lang.Override
public final boolean isInitialized() { public final boolean isInitialized() {
...@@ -253,10 +254,10 @@ public final class CookDataNotifyOuterClass { ...@@ -253,10 +254,10 @@ public final class CookDataNotifyOuterClass {
} }
emu.grasscutter.net.proto.CookDataNotifyOuterClass.CookDataNotify other = (emu.grasscutter.net.proto.CookDataNotifyOuterClass.CookDataNotify) obj; emu.grasscutter.net.proto.CookDataNotifyOuterClass.CookDataNotify other = (emu.grasscutter.net.proto.CookDataNotifyOuterClass.CookDataNotify) obj;
if (getGrade()
!= other.getGrade()) return false;
if (!getRecipeDataListList() if (!getRecipeDataListList()
.equals(other.getRecipeDataListList())) return false; .equals(other.getRecipeDataListList())) return false;
if (getGrade()
!= other.getGrade()) return false;
if (!unknownFields.equals(other.unknownFields)) return false; if (!unknownFields.equals(other.unknownFields)) return false;
return true; return true;
} }
...@@ -268,12 +269,12 @@ public final class CookDataNotifyOuterClass { ...@@ -268,12 +269,12 @@ public final class CookDataNotifyOuterClass {
} }
int hash = 41; int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode(); hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + GRADE_FIELD_NUMBER;
hash = (53 * hash) + getGrade();
if (getRecipeDataListCount() > 0) { if (getRecipeDataListCount() > 0) {
hash = (37 * hash) + RECIPE_DATA_LIST_FIELD_NUMBER; hash = (37 * hash) + RECIPE_DATA_LIST_FIELD_NUMBER;
hash = (53 * hash) + getRecipeDataListList().hashCode(); hash = (53 * hash) + getRecipeDataListList().hashCode();
} }
hash = (37 * hash) + GRADE_FIELD_NUMBER;
hash = (53 * hash) + getGrade();
hash = (29 * hash) + unknownFields.hashCode(); hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash; memoizedHashCode = hash;
return hash; return hash;
...@@ -373,7 +374,8 @@ public final class CookDataNotifyOuterClass { ...@@ -373,7 +374,8 @@ public final class CookDataNotifyOuterClass {
* <pre> * <pre>
* CmdId: 195 * CmdId: 195
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CookDataNotify} * Protobuf type {@code CookDataNotify}
...@@ -414,14 +416,14 @@ public final class CookDataNotifyOuterClass { ...@@ -414,14 +416,14 @@ public final class CookDataNotifyOuterClass {
@java.lang.Override @java.lang.Override
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
grade_ = 0;
if (recipeDataListBuilder_ == null) { if (recipeDataListBuilder_ == null) {
recipeDataList_ = java.util.Collections.emptyList(); recipeDataList_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
} else { } else {
recipeDataListBuilder_.clear(); recipeDataListBuilder_.clear();
} }
grade_ = 0;
return this; return this;
} }
...@@ -449,7 +451,6 @@ public final class CookDataNotifyOuterClass { ...@@ -449,7 +451,6 @@ public final class CookDataNotifyOuterClass {
public emu.grasscutter.net.proto.CookDataNotifyOuterClass.CookDataNotify buildPartial() { public emu.grasscutter.net.proto.CookDataNotifyOuterClass.CookDataNotify buildPartial() {
emu.grasscutter.net.proto.CookDataNotifyOuterClass.CookDataNotify result = new emu.grasscutter.net.proto.CookDataNotifyOuterClass.CookDataNotify(this); emu.grasscutter.net.proto.CookDataNotifyOuterClass.CookDataNotify result = new emu.grasscutter.net.proto.CookDataNotifyOuterClass.CookDataNotify(this);
int from_bitField0_ = bitField0_; int from_bitField0_ = bitField0_;
result.grade_ = grade_;
if (recipeDataListBuilder_ == null) { if (recipeDataListBuilder_ == null) {
if (((bitField0_ & 0x00000001) != 0)) { if (((bitField0_ & 0x00000001) != 0)) {
recipeDataList_ = java.util.Collections.unmodifiableList(recipeDataList_); recipeDataList_ = java.util.Collections.unmodifiableList(recipeDataList_);
...@@ -459,6 +460,7 @@ public final class CookDataNotifyOuterClass { ...@@ -459,6 +460,7 @@ public final class CookDataNotifyOuterClass {
} else { } else {
result.recipeDataList_ = recipeDataListBuilder_.build(); result.recipeDataList_ = recipeDataListBuilder_.build();
} }
result.grade_ = grade_;
onBuilt(); onBuilt();
return result; return result;
} }
...@@ -507,9 +509,6 @@ public final class CookDataNotifyOuterClass { ...@@ -507,9 +509,6 @@ public final class CookDataNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.CookDataNotifyOuterClass.CookDataNotify other) { public Builder mergeFrom(emu.grasscutter.net.proto.CookDataNotifyOuterClass.CookDataNotify other) {
if (other == emu.grasscutter.net.proto.CookDataNotifyOuterClass.CookDataNotify.getDefaultInstance()) return this; if (other == emu.grasscutter.net.proto.CookDataNotifyOuterClass.CookDataNotify.getDefaultInstance()) return this;
if (other.getGrade() != 0) {
setGrade(other.getGrade());
}
if (recipeDataListBuilder_ == null) { if (recipeDataListBuilder_ == null) {
if (!other.recipeDataList_.isEmpty()) { if (!other.recipeDataList_.isEmpty()) {
if (recipeDataList_.isEmpty()) { if (recipeDataList_.isEmpty()) {
...@@ -536,6 +535,9 @@ public final class CookDataNotifyOuterClass { ...@@ -536,6 +535,9 @@ public final class CookDataNotifyOuterClass {
} }
} }
} }
if (other.getGrade() != 0) {
setGrade(other.getGrade());
}
this.mergeUnknownFields(other.unknownFields); this.mergeUnknownFields(other.unknownFields);
onChanged(); onChanged();
return this; return this;
...@@ -566,37 +568,6 @@ public final class CookDataNotifyOuterClass { ...@@ -566,37 +568,6 @@ public final class CookDataNotifyOuterClass {
} }
private int bitField0_; private int bitField0_;
private int grade_ ;
/**
* <code>uint32 grade = 11;</code>
* @return The grade.
*/
@java.lang.Override
public int getGrade() {
return grade_;
}
/**
* <code>uint32 grade = 11;</code>
* @param value The grade to set.
* @return This builder for chaining.
*/
public Builder setGrade(int value) {
grade_ = value;
onChanged();
return this;
}
/**
* <code>uint32 grade = 11;</code>
* @return This builder for chaining.
*/
public Builder clearGrade() {
grade_ = 0;
onChanged();
return this;
}
private java.util.List<emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData> recipeDataList_ = private java.util.List<emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData> recipeDataList_ =
java.util.Collections.emptyList(); java.util.Collections.emptyList();
private void ensureRecipeDataListIsMutable() { private void ensureRecipeDataListIsMutable() {
...@@ -836,6 +807,37 @@ public final class CookDataNotifyOuterClass { ...@@ -836,6 +807,37 @@ public final class CookDataNotifyOuterClass {
} }
return recipeDataListBuilder_; return recipeDataListBuilder_;
} }
private int grade_ ;
/**
* <code>uint32 grade = 11;</code>
* @return The grade.
*/
@java.lang.Override
public int getGrade() {
return grade_;
}
/**
* <code>uint32 grade = 11;</code>
* @param value The grade to set.
* @return This builder for chaining.
*/
public Builder setGrade(int value) {
grade_ = value;
onChanged();
return this;
}
/**
* <code>uint32 grade = 11;</code>
* @return This builder for chaining.
*/
public Builder clearGrade() {
grade_ = 0;
onChanged();
return this;
}
@java.lang.Override @java.lang.Override
public final Builder setUnknownFields( public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) { final com.google.protobuf.UnknownFieldSet unknownFields) {
...@@ -904,8 +906,8 @@ public final class CookDataNotifyOuterClass { ...@@ -904,8 +906,8 @@ public final class CookDataNotifyOuterClass {
static { static {
java.lang.String[] descriptorData = { java.lang.String[] descriptorData = {
"\n\024CookDataNotify.proto\032\024CookRecipeData.p" + "\n\024CookDataNotify.proto\032\024CookRecipeData.p" +
"roto\"J\n\016CookDataNotify\022\r\n\005grade\030\013 \001(\r\022)\n" + "roto\"J\n\016CookDataNotify\022)\n\020recipe_data_li" +
"\020recipe_data_list\030\002 \003(\0132\017.CookRecipeData" + "st\030\002 \003(\0132\017.CookRecipeData\022\r\n\005grade\030\013 \001(\r" +
"B\033\n\031emu.grasscutter.net.protob\006proto3" "B\033\n\031emu.grasscutter.net.protob\006proto3"
}; };
descriptor = com.google.protobuf.Descriptors.FileDescriptor descriptor = com.google.protobuf.Descriptors.FileDescriptor
...@@ -918,7 +920,7 @@ public final class CookDataNotifyOuterClass { ...@@ -918,7 +920,7 @@ public final class CookDataNotifyOuterClass {
internal_static_CookDataNotify_fieldAccessorTable = new internal_static_CookDataNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_CookDataNotify_descriptor, internal_static_CookDataNotify_descriptor,
new java.lang.String[] { "Grade", "RecipeDataList", }); new java.lang.String[] { "RecipeDataList", "Grade", });
emu.grasscutter.net.proto.CookRecipeDataOuterClass.getDescriptor(); emu.grasscutter.net.proto.CookRecipeDataOuterClass.getDescriptor();
} }
......
...@@ -28,7 +28,8 @@ public final class CookGradeDataNotifyOuterClass { ...@@ -28,7 +28,8 @@ public final class CookGradeDataNotifyOuterClass {
* <pre> * <pre>
* CmdId: 134 * CmdId: 134
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CookGradeDataNotify} * Protobuf type {@code CookGradeDataNotify}
...@@ -282,7 +283,8 @@ public final class CookGradeDataNotifyOuterClass { ...@@ -282,7 +283,8 @@ public final class CookGradeDataNotifyOuterClass {
* <pre> * <pre>
* CmdId: 134 * CmdId: 134
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CookGradeDataNotify} * Protobuf type {@code CookGradeDataNotify}
......
...@@ -37,7 +37,8 @@ public final class CookRecipeDataNotifyOuterClass { ...@@ -37,7 +37,8 @@ public final class CookRecipeDataNotifyOuterClass {
* <pre> * <pre>
* CmdId: 106 * CmdId: 106
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CookRecipeDataNotify} * Protobuf type {@code CookRecipeDataNotify}
...@@ -319,7 +320,8 @@ public final class CookRecipeDataNotifyOuterClass { ...@@ -319,7 +320,8 @@ public final class CookRecipeDataNotifyOuterClass {
* <pre> * <pre>
* CmdId: 106 * CmdId: 106
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CookRecipeDataNotify} * Protobuf type {@code CookRecipeDataNotify}
......
...@@ -18,17 +18,17 @@ public final class CookRecipeDataOuterClass { ...@@ -18,17 +18,17 @@ public final class CookRecipeDataOuterClass {
// @@protoc_insertion_point(interface_extends:CookRecipeData) // @@protoc_insertion_point(interface_extends:CookRecipeData)
com.google.protobuf.MessageOrBuilder { com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 recipe_id = 9;</code>
* @return The recipeId.
*/
int getRecipeId();
/** /**
* <code>uint32 proficiency = 13;</code> * <code>uint32 proficiency = 13;</code>
* @return The proficiency. * @return The proficiency.
*/ */
int getProficiency(); int getProficiency();
/**
* <code>uint32 recipe_id = 9;</code>
* @return The recipeId.
*/
int getRecipeId();
} }
/** /**
* Protobuf type {@code CookRecipeData} * Protobuf type {@code CookRecipeData}
...@@ -117,17 +117,6 @@ public final class CookRecipeDataOuterClass { ...@@ -117,17 +117,6 @@ public final class CookRecipeDataOuterClass {
emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData.class, emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData.Builder.class); emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData.class, emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData.Builder.class);
} }
public static final int RECIPE_ID_FIELD_NUMBER = 9;
private int recipeId_;
/**
* <code>uint32 recipe_id = 9;</code>
* @return The recipeId.
*/
@java.lang.Override
public int getRecipeId() {
return recipeId_;
}
public static final int PROFICIENCY_FIELD_NUMBER = 13; public static final int PROFICIENCY_FIELD_NUMBER = 13;
private int proficiency_; private int proficiency_;
/** /**
...@@ -139,6 +128,17 @@ public final class CookRecipeDataOuterClass { ...@@ -139,6 +128,17 @@ public final class CookRecipeDataOuterClass {
return proficiency_; return proficiency_;
} }
public static final int RECIPE_ID_FIELD_NUMBER = 9;
private int recipeId_;
/**
* <code>uint32 recipe_id = 9;</code>
* @return The recipeId.
*/
@java.lang.Override
public int getRecipeId() {
return recipeId_;
}
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
@java.lang.Override @java.lang.Override
public final boolean isInitialized() { public final boolean isInitialized() {
...@@ -191,10 +191,10 @@ public final class CookRecipeDataOuterClass { ...@@ -191,10 +191,10 @@ public final class CookRecipeDataOuterClass {
} }
emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData other = (emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData) obj; emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData other = (emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData) obj;
if (getRecipeId()
!= other.getRecipeId()) return false;
if (getProficiency() if (getProficiency()
!= other.getProficiency()) return false; != other.getProficiency()) return false;
if (getRecipeId()
!= other.getRecipeId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false; if (!unknownFields.equals(other.unknownFields)) return false;
return true; return true;
} }
...@@ -206,10 +206,10 @@ public final class CookRecipeDataOuterClass { ...@@ -206,10 +206,10 @@ public final class CookRecipeDataOuterClass {
} }
int hash = 41; int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode(); hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + RECIPE_ID_FIELD_NUMBER;
hash = (53 * hash) + getRecipeId();
hash = (37 * hash) + PROFICIENCY_FIELD_NUMBER; hash = (37 * hash) + PROFICIENCY_FIELD_NUMBER;
hash = (53 * hash) + getProficiency(); hash = (53 * hash) + getProficiency();
hash = (37 * hash) + RECIPE_ID_FIELD_NUMBER;
hash = (53 * hash) + getRecipeId();
hash = (29 * hash) + unknownFields.hashCode(); hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash; memoizedHashCode = hash;
return hash; return hash;
...@@ -343,10 +343,10 @@ public final class CookRecipeDataOuterClass { ...@@ -343,10 +343,10 @@ public final class CookRecipeDataOuterClass {
@java.lang.Override @java.lang.Override
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
recipeId_ = 0;
proficiency_ = 0; proficiency_ = 0;
recipeId_ = 0;
return this; return this;
} }
...@@ -373,8 +373,8 @@ public final class CookRecipeDataOuterClass { ...@@ -373,8 +373,8 @@ public final class CookRecipeDataOuterClass {
@java.lang.Override @java.lang.Override
public emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData buildPartial() { public emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData buildPartial() {
emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData result = new emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData(this); emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData result = new emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData(this);
result.recipeId_ = recipeId_;
result.proficiency_ = proficiency_; result.proficiency_ = proficiency_;
result.recipeId_ = recipeId_;
onBuilt(); onBuilt();
return result; return result;
} }
...@@ -423,12 +423,12 @@ public final class CookRecipeDataOuterClass { ...@@ -423,12 +423,12 @@ public final class CookRecipeDataOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData other) { public Builder mergeFrom(emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData other) {
if (other == emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData.getDefaultInstance()) return this; if (other == emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData.getDefaultInstance()) return this;
if (other.getRecipeId() != 0) {
setRecipeId(other.getRecipeId());
}
if (other.getProficiency() != 0) { if (other.getProficiency() != 0) {
setProficiency(other.getProficiency()); setProficiency(other.getProficiency());
} }
if (other.getRecipeId() != 0) {
setRecipeId(other.getRecipeId());
}
this.mergeUnknownFields(other.unknownFields); this.mergeUnknownFields(other.unknownFields);
onChanged(); onChanged();
return this; return this;
...@@ -458,64 +458,64 @@ public final class CookRecipeDataOuterClass { ...@@ -458,64 +458,64 @@ public final class CookRecipeDataOuterClass {
return this; return this;
} }
private int recipeId_ ; private int proficiency_ ;
/** /**
* <code>uint32 recipe_id = 9;</code> * <code>uint32 proficiency = 13;</code>
* @return The recipeId. * @return The proficiency.
*/ */
@java.lang.Override @java.lang.Override
public int getRecipeId() { public int getProficiency() {
return recipeId_; return proficiency_;
} }
/** /**
* <code>uint32 recipe_id = 9;</code> * <code>uint32 proficiency = 13;</code>
* @param value The recipeId to set. * @param value The proficiency to set.
* @return This builder for chaining. * @return This builder for chaining.
*/ */
public Builder setRecipeId(int value) { public Builder setProficiency(int value) {
recipeId_ = value; proficiency_ = value;
onChanged(); onChanged();
return this; return this;
} }
/** /**
* <code>uint32 recipe_id = 9;</code> * <code>uint32 proficiency = 13;</code>
* @return This builder for chaining. * @return This builder for chaining.
*/ */
public Builder clearRecipeId() { public Builder clearProficiency() {
recipeId_ = 0; proficiency_ = 0;
onChanged(); onChanged();
return this; return this;
} }
private int proficiency_ ; private int recipeId_ ;
/** /**
* <code>uint32 proficiency = 13;</code> * <code>uint32 recipe_id = 9;</code>
* @return The proficiency. * @return The recipeId.
*/ */
@java.lang.Override @java.lang.Override
public int getProficiency() { public int getRecipeId() {
return proficiency_; return recipeId_;
} }
/** /**
* <code>uint32 proficiency = 13;</code> * <code>uint32 recipe_id = 9;</code>
* @param value The proficiency to set. * @param value The recipeId to set.
* @return This builder for chaining. * @return This builder for chaining.
*/ */
public Builder setProficiency(int value) { public Builder setRecipeId(int value) {
proficiency_ = value; recipeId_ = value;
onChanged(); onChanged();
return this; return this;
} }
/** /**
* <code>uint32 proficiency = 13;</code> * <code>uint32 recipe_id = 9;</code>
* @return This builder for chaining. * @return This builder for chaining.
*/ */
public Builder clearProficiency() { public Builder clearRecipeId() {
proficiency_ = 0; recipeId_ = 0;
onChanged(); onChanged();
return this; return this;
} }
...@@ -587,7 +587,7 @@ public final class CookRecipeDataOuterClass { ...@@ -587,7 +587,7 @@ public final class CookRecipeDataOuterClass {
static { static {
java.lang.String[] descriptorData = { java.lang.String[] descriptorData = {
"\n\024CookRecipeData.proto\"8\n\016CookRecipeData" + "\n\024CookRecipeData.proto\"8\n\016CookRecipeData" +
"\022\021\n\trecipe_id\030\t \001(\r\022\023\n\013proficiency\030\r \001(\r" + "\022\023\n\013proficiency\030\r \001(\r\022\021\n\trecipe_id\030\t \001(\r" +
"B\033\n\031emu.grasscutter.net.protob\006proto3" "B\033\n\031emu.grasscutter.net.protob\006proto3"
}; };
descriptor = com.google.protobuf.Descriptors.FileDescriptor descriptor = com.google.protobuf.Descriptors.FileDescriptor
...@@ -599,7 +599,7 @@ public final class CookRecipeDataOuterClass { ...@@ -599,7 +599,7 @@ public final class CookRecipeDataOuterClass {
internal_static_CookRecipeData_fieldAccessorTable = new internal_static_CookRecipeData_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_CookRecipeData_descriptor, internal_static_CookRecipeData_descriptor,
new java.lang.String[] { "RecipeId", "Proficiency", }); new java.lang.String[] { "Proficiency", "RecipeId", });
} }
// @@protoc_insertion_point(outer_class_scope) // @@protoc_insertion_point(outer_class_scope)
......
...@@ -75,7 +75,8 @@ public final class CoopDataNotifyOuterClass { ...@@ -75,7 +75,8 @@ public final class CoopDataNotifyOuterClass {
* <pre> * <pre>
* CmdId: 1979 * CmdId: 1979
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CoopDataNotify} * Protobuf type {@code CoopDataNotify}
...@@ -505,7 +506,8 @@ public final class CoopDataNotifyOuterClass { ...@@ -505,7 +506,8 @@ public final class CoopDataNotifyOuterClass {
* <pre> * <pre>
* CmdId: 1979 * CmdId: 1979
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CoopDataNotify} * Protobuf type {@code CoopDataNotify}
......
...@@ -64,7 +64,7 @@ public final class CreateVehicleReqOuterClass { ...@@ -64,7 +64,7 @@ public final class CreateVehicleReqOuterClass {
* <pre> * <pre>
* CmdId: 893 * CmdId: 893
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true * IsAllowClient: true
* </pre> * </pre>
* *
...@@ -456,7 +456,7 @@ public final class CreateVehicleReqOuterClass { ...@@ -456,7 +456,7 @@ public final class CreateVehicleReqOuterClass {
* <pre> * <pre>
* CmdId: 893 * CmdId: 893
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true * IsAllowClient: true
* </pre> * </pre>
* *
......
...@@ -40,7 +40,8 @@ public final class CreateVehicleRspOuterClass { ...@@ -40,7 +40,8 @@ public final class CreateVehicleRspOuterClass {
* <pre> * <pre>
* CmdId: 827 * CmdId: 827
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CreateVehicleRsp} * Protobuf type {@code CreateVehicleRsp}
...@@ -348,7 +349,8 @@ public final class CreateVehicleRspOuterClass { ...@@ -348,7 +349,8 @@ public final class CreateVehicleRspOuterClass {
* <pre> * <pre>
* CmdId: 827 * CmdId: 827
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CreateVehicleRsp} * Protobuf type {@code CreateVehicleRsp}
......
...@@ -34,7 +34,8 @@ public final class CutSceneBeginNotifyOuterClass { ...@@ -34,7 +34,8 @@ public final class CutSceneBeginNotifyOuterClass {
* <pre> * <pre>
* CmdId: 296 * CmdId: 296
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CutSceneBeginNotify} * Protobuf type {@code CutSceneBeginNotify}
...@@ -316,7 +317,8 @@ public final class CutSceneBeginNotifyOuterClass { ...@@ -316,7 +317,8 @@ public final class CutSceneBeginNotifyOuterClass {
* <pre> * <pre>
* CmdId: 296 * CmdId: 296
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CutSceneBeginNotify} * Protobuf type {@code CutSceneBeginNotify}
......
...@@ -34,7 +34,8 @@ public final class CutSceneEndNotifyOuterClass { ...@@ -34,7 +34,8 @@ public final class CutSceneEndNotifyOuterClass {
* <pre> * <pre>
* CmdId: 215 * CmdId: 215
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CutSceneEndNotify} * Protobuf type {@code CutSceneEndNotify}
...@@ -315,7 +316,8 @@ public final class CutSceneEndNotifyOuterClass { ...@@ -315,7 +316,8 @@ public final class CutSceneEndNotifyOuterClass {
* <pre> * <pre>
* CmdId: 215 * CmdId: 215
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true
* </pre> * </pre>
* *
* Protobuf type {@code CutSceneEndNotify} * Protobuf type {@code CutSceneEndNotify}
......
...@@ -28,7 +28,7 @@ public final class CutSceneFinishNotifyOuterClass { ...@@ -28,7 +28,7 @@ public final class CutSceneFinishNotifyOuterClass {
* <pre> * <pre>
* CmdId: 262 * CmdId: 262
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true * IsAllowClient: true
* </pre> * </pre>
* *
...@@ -283,7 +283,7 @@ public final class CutSceneFinishNotifyOuterClass { ...@@ -283,7 +283,7 @@ public final class CutSceneFinishNotifyOuterClass {
* <pre> * <pre>
* CmdId: 262 * CmdId: 262
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true * IsAllowClient: true
* </pre> * </pre>
* *
......
...@@ -39,7 +39,7 @@ public final class DealAddFriendReqOuterClass { ...@@ -39,7 +39,7 @@ public final class DealAddFriendReqOuterClass {
* <pre> * <pre>
* CmdId: 4003 * CmdId: 4003
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true * IsAllowClient: true
* </pre> * </pre>
* *
...@@ -330,7 +330,7 @@ public final class DealAddFriendReqOuterClass { ...@@ -330,7 +330,7 @@ public final class DealAddFriendReqOuterClass {
* <pre> * <pre>
* CmdId: 4003 * CmdId: 4003
* EnetChannelId: 0 * EnetChannelId: 0
* EnetIsReliable: true * EnetIsReliable: false
* IsAllowClient: true * IsAllowClient: true
* </pre> * </pre>
* *
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment