Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-24 09:09:50 +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/ResinChangeNotifyOuterClass.java
+95 -218
View File
@@ -19,24 +19,29 @@ public final class ResinChangeNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 curValue = 12;</code>
* <code>uint32 cur_value = 14;</code>
* @return The curValue.
*/
int getCurValue();
/**
* <code>uint32 nextAddTimestamp = 4;</code>
* @return The nextAddTimestamp.
*/
int getNextAddTimestamp();
/**
* <code>uint32 curBuyCount = 5;</code>
* <code>uint32 curBuyCount = 13;</code>
* @return The curBuyCount.
*/
int getCurBuyCount();
/**
* <code>uint32 nextAddTimestamp = 12;</code>
* @return The nextAddTimestamp.
*/
int getNextAddTimestamp();
}
/**
* <pre>
* Name: IBIMGHOHNDK
* CmdId: 649
* </pre>
*
* Protobuf type {@code ResinChangeNotify}
*/
public static final class ResinChangeNotify extends
@@ -81,17 +86,17 @@ public final class ResinChangeNotifyOuterClass {
case 0:
done = true;
break;
case 32: {
case 96: {
nextAddTimestamp_ = input.readUInt32();
break;
}
case 40: {
case 104: {
curBuyCount_ = input.readUInt32();
break;
}
case 96: {
case 112: {
curValue_ = input.readUInt32();
break;
@@ -128,141 +133,10 @@ public final class ResinChangeNotifyOuterClass {
emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify.class, emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify.Builder.class);
}
/**
* Protobuf enum {@code ResinChangeNotify.AJMGAALGPGO}
*/
public enum AJMGAALGPGO
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 694;</code>
*/
PEPPOHPHJOJ(1, 694),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final AJMGAALGPGO DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 694;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 694;
/**
* <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 AJMGAALGPGO 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 AJMGAALGPGO forNumber(int value) {
switch (value) {
case 0: return NONE;
case 694: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<AJMGAALGPGO>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
AJMGAALGPGO> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<AJMGAALGPGO>() {
public AJMGAALGPGO findValueByNumber(int number) {
return AJMGAALGPGO.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.ResinChangeNotifyOuterClass.ResinChangeNotify.getDescriptor().getEnumTypes().get(0);
}
private static final AJMGAALGPGO[] VALUES = getStaticValuesArray();
private static AJMGAALGPGO[] getStaticValuesArray() {
return new AJMGAALGPGO[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static AJMGAALGPGO 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 AJMGAALGPGO(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:ResinChangeNotify.AJMGAALGPGO)
}
public static final int CURVALUE_FIELD_NUMBER = 12;
public static final int CUR_VALUE_FIELD_NUMBER = 14;
private int curValue_;
/**
* <code>uint32 curValue = 12;</code>
* <code>uint32 cur_value = 14;</code>
* @return The curValue.
*/
@java.lang.Override
@@ -270,21 +144,10 @@ public final class ResinChangeNotifyOuterClass {
return curValue_;
}
public static final int NEXTADDTIMESTAMP_FIELD_NUMBER = 4;
private int nextAddTimestamp_;
/**
* <code>uint32 nextAddTimestamp = 4;</code>
* @return The nextAddTimestamp.
*/
@java.lang.Override
public int getNextAddTimestamp() {
return nextAddTimestamp_;
}
public static final int CURBUYCOUNT_FIELD_NUMBER = 5;
public static final int CURBUYCOUNT_FIELD_NUMBER = 13;
private int curBuyCount_;
/**
* <code>uint32 curBuyCount = 5;</code>
* <code>uint32 curBuyCount = 13;</code>
* @return The curBuyCount.
*/
@java.lang.Override
@@ -292,6 +155,17 @@ public final class ResinChangeNotifyOuterClass {
return curBuyCount_;
}
public static final int NEXTADDTIMESTAMP_FIELD_NUMBER = 12;
private int nextAddTimestamp_;
/**
* <code>uint32 nextAddTimestamp = 12;</code>
* @return The nextAddTimestamp.
*/
@java.lang.Override
public int getNextAddTimestamp() {
return nextAddTimestamp_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -307,13 +181,13 @@ public final class ResinChangeNotifyOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (nextAddTimestamp_ != 0) {
output.writeUInt32(4, nextAddTimestamp_);
output.writeUInt32(12, nextAddTimestamp_);
}
if (curBuyCount_ != 0) {
output.writeUInt32(5, curBuyCount_);
output.writeUInt32(13, curBuyCount_);
}
if (curValue_ != 0) {
output.writeUInt32(12, curValue_);
output.writeUInt32(14, curValue_);
}
unknownFields.writeTo(output);
}
@@ -326,15 +200,15 @@ public final class ResinChangeNotifyOuterClass {
size = 0;
if (nextAddTimestamp_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(4, nextAddTimestamp_);
.computeUInt32Size(12, nextAddTimestamp_);
}
if (curBuyCount_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, curBuyCount_);
.computeUInt32Size(13, curBuyCount_);
}
if (curValue_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(12, curValue_);
.computeUInt32Size(14, curValue_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -353,10 +227,10 @@ public final class ResinChangeNotifyOuterClass {
if (getCurValue()
!= other.getCurValue()) return false;
if (getNextAddTimestamp()
!= other.getNextAddTimestamp()) return false;
if (getCurBuyCount()
!= other.getCurBuyCount()) return false;
if (getNextAddTimestamp()
!= other.getNextAddTimestamp()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -368,12 +242,12 @@ public final class ResinChangeNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + CURVALUE_FIELD_NUMBER;
hash = (37 * hash) + CUR_VALUE_FIELD_NUMBER;
hash = (53 * hash) + getCurValue();
hash = (37 * hash) + NEXTADDTIMESTAMP_FIELD_NUMBER;
hash = (53 * hash) + getNextAddTimestamp();
hash = (37 * hash) + CURBUYCOUNT_FIELD_NUMBER;
hash = (53 * hash) + getCurBuyCount();
hash = (37 * hash) + NEXTADDTIMESTAMP_FIELD_NUMBER;
hash = (53 * hash) + getNextAddTimestamp();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -470,6 +344,11 @@ public final class ResinChangeNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: IBIMGHOHNDK
* CmdId: 649
* </pre>
*
* Protobuf type {@code ResinChangeNotify}
*/
public static final class Builder extends
@@ -509,10 +388,10 @@ public final class ResinChangeNotifyOuterClass {
super.clear();
curValue_ = 0;
nextAddTimestamp_ = 0;
curBuyCount_ = 0;
nextAddTimestamp_ = 0;
return this;
}
@@ -540,8 +419,8 @@ public final class ResinChangeNotifyOuterClass {
public emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify buildPartial() {
emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify result = new emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify(this);
result.curValue_ = curValue_;
result.nextAddTimestamp_ = nextAddTimestamp_;
result.curBuyCount_ = curBuyCount_;
result.nextAddTimestamp_ = nextAddTimestamp_;
onBuilt();
return result;
}
@@ -593,12 +472,12 @@ public final class ResinChangeNotifyOuterClass {
if (other.getCurValue() != 0) {
setCurValue(other.getCurValue());
}
if (other.getNextAddTimestamp() != 0) {
setNextAddTimestamp(other.getNextAddTimestamp());
}
if (other.getCurBuyCount() != 0) {
setCurBuyCount(other.getCurBuyCount());
}
if (other.getNextAddTimestamp() != 0) {
setNextAddTimestamp(other.getNextAddTimestamp());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -630,7 +509,7 @@ public final class ResinChangeNotifyOuterClass {
private int curValue_ ;
/**
* <code>uint32 curValue = 12;</code>
* <code>uint32 cur_value = 14;</code>
* @return The curValue.
*/
@java.lang.Override
@@ -638,7 +517,7 @@ public final class ResinChangeNotifyOuterClass {
return curValue_;
}
/**
* <code>uint32 curValue = 12;</code>
* <code>uint32 cur_value = 14;</code>
* @param value The curValue to set.
* @return This builder for chaining.
*/
@@ -649,7 +528,7 @@ public final class ResinChangeNotifyOuterClass {
return this;
}
/**
* <code>uint32 curValue = 12;</code>
* <code>uint32 cur_value = 14;</code>
* @return This builder for chaining.
*/
public Builder clearCurValue() {
@@ -659,40 +538,9 @@ public final class ResinChangeNotifyOuterClass {
return this;
}
private int nextAddTimestamp_ ;
/**
* <code>uint32 nextAddTimestamp = 4;</code>
* @return The nextAddTimestamp.
*/
@java.lang.Override
public int getNextAddTimestamp() {
return nextAddTimestamp_;
}
/**
* <code>uint32 nextAddTimestamp = 4;</code>
* @param value The nextAddTimestamp to set.
* @return This builder for chaining.
*/
public Builder setNextAddTimestamp(int value) {
nextAddTimestamp_ = value;
onChanged();
return this;
}
/**
* <code>uint32 nextAddTimestamp = 4;</code>
* @return This builder for chaining.
*/
public Builder clearNextAddTimestamp() {
nextAddTimestamp_ = 0;
onChanged();
return this;
}
private int curBuyCount_ ;
/**
* <code>uint32 curBuyCount = 5;</code>
* <code>uint32 curBuyCount = 13;</code>
* @return The curBuyCount.
*/
@java.lang.Override
@@ -700,7 +548,7 @@ public final class ResinChangeNotifyOuterClass {
return curBuyCount_;
}
/**
* <code>uint32 curBuyCount = 5;</code>
* <code>uint32 curBuyCount = 13;</code>
* @param value The curBuyCount to set.
* @return This builder for chaining.
*/
@@ -711,7 +559,7 @@ public final class ResinChangeNotifyOuterClass {
return this;
}
/**
* <code>uint32 curBuyCount = 5;</code>
* <code>uint32 curBuyCount = 13;</code>
* @return This builder for chaining.
*/
public Builder clearCurBuyCount() {
@@ -720,6 +568,37 @@ public final class ResinChangeNotifyOuterClass {
onChanged();
return this;
}
private int nextAddTimestamp_ ;
/**
* <code>uint32 nextAddTimestamp = 12;</code>
* @return The nextAddTimestamp.
*/
@java.lang.Override
public int getNextAddTimestamp() {
return nextAddTimestamp_;
}
/**
* <code>uint32 nextAddTimestamp = 12;</code>
* @param value The nextAddTimestamp to set.
* @return This builder for chaining.
*/
public Builder setNextAddTimestamp(int value) {
nextAddTimestamp_ = value;
onChanged();
return this;
}
/**
* <code>uint32 nextAddTimestamp = 12;</code>
* @return This builder for chaining.
*/
public Builder clearNextAddTimestamp() {
nextAddTimestamp_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -787,12 +666,10 @@ public final class ResinChangeNotifyOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\027ResinChangeNotify.proto\"\245\001\n\021ResinChang" +
"eNotify\022\020\n\010curValue\030\014 \001(\r\022\030\n\020nextAddTime" +
"stamp\030\004 \001(\r\022\023\n\013curBuyCount\030\005 \001(\r\"O\n\013AJMG" +
"AALGPGO\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\266\005\022\017\n\013D" +
"CDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu" +
".grasscutter.net.protob\006proto3"
"\n\027ResinChangeNotify.proto\"U\n\021ResinChange" +
"Notify\022\021\n\tcur_value\030\016 \001(\r\022\023\n\013curBuyCount" +
"\030\r \001(\r\022\030\n\020nextAddTimestamp\030\014 \001(\rB\033\n\031emu." +
"grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -803,7 +680,7 @@ public final class ResinChangeNotifyOuterClass {
internal_static_ResinChangeNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_ResinChangeNotify_descriptor,
new java.lang.String[] { "CurValue", "NextAddTimestamp", "CurBuyCount", });
new java.lang.String[] { "CurValue", "CurBuyCount", "NextAddTimestamp", });
}
// @@protoc_insertion_point(outer_class_scope)