Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-06 12:35:07 +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/GroupSuiteNotifyOuterClass.java
+38 -161
View File
@@ -19,11 +19,11 @@ public final class GroupSuiteNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>map&lt;uint32, uint32&gt; groupMap = 12;</code>
* <code>map&lt;uint32, uint32&gt; group_map = 4;</code>
*/
int getGroupMapCount();
/**
* <code>map&lt;uint32, uint32&gt; groupMap = 12;</code>
* <code>map&lt;uint32, uint32&gt; group_map = 4;</code>
*/
boolean containsGroupMap(
int key);
@@ -34,25 +34,30 @@ public final class GroupSuiteNotifyOuterClass {
java.util.Map<java.lang.Integer, java.lang.Integer>
getGroupMap();
/**
* <code>map&lt;uint32, uint32&gt; groupMap = 12;</code>
* <code>map&lt;uint32, uint32&gt; group_map = 4;</code>
*/
java.util.Map<java.lang.Integer, java.lang.Integer>
getGroupMapMap();
/**
* <code>map&lt;uint32, uint32&gt; groupMap = 12;</code>
* <code>map&lt;uint32, uint32&gt; group_map = 4;</code>
*/
int getGroupMapOrDefault(
int key,
int defaultValue);
/**
* <code>map&lt;uint32, uint32&gt; groupMap = 12;</code>
* <code>map&lt;uint32, uint32&gt; group_map = 4;</code>
*/
int getGroupMapOrThrow(
int key);
}
/**
* <pre>
* Name: AHFIMIOOLNJ
* CmdId: 3263
* </pre>
*
* Protobuf type {@code GroupSuiteNotify}
*/
public static final class GroupSuiteNotify extends
@@ -98,7 +103,7 @@ public final class GroupSuiteNotifyOuterClass {
case 0:
done = true;
break;
case 98: {
case 34: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
groupMap_ = com.google.protobuf.MapField.newMapField(
GroupMapDefaultEntryHolder.defaultEntry);
@@ -140,7 +145,7 @@ public final class GroupSuiteNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 12:
case 4:
return internalGetGroupMap();
default:
throw new RuntimeException(
@@ -155,138 +160,7 @@ public final class GroupSuiteNotifyOuterClass {
emu.grasscutter.net.proto.GroupSuiteNotifyOuterClass.GroupSuiteNotify.class, emu.grasscutter.net.proto.GroupSuiteNotifyOuterClass.GroupSuiteNotify.Builder.class);
}
/**
* Protobuf enum {@code GroupSuiteNotify.CABLEKMACEB}
*/
public enum CABLEKMACEB
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 3115;</code>
*/
PEPPOHPHJOJ(1, 3115),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final CABLEKMACEB DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 3115;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 3115;
/**
* <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 CABLEKMACEB 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 CABLEKMACEB forNumber(int value) {
switch (value) {
case 0: return NONE;
case 3115: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<CABLEKMACEB>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
CABLEKMACEB> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<CABLEKMACEB>() {
public CABLEKMACEB findValueByNumber(int number) {
return CABLEKMACEB.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.GroupSuiteNotifyOuterClass.GroupSuiteNotify.getDescriptor().getEnumTypes().get(0);
}
private static final CABLEKMACEB[] VALUES = getStaticValuesArray();
private static CABLEKMACEB[] getStaticValuesArray() {
return new CABLEKMACEB[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static CABLEKMACEB 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 CABLEKMACEB(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:GroupSuiteNotify.CABLEKMACEB)
}
public static final int GROUPMAP_FIELD_NUMBER = 12;
public static final int GROUP_MAP_FIELD_NUMBER = 4;
private static final class GroupMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry<
java.lang.Integer, java.lang.Integer> defaultEntry =
@@ -313,7 +187,7 @@ public final class GroupSuiteNotifyOuterClass {
return internalGetGroupMap().getMap().size();
}
/**
* <code>map&lt;uint32, uint32&gt; groupMap = 12;</code>
* <code>map&lt;uint32, uint32&gt; group_map = 4;</code>
*/
@java.lang.Override
@@ -331,7 +205,7 @@ public final class GroupSuiteNotifyOuterClass {
return getGroupMapMap();
}
/**
* <code>map&lt;uint32, uint32&gt; groupMap = 12;</code>
* <code>map&lt;uint32, uint32&gt; group_map = 4;</code>
*/
@java.lang.Override
@@ -339,7 +213,7 @@ public final class GroupSuiteNotifyOuterClass {
return internalGetGroupMap().getMap();
}
/**
* <code>map&lt;uint32, uint32&gt; groupMap = 12;</code>
* <code>map&lt;uint32, uint32&gt; group_map = 4;</code>
*/
@java.lang.Override
@@ -352,7 +226,7 @@ public final class GroupSuiteNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, uint32&gt; groupMap = 12;</code>
* <code>map&lt;uint32, uint32&gt; group_map = 4;</code>
*/
@java.lang.Override
@@ -386,7 +260,7 @@ public final class GroupSuiteNotifyOuterClass {
output,
internalGetGroupMap(),
GroupMapDefaultEntryHolder.defaultEntry,
12);
4);
unknownFields.writeTo(output);
}
@@ -404,7 +278,7 @@ public final class GroupSuiteNotifyOuterClass {
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(12, groupMap__);
.computeMessageSize(4, groupMap__);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -435,7 +309,7 @@ public final class GroupSuiteNotifyOuterClass {
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
if (!internalGetGroupMap().getMap().isEmpty()) {
hash = (37 * hash) + GROUPMAP_FIELD_NUMBER;
hash = (37 * hash) + GROUP_MAP_FIELD_NUMBER;
hash = (53 * hash) + internalGetGroupMap().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
@@ -534,6 +408,11 @@ public final class GroupSuiteNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: AHFIMIOOLNJ
* CmdId: 3263
* </pre>
*
* Protobuf type {@code GroupSuiteNotify}
*/
public static final class Builder extends
@@ -549,7 +428,7 @@ public final class GroupSuiteNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 12:
case 4:
return internalGetGroupMap();
default:
throw new RuntimeException(
@@ -560,7 +439,7 @@ public final class GroupSuiteNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMutableMapField(
int number) {
switch (number) {
case 12:
case 4:
return internalGetMutableGroupMap();
default:
throw new RuntimeException(
@@ -730,7 +609,7 @@ public final class GroupSuiteNotifyOuterClass {
return internalGetGroupMap().getMap().size();
}
/**
* <code>map&lt;uint32, uint32&gt; groupMap = 12;</code>
* <code>map&lt;uint32, uint32&gt; group_map = 4;</code>
*/
@java.lang.Override
@@ -748,7 +627,7 @@ public final class GroupSuiteNotifyOuterClass {
return getGroupMapMap();
}
/**
* <code>map&lt;uint32, uint32&gt; groupMap = 12;</code>
* <code>map&lt;uint32, uint32&gt; group_map = 4;</code>
*/
@java.lang.Override
@@ -756,7 +635,7 @@ public final class GroupSuiteNotifyOuterClass {
return internalGetGroupMap().getMap();
}
/**
* <code>map&lt;uint32, uint32&gt; groupMap = 12;</code>
* <code>map&lt;uint32, uint32&gt; group_map = 4;</code>
*/
@java.lang.Override
@@ -769,7 +648,7 @@ public final class GroupSuiteNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, uint32&gt; groupMap = 12;</code>
* <code>map&lt;uint32, uint32&gt; group_map = 4;</code>
*/
@java.lang.Override
@@ -790,7 +669,7 @@ public final class GroupSuiteNotifyOuterClass {
return this;
}
/**
* <code>map&lt;uint32, uint32&gt; groupMap = 12;</code>
* <code>map&lt;uint32, uint32&gt; group_map = 4;</code>
*/
public Builder removeGroupMap(
@@ -809,7 +688,7 @@ public final class GroupSuiteNotifyOuterClass {
return internalGetMutableGroupMap().getMutableMap();
}
/**
* <code>map&lt;uint32, uint32&gt; groupMap = 12;</code>
* <code>map&lt;uint32, uint32&gt; group_map = 4;</code>
*/
public Builder putGroupMap(
int key,
@@ -821,7 +700,7 @@ public final class GroupSuiteNotifyOuterClass {
return this;
}
/**
* <code>map&lt;uint32, uint32&gt; groupMap = 12;</code>
* <code>map&lt;uint32, uint32&gt; group_map = 4;</code>
*/
public Builder putAllGroupMap(
@@ -902,13 +781,11 @@ public final class GroupSuiteNotifyOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\026GroupSuiteNotify.proto\"\307\001\n\020GroupSuiteN" +
"otify\0221\n\010groupMap\030\014 \003(\0132\037.GroupSuiteNoti" +
"\n\026GroupSuiteNotify.proto\"w\n\020GroupSuiteNo" +
"tify\0222\n\tgroup_map\030\004 \003(\0132\037.GroupSuiteNoti" +
"fy.GroupMapEntry\032/\n\rGroupMapEntry\022\013\n\003key" +
"\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001\"O\n\013CABLEKMACEB" +
"\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\253\030\022\017\n\013DCDNILFD" +
"FLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.grassc" +
"utter.net.protob\006proto3"
"\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001B\033\n\031emu.grasscu" +
"tter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,