Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 23:10:00 +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/PlayerPropChangeNotifyOuterClass.java
+42 -165
View File
@@ -19,18 +19,23 @@ public final class PlayerPropChangeNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 propDelta = 8;</code>
* <code>uint32 prop_delta = 9;</code>
* @return The propDelta.
*/
int getPropDelta();
/**
* <code>uint32 propType = 12;</code>
* <code>uint32 prop_type = 4;</code>
* @return The propType.
*/
int getPropType();
}
/**
* <pre>
* Name: CKDGLFFGEAA
* CmdId: 156
* </pre>
*
* Protobuf type {@code PlayerPropChangeNotify}
*/
public static final class PlayerPropChangeNotify extends
@@ -75,16 +80,16 @@ public final class PlayerPropChangeNotifyOuterClass {
case 0:
done = true;
break;
case 64: {
propDelta_ = input.readUInt32();
break;
}
case 96: {
case 32: {
propType_ = input.readUInt32();
break;
}
case 72: {
propDelta_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -117,141 +122,10 @@ public final class PlayerPropChangeNotifyOuterClass {
emu.grasscutter.net.proto.PlayerPropChangeNotifyOuterClass.PlayerPropChangeNotify.class, emu.grasscutter.net.proto.PlayerPropChangeNotifyOuterClass.PlayerPropChangeNotify.Builder.class);
}
/**
* Protobuf enum {@code PlayerPropChangeNotify.NHOMLNBEJIC}
*/
public enum NHOMLNBEJIC
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 146;</code>
*/
PEPPOHPHJOJ(1, 146),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final NHOMLNBEJIC DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 146;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 146;
/**
* <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 NHOMLNBEJIC 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 NHOMLNBEJIC forNumber(int value) {
switch (value) {
case 0: return NONE;
case 146: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<NHOMLNBEJIC>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
NHOMLNBEJIC> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<NHOMLNBEJIC>() {
public NHOMLNBEJIC findValueByNumber(int number) {
return NHOMLNBEJIC.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.PlayerPropChangeNotifyOuterClass.PlayerPropChangeNotify.getDescriptor().getEnumTypes().get(0);
}
private static final NHOMLNBEJIC[] VALUES = getStaticValuesArray();
private static NHOMLNBEJIC[] getStaticValuesArray() {
return new NHOMLNBEJIC[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static NHOMLNBEJIC 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 NHOMLNBEJIC(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:PlayerPropChangeNotify.NHOMLNBEJIC)
}
public static final int PROPDELTA_FIELD_NUMBER = 8;
public static final int PROP_DELTA_FIELD_NUMBER = 9;
private int propDelta_;
/**
* <code>uint32 propDelta = 8;</code>
* <code>uint32 prop_delta = 9;</code>
* @return The propDelta.
*/
@java.lang.Override
@@ -259,10 +133,10 @@ public final class PlayerPropChangeNotifyOuterClass {
return propDelta_;
}
public static final int PROPTYPE_FIELD_NUMBER = 12;
public static final int PROP_TYPE_FIELD_NUMBER = 4;
private int propType_;
/**
* <code>uint32 propType = 12;</code>
* <code>uint32 prop_type = 4;</code>
* @return The propType.
*/
@java.lang.Override
@@ -284,11 +158,11 @@ public final class PlayerPropChangeNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (propDelta_ != 0) {
output.writeUInt32(8, propDelta_);
}
if (propType_ != 0) {
output.writeUInt32(12, propType_);
output.writeUInt32(4, propType_);
}
if (propDelta_ != 0) {
output.writeUInt32(9, propDelta_);
}
unknownFields.writeTo(output);
}
@@ -299,13 +173,13 @@ public final class PlayerPropChangeNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (propDelta_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(8, propDelta_);
}
if (propType_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(12, propType_);
.computeUInt32Size(4, propType_);
}
if (propDelta_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, propDelta_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -337,9 +211,9 @@ public final class PlayerPropChangeNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + PROPDELTA_FIELD_NUMBER;
hash = (37 * hash) + PROP_DELTA_FIELD_NUMBER;
hash = (53 * hash) + getPropDelta();
hash = (37 * hash) + PROPTYPE_FIELD_NUMBER;
hash = (37 * hash) + PROP_TYPE_FIELD_NUMBER;
hash = (53 * hash) + getPropType();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
@@ -437,6 +311,11 @@ public final class PlayerPropChangeNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: CKDGLFFGEAA
* CmdId: 156
* </pre>
*
* Protobuf type {@code PlayerPropChangeNotify}
*/
public static final class Builder extends
@@ -591,7 +470,7 @@ public final class PlayerPropChangeNotifyOuterClass {
private int propDelta_ ;
/**
* <code>uint32 propDelta = 8;</code>
* <code>uint32 prop_delta = 9;</code>
* @return The propDelta.
*/
@java.lang.Override
@@ -599,7 +478,7 @@ public final class PlayerPropChangeNotifyOuterClass {
return propDelta_;
}
/**
* <code>uint32 propDelta = 8;</code>
* <code>uint32 prop_delta = 9;</code>
* @param value The propDelta to set.
* @return This builder for chaining.
*/
@@ -610,7 +489,7 @@ public final class PlayerPropChangeNotifyOuterClass {
return this;
}
/**
* <code>uint32 propDelta = 8;</code>
* <code>uint32 prop_delta = 9;</code>
* @return This builder for chaining.
*/
public Builder clearPropDelta() {
@@ -622,7 +501,7 @@ public final class PlayerPropChangeNotifyOuterClass {
private int propType_ ;
/**
* <code>uint32 propType = 12;</code>
* <code>uint32 prop_type = 4;</code>
* @return The propType.
*/
@java.lang.Override
@@ -630,7 +509,7 @@ public final class PlayerPropChangeNotifyOuterClass {
return propType_;
}
/**
* <code>uint32 propType = 12;</code>
* <code>uint32 prop_type = 4;</code>
* @param value The propType to set.
* @return This builder for chaining.
*/
@@ -641,7 +520,7 @@ public final class PlayerPropChangeNotifyOuterClass {
return this;
}
/**
* <code>uint32 propType = 12;</code>
* <code>uint32 prop_type = 4;</code>
* @return This builder for chaining.
*/
public Builder clearPropType() {
@@ -717,11 +596,9 @@ public final class PlayerPropChangeNotifyOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\034PlayerPropChangeNotify.proto\"\216\001\n\026Playe" +
"rPropChangeNotify\022\021\n\tpropDelta\030\010 \001(\r\022\020\n\010" +
"propType\030\014 \001(\r\"O\n\013NHOMLNBEJIC\022\010\n\004NONE\020\000\022" +
"\020\n\013PEPPOHPHJOJ\020\222\001\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NN" +
"BKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.grasscutter.net.p" +
"\n\034PlayerPropChangeNotify.proto\"?\n\026Player" +
"PropChangeNotify\022\022\n\nprop_delta\030\t \001(\r\022\021\n\t" +
"prop_type\030\004 \001(\rB\033\n\031emu.grasscutter.net.p" +
"rotob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor