mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-23 20:09:56 +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
+23
-144
@@ -19,12 +19,17 @@ public final class ServerTimeNotifyOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint64 serverTime = 12;</code>
|
||||
* <code>uint64 server_time = 8;</code>
|
||||
* @return The serverTime.
|
||||
*/
|
||||
long getServerTime();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: OJGHKIIHLIG
|
||||
* CmdId: 50
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code ServerTimeNotify}
|
||||
*/
|
||||
public static final class ServerTimeNotify extends
|
||||
@@ -69,7 +74,7 @@ public final class ServerTimeNotifyOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 96: {
|
||||
case 64: {
|
||||
|
||||
serverTime_ = input.readUInt64();
|
||||
break;
|
||||
@@ -106,139 +111,10 @@ public final class ServerTimeNotifyOuterClass {
|
||||
emu.grasscutter.net.proto.ServerTimeNotifyOuterClass.ServerTimeNotify.class, emu.grasscutter.net.proto.ServerTimeNotifyOuterClass.ServerTimeNotify.Builder.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* Protobuf enum {@code ServerTimeNotify.ODMLPFBCGNH}
|
||||
*/
|
||||
public enum ODMLPFBCGNH
|
||||
implements com.google.protobuf.ProtocolMessageEnum {
|
||||
/**
|
||||
* <code>NONE = 0;</code>
|
||||
*/
|
||||
NONE(0),
|
||||
/**
|
||||
* <code>PEPPOHPHJOJ = 14;</code>
|
||||
*/
|
||||
PEPPOHPHJOJ(14),
|
||||
/**
|
||||
* <code>DCDNILFDFLB = 1;</code>
|
||||
*/
|
||||
DCDNILFDFLB(1),
|
||||
UNRECOGNIZED(-1),
|
||||
;
|
||||
|
||||
/**
|
||||
* <code>NNBKOLMPOEA = 1;</code>
|
||||
*/
|
||||
public static final ODMLPFBCGNH NNBKOLMPOEA = DCDNILFDFLB;
|
||||
/**
|
||||
* <code>NONE = 0;</code>
|
||||
*/
|
||||
public static final int NONE_VALUE = 0;
|
||||
/**
|
||||
* <code>PEPPOHPHJOJ = 14;</code>
|
||||
*/
|
||||
public static final int PEPPOHPHJOJ_VALUE = 14;
|
||||
/**
|
||||
* <code>DCDNILFDFLB = 1;</code>
|
||||
*/
|
||||
public static final int DCDNILFDFLB_VALUE = 1;
|
||||
/**
|
||||
* <code>NNBKOLMPOEA = 1;</code>
|
||||
*/
|
||||
public static final int NNBKOLMPOEA_VALUE = 1;
|
||||
|
||||
|
||||
public final int getNumber() {
|
||||
if (this == UNRECOGNIZED) {
|
||||
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 ODMLPFBCGNH 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 ODMLPFBCGNH forNumber(int value) {
|
||||
switch (value) {
|
||||
case 0: return NONE;
|
||||
case 14: return PEPPOHPHJOJ;
|
||||
case 1: return DCDNILFDFLB;
|
||||
default: return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static com.google.protobuf.Internal.EnumLiteMap<ODMLPFBCGNH>
|
||||
internalGetValueMap() {
|
||||
return internalValueMap;
|
||||
}
|
||||
private static final com.google.protobuf.Internal.EnumLiteMap<
|
||||
ODMLPFBCGNH> internalValueMap =
|
||||
new com.google.protobuf.Internal.EnumLiteMap<ODMLPFBCGNH>() {
|
||||
public ODMLPFBCGNH findValueByNumber(int number) {
|
||||
return ODMLPFBCGNH.forNumber(number);
|
||||
}
|
||||
};
|
||||
|
||||
public final com.google.protobuf.Descriptors.EnumValueDescriptor
|
||||
getValueDescriptor() {
|
||||
if (this == UNRECOGNIZED) {
|
||||
throw new java.lang.IllegalStateException(
|
||||
"Can't get the descriptor of an unrecognized enum value.");
|
||||
}
|
||||
return getDescriptor().getValues().get(ordinal());
|
||||
}
|
||||
public final com.google.protobuf.Descriptors.EnumDescriptor
|
||||
getDescriptorForType() {
|
||||
return getDescriptor();
|
||||
}
|
||||
public static final com.google.protobuf.Descriptors.EnumDescriptor
|
||||
getDescriptor() {
|
||||
return emu.grasscutter.net.proto.ServerTimeNotifyOuterClass.ServerTimeNotify.getDescriptor().getEnumTypes().get(0);
|
||||
}
|
||||
|
||||
private static final ODMLPFBCGNH[] VALUES = getStaticValuesArray();
|
||||
private static ODMLPFBCGNH[] getStaticValuesArray() {
|
||||
return new ODMLPFBCGNH[] {
|
||||
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
|
||||
};
|
||||
}
|
||||
public static ODMLPFBCGNH 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 value;
|
||||
|
||||
private ODMLPFBCGNH(int value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(enum_scope:ServerTimeNotify.ODMLPFBCGNH)
|
||||
}
|
||||
|
||||
public static final int SERVERTIME_FIELD_NUMBER = 12;
|
||||
public static final int SERVER_TIME_FIELD_NUMBER = 8;
|
||||
private long serverTime_;
|
||||
/**
|
||||
* <code>uint64 serverTime = 12;</code>
|
||||
* <code>uint64 server_time = 8;</code>
|
||||
* @return The serverTime.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -261,7 +137,7 @@ public final class ServerTimeNotifyOuterClass {
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (serverTime_ != 0L) {
|
||||
output.writeUInt64(12, serverTime_);
|
||||
output.writeUInt64(8, serverTime_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -274,7 +150,7 @@ public final class ServerTimeNotifyOuterClass {
|
||||
size = 0;
|
||||
if (serverTime_ != 0L) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt64Size(12, serverTime_);
|
||||
.computeUInt64Size(8, serverTime_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -304,7 +180,7 @@ public final class ServerTimeNotifyOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + SERVERTIME_FIELD_NUMBER;
|
||||
hash = (37 * hash) + SERVER_TIME_FIELD_NUMBER;
|
||||
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
|
||||
getServerTime());
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
@@ -403,6 +279,11 @@ public final class ServerTimeNotifyOuterClass {
|
||||
return builder;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: OJGHKIIHLIG
|
||||
* CmdId: 50
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code ServerTimeNotify}
|
||||
*/
|
||||
public static final class Builder extends
|
||||
@@ -551,7 +432,7 @@ public final class ServerTimeNotifyOuterClass {
|
||||
|
||||
private long serverTime_ ;
|
||||
/**
|
||||
* <code>uint64 serverTime = 12;</code>
|
||||
* <code>uint64 server_time = 8;</code>
|
||||
* @return The serverTime.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -559,7 +440,7 @@ public final class ServerTimeNotifyOuterClass {
|
||||
return serverTime_;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 serverTime = 12;</code>
|
||||
* <code>uint64 server_time = 8;</code>
|
||||
* @param value The serverTime to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -570,7 +451,7 @@ public final class ServerTimeNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 serverTime = 12;</code>
|
||||
* <code>uint64 server_time = 8;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearServerTime() {
|
||||
@@ -646,11 +527,9 @@ public final class ServerTimeNotifyOuterClass {
|
||||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\026ServerTimeNotify.proto\"v\n\020ServerTimeNo" +
|
||||
"tify\022\022\n\nserverTime\030\014 \001(\004\"N\n\013ODMLPFBCGNH\022" +
|
||||
"\010\n\004NONE\020\000\022\017\n\013PEPPOHPHJOJ\020\016\022\017\n\013DCDNILFDFL" +
|
||||
"B\020\001\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.grasscut" +
|
||||
"ter.net.protob\006proto3"
|
||||
"\n\026ServerTimeNotify.proto\"\'\n\020ServerTimeNo" +
|
||||
"tify\022\023\n\013server_time\030\010 \001(\004B\033\n\031emu.grasscu" +
|
||||
"tter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
|
||||
Reference in New Issue
Block a user