Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-04 06:13:34 +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/TakeFurnitureMakeReqOuterClass.java
+136 -268
View File
@@ -19,24 +19,29 @@ public final class TakeFurnitureMakeReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 index = 6;</code>
* @return The index.
* <code>uint32 make_id = 7;</code>
* @return The makeId.
*/
int getIndex();
int getMakeId();
/**
* <code>bool isFastFinish = 15;</code>
* <code>bool is_fast_finish = 11;</code>
* @return The isFastFinish.
*/
boolean getIsFastFinish();
/**
* <code>uint32 makeId = 9;</code>
* @return The makeId.
* <code>uint32 index = 10;</code>
* @return The index.
*/
int getMakeId();
int getIndex();
}
/**
* <pre>
* Name: IENBCEAAOKF
* CmdId: 4713
* </pre>
*
* Protobuf type {@code TakeFurnitureMakeReq}
*/
public static final class TakeFurnitureMakeReq extends
@@ -81,17 +86,17 @@ public final class TakeFurnitureMakeReqOuterClass {
case 0:
done = true;
break;
case 48: {
index_ = input.readUInt32();
break;
}
case 72: {
case 56: {
makeId_ = input.readUInt32();
break;
}
case 120: {
case 80: {
index_ = input.readUInt32();
break;
}
case 88: {
isFastFinish_ = input.readBool();
break;
@@ -128,160 +133,21 @@ public final class TakeFurnitureMakeReqOuterClass {
emu.grasscutter.net.proto.TakeFurnitureMakeReqOuterClass.TakeFurnitureMakeReq.class, emu.grasscutter.net.proto.TakeFurnitureMakeReqOuterClass.TakeFurnitureMakeReq.Builder.class);
}
public static final int MAKE_ID_FIELD_NUMBER = 7;
private int makeId_;
/**
* Protobuf enum {@code TakeFurnitureMakeReq.JMDDKPFHPPA}
*/
public enum JMDDKPFHPPA
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 4825;</code>
*/
PEPPOHPHJOJ(1, 4825),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final JMDDKPFHPPA DCDNILFDFLB = NONE;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final JMDDKPFHPPA EAJIABGAOCI = NNBKOLMPOEA;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 4825;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 4825;
/**
* <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 JMDDKPFHPPA 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 JMDDKPFHPPA forNumber(int value) {
switch (value) {
case 0: return NONE;
case 4825: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<JMDDKPFHPPA>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
JMDDKPFHPPA> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<JMDDKPFHPPA>() {
public JMDDKPFHPPA findValueByNumber(int number) {
return JMDDKPFHPPA.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.TakeFurnitureMakeReqOuterClass.TakeFurnitureMakeReq.getDescriptor().getEnumTypes().get(0);
}
private static final JMDDKPFHPPA[] VALUES = getStaticValuesArray();
private static JMDDKPFHPPA[] getStaticValuesArray() {
return new JMDDKPFHPPA[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
};
}
public static JMDDKPFHPPA 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 JMDDKPFHPPA(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:TakeFurnitureMakeReq.JMDDKPFHPPA)
}
public static final int INDEX_FIELD_NUMBER = 6;
private int index_;
/**
* <code>uint32 index = 6;</code>
* @return The index.
* <code>uint32 make_id = 7;</code>
* @return The makeId.
*/
@java.lang.Override
public int getIndex() {
return index_;
public int getMakeId() {
return makeId_;
}
public static final int ISFASTFINISH_FIELD_NUMBER = 15;
public static final int IS_FAST_FINISH_FIELD_NUMBER = 11;
private boolean isFastFinish_;
/**
* <code>bool isFastFinish = 15;</code>
* <code>bool is_fast_finish = 11;</code>
* @return The isFastFinish.
*/
@java.lang.Override
@@ -289,15 +155,15 @@ public final class TakeFurnitureMakeReqOuterClass {
return isFastFinish_;
}
public static final int MAKEID_FIELD_NUMBER = 9;
private int makeId_;
public static final int INDEX_FIELD_NUMBER = 10;
private int index_;
/**
* <code>uint32 makeId = 9;</code>
* @return The makeId.
* <code>uint32 index = 10;</code>
* @return The index.
*/
@java.lang.Override
public int getMakeId() {
return makeId_;
public int getIndex() {
return index_;
}
private byte memoizedIsInitialized = -1;
@@ -314,14 +180,14 @@ public final class TakeFurnitureMakeReqOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (index_ != 0) {
output.writeUInt32(6, index_);
}
if (makeId_ != 0) {
output.writeUInt32(9, makeId_);
output.writeUInt32(7, makeId_);
}
if (index_ != 0) {
output.writeUInt32(10, index_);
}
if (isFastFinish_ != false) {
output.writeBool(15, isFastFinish_);
output.writeBool(11, isFastFinish_);
}
unknownFields.writeTo(output);
}
@@ -332,17 +198,17 @@ public final class TakeFurnitureMakeReqOuterClass {
if (size != -1) return size;
size = 0;
if (index_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, index_);
}
if (makeId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, makeId_);
.computeUInt32Size(7, makeId_);
}
if (index_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, index_);
}
if (isFastFinish_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(15, isFastFinish_);
.computeBoolSize(11, isFastFinish_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -359,12 +225,12 @@ public final class TakeFurnitureMakeReqOuterClass {
}
emu.grasscutter.net.proto.TakeFurnitureMakeReqOuterClass.TakeFurnitureMakeReq other = (emu.grasscutter.net.proto.TakeFurnitureMakeReqOuterClass.TakeFurnitureMakeReq) obj;
if (getIndex()
!= other.getIndex()) return false;
if (getIsFastFinish()
!= other.getIsFastFinish()) return false;
if (getMakeId()
!= other.getMakeId()) return false;
if (getIsFastFinish()
!= other.getIsFastFinish()) return false;
if (getIndex()
!= other.getIndex()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -376,13 +242,13 @@ public final class TakeFurnitureMakeReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + INDEX_FIELD_NUMBER;
hash = (53 * hash) + getIndex();
hash = (37 * hash) + ISFASTFINISH_FIELD_NUMBER;
hash = (37 * hash) + MAKE_ID_FIELD_NUMBER;
hash = (53 * hash) + getMakeId();
hash = (37 * hash) + IS_FAST_FINISH_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsFastFinish());
hash = (37 * hash) + MAKEID_FIELD_NUMBER;
hash = (53 * hash) + getMakeId();
hash = (37 * hash) + INDEX_FIELD_NUMBER;
hash = (53 * hash) + getIndex();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -479,6 +345,11 @@ public final class TakeFurnitureMakeReqOuterClass {
return builder;
}
/**
* <pre>
* Name: IENBCEAAOKF
* CmdId: 4713
* </pre>
*
* Protobuf type {@code TakeFurnitureMakeReq}
*/
public static final class Builder extends
@@ -516,11 +387,11 @@ public final class TakeFurnitureMakeReqOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
index_ = 0;
makeId_ = 0;
isFastFinish_ = false;
makeId_ = 0;
index_ = 0;
return this;
}
@@ -548,9 +419,9 @@ public final class TakeFurnitureMakeReqOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.TakeFurnitureMakeReqOuterClass.TakeFurnitureMakeReq buildPartial() {
emu.grasscutter.net.proto.TakeFurnitureMakeReqOuterClass.TakeFurnitureMakeReq result = new emu.grasscutter.net.proto.TakeFurnitureMakeReqOuterClass.TakeFurnitureMakeReq(this);
result.index_ = index_;
result.isFastFinish_ = isFastFinish_;
result.makeId_ = makeId_;
result.isFastFinish_ = isFastFinish_;
result.index_ = index_;
onBuilt();
return result;
}
@@ -599,14 +470,14 @@ public final class TakeFurnitureMakeReqOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.TakeFurnitureMakeReqOuterClass.TakeFurnitureMakeReq other) {
if (other == emu.grasscutter.net.proto.TakeFurnitureMakeReqOuterClass.TakeFurnitureMakeReq.getDefaultInstance()) return this;
if (other.getIndex() != 0) {
setIndex(other.getIndex());
if (other.getMakeId() != 0) {
setMakeId(other.getMakeId());
}
if (other.getIsFastFinish() != false) {
setIsFastFinish(other.getIsFastFinish());
}
if (other.getMakeId() != 0) {
setMakeId(other.getMakeId());
if (other.getIndex() != 0) {
setIndex(other.getIndex());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -637,71 +508,9 @@ public final class TakeFurnitureMakeReqOuterClass {
return this;
}
private int index_ ;
/**
* <code>uint32 index = 6;</code>
* @return The index.
*/
@java.lang.Override
public int getIndex() {
return index_;
}
/**
* <code>uint32 index = 6;</code>
* @param value The index to set.
* @return This builder for chaining.
*/
public Builder setIndex(int value) {
index_ = value;
onChanged();
return this;
}
/**
* <code>uint32 index = 6;</code>
* @return This builder for chaining.
*/
public Builder clearIndex() {
index_ = 0;
onChanged();
return this;
}
private boolean isFastFinish_ ;
/**
* <code>bool isFastFinish = 15;</code>
* @return The isFastFinish.
*/
@java.lang.Override
public boolean getIsFastFinish() {
return isFastFinish_;
}
/**
* <code>bool isFastFinish = 15;</code>
* @param value The isFastFinish to set.
* @return This builder for chaining.
*/
public Builder setIsFastFinish(boolean value) {
isFastFinish_ = value;
onChanged();
return this;
}
/**
* <code>bool isFastFinish = 15;</code>
* @return This builder for chaining.
*/
public Builder clearIsFastFinish() {
isFastFinish_ = false;
onChanged();
return this;
}
private int makeId_ ;
/**
* <code>uint32 makeId = 9;</code>
* <code>uint32 make_id = 7;</code>
* @return The makeId.
*/
@java.lang.Override
@@ -709,7 +518,7 @@ public final class TakeFurnitureMakeReqOuterClass {
return makeId_;
}
/**
* <code>uint32 makeId = 9;</code>
* <code>uint32 make_id = 7;</code>
* @param value The makeId to set.
* @return This builder for chaining.
*/
@@ -720,7 +529,7 @@ public final class TakeFurnitureMakeReqOuterClass {
return this;
}
/**
* <code>uint32 makeId = 9;</code>
* <code>uint32 make_id = 7;</code>
* @return This builder for chaining.
*/
public Builder clearMakeId() {
@@ -729,6 +538,68 @@ public final class TakeFurnitureMakeReqOuterClass {
onChanged();
return this;
}
private boolean isFastFinish_ ;
/**
* <code>bool is_fast_finish = 11;</code>
* @return The isFastFinish.
*/
@java.lang.Override
public boolean getIsFastFinish() {
return isFastFinish_;
}
/**
* <code>bool is_fast_finish = 11;</code>
* @param value The isFastFinish to set.
* @return This builder for chaining.
*/
public Builder setIsFastFinish(boolean value) {
isFastFinish_ = value;
onChanged();
return this;
}
/**
* <code>bool is_fast_finish = 11;</code>
* @return This builder for chaining.
*/
public Builder clearIsFastFinish() {
isFastFinish_ = false;
onChanged();
return this;
}
private int index_ ;
/**
* <code>uint32 index = 10;</code>
* @return The index.
*/
@java.lang.Override
public int getIndex() {
return index_;
}
/**
* <code>uint32 index = 10;</code>
* @param value The index to set.
* @return This builder for chaining.
*/
public Builder setIndex(int value) {
index_ = value;
onChanged();
return this;
}
/**
* <code>uint32 index = 10;</code>
* @return This builder for chaining.
*/
public Builder clearIndex() {
index_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -796,13 +667,10 @@ public final class TakeFurnitureMakeReqOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\032TakeFurnitureMakeReq.proto\"\255\001\n\024TakeFur" +
"nitureMakeReq\022\r\n\005index\030\006 \001(\r\022\024\n\014isFastFi" +
"nish\030\017 \001(\010\022\016\n\006makeId\030\t \001(\r\"`\n\013JMDDKPFHPP" +
"A\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\331%\022\017\n\013DCDNILF" +
"DFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\022\017\n\013EAJIABGAOCI\020\001" +
"\032\002\020\001B\033\n\031emu.grasscutter.net.protob\006proto" +
"3"
"\n\032TakeFurnitureMakeReq.proto\"N\n\024TakeFurn" +
"itureMakeReq\022\017\n\007make_id\030\007 \001(\r\022\026\n\016is_fast" +
"_finish\030\013 \001(\010\022\r\n\005index\030\n \001(\rB\033\n\031emu.gras" +
"scutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -813,7 +681,7 @@ public final class TakeFurnitureMakeReqOuterClass {
internal_static_TakeFurnitureMakeReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_TakeFurnitureMakeReq_descriptor,
new java.lang.String[] { "Index", "IsFastFinish", "MakeId", });
new java.lang.String[] { "MakeId", "IsFastFinish", "Index", });
}
// @@protoc_insertion_point(outer_class_scope)