Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 17:01:21 +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/InvestigationMonsterUpdateNotifyOuterClass.java
+34 -157
View File
@@ -19,21 +19,26 @@ public final class InvestigationMonsterUpdateNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.InvestigationMonster investigationMonster = 15;</code>
* <code>.InvestigationMonster investigation_monster = 13;</code>
* @return Whether the investigationMonster field is set.
*/
boolean hasInvestigationMonster();
/**
* <code>.InvestigationMonster investigationMonster = 15;</code>
* <code>.InvestigationMonster investigation_monster = 13;</code>
* @return The investigationMonster.
*/
emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster getInvestigationMonster();
/**
* <code>.InvestigationMonster investigationMonster = 15;</code>
* <code>.InvestigationMonster investigation_monster = 13;</code>
*/
emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonsterOrBuilder getInvestigationMonsterOrBuilder();
}
/**
* <pre>
* Name: IDGEJMMEOEO
* CmdId: 1920
* </pre>
*
* Protobuf type {@code InvestigationMonsterUpdateNotify}
*/
public static final class InvestigationMonsterUpdateNotify extends
@@ -78,7 +83,7 @@ public final class InvestigationMonsterUpdateNotifyOuterClass {
case 0:
done = true;
break;
case 122: {
case 106: {
emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.Builder subBuilder = null;
if (investigationMonster_ != null) {
subBuilder = investigationMonster_.toBuilder();
@@ -123,141 +128,10 @@ public final class InvestigationMonsterUpdateNotifyOuterClass {
emu.grasscutter.net.proto.InvestigationMonsterUpdateNotifyOuterClass.InvestigationMonsterUpdateNotify.class, emu.grasscutter.net.proto.InvestigationMonsterUpdateNotifyOuterClass.InvestigationMonsterUpdateNotify.Builder.class);
}
/**
* Protobuf enum {@code InvestigationMonsterUpdateNotify.PGJKAGCIHFP}
*/
public enum PGJKAGCIHFP
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 1919;</code>
*/
PEPPOHPHJOJ(1, 1919),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final PGJKAGCIHFP DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 1919;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 1919;
/**
* <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 PGJKAGCIHFP 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 PGJKAGCIHFP forNumber(int value) {
switch (value) {
case 0: return NONE;
case 1919: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<PGJKAGCIHFP>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
PGJKAGCIHFP> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<PGJKAGCIHFP>() {
public PGJKAGCIHFP findValueByNumber(int number) {
return PGJKAGCIHFP.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.InvestigationMonsterUpdateNotifyOuterClass.InvestigationMonsterUpdateNotify.getDescriptor().getEnumTypes().get(0);
}
private static final PGJKAGCIHFP[] VALUES = getStaticValuesArray();
private static PGJKAGCIHFP[] getStaticValuesArray() {
return new PGJKAGCIHFP[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static PGJKAGCIHFP 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 PGJKAGCIHFP(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:InvestigationMonsterUpdateNotify.PGJKAGCIHFP)
}
public static final int INVESTIGATIONMONSTER_FIELD_NUMBER = 15;
public static final int INVESTIGATION_MONSTER_FIELD_NUMBER = 13;
private emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster investigationMonster_;
/**
* <code>.InvestigationMonster investigationMonster = 15;</code>
* <code>.InvestigationMonster investigation_monster = 13;</code>
* @return Whether the investigationMonster field is set.
*/
@java.lang.Override
@@ -265,7 +139,7 @@ public final class InvestigationMonsterUpdateNotifyOuterClass {
return investigationMonster_ != null;
}
/**
* <code>.InvestigationMonster investigationMonster = 15;</code>
* <code>.InvestigationMonster investigation_monster = 13;</code>
* @return The investigationMonster.
*/
@java.lang.Override
@@ -273,7 +147,7 @@ public final class InvestigationMonsterUpdateNotifyOuterClass {
return investigationMonster_ == null ? emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.getDefaultInstance() : investigationMonster_;
}
/**
* <code>.InvestigationMonster investigationMonster = 15;</code>
* <code>.InvestigationMonster investigation_monster = 13;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonsterOrBuilder getInvestigationMonsterOrBuilder() {
@@ -295,7 +169,7 @@ public final class InvestigationMonsterUpdateNotifyOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (investigationMonster_ != null) {
output.writeMessage(15, getInvestigationMonster());
output.writeMessage(13, getInvestigationMonster());
}
unknownFields.writeTo(output);
}
@@ -308,7 +182,7 @@ public final class InvestigationMonsterUpdateNotifyOuterClass {
size = 0;
if (investigationMonster_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(15, getInvestigationMonster());
.computeMessageSize(13, getInvestigationMonster());
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -342,7 +216,7 @@ public final class InvestigationMonsterUpdateNotifyOuterClass {
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
if (hasInvestigationMonster()) {
hash = (37 * hash) + INVESTIGATIONMONSTER_FIELD_NUMBER;
hash = (37 * hash) + INVESTIGATION_MONSTER_FIELD_NUMBER;
hash = (53 * hash) + getInvestigationMonster().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
@@ -441,6 +315,11 @@ public final class InvestigationMonsterUpdateNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: IDGEJMMEOEO
* CmdId: 1920
* </pre>
*
* Protobuf type {@code InvestigationMonsterUpdateNotify}
*/
public static final class Builder extends
@@ -599,14 +478,14 @@ public final class InvestigationMonsterUpdateNotifyOuterClass {
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster, emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.Builder, emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonsterOrBuilder> investigationMonsterBuilder_;
/**
* <code>.InvestigationMonster investigationMonster = 15;</code>
* <code>.InvestigationMonster investigation_monster = 13;</code>
* @return Whether the investigationMonster field is set.
*/
public boolean hasInvestigationMonster() {
return investigationMonsterBuilder_ != null || investigationMonster_ != null;
}
/**
* <code>.InvestigationMonster investigationMonster = 15;</code>
* <code>.InvestigationMonster investigation_monster = 13;</code>
* @return The investigationMonster.
*/
public emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster getInvestigationMonster() {
@@ -617,7 +496,7 @@ public final class InvestigationMonsterUpdateNotifyOuterClass {
}
}
/**
* <code>.InvestigationMonster investigationMonster = 15;</code>
* <code>.InvestigationMonster investigation_monster = 13;</code>
*/
public Builder setInvestigationMonster(emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster value) {
if (investigationMonsterBuilder_ == null) {
@@ -633,7 +512,7 @@ public final class InvestigationMonsterUpdateNotifyOuterClass {
return this;
}
/**
* <code>.InvestigationMonster investigationMonster = 15;</code>
* <code>.InvestigationMonster investigation_monster = 13;</code>
*/
public Builder setInvestigationMonster(
emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.Builder builderForValue) {
@@ -647,7 +526,7 @@ public final class InvestigationMonsterUpdateNotifyOuterClass {
return this;
}
/**
* <code>.InvestigationMonster investigationMonster = 15;</code>
* <code>.InvestigationMonster investigation_monster = 13;</code>
*/
public Builder mergeInvestigationMonster(emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster value) {
if (investigationMonsterBuilder_ == null) {
@@ -665,7 +544,7 @@ public final class InvestigationMonsterUpdateNotifyOuterClass {
return this;
}
/**
* <code>.InvestigationMonster investigationMonster = 15;</code>
* <code>.InvestigationMonster investigation_monster = 13;</code>
*/
public Builder clearInvestigationMonster() {
if (investigationMonsterBuilder_ == null) {
@@ -679,7 +558,7 @@ public final class InvestigationMonsterUpdateNotifyOuterClass {
return this;
}
/**
* <code>.InvestigationMonster investigationMonster = 15;</code>
* <code>.InvestigationMonster investigation_monster = 13;</code>
*/
public emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.Builder getInvestigationMonsterBuilder() {
@@ -687,7 +566,7 @@ public final class InvestigationMonsterUpdateNotifyOuterClass {
return getInvestigationMonsterFieldBuilder().getBuilder();
}
/**
* <code>.InvestigationMonster investigationMonster = 15;</code>
* <code>.InvestigationMonster investigation_monster = 13;</code>
*/
public emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonsterOrBuilder getInvestigationMonsterOrBuilder() {
if (investigationMonsterBuilder_ != null) {
@@ -698,7 +577,7 @@ public final class InvestigationMonsterUpdateNotifyOuterClass {
}
}
/**
* <code>.InvestigationMonster investigationMonster = 15;</code>
* <code>.InvestigationMonster investigation_monster = 13;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster, emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.Builder, emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonsterOrBuilder>
@@ -781,12 +660,10 @@ public final class InvestigationMonsterUpdateNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n&InvestigationMonsterUpdateNotify.proto" +
"\032\032InvestigationMonster.proto\"\250\001\n Investi" +
"gationMonsterUpdateNotify\0223\n\024investigati" +
"onMonster\030\017 \001(\0132\025.InvestigationMonster\"O" +
"\n\013PGJKAGCIHFP\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\377" +
"\016\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B" +
"\033\n\031emu.grasscutter.net.protob\006proto3"
"\032\032InvestigationMonster.proto\"X\n Investig" +
"ationMonsterUpdateNotify\0224\n\025investigatio" +
"n_monster\030\r \001(\0132\025.InvestigationMonsterB\033" +
"\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,