mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-06-05 15:44:26 +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
+254
-385
@@ -19,52 +19,57 @@ public final class GadgetInteractReqOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>.InterOpType opType = 1;</code>
|
||||
* <code>.InterOpType op_type = 8;</code>
|
||||
* @return The enum numeric value on the wire for opType.
|
||||
*/
|
||||
int getOpTypeValue();
|
||||
/**
|
||||
* <code>.InterOpType opType = 1;</code>
|
||||
* <code>.InterOpType op_type = 8;</code>
|
||||
* @return The opType.
|
||||
*/
|
||||
emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType getOpType();
|
||||
|
||||
/**
|
||||
* <code>bool isUseCondenseResin = 14;</code>
|
||||
* @return The isUseCondenseResin.
|
||||
*/
|
||||
boolean getIsUseCondenseResin();
|
||||
|
||||
/**
|
||||
* <code>uint32 gadgetEntityId = 8;</code>
|
||||
* @return The gadgetEntityId.
|
||||
*/
|
||||
int getGadgetEntityId();
|
||||
|
||||
/**
|
||||
* <code>uint32 gadgetId = 15;</code>
|
||||
* @return The gadgetId.
|
||||
*/
|
||||
int getGadgetId();
|
||||
|
||||
/**
|
||||
* <code>.ResinCostType resinCostType = 7;</code>
|
||||
* <code>.ResinCostType resin_cost_type = 4;</code>
|
||||
* @return The enum numeric value on the wire for resinCostType.
|
||||
*/
|
||||
int getResinCostTypeValue();
|
||||
/**
|
||||
* <code>.ResinCostType resinCostType = 7;</code>
|
||||
* <code>.ResinCostType resin_cost_type = 4;</code>
|
||||
* @return The resinCostType.
|
||||
*/
|
||||
emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType getResinCostType();
|
||||
|
||||
/**
|
||||
* <code>uint32 uiInteractId = 6;</code>
|
||||
* <code>bool is_use_condense_resin = 9;</code>
|
||||
* @return The isUseCondenseResin.
|
||||
*/
|
||||
boolean getIsUseCondenseResin();
|
||||
|
||||
/**
|
||||
* <code>uint32 gadget_id = 3;</code>
|
||||
* @return The gadgetId.
|
||||
*/
|
||||
int getGadgetId();
|
||||
|
||||
/**
|
||||
* <code>uint32 ui_interact_id = 11;</code>
|
||||
* @return The uiInteractId.
|
||||
*/
|
||||
int getUiInteractId();
|
||||
|
||||
/**
|
||||
* <code>uint32 gadget_entity_id = 2;</code>
|
||||
* @return The gadgetEntityId.
|
||||
*/
|
||||
int getGadgetEntityId();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: KJHPMOAELOJ
|
||||
* CmdId: 867
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code GadgetInteractReq}
|
||||
*/
|
||||
public static final class GadgetInteractReq extends
|
||||
@@ -111,36 +116,36 @@ public final class GadgetInteractReqOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 8: {
|
||||
int rawValue = input.readEnum();
|
||||
case 16: {
|
||||
|
||||
opType_ = rawValue;
|
||||
gadgetEntityId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 48: {
|
||||
case 24: {
|
||||
|
||||
uiInteractId_ = input.readUInt32();
|
||||
gadgetId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 56: {
|
||||
case 32: {
|
||||
int rawValue = input.readEnum();
|
||||
|
||||
resinCostType_ = rawValue;
|
||||
break;
|
||||
}
|
||||
case 64: {
|
||||
int rawValue = input.readEnum();
|
||||
|
||||
gadgetEntityId_ = input.readUInt32();
|
||||
opType_ = rawValue;
|
||||
break;
|
||||
}
|
||||
case 112: {
|
||||
case 72: {
|
||||
|
||||
isUseCondenseResin_ = input.readBool();
|
||||
break;
|
||||
}
|
||||
case 120: {
|
||||
case 88: {
|
||||
|
||||
gadgetId_ = input.readUInt32();
|
||||
uiInteractId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
@@ -175,156 +180,17 @@ public final class GadgetInteractReqOuterClass {
|
||||
emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq.class, emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq.Builder.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* Protobuf enum {@code GadgetInteractReq.HNAHFIOGDFG}
|
||||
*/
|
||||
public enum HNAHFIOGDFG
|
||||
implements com.google.protobuf.ProtocolMessageEnum {
|
||||
/**
|
||||
* <code>NONE = 0;</code>
|
||||
*/
|
||||
NONE(0, 0),
|
||||
/**
|
||||
* <code>PEPPOHPHJOJ = 805;</code>
|
||||
*/
|
||||
PEPPOHPHJOJ(1, 805),
|
||||
/**
|
||||
* <code>NNBKOLMPOEA = 1;</code>
|
||||
*/
|
||||
NNBKOLMPOEA(3, 1),
|
||||
UNRECOGNIZED(-1, -1),
|
||||
;
|
||||
|
||||
/**
|
||||
* <code>DCDNILFDFLB = 0;</code>
|
||||
*/
|
||||
public static final HNAHFIOGDFG DCDNILFDFLB = NONE;
|
||||
/**
|
||||
* <code>EAJIABGAOCI = 1;</code>
|
||||
*/
|
||||
public static final HNAHFIOGDFG EAJIABGAOCI = NNBKOLMPOEA;
|
||||
/**
|
||||
* <code>NONE = 0;</code>
|
||||
*/
|
||||
public static final int NONE_VALUE = 0;
|
||||
/**
|
||||
* <code>PEPPOHPHJOJ = 805;</code>
|
||||
*/
|
||||
public static final int PEPPOHPHJOJ_VALUE = 805;
|
||||
/**
|
||||
* <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 HNAHFIOGDFG 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 HNAHFIOGDFG forNumber(int value) {
|
||||
switch (value) {
|
||||
case 0: return NONE;
|
||||
case 805: return PEPPOHPHJOJ;
|
||||
case 1: return NNBKOLMPOEA;
|
||||
default: return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static com.google.protobuf.Internal.EnumLiteMap<HNAHFIOGDFG>
|
||||
internalGetValueMap() {
|
||||
return internalValueMap;
|
||||
}
|
||||
private static final com.google.protobuf.Internal.EnumLiteMap<
|
||||
HNAHFIOGDFG> internalValueMap =
|
||||
new com.google.protobuf.Internal.EnumLiteMap<HNAHFIOGDFG>() {
|
||||
public HNAHFIOGDFG findValueByNumber(int number) {
|
||||
return HNAHFIOGDFG.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.GadgetInteractReqOuterClass.GadgetInteractReq.getDescriptor().getEnumTypes().get(0);
|
||||
}
|
||||
|
||||
private static final HNAHFIOGDFG[] VALUES = getStaticValuesArray();
|
||||
private static HNAHFIOGDFG[] getStaticValuesArray() {
|
||||
return new HNAHFIOGDFG[] {
|
||||
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
|
||||
};
|
||||
}
|
||||
public static HNAHFIOGDFG 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 HNAHFIOGDFG(int index, int value) {
|
||||
this.index = index;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(enum_scope:GadgetInteractReq.HNAHFIOGDFG)
|
||||
}
|
||||
|
||||
public static final int OPTYPE_FIELD_NUMBER = 1;
|
||||
public static final int OP_TYPE_FIELD_NUMBER = 8;
|
||||
private int opType_;
|
||||
/**
|
||||
* <code>.InterOpType opType = 1;</code>
|
||||
* <code>.InterOpType op_type = 8;</code>
|
||||
* @return The enum numeric value on the wire for opType.
|
||||
*/
|
||||
@java.lang.Override public int getOpTypeValue() {
|
||||
return opType_;
|
||||
}
|
||||
/**
|
||||
* <code>.InterOpType opType = 1;</code>
|
||||
* <code>.InterOpType op_type = 8;</code>
|
||||
* @return The opType.
|
||||
*/
|
||||
@java.lang.Override public emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType getOpType() {
|
||||
@@ -333,50 +199,17 @@ public final class GadgetInteractReqOuterClass {
|
||||
return result == null ? emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.UNRECOGNIZED : result;
|
||||
}
|
||||
|
||||
public static final int ISUSECONDENSERESIN_FIELD_NUMBER = 14;
|
||||
private boolean isUseCondenseResin_;
|
||||
/**
|
||||
* <code>bool isUseCondenseResin = 14;</code>
|
||||
* @return The isUseCondenseResin.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean getIsUseCondenseResin() {
|
||||
return isUseCondenseResin_;
|
||||
}
|
||||
|
||||
public static final int GADGETENTITYID_FIELD_NUMBER = 8;
|
||||
private int gadgetEntityId_;
|
||||
/**
|
||||
* <code>uint32 gadgetEntityId = 8;</code>
|
||||
* @return The gadgetEntityId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getGadgetEntityId() {
|
||||
return gadgetEntityId_;
|
||||
}
|
||||
|
||||
public static final int GADGETID_FIELD_NUMBER = 15;
|
||||
private int gadgetId_;
|
||||
/**
|
||||
* <code>uint32 gadgetId = 15;</code>
|
||||
* @return The gadgetId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getGadgetId() {
|
||||
return gadgetId_;
|
||||
}
|
||||
|
||||
public static final int RESINCOSTTYPE_FIELD_NUMBER = 7;
|
||||
public static final int RESIN_COST_TYPE_FIELD_NUMBER = 4;
|
||||
private int resinCostType_;
|
||||
/**
|
||||
* <code>.ResinCostType resinCostType = 7;</code>
|
||||
* <code>.ResinCostType resin_cost_type = 4;</code>
|
||||
* @return The enum numeric value on the wire for resinCostType.
|
||||
*/
|
||||
@java.lang.Override public int getResinCostTypeValue() {
|
||||
return resinCostType_;
|
||||
}
|
||||
/**
|
||||
* <code>.ResinCostType resinCostType = 7;</code>
|
||||
* <code>.ResinCostType resin_cost_type = 4;</code>
|
||||
* @return The resinCostType.
|
||||
*/
|
||||
@java.lang.Override public emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType getResinCostType() {
|
||||
@@ -385,10 +218,32 @@ public final class GadgetInteractReqOuterClass {
|
||||
return result == null ? emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType.UNRECOGNIZED : result;
|
||||
}
|
||||
|
||||
public static final int UIINTERACTID_FIELD_NUMBER = 6;
|
||||
public static final int IS_USE_CONDENSE_RESIN_FIELD_NUMBER = 9;
|
||||
private boolean isUseCondenseResin_;
|
||||
/**
|
||||
* <code>bool is_use_condense_resin = 9;</code>
|
||||
* @return The isUseCondenseResin.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean getIsUseCondenseResin() {
|
||||
return isUseCondenseResin_;
|
||||
}
|
||||
|
||||
public static final int GADGET_ID_FIELD_NUMBER = 3;
|
||||
private int gadgetId_;
|
||||
/**
|
||||
* <code>uint32 gadget_id = 3;</code>
|
||||
* @return The gadgetId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getGadgetId() {
|
||||
return gadgetId_;
|
||||
}
|
||||
|
||||
public static final int UI_INTERACT_ID_FIELD_NUMBER = 11;
|
||||
private int uiInteractId_;
|
||||
/**
|
||||
* <code>uint32 uiInteractId = 6;</code>
|
||||
* <code>uint32 ui_interact_id = 11;</code>
|
||||
* @return The uiInteractId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -396,6 +251,17 @@ public final class GadgetInteractReqOuterClass {
|
||||
return uiInteractId_;
|
||||
}
|
||||
|
||||
public static final int GADGET_ENTITY_ID_FIELD_NUMBER = 2;
|
||||
private int gadgetEntityId_;
|
||||
/**
|
||||
* <code>uint32 gadget_entity_id = 2;</code>
|
||||
* @return The gadgetEntityId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getGadgetEntityId() {
|
||||
return gadgetEntityId_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@java.lang.Override
|
||||
public final boolean isInitialized() {
|
||||
@@ -410,23 +276,23 @@ public final class GadgetInteractReqOuterClass {
|
||||
@java.lang.Override
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (opType_ != emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.INTER_OP_TYPE_FINISH.getNumber()) {
|
||||
output.writeEnum(1, opType_);
|
||||
}
|
||||
if (uiInteractId_ != 0) {
|
||||
output.writeUInt32(6, uiInteractId_);
|
||||
}
|
||||
if (resinCostType_ != emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType.RESIN_COST_TYPE_NONE.getNumber()) {
|
||||
output.writeEnum(7, resinCostType_);
|
||||
}
|
||||
if (gadgetEntityId_ != 0) {
|
||||
output.writeUInt32(8, gadgetEntityId_);
|
||||
}
|
||||
if (isUseCondenseResin_ != false) {
|
||||
output.writeBool(14, isUseCondenseResin_);
|
||||
output.writeUInt32(2, gadgetEntityId_);
|
||||
}
|
||||
if (gadgetId_ != 0) {
|
||||
output.writeUInt32(15, gadgetId_);
|
||||
output.writeUInt32(3, gadgetId_);
|
||||
}
|
||||
if (resinCostType_ != emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType.RESIN_COST_TYPE_NONE.getNumber()) {
|
||||
output.writeEnum(4, resinCostType_);
|
||||
}
|
||||
if (opType_ != emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.INTER_OP_TYPE_FINISH.getNumber()) {
|
||||
output.writeEnum(8, opType_);
|
||||
}
|
||||
if (isUseCondenseResin_ != false) {
|
||||
output.writeBool(9, isUseCondenseResin_);
|
||||
}
|
||||
if (uiInteractId_ != 0) {
|
||||
output.writeUInt32(11, uiInteractId_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -437,29 +303,29 @@ public final class GadgetInteractReqOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (opType_ != emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.INTER_OP_TYPE_FINISH.getNumber()) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeEnumSize(1, opType_);
|
||||
}
|
||||
if (uiInteractId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(6, uiInteractId_);
|
||||
}
|
||||
if (resinCostType_ != emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType.RESIN_COST_TYPE_NONE.getNumber()) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeEnumSize(7, resinCostType_);
|
||||
}
|
||||
if (gadgetEntityId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(8, gadgetEntityId_);
|
||||
}
|
||||
if (isUseCondenseResin_ != false) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeBoolSize(14, isUseCondenseResin_);
|
||||
.computeUInt32Size(2, gadgetEntityId_);
|
||||
}
|
||||
if (gadgetId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(15, gadgetId_);
|
||||
.computeUInt32Size(3, gadgetId_);
|
||||
}
|
||||
if (resinCostType_ != emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType.RESIN_COST_TYPE_NONE.getNumber()) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeEnumSize(4, resinCostType_);
|
||||
}
|
||||
if (opType_ != emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.INTER_OP_TYPE_FINISH.getNumber()) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeEnumSize(8, opType_);
|
||||
}
|
||||
if (isUseCondenseResin_ != false) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeBoolSize(9, isUseCondenseResin_);
|
||||
}
|
||||
if (uiInteractId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(11, uiInteractId_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -477,15 +343,15 @@ public final class GadgetInteractReqOuterClass {
|
||||
emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq other = (emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq) obj;
|
||||
|
||||
if (opType_ != other.opType_) return false;
|
||||
if (resinCostType_ != other.resinCostType_) return false;
|
||||
if (getIsUseCondenseResin()
|
||||
!= other.getIsUseCondenseResin()) return false;
|
||||
if (getGadgetEntityId()
|
||||
!= other.getGadgetEntityId()) return false;
|
||||
if (getGadgetId()
|
||||
!= other.getGadgetId()) return false;
|
||||
if (resinCostType_ != other.resinCostType_) return false;
|
||||
if (getUiInteractId()
|
||||
!= other.getUiInteractId()) return false;
|
||||
if (getGadgetEntityId()
|
||||
!= other.getGadgetEntityId()) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
return true;
|
||||
}
|
||||
@@ -497,19 +363,19 @@ public final class GadgetInteractReqOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + OPTYPE_FIELD_NUMBER;
|
||||
hash = (37 * hash) + OP_TYPE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + opType_;
|
||||
hash = (37 * hash) + ISUSECONDENSERESIN_FIELD_NUMBER;
|
||||
hash = (37 * hash) + RESIN_COST_TYPE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + resinCostType_;
|
||||
hash = (37 * hash) + IS_USE_CONDENSE_RESIN_FIELD_NUMBER;
|
||||
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
|
||||
getIsUseCondenseResin());
|
||||
hash = (37 * hash) + GADGETENTITYID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getGadgetEntityId();
|
||||
hash = (37 * hash) + GADGETID_FIELD_NUMBER;
|
||||
hash = (37 * hash) + GADGET_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getGadgetId();
|
||||
hash = (37 * hash) + RESINCOSTTYPE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + resinCostType_;
|
||||
hash = (37 * hash) + UIINTERACTID_FIELD_NUMBER;
|
||||
hash = (37 * hash) + UI_INTERACT_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getUiInteractId();
|
||||
hash = (37 * hash) + GADGET_ENTITY_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getGadgetEntityId();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@@ -606,6 +472,11 @@ public final class GadgetInteractReqOuterClass {
|
||||
return builder;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: KJHPMOAELOJ
|
||||
* CmdId: 867
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code GadgetInteractReq}
|
||||
*/
|
||||
public static final class Builder extends
|
||||
@@ -645,16 +516,16 @@ public final class GadgetInteractReqOuterClass {
|
||||
super.clear();
|
||||
opType_ = 0;
|
||||
|
||||
isUseCondenseResin_ = false;
|
||||
resinCostType_ = 0;
|
||||
|
||||
gadgetEntityId_ = 0;
|
||||
isUseCondenseResin_ = false;
|
||||
|
||||
gadgetId_ = 0;
|
||||
|
||||
resinCostType_ = 0;
|
||||
|
||||
uiInteractId_ = 0;
|
||||
|
||||
gadgetEntityId_ = 0;
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -682,11 +553,11 @@ public final class GadgetInteractReqOuterClass {
|
||||
public emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq buildPartial() {
|
||||
emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq result = new emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq(this);
|
||||
result.opType_ = opType_;
|
||||
result.isUseCondenseResin_ = isUseCondenseResin_;
|
||||
result.gadgetEntityId_ = gadgetEntityId_;
|
||||
result.gadgetId_ = gadgetId_;
|
||||
result.resinCostType_ = resinCostType_;
|
||||
result.isUseCondenseResin_ = isUseCondenseResin_;
|
||||
result.gadgetId_ = gadgetId_;
|
||||
result.uiInteractId_ = uiInteractId_;
|
||||
result.gadgetEntityId_ = gadgetEntityId_;
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
@@ -738,21 +609,21 @@ public final class GadgetInteractReqOuterClass {
|
||||
if (other.opType_ != 0) {
|
||||
setOpTypeValue(other.getOpTypeValue());
|
||||
}
|
||||
if (other.resinCostType_ != 0) {
|
||||
setResinCostTypeValue(other.getResinCostTypeValue());
|
||||
}
|
||||
if (other.getIsUseCondenseResin() != false) {
|
||||
setIsUseCondenseResin(other.getIsUseCondenseResin());
|
||||
}
|
||||
if (other.getGadgetEntityId() != 0) {
|
||||
setGadgetEntityId(other.getGadgetEntityId());
|
||||
}
|
||||
if (other.getGadgetId() != 0) {
|
||||
setGadgetId(other.getGadgetId());
|
||||
}
|
||||
if (other.resinCostType_ != 0) {
|
||||
setResinCostTypeValue(other.getResinCostTypeValue());
|
||||
}
|
||||
if (other.getUiInteractId() != 0) {
|
||||
setUiInteractId(other.getUiInteractId());
|
||||
}
|
||||
if (other.getGadgetEntityId() != 0) {
|
||||
setGadgetEntityId(other.getGadgetEntityId());
|
||||
}
|
||||
this.mergeUnknownFields(other.unknownFields);
|
||||
onChanged();
|
||||
return this;
|
||||
@@ -784,14 +655,14 @@ public final class GadgetInteractReqOuterClass {
|
||||
|
||||
private int opType_ = 0;
|
||||
/**
|
||||
* <code>.InterOpType opType = 1;</code>
|
||||
* <code>.InterOpType op_type = 8;</code>
|
||||
* @return The enum numeric value on the wire for opType.
|
||||
*/
|
||||
@java.lang.Override public int getOpTypeValue() {
|
||||
return opType_;
|
||||
}
|
||||
/**
|
||||
* <code>.InterOpType opType = 1;</code>
|
||||
* <code>.InterOpType op_type = 8;</code>
|
||||
* @param value The enum numeric value on the wire for opType to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -802,7 +673,7 @@ public final class GadgetInteractReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.InterOpType opType = 1;</code>
|
||||
* <code>.InterOpType op_type = 8;</code>
|
||||
* @return The opType.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -812,7 +683,7 @@ public final class GadgetInteractReqOuterClass {
|
||||
return result == null ? emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.UNRECOGNIZED : result;
|
||||
}
|
||||
/**
|
||||
* <code>.InterOpType opType = 1;</code>
|
||||
* <code>.InterOpType op_type = 8;</code>
|
||||
* @param value The opType to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -826,7 +697,7 @@ public final class GadgetInteractReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.InterOpType opType = 1;</code>
|
||||
* <code>.InterOpType op_type = 8;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearOpType() {
|
||||
@@ -836,109 +707,16 @@ public final class GadgetInteractReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private boolean isUseCondenseResin_ ;
|
||||
/**
|
||||
* <code>bool isUseCondenseResin = 14;</code>
|
||||
* @return The isUseCondenseResin.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean getIsUseCondenseResin() {
|
||||
return isUseCondenseResin_;
|
||||
}
|
||||
/**
|
||||
* <code>bool isUseCondenseResin = 14;</code>
|
||||
* @param value The isUseCondenseResin to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setIsUseCondenseResin(boolean value) {
|
||||
|
||||
isUseCondenseResin_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>bool isUseCondenseResin = 14;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearIsUseCondenseResin() {
|
||||
|
||||
isUseCondenseResin_ = false;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int gadgetEntityId_ ;
|
||||
/**
|
||||
* <code>uint32 gadgetEntityId = 8;</code>
|
||||
* @return The gadgetEntityId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getGadgetEntityId() {
|
||||
return gadgetEntityId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 gadgetEntityId = 8;</code>
|
||||
* @param value The gadgetEntityId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setGadgetEntityId(int value) {
|
||||
|
||||
gadgetEntityId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 gadgetEntityId = 8;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearGadgetEntityId() {
|
||||
|
||||
gadgetEntityId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int gadgetId_ ;
|
||||
/**
|
||||
* <code>uint32 gadgetId = 15;</code>
|
||||
* @return The gadgetId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getGadgetId() {
|
||||
return gadgetId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 gadgetId = 15;</code>
|
||||
* @param value The gadgetId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setGadgetId(int value) {
|
||||
|
||||
gadgetId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 gadgetId = 15;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearGadgetId() {
|
||||
|
||||
gadgetId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int resinCostType_ = 0;
|
||||
/**
|
||||
* <code>.ResinCostType resinCostType = 7;</code>
|
||||
* <code>.ResinCostType resin_cost_type = 4;</code>
|
||||
* @return The enum numeric value on the wire for resinCostType.
|
||||
*/
|
||||
@java.lang.Override public int getResinCostTypeValue() {
|
||||
return resinCostType_;
|
||||
}
|
||||
/**
|
||||
* <code>.ResinCostType resinCostType = 7;</code>
|
||||
* <code>.ResinCostType resin_cost_type = 4;</code>
|
||||
* @param value The enum numeric value on the wire for resinCostType to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -949,7 +727,7 @@ public final class GadgetInteractReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.ResinCostType resinCostType = 7;</code>
|
||||
* <code>.ResinCostType resin_cost_type = 4;</code>
|
||||
* @return The resinCostType.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -959,7 +737,7 @@ public final class GadgetInteractReqOuterClass {
|
||||
return result == null ? emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType.UNRECOGNIZED : result;
|
||||
}
|
||||
/**
|
||||
* <code>.ResinCostType resinCostType = 7;</code>
|
||||
* <code>.ResinCostType resin_cost_type = 4;</code>
|
||||
* @param value The resinCostType to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -973,7 +751,7 @@ public final class GadgetInteractReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.ResinCostType resinCostType = 7;</code>
|
||||
* <code>.ResinCostType resin_cost_type = 4;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearResinCostType() {
|
||||
@@ -983,9 +761,71 @@ public final class GadgetInteractReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private boolean isUseCondenseResin_ ;
|
||||
/**
|
||||
* <code>bool is_use_condense_resin = 9;</code>
|
||||
* @return The isUseCondenseResin.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean getIsUseCondenseResin() {
|
||||
return isUseCondenseResin_;
|
||||
}
|
||||
/**
|
||||
* <code>bool is_use_condense_resin = 9;</code>
|
||||
* @param value The isUseCondenseResin to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setIsUseCondenseResin(boolean value) {
|
||||
|
||||
isUseCondenseResin_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>bool is_use_condense_resin = 9;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearIsUseCondenseResin() {
|
||||
|
||||
isUseCondenseResin_ = false;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int gadgetId_ ;
|
||||
/**
|
||||
* <code>uint32 gadget_id = 3;</code>
|
||||
* @return The gadgetId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getGadgetId() {
|
||||
return gadgetId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 gadget_id = 3;</code>
|
||||
* @param value The gadgetId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setGadgetId(int value) {
|
||||
|
||||
gadgetId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 gadget_id = 3;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearGadgetId() {
|
||||
|
||||
gadgetId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int uiInteractId_ ;
|
||||
/**
|
||||
* <code>uint32 uiInteractId = 6;</code>
|
||||
* <code>uint32 ui_interact_id = 11;</code>
|
||||
* @return The uiInteractId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -993,7 +833,7 @@ public final class GadgetInteractReqOuterClass {
|
||||
return uiInteractId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 uiInteractId = 6;</code>
|
||||
* <code>uint32 ui_interact_id = 11;</code>
|
||||
* @param value The uiInteractId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -1004,7 +844,7 @@ public final class GadgetInteractReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 uiInteractId = 6;</code>
|
||||
* <code>uint32 ui_interact_id = 11;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearUiInteractId() {
|
||||
@@ -1013,6 +853,37 @@ public final class GadgetInteractReqOuterClass {
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int gadgetEntityId_ ;
|
||||
/**
|
||||
* <code>uint32 gadget_entity_id = 2;</code>
|
||||
* @return The gadgetEntityId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getGadgetEntityId() {
|
||||
return gadgetEntityId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 gadget_entity_id = 2;</code>
|
||||
* @param value The gadgetEntityId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setGadgetEntityId(int value) {
|
||||
|
||||
gadgetEntityId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 gadget_entity_id = 2;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearGadgetEntityId() {
|
||||
|
||||
gadgetEntityId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
@java.lang.Override
|
||||
public final Builder setUnknownFields(
|
||||
final com.google.protobuf.UnknownFieldSet unknownFields) {
|
||||
@@ -1081,15 +952,13 @@ public final class GadgetInteractReqOuterClass {
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\027GadgetInteractReq.proto\032\021InterOpType.p" +
|
||||
"roto\032\023ResinCostType.proto\"\226\002\n\021GadgetInte" +
|
||||
"ractReq\022\034\n\006opType\030\001 \001(\0162\014.InterOpType\022\032\n" +
|
||||
"\022isUseCondenseResin\030\016 \001(\010\022\026\n\016gadgetEntit" +
|
||||
"yId\030\010 \001(\r\022\020\n\010gadgetId\030\017 \001(\r\022%\n\rresinCost" +
|
||||
"Type\030\007 \001(\0162\016.ResinCostType\022\024\n\014uiInteract" +
|
||||
"Id\030\006 \001(\r\"`\n\013HNAHFIOGDFG\022\010\n\004NONE\020\000\022\020\n\013PEP" +
|
||||
"POHPHJOJ\020\245\006\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKOLMP" +
|
||||
"OEA\020\001\022\017\n\013EAJIABGAOCI\020\001\032\002\020\001B\033\n\031emu.grassc" +
|
||||
"utter.net.protob\006proto3"
|
||||
"roto\032\023ResinCostType.proto\"\277\001\n\021GadgetInte" +
|
||||
"ractReq\022\035\n\007op_type\030\010 \001(\0162\014.InterOpType\022\'" +
|
||||
"\n\017resin_cost_type\030\004 \001(\0162\016.ResinCostType\022" +
|
||||
"\035\n\025is_use_condense_resin\030\t \001(\010\022\021\n\tgadget" +
|
||||
"_id\030\003 \001(\r\022\026\n\016ui_interact_id\030\013 \001(\r\022\030\n\020gad" +
|
||||
"get_entity_id\030\002 \001(\rB\033\n\031emu.grasscutter.n" +
|
||||
"et.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
@@ -1102,7 +971,7 @@ public final class GadgetInteractReqOuterClass {
|
||||
internal_static_GadgetInteractReq_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_GadgetInteractReq_descriptor,
|
||||
new java.lang.String[] { "OpType", "IsUseCondenseResin", "GadgetEntityId", "GadgetId", "ResinCostType", "UiInteractId", });
|
||||
new java.lang.String[] { "OpType", "ResinCostType", "IsUseCondenseResin", "GadgetId", "UiInteractId", "GadgetEntityId", });
|
||||
emu.grasscutter.net.proto.InterOpTypeOuterClass.getDescriptor();
|
||||
emu.grasscutter.net.proto.ResinCostTypeOuterClass.getDescriptor();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user