Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 21:29:51 +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/PlayerGameTimeNotifyOuterClass.java
+104 -235
View File
@@ -19,24 +19,29 @@ public final class PlayerGameTimeNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 gameTime = 1;</code>
* @return The gameTime.
*/
int getGameTime();
/**
* <code>bool isHome = 3;</code>
* <code>bool is_home = 10;</code>
* @return The isHome.
*/
boolean getIsHome();
/**
* <code>uint32 uid = 14;</code>
* <code>uint32 game_time = 14;</code>
* @return The gameTime.
*/
int getGameTime();
/**
* <code>uint32 uid = 12;</code>
* @return The uid.
*/
int getUid();
}
/**
* <pre>
* Name: ELLGKGBIOFD
* CmdId: 159
* </pre>
*
* Protobuf type {@code PlayerGameTimeNotify}
*/
public static final class PlayerGameTimeNotify extends
@@ -81,21 +86,21 @@ public final class PlayerGameTimeNotifyOuterClass {
case 0:
done = true;
break;
case 8: {
gameTime_ = input.readUInt32();
break;
}
case 24: {
case 80: {
isHome_ = input.readBool();
break;
}
case 112: {
case 96: {
uid_ = input.readUInt32();
break;
}
case 112: {
gameTime_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -128,160 +133,10 @@ public final class PlayerGameTimeNotifyOuterClass {
emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify.class, emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify.Builder.class);
}
/**
* Protobuf enum {@code PlayerGameTimeNotify.FAMEPMJBHAJ}
*/
public enum FAMEPMJBHAJ
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 124;</code>
*/
PEPPOHPHJOJ(1, 124),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final FAMEPMJBHAJ DCDNILFDFLB = NONE;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final FAMEPMJBHAJ EAJIABGAOCI = NNBKOLMPOEA;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 124;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 124;
/**
* <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 FAMEPMJBHAJ 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 FAMEPMJBHAJ forNumber(int value) {
switch (value) {
case 0: return NONE;
case 124: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<FAMEPMJBHAJ>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
FAMEPMJBHAJ> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<FAMEPMJBHAJ>() {
public FAMEPMJBHAJ findValueByNumber(int number) {
return FAMEPMJBHAJ.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.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify.getDescriptor().getEnumTypes().get(0);
}
private static final FAMEPMJBHAJ[] VALUES = getStaticValuesArray();
private static FAMEPMJBHAJ[] getStaticValuesArray() {
return new FAMEPMJBHAJ[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
};
}
public static FAMEPMJBHAJ 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 FAMEPMJBHAJ(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:PlayerGameTimeNotify.FAMEPMJBHAJ)
}
public static final int GAMETIME_FIELD_NUMBER = 1;
private int gameTime_;
/**
* <code>uint32 gameTime = 1;</code>
* @return The gameTime.
*/
@java.lang.Override
public int getGameTime() {
return gameTime_;
}
public static final int ISHOME_FIELD_NUMBER = 3;
public static final int IS_HOME_FIELD_NUMBER = 10;
private boolean isHome_;
/**
* <code>bool isHome = 3;</code>
* <code>bool is_home = 10;</code>
* @return The isHome.
*/
@java.lang.Override
@@ -289,10 +144,21 @@ public final class PlayerGameTimeNotifyOuterClass {
return isHome_;
}
public static final int UID_FIELD_NUMBER = 14;
public static final int GAME_TIME_FIELD_NUMBER = 14;
private int gameTime_;
/**
* <code>uint32 game_time = 14;</code>
* @return The gameTime.
*/
@java.lang.Override
public int getGameTime() {
return gameTime_;
}
public static final int UID_FIELD_NUMBER = 12;
private int uid_;
/**
* <code>uint32 uid = 14;</code>
* <code>uint32 uid = 12;</code>
* @return The uid.
*/
@java.lang.Override
@@ -314,14 +180,14 @@ public final class PlayerGameTimeNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (gameTime_ != 0) {
output.writeUInt32(1, gameTime_);
}
if (isHome_ != false) {
output.writeBool(3, isHome_);
output.writeBool(10, isHome_);
}
if (uid_ != 0) {
output.writeUInt32(14, uid_);
output.writeUInt32(12, uid_);
}
if (gameTime_ != 0) {
output.writeUInt32(14, gameTime_);
}
unknownFields.writeTo(output);
}
@@ -332,17 +198,17 @@ public final class PlayerGameTimeNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (gameTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, gameTime_);
}
if (isHome_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(3, isHome_);
.computeBoolSize(10, isHome_);
}
if (uid_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, uid_);
.computeUInt32Size(12, uid_);
}
if (gameTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, gameTime_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -359,10 +225,10 @@ public final class PlayerGameTimeNotifyOuterClass {
}
emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify other = (emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify) obj;
if (getGameTime()
!= other.getGameTime()) return false;
if (getIsHome()
!= other.getIsHome()) return false;
if (getGameTime()
!= other.getGameTime()) return false;
if (getUid()
!= other.getUid()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
@@ -376,11 +242,11 @@ public final class PlayerGameTimeNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + GAMETIME_FIELD_NUMBER;
hash = (53 * hash) + getGameTime();
hash = (37 * hash) + ISHOME_FIELD_NUMBER;
hash = (37 * hash) + IS_HOME_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsHome());
hash = (37 * hash) + GAME_TIME_FIELD_NUMBER;
hash = (53 * hash) + getGameTime();
hash = (37 * hash) + UID_FIELD_NUMBER;
hash = (53 * hash) + getUid();
hash = (29 * hash) + unknownFields.hashCode();
@@ -479,6 +345,11 @@ public final class PlayerGameTimeNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: ELLGKGBIOFD
* CmdId: 159
* </pre>
*
* Protobuf type {@code PlayerGameTimeNotify}
*/
public static final class Builder extends
@@ -516,10 +387,10 @@ public final class PlayerGameTimeNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
gameTime_ = 0;
isHome_ = false;
gameTime_ = 0;
uid_ = 0;
return this;
@@ -548,8 +419,8 @@ public final class PlayerGameTimeNotifyOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify buildPartial() {
emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify result = new emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify(this);
result.gameTime_ = gameTime_;
result.isHome_ = isHome_;
result.gameTime_ = gameTime_;
result.uid_ = uid_;
onBuilt();
return result;
@@ -599,12 +470,12 @@ public final class PlayerGameTimeNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify other) {
if (other == emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify.getDefaultInstance()) return this;
if (other.getGameTime() != 0) {
setGameTime(other.getGameTime());
}
if (other.getIsHome() != false) {
setIsHome(other.getIsHome());
}
if (other.getGameTime() != 0) {
setGameTime(other.getGameTime());
}
if (other.getUid() != 0) {
setUid(other.getUid());
}
@@ -637,40 +508,9 @@ public final class PlayerGameTimeNotifyOuterClass {
return this;
}
private int gameTime_ ;
/**
* <code>uint32 gameTime = 1;</code>
* @return The gameTime.
*/
@java.lang.Override
public int getGameTime() {
return gameTime_;
}
/**
* <code>uint32 gameTime = 1;</code>
* @param value The gameTime to set.
* @return This builder for chaining.
*/
public Builder setGameTime(int value) {
gameTime_ = value;
onChanged();
return this;
}
/**
* <code>uint32 gameTime = 1;</code>
* @return This builder for chaining.
*/
public Builder clearGameTime() {
gameTime_ = 0;
onChanged();
return this;
}
private boolean isHome_ ;
/**
* <code>bool isHome = 3;</code>
* <code>bool is_home = 10;</code>
* @return The isHome.
*/
@java.lang.Override
@@ -678,7 +518,7 @@ public final class PlayerGameTimeNotifyOuterClass {
return isHome_;
}
/**
* <code>bool isHome = 3;</code>
* <code>bool is_home = 10;</code>
* @param value The isHome to set.
* @return This builder for chaining.
*/
@@ -689,7 +529,7 @@ public final class PlayerGameTimeNotifyOuterClass {
return this;
}
/**
* <code>bool isHome = 3;</code>
* <code>bool is_home = 10;</code>
* @return This builder for chaining.
*/
public Builder clearIsHome() {
@@ -699,9 +539,40 @@ public final class PlayerGameTimeNotifyOuterClass {
return this;
}
private int gameTime_ ;
/**
* <code>uint32 game_time = 14;</code>
* @return The gameTime.
*/
@java.lang.Override
public int getGameTime() {
return gameTime_;
}
/**
* <code>uint32 game_time = 14;</code>
* @param value The gameTime to set.
* @return This builder for chaining.
*/
public Builder setGameTime(int value) {
gameTime_ = value;
onChanged();
return this;
}
/**
* <code>uint32 game_time = 14;</code>
* @return This builder for chaining.
*/
public Builder clearGameTime() {
gameTime_ = 0;
onChanged();
return this;
}
private int uid_ ;
/**
* <code>uint32 uid = 14;</code>
* <code>uint32 uid = 12;</code>
* @return The uid.
*/
@java.lang.Override
@@ -709,7 +580,7 @@ public final class PlayerGameTimeNotifyOuterClass {
return uid_;
}
/**
* <code>uint32 uid = 14;</code>
* <code>uint32 uid = 12;</code>
* @param value The uid to set.
* @return This builder for chaining.
*/
@@ -720,7 +591,7 @@ public final class PlayerGameTimeNotifyOuterClass {
return this;
}
/**
* <code>uint32 uid = 14;</code>
* <code>uint32 uid = 12;</code>
* @return This builder for chaining.
*/
public Builder clearUid() {
@@ -796,12 +667,10 @@ public final class PlayerGameTimeNotifyOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\032PlayerGameTimeNotify.proto\"\246\001\n\024PlayerG" +
"ameTimeNotify\022\020\n\010gameTime\030\001 \001(\r\022\016\n\006isHom" +
"e\030\003 \001(\010\022\013\n\003uid\030\016 \001(\r\"_\n\013FAMEPMJBHAJ\022\010\n\004N" +
"ONE\020\000\022\017\n\013PEPPOHPHJOJ\020|\022\017\n\013DCDNILFDFLB\020\000\022" +
"\017\n\013NNBKOLMPOEA\020\001\022\017\n\013EAJIABGAOCI\020\001\032\002\020\001B\033\n" +
"\031emu.grasscutter.net.protob\006proto3"
"\n\032PlayerGameTimeNotify.proto\"G\n\024PlayerGa" +
"meTimeNotify\022\017\n\007is_home\030\n \001(\010\022\021\n\tgame_ti" +
"me\030\016 \001(\r\022\013\n\003uid\030\014 \001(\rB\033\n\031emu.grasscutter" +
".net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -812,7 +681,7 @@ public final class PlayerGameTimeNotifyOuterClass {
internal_static_PlayerGameTimeNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_PlayerGameTimeNotify_descriptor,
new java.lang.String[] { "GameTime", "IsHome", "Uid", });
new java.lang.String[] { "IsHome", "GameTime", "Uid", });
}
// @@protoc_insertion_point(outer_class_scope)