Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 04: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/WidgetDoBagRspOuterClass.java
+75 -198
View File
@@ -18,19 +18,24 @@ public final class WidgetDoBagRspOuterClass {
// @@protoc_insertion_point(interface_extends:WidgetDoBagRsp)
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 materialId = 6;</code>
* @return The materialId.
*/
int getMaterialId();
/**
* <code>int32 retcode = 1;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint32 material_id = 14;</code>
* @return The materialId.
*/
int getMaterialId();
}
/**
* <pre>
* Name: ABLCJNBHJHB
* CmdId: 4295
* </pre>
*
* Protobuf type {@code WidgetDoBagRsp}
*/
public static final class WidgetDoBagRsp extends
@@ -80,7 +85,7 @@ public final class WidgetDoBagRspOuterClass {
retcode_ = input.readInt32();
break;
}
case 48: {
case 112: {
materialId_ = input.readUInt32();
break;
@@ -117,148 +122,6 @@ public final class WidgetDoBagRspOuterClass {
emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp.class, emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp.Builder.class);
}
/**
* Protobuf enum {@code WidgetDoBagRsp.MDHJPMKCGNN}
*/
public enum MDHJPMKCGNN
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 4258;</code>
*/
PEPPOHPHJOJ(1, 4258),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final MDHJPMKCGNN DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 4258;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 4258;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final int DCDNILFDFLB_VALUE = 0;
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
public static final int NNBKOLMPOEA_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 MDHJPMKCGNN 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 MDHJPMKCGNN forNumber(int value) {
switch (value) {
case 0: return NONE;
case 4258: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<MDHJPMKCGNN>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
MDHJPMKCGNN> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<MDHJPMKCGNN>() {
public MDHJPMKCGNN findValueByNumber(int number) {
return MDHJPMKCGNN.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.WidgetDoBagRspOuterClass.WidgetDoBagRsp.getDescriptor().getEnumTypes().get(0);
}
private static final MDHJPMKCGNN[] VALUES = getStaticValuesArray();
private static MDHJPMKCGNN[] getStaticValuesArray() {
return new MDHJPMKCGNN[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static MDHJPMKCGNN 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 MDHJPMKCGNN(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:WidgetDoBagRsp.MDHJPMKCGNN)
}
public static final int MATERIALID_FIELD_NUMBER = 6;
private int materialId_;
/**
* <code>uint32 materialId = 6;</code>
* @return The materialId.
*/
@java.lang.Override
public int getMaterialId() {
return materialId_;
}
public static final int RETCODE_FIELD_NUMBER = 1;
private int retcode_;
/**
@@ -270,6 +133,17 @@ public final class WidgetDoBagRspOuterClass {
return retcode_;
}
public static final int MATERIAL_ID_FIELD_NUMBER = 14;
private int materialId_;
/**
* <code>uint32 material_id = 14;</code>
* @return The materialId.
*/
@java.lang.Override
public int getMaterialId() {
return materialId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -288,7 +162,7 @@ public final class WidgetDoBagRspOuterClass {
output.writeInt32(1, retcode_);
}
if (materialId_ != 0) {
output.writeUInt32(6, materialId_);
output.writeUInt32(14, materialId_);
}
unknownFields.writeTo(output);
}
@@ -305,7 +179,7 @@ public final class WidgetDoBagRspOuterClass {
}
if (materialId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, materialId_);
.computeUInt32Size(14, materialId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -322,10 +196,10 @@ public final class WidgetDoBagRspOuterClass {
}
emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp other = (emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp) obj;
if (getMaterialId()
!= other.getMaterialId()) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (getMaterialId()
!= other.getMaterialId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -337,10 +211,10 @@ public final class WidgetDoBagRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + MATERIALID_FIELD_NUMBER;
hash = (53 * hash) + getMaterialId();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + MATERIAL_ID_FIELD_NUMBER;
hash = (53 * hash) + getMaterialId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -437,6 +311,11 @@ public final class WidgetDoBagRspOuterClass {
return builder;
}
/**
* <pre>
* Name: ABLCJNBHJHB
* CmdId: 4295
* </pre>
*
* Protobuf type {@code WidgetDoBagRsp}
*/
public static final class Builder extends
@@ -474,10 +353,10 @@ public final class WidgetDoBagRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
materialId_ = 0;
retcode_ = 0;
materialId_ = 0;
return this;
}
@@ -504,8 +383,8 @@ public final class WidgetDoBagRspOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp buildPartial() {
emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp result = new emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp(this);
result.materialId_ = materialId_;
result.retcode_ = retcode_;
result.materialId_ = materialId_;
onBuilt();
return result;
}
@@ -554,12 +433,12 @@ public final class WidgetDoBagRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp other) {
if (other == emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp.getDefaultInstance()) return this;
if (other.getMaterialId() != 0) {
setMaterialId(other.getMaterialId());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.getMaterialId() != 0) {
setMaterialId(other.getMaterialId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -589,37 +468,6 @@ public final class WidgetDoBagRspOuterClass {
return this;
}
private int materialId_ ;
/**
* <code>uint32 materialId = 6;</code>
* @return The materialId.
*/
@java.lang.Override
public int getMaterialId() {
return materialId_;
}
/**
* <code>uint32 materialId = 6;</code>
* @param value The materialId to set.
* @return This builder for chaining.
*/
public Builder setMaterialId(int value) {
materialId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 materialId = 6;</code>
* @return This builder for chaining.
*/
public Builder clearMaterialId() {
materialId_ = 0;
onChanged();
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 1;</code>
@@ -650,6 +498,37 @@ public final class WidgetDoBagRspOuterClass {
onChanged();
return this;
}
private int materialId_ ;
/**
* <code>uint32 material_id = 14;</code>
* @return The materialId.
*/
@java.lang.Override
public int getMaterialId() {
return materialId_;
}
/**
* <code>uint32 material_id = 14;</code>
* @param value The materialId to set.
* @return This builder for chaining.
*/
public Builder setMaterialId(int value) {
materialId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 material_id = 14;</code>
* @return This builder for chaining.
*/
public Builder clearMaterialId() {
materialId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -717,11 +596,9 @@ public final class WidgetDoBagRspOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\024WidgetDoBagRsp.proto\"\206\001\n\016WidgetDoBagRs" +
"p\022\022\n\nmaterialId\030\006 \001(\r\022\017\n\007retcode\030\001 \001(\005\"O" +
"\n\013MDHJPMKCGNN\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\242" +
"!\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B" +
"\033\n\031emu.grasscutter.net.protob\006proto3"
"\n\024WidgetDoBagRsp.proto\"6\n\016WidgetDoBagRsp" +
"\022\017\n\007retcode\030\001 \001(\005\022\023\n\013material_id\030\016 \001(\rB\033" +
"\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -732,7 +609,7 @@ public final class WidgetDoBagRspOuterClass {
internal_static_WidgetDoBagRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_WidgetDoBagRsp_descriptor,
new java.lang.String[] { "MaterialId", "Retcode", });
new java.lang.String[] { "Retcode", "MaterialId", });
}
// @@protoc_insertion_point(outer_class_scope)