Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 15:59:53 +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/CodexDataUpdateNotifyOuterClass.java
+109 -232
View File
@@ -19,29 +19,34 @@ public final class CodexDataUpdateNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.CodexType type = 15;</code>
* <code>.CodexType type = 10;</code>
* @return The enum numeric value on the wire for type.
*/
int getTypeValue();
/**
* <code>.CodexType type = 15;</code>
* <code>.CodexType type = 10;</code>
* @return The type.
*/
emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType getType();
/**
* <code>uint32 id = 6;</code>
* @return The id.
*/
int getId();
/**
* <code>uint32 weaponMaxPromoteLevel = 1;</code>
* <code>uint32 weapon_max_promote_level = 15;</code>
* @return The weaponMaxPromoteLevel.
*/
int getWeaponMaxPromoteLevel();
/**
* <code>uint32 id = 5;</code>
* @return The id.
*/
int getId();
}
/**
* <pre>
* Name: MKIEDBEHAHC
* CmdId: 4207
* </pre>
*
* Protobuf type {@code CodexDataUpdateNotify}
*/
public static final class CodexDataUpdateNotify extends
@@ -87,22 +92,22 @@ public final class CodexDataUpdateNotifyOuterClass {
case 0:
done = true;
break;
case 8: {
weaponMaxPromoteLevel_ = input.readUInt32();
break;
}
case 48: {
case 40: {
id_ = input.readUInt32();
break;
}
case 120: {
case 80: {
int rawValue = input.readEnum();
type_ = rawValue;
break;
}
case 120: {
weaponMaxPromoteLevel_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -135,148 +140,17 @@ public final class CodexDataUpdateNotifyOuterClass {
emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify.class, emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify.Builder.class);
}
/**
* Protobuf enum {@code CodexDataUpdateNotify.IJBHHHDDJOJ}
*/
public enum IJBHHHDDJOJ
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 4202;</code>
*/
PEPPOHPHJOJ(1, 4202),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final IJBHHHDDJOJ DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 4202;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 4202;
/**
* <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 IJBHHHDDJOJ 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 IJBHHHDDJOJ forNumber(int value) {
switch (value) {
case 0: return NONE;
case 4202: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<IJBHHHDDJOJ>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
IJBHHHDDJOJ> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<IJBHHHDDJOJ>() {
public IJBHHHDDJOJ findValueByNumber(int number) {
return IJBHHHDDJOJ.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.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify.getDescriptor().getEnumTypes().get(0);
}
private static final IJBHHHDDJOJ[] VALUES = getStaticValuesArray();
private static IJBHHHDDJOJ[] getStaticValuesArray() {
return new IJBHHHDDJOJ[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static IJBHHHDDJOJ 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 IJBHHHDDJOJ(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:CodexDataUpdateNotify.IJBHHHDDJOJ)
}
public static final int TYPE_FIELD_NUMBER = 15;
public static final int TYPE_FIELD_NUMBER = 10;
private int type_;
/**
* <code>.CodexType type = 15;</code>
* <code>.CodexType type = 10;</code>
* @return The enum numeric value on the wire for type.
*/
@java.lang.Override public int getTypeValue() {
return type_;
}
/**
* <code>.CodexType type = 15;</code>
* <code>.CodexType type = 10;</code>
* @return The type.
*/
@java.lang.Override public emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType getType() {
@@ -285,21 +159,10 @@ public final class CodexDataUpdateNotifyOuterClass {
return result == null ? emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType.UNRECOGNIZED : result;
}
public static final int ID_FIELD_NUMBER = 6;
private int id_;
/**
* <code>uint32 id = 6;</code>
* @return The id.
*/
@java.lang.Override
public int getId() {
return id_;
}
public static final int WEAPONMAXPROMOTELEVEL_FIELD_NUMBER = 1;
public static final int WEAPON_MAX_PROMOTE_LEVEL_FIELD_NUMBER = 15;
private int weaponMaxPromoteLevel_;
/**
* <code>uint32 weaponMaxPromoteLevel = 1;</code>
* <code>uint32 weapon_max_promote_level = 15;</code>
* @return The weaponMaxPromoteLevel.
*/
@java.lang.Override
@@ -307,6 +170,17 @@ public final class CodexDataUpdateNotifyOuterClass {
return weaponMaxPromoteLevel_;
}
public static final int ID_FIELD_NUMBER = 5;
private int id_;
/**
* <code>uint32 id = 5;</code>
* @return The id.
*/
@java.lang.Override
public int getId() {
return id_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -321,14 +195,14 @@ public final class CodexDataUpdateNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (weaponMaxPromoteLevel_ != 0) {
output.writeUInt32(1, weaponMaxPromoteLevel_);
}
if (id_ != 0) {
output.writeUInt32(6, id_);
output.writeUInt32(5, id_);
}
if (type_ != emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType.CODEX_TYPE_NONE.getNumber()) {
output.writeEnum(15, type_);
if (type_ != emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType.CODEX_NONE.getNumber()) {
output.writeEnum(10, type_);
}
if (weaponMaxPromoteLevel_ != 0) {
output.writeUInt32(15, weaponMaxPromoteLevel_);
}
unknownFields.writeTo(output);
}
@@ -339,17 +213,17 @@ public final class CodexDataUpdateNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (weaponMaxPromoteLevel_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, weaponMaxPromoteLevel_);
}
if (id_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, id_);
.computeUInt32Size(5, id_);
}
if (type_ != emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType.CODEX_TYPE_NONE.getNumber()) {
if (type_ != emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType.CODEX_NONE.getNumber()) {
size += com.google.protobuf.CodedOutputStream
.computeEnumSize(15, type_);
.computeEnumSize(10, type_);
}
if (weaponMaxPromoteLevel_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, weaponMaxPromoteLevel_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -367,10 +241,10 @@ public final class CodexDataUpdateNotifyOuterClass {
emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify other = (emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify) obj;
if (type_ != other.type_) return false;
if (getId()
!= other.getId()) return false;
if (getWeaponMaxPromoteLevel()
!= other.getWeaponMaxPromoteLevel()) return false;
if (getId()
!= other.getId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -384,10 +258,10 @@ public final class CodexDataUpdateNotifyOuterClass {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + TYPE_FIELD_NUMBER;
hash = (53 * hash) + type_;
hash = (37 * hash) + WEAPON_MAX_PROMOTE_LEVEL_FIELD_NUMBER;
hash = (53 * hash) + getWeaponMaxPromoteLevel();
hash = (37 * hash) + ID_FIELD_NUMBER;
hash = (53 * hash) + getId();
hash = (37 * hash) + WEAPONMAXPROMOTELEVEL_FIELD_NUMBER;
hash = (53 * hash) + getWeaponMaxPromoteLevel();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -484,6 +358,11 @@ public final class CodexDataUpdateNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: MKIEDBEHAHC
* CmdId: 4207
* </pre>
*
* Protobuf type {@code CodexDataUpdateNotify}
*/
public static final class Builder extends
@@ -523,10 +402,10 @@ public final class CodexDataUpdateNotifyOuterClass {
super.clear();
type_ = 0;
id_ = 0;
weaponMaxPromoteLevel_ = 0;
id_ = 0;
return this;
}
@@ -554,8 +433,8 @@ public final class CodexDataUpdateNotifyOuterClass {
public emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify buildPartial() {
emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify result = new emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify(this);
result.type_ = type_;
result.id_ = id_;
result.weaponMaxPromoteLevel_ = weaponMaxPromoteLevel_;
result.id_ = id_;
onBuilt();
return result;
}
@@ -607,12 +486,12 @@ public final class CodexDataUpdateNotifyOuterClass {
if (other.type_ != 0) {
setTypeValue(other.getTypeValue());
}
if (other.getId() != 0) {
setId(other.getId());
}
if (other.getWeaponMaxPromoteLevel() != 0) {
setWeaponMaxPromoteLevel(other.getWeaponMaxPromoteLevel());
}
if (other.getId() != 0) {
setId(other.getId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -644,14 +523,14 @@ public final class CodexDataUpdateNotifyOuterClass {
private int type_ = 0;
/**
* <code>.CodexType type = 15;</code>
* <code>.CodexType type = 10;</code>
* @return The enum numeric value on the wire for type.
*/
@java.lang.Override public int getTypeValue() {
return type_;
}
/**
* <code>.CodexType type = 15;</code>
* <code>.CodexType type = 10;</code>
* @param value The enum numeric value on the wire for type to set.
* @return This builder for chaining.
*/
@@ -662,7 +541,7 @@ public final class CodexDataUpdateNotifyOuterClass {
return this;
}
/**
* <code>.CodexType type = 15;</code>
* <code>.CodexType type = 10;</code>
* @return The type.
*/
@java.lang.Override
@@ -672,7 +551,7 @@ public final class CodexDataUpdateNotifyOuterClass {
return result == null ? emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType.UNRECOGNIZED : result;
}
/**
* <code>.CodexType type = 15;</code>
* <code>.CodexType type = 10;</code>
* @param value The type to set.
* @return This builder for chaining.
*/
@@ -686,7 +565,7 @@ public final class CodexDataUpdateNotifyOuterClass {
return this;
}
/**
* <code>.CodexType type = 15;</code>
* <code>.CodexType type = 10;</code>
* @return This builder for chaining.
*/
public Builder clearType() {
@@ -696,40 +575,9 @@ public final class CodexDataUpdateNotifyOuterClass {
return this;
}
private int id_ ;
/**
* <code>uint32 id = 6;</code>
* @return The id.
*/
@java.lang.Override
public int getId() {
return id_;
}
/**
* <code>uint32 id = 6;</code>
* @param value The id to set.
* @return This builder for chaining.
*/
public Builder setId(int value) {
id_ = value;
onChanged();
return this;
}
/**
* <code>uint32 id = 6;</code>
* @return This builder for chaining.
*/
public Builder clearId() {
id_ = 0;
onChanged();
return this;
}
private int weaponMaxPromoteLevel_ ;
/**
* <code>uint32 weaponMaxPromoteLevel = 1;</code>
* <code>uint32 weapon_max_promote_level = 15;</code>
* @return The weaponMaxPromoteLevel.
*/
@java.lang.Override
@@ -737,7 +585,7 @@ public final class CodexDataUpdateNotifyOuterClass {
return weaponMaxPromoteLevel_;
}
/**
* <code>uint32 weaponMaxPromoteLevel = 1;</code>
* <code>uint32 weapon_max_promote_level = 15;</code>
* @param value The weaponMaxPromoteLevel to set.
* @return This builder for chaining.
*/
@@ -748,7 +596,7 @@ public final class CodexDataUpdateNotifyOuterClass {
return this;
}
/**
* <code>uint32 weaponMaxPromoteLevel = 1;</code>
* <code>uint32 weapon_max_promote_level = 15;</code>
* @return This builder for chaining.
*/
public Builder clearWeaponMaxPromoteLevel() {
@@ -757,6 +605,37 @@ public final class CodexDataUpdateNotifyOuterClass {
onChanged();
return this;
}
private int id_ ;
/**
* <code>uint32 id = 5;</code>
* @return The id.
*/
@java.lang.Override
public int getId() {
return id_;
}
/**
* <code>uint32 id = 5;</code>
* @param value The id to set.
* @return This builder for chaining.
*/
public Builder setId(int value) {
id_ = value;
onChanged();
return this;
}
/**
* <code>uint32 id = 5;</code>
* @return This builder for chaining.
*/
public Builder clearId() {
id_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -825,12 +704,10 @@ public final class CodexDataUpdateNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\033CodexDataUpdateNotify.proto\032\017CodexType" +
".proto\"\255\001\n\025CodexDataUpdateNotify\022\030\n\004type" +
"\030\017 \001(\0162\n.CodexType\022\n\n\002id\030\006 \001(\r\022\035\n\025weapon" +
"MaxPromoteLevel\030\001 \001(\r\"O\n\013IJBHHHDDJOJ\022\010\n\004" +
"NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\352 \022\017\n\013DCDNILFDFLB\020" +
"\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.grasscutte" +
"r.net.protob\006proto3"
".proto\"_\n\025CodexDataUpdateNotify\022\030\n\004type\030" +
"\n \001(\0162\n.CodexType\022 \n\030weapon_max_promote_" +
"level\030\017 \001(\r\022\n\n\002id\030\005 \001(\rB\033\n\031emu.grasscutt" +
"er.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -842,7 +719,7 @@ public final class CodexDataUpdateNotifyOuterClass {
internal_static_CodexDataUpdateNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_CodexDataUpdateNotify_descriptor,
new java.lang.String[] { "Type", "Id", "WeaponMaxPromoteLevel", });
new java.lang.String[] { "Type", "WeaponMaxPromoteLevel", "Id", });
emu.grasscutter.net.proto.CodexTypeOuterClass.getDescriptor();
}