Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-08 12:33:36 +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/SceneTimeNotifyOuterClass.java
+103 -226
View File
@@ -19,24 +19,29 @@ public final class SceneTimeNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>bool isPaused = 4;</code>
* @return The isPaused.
*/
boolean getIsPaused();
/**
* <code>uint64 sceneTime = 10;</code>
* <code>uint64 scene_time = 2;</code>
* @return The sceneTime.
*/
long getSceneTime();
/**
* <code>uint32 sceneId = 13;</code>
* <code>uint32 scene_id = 13;</code>
* @return The sceneId.
*/
int getSceneId();
/**
* <code>bool is_paused = 7;</code>
* @return The isPaused.
*/
boolean getIsPaused();
}
/**
* <pre>
* Name: EBJECAINEDK
* CmdId: 210
* </pre>
*
* Protobuf type {@code SceneTimeNotify}
*/
public static final class SceneTimeNotify extends
@@ -81,16 +86,16 @@ public final class SceneTimeNotifyOuterClass {
case 0:
done = true;
break;
case 32: {
isPaused_ = input.readBool();
break;
}
case 80: {
case 16: {
sceneTime_ = input.readUInt64();
break;
}
case 56: {
isPaused_ = input.readBool();
break;
}
case 104: {
sceneId_ = input.readUInt32();
@@ -128,152 +133,10 @@ public final class SceneTimeNotifyOuterClass {
emu.grasscutter.net.proto.SceneTimeNotifyOuterClass.SceneTimeNotify.class, emu.grasscutter.net.proto.SceneTimeNotifyOuterClass.SceneTimeNotify.Builder.class);
}
/**
* Protobuf enum {@code SceneTimeNotify.CHDHNBMCGCK}
*/
public enum CHDHNBMCGCK
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 232;</code>
*/
PEPPOHPHJOJ(1, 232),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final CHDHNBMCGCK DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 232;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 232;
/**
* <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 CHDHNBMCGCK 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 CHDHNBMCGCK forNumber(int value) {
switch (value) {
case 0: return NONE;
case 232: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<CHDHNBMCGCK>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
CHDHNBMCGCK> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<CHDHNBMCGCK>() {
public CHDHNBMCGCK findValueByNumber(int number) {
return CHDHNBMCGCK.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.SceneTimeNotifyOuterClass.SceneTimeNotify.getDescriptor().getEnumTypes().get(0);
}
private static final CHDHNBMCGCK[] VALUES = getStaticValuesArray();
private static CHDHNBMCGCK[] getStaticValuesArray() {
return new CHDHNBMCGCK[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static CHDHNBMCGCK 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 CHDHNBMCGCK(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:SceneTimeNotify.CHDHNBMCGCK)
}
public static final int ISPAUSED_FIELD_NUMBER = 4;
private boolean isPaused_;
/**
* <code>bool isPaused = 4;</code>
* @return The isPaused.
*/
@java.lang.Override
public boolean getIsPaused() {
return isPaused_;
}
public static final int SCENETIME_FIELD_NUMBER = 10;
public static final int SCENE_TIME_FIELD_NUMBER = 2;
private long sceneTime_;
/**
* <code>uint64 sceneTime = 10;</code>
* <code>uint64 scene_time = 2;</code>
* @return The sceneTime.
*/
@java.lang.Override
@@ -281,10 +144,10 @@ public final class SceneTimeNotifyOuterClass {
return sceneTime_;
}
public static final int SCENEID_FIELD_NUMBER = 13;
public static final int SCENE_ID_FIELD_NUMBER = 13;
private int sceneId_;
/**
* <code>uint32 sceneId = 13;</code>
* <code>uint32 scene_id = 13;</code>
* @return The sceneId.
*/
@java.lang.Override
@@ -292,6 +155,17 @@ public final class SceneTimeNotifyOuterClass {
return sceneId_;
}
public static final int IS_PAUSED_FIELD_NUMBER = 7;
private boolean isPaused_;
/**
* <code>bool is_paused = 7;</code>
* @return The isPaused.
*/
@java.lang.Override
public boolean getIsPaused() {
return isPaused_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -306,11 +180,11 @@ public final class SceneTimeNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (isPaused_ != false) {
output.writeBool(4, isPaused_);
}
if (sceneTime_ != 0L) {
output.writeUInt64(10, sceneTime_);
output.writeUInt64(2, sceneTime_);
}
if (isPaused_ != false) {
output.writeBool(7, isPaused_);
}
if (sceneId_ != 0) {
output.writeUInt32(13, sceneId_);
@@ -324,13 +198,13 @@ public final class SceneTimeNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (isPaused_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(4, isPaused_);
}
if (sceneTime_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(10, sceneTime_);
.computeUInt64Size(2, sceneTime_);
}
if (isPaused_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(7, isPaused_);
}
if (sceneId_ != 0) {
size += com.google.protobuf.CodedOutputStream
@@ -351,12 +225,12 @@ public final class SceneTimeNotifyOuterClass {
}
emu.grasscutter.net.proto.SceneTimeNotifyOuterClass.SceneTimeNotify other = (emu.grasscutter.net.proto.SceneTimeNotifyOuterClass.SceneTimeNotify) obj;
if (getIsPaused()
!= other.getIsPaused()) return false;
if (getSceneTime()
!= other.getSceneTime()) return false;
if (getSceneId()
!= other.getSceneId()) return false;
if (getIsPaused()
!= other.getIsPaused()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -368,14 +242,14 @@ public final class SceneTimeNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + ISPAUSED_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsPaused());
hash = (37 * hash) + SCENETIME_FIELD_NUMBER;
hash = (37 * hash) + SCENE_TIME_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getSceneTime());
hash = (37 * hash) + SCENEID_FIELD_NUMBER;
hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
hash = (53 * hash) + getSceneId();
hash = (37 * hash) + IS_PAUSED_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsPaused());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -472,6 +346,11 @@ public final class SceneTimeNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: EBJECAINEDK
* CmdId: 210
* </pre>
*
* Protobuf type {@code SceneTimeNotify}
*/
public static final class Builder extends
@@ -509,12 +388,12 @@ public final class SceneTimeNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
isPaused_ = false;
sceneTime_ = 0L;
sceneId_ = 0;
isPaused_ = false;
return this;
}
@@ -541,9 +420,9 @@ public final class SceneTimeNotifyOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.SceneTimeNotifyOuterClass.SceneTimeNotify buildPartial() {
emu.grasscutter.net.proto.SceneTimeNotifyOuterClass.SceneTimeNotify result = new emu.grasscutter.net.proto.SceneTimeNotifyOuterClass.SceneTimeNotify(this);
result.isPaused_ = isPaused_;
result.sceneTime_ = sceneTime_;
result.sceneId_ = sceneId_;
result.isPaused_ = isPaused_;
onBuilt();
return result;
}
@@ -592,15 +471,15 @@ public final class SceneTimeNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.SceneTimeNotifyOuterClass.SceneTimeNotify other) {
if (other == emu.grasscutter.net.proto.SceneTimeNotifyOuterClass.SceneTimeNotify.getDefaultInstance()) return this;
if (other.getIsPaused() != false) {
setIsPaused(other.getIsPaused());
}
if (other.getSceneTime() != 0L) {
setSceneTime(other.getSceneTime());
}
if (other.getSceneId() != 0) {
setSceneId(other.getSceneId());
}
if (other.getIsPaused() != false) {
setIsPaused(other.getIsPaused());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -630,40 +509,9 @@ public final class SceneTimeNotifyOuterClass {
return this;
}
private boolean isPaused_ ;
/**
* <code>bool isPaused = 4;</code>
* @return The isPaused.
*/
@java.lang.Override
public boolean getIsPaused() {
return isPaused_;
}
/**
* <code>bool isPaused = 4;</code>
* @param value The isPaused to set.
* @return This builder for chaining.
*/
public Builder setIsPaused(boolean value) {
isPaused_ = value;
onChanged();
return this;
}
/**
* <code>bool isPaused = 4;</code>
* @return This builder for chaining.
*/
public Builder clearIsPaused() {
isPaused_ = false;
onChanged();
return this;
}
private long sceneTime_ ;
/**
* <code>uint64 sceneTime = 10;</code>
* <code>uint64 scene_time = 2;</code>
* @return The sceneTime.
*/
@java.lang.Override
@@ -671,7 +519,7 @@ public final class SceneTimeNotifyOuterClass {
return sceneTime_;
}
/**
* <code>uint64 sceneTime = 10;</code>
* <code>uint64 scene_time = 2;</code>
* @param value The sceneTime to set.
* @return This builder for chaining.
*/
@@ -682,7 +530,7 @@ public final class SceneTimeNotifyOuterClass {
return this;
}
/**
* <code>uint64 sceneTime = 10;</code>
* <code>uint64 scene_time = 2;</code>
* @return This builder for chaining.
*/
public Builder clearSceneTime() {
@@ -694,7 +542,7 @@ public final class SceneTimeNotifyOuterClass {
private int sceneId_ ;
/**
* <code>uint32 sceneId = 13;</code>
* <code>uint32 scene_id = 13;</code>
* @return The sceneId.
*/
@java.lang.Override
@@ -702,7 +550,7 @@ public final class SceneTimeNotifyOuterClass {
return sceneId_;
}
/**
* <code>uint32 sceneId = 13;</code>
* <code>uint32 scene_id = 13;</code>
* @param value The sceneId to set.
* @return This builder for chaining.
*/
@@ -713,7 +561,7 @@ public final class SceneTimeNotifyOuterClass {
return this;
}
/**
* <code>uint32 sceneId = 13;</code>
* <code>uint32 scene_id = 13;</code>
* @return This builder for chaining.
*/
public Builder clearSceneId() {
@@ -722,6 +570,37 @@ public final class SceneTimeNotifyOuterClass {
onChanged();
return this;
}
private boolean isPaused_ ;
/**
* <code>bool is_paused = 7;</code>
* @return The isPaused.
*/
@java.lang.Override
public boolean getIsPaused() {
return isPaused_;
}
/**
* <code>bool is_paused = 7;</code>
* @param value The isPaused to set.
* @return This builder for chaining.
*/
public Builder setIsPaused(boolean value) {
isPaused_ = value;
onChanged();
return this;
}
/**
* <code>bool is_paused = 7;</code>
* @return This builder for chaining.
*/
public Builder clearIsPaused() {
isPaused_ = false;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -789,12 +668,10 @@ public final class SceneTimeNotifyOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\025SceneTimeNotify.proto\"\230\001\n\017SceneTimeNot" +
"ify\022\020\n\010isPaused\030\004 \001(\010\022\021\n\tsceneTime\030\n \001(\004" +
"\022\017\n\007sceneId\030\r \001(\r\"O\n\013CHDHNBMCGCK\022\010\n\004NONE" +
"\020\000\022\020\n\013PEPPOHPHJOJ\020\350\001\022\017\n\013DCDNILFDFLB\020\000\022\017\n" +
"\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.grasscutter.ne" +
"t.protob\006proto3"
"\n\025SceneTimeNotify.proto\"J\n\017SceneTimeNoti" +
"fy\022\022\n\nscene_time\030\002 \001(\004\022\020\n\010scene_id\030\r \001(\r" +
"\022\021\n\tis_paused\030\007 \001(\010B\033\n\031emu.grasscutter.n" +
"et.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -805,7 +682,7 @@ public final class SceneTimeNotifyOuterClass {
internal_static_SceneTimeNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_SceneTimeNotify_descriptor,
new java.lang.String[] { "IsPaused", "SceneTime", "SceneId", });
new java.lang.String[] { "SceneTime", "SceneId", "IsPaused", });
}
// @@protoc_insertion_point(outer_class_scope)