Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 12:33:57 +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/SetEquipLockStateReqOuterClass.java
+87 -218
View File
@@ -19,18 +19,23 @@ public final class SetEquipLockStateReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint64 targetEquipGuid = 10;</code>
* @return The targetEquipGuid.
*/
long getTargetEquipGuid();
/**
* <code>bool isLocked = 3;</code>
* <code>bool is_locked = 10;</code>
* @return The isLocked.
*/
boolean getIsLocked();
/**
* <code>uint64 target_equip_guid = 13;</code>
* @return The targetEquipGuid.
*/
long getTargetEquipGuid();
}
/**
* <pre>
* Name: CPBMGDOBJCG
* CmdId: 645
* </pre>
*
* Protobuf type {@code SetEquipLockStateReq}
*/
public static final class SetEquipLockStateReq extends
@@ -75,12 +80,12 @@ public final class SetEquipLockStateReqOuterClass {
case 0:
done = true;
break;
case 24: {
case 80: {
isLocked_ = input.readBool();
break;
}
case 80: {
case 104: {
targetEquipGuid_ = input.readUInt64();
break;
@@ -117,160 +122,10 @@ public final class SetEquipLockStateReqOuterClass {
emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq.class, emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq.Builder.class);
}
/**
* Protobuf enum {@code SetEquipLockStateReq.OHOCDDBFFKA}
*/
public enum OHOCDDBFFKA
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 684;</code>
*/
PEPPOHPHJOJ(1, 684),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final OHOCDDBFFKA DCDNILFDFLB = NONE;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final OHOCDDBFFKA EAJIABGAOCI = NNBKOLMPOEA;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 684;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 684;
/**
* <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 OHOCDDBFFKA 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 OHOCDDBFFKA forNumber(int value) {
switch (value) {
case 0: return NONE;
case 684: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<OHOCDDBFFKA>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
OHOCDDBFFKA> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<OHOCDDBFFKA>() {
public OHOCDDBFFKA findValueByNumber(int number) {
return OHOCDDBFFKA.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.SetEquipLockStateReqOuterClass.SetEquipLockStateReq.getDescriptor().getEnumTypes().get(0);
}
private static final OHOCDDBFFKA[] VALUES = getStaticValuesArray();
private static OHOCDDBFFKA[] getStaticValuesArray() {
return new OHOCDDBFFKA[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
};
}
public static OHOCDDBFFKA 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 OHOCDDBFFKA(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:SetEquipLockStateReq.OHOCDDBFFKA)
}
public static final int TARGETEQUIPGUID_FIELD_NUMBER = 10;
private long targetEquipGuid_;
/**
* <code>uint64 targetEquipGuid = 10;</code>
* @return The targetEquipGuid.
*/
@java.lang.Override
public long getTargetEquipGuid() {
return targetEquipGuid_;
}
public static final int ISLOCKED_FIELD_NUMBER = 3;
public static final int IS_LOCKED_FIELD_NUMBER = 10;
private boolean isLocked_;
/**
* <code>bool isLocked = 3;</code>
* <code>bool is_locked = 10;</code>
* @return The isLocked.
*/
@java.lang.Override
@@ -278,6 +133,17 @@ public final class SetEquipLockStateReqOuterClass {
return isLocked_;
}
public static final int TARGET_EQUIP_GUID_FIELD_NUMBER = 13;
private long targetEquipGuid_;
/**
* <code>uint64 target_equip_guid = 13;</code>
* @return The targetEquipGuid.
*/
@java.lang.Override
public long getTargetEquipGuid() {
return targetEquipGuid_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -293,10 +159,10 @@ public final class SetEquipLockStateReqOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (isLocked_ != false) {
output.writeBool(3, isLocked_);
output.writeBool(10, isLocked_);
}
if (targetEquipGuid_ != 0L) {
output.writeUInt64(10, targetEquipGuid_);
output.writeUInt64(13, targetEquipGuid_);
}
unknownFields.writeTo(output);
}
@@ -309,11 +175,11 @@ public final class SetEquipLockStateReqOuterClass {
size = 0;
if (isLocked_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(3, isLocked_);
.computeBoolSize(10, isLocked_);
}
if (targetEquipGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(10, targetEquipGuid_);
.computeUInt64Size(13, targetEquipGuid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -330,10 +196,10 @@ public final class SetEquipLockStateReqOuterClass {
}
emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq other = (emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq) obj;
if (getTargetEquipGuid()
!= other.getTargetEquipGuid()) return false;
if (getIsLocked()
!= other.getIsLocked()) return false;
if (getTargetEquipGuid()
!= other.getTargetEquipGuid()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -345,12 +211,12 @@ public final class SetEquipLockStateReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + TARGETEQUIPGUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getTargetEquipGuid());
hash = (37 * hash) + ISLOCKED_FIELD_NUMBER;
hash = (37 * hash) + IS_LOCKED_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsLocked());
hash = (37 * hash) + TARGET_EQUIP_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getTargetEquipGuid());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -447,6 +313,11 @@ public final class SetEquipLockStateReqOuterClass {
return builder;
}
/**
* <pre>
* Name: CPBMGDOBJCG
* CmdId: 645
* </pre>
*
* Protobuf type {@code SetEquipLockStateReq}
*/
public static final class Builder extends
@@ -484,10 +355,10 @@ public final class SetEquipLockStateReqOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
targetEquipGuid_ = 0L;
isLocked_ = false;
targetEquipGuid_ = 0L;
return this;
}
@@ -514,8 +385,8 @@ public final class SetEquipLockStateReqOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq buildPartial() {
emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq result = new emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq(this);
result.targetEquipGuid_ = targetEquipGuid_;
result.isLocked_ = isLocked_;
result.targetEquipGuid_ = targetEquipGuid_;
onBuilt();
return result;
}
@@ -564,12 +435,12 @@ public final class SetEquipLockStateReqOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq other) {
if (other == emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq.getDefaultInstance()) return this;
if (other.getTargetEquipGuid() != 0L) {
setTargetEquipGuid(other.getTargetEquipGuid());
}
if (other.getIsLocked() != false) {
setIsLocked(other.getIsLocked());
}
if (other.getTargetEquipGuid() != 0L) {
setTargetEquipGuid(other.getTargetEquipGuid());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -599,40 +470,9 @@ public final class SetEquipLockStateReqOuterClass {
return this;
}
private long targetEquipGuid_ ;
/**
* <code>uint64 targetEquipGuid = 10;</code>
* @return The targetEquipGuid.
*/
@java.lang.Override
public long getTargetEquipGuid() {
return targetEquipGuid_;
}
/**
* <code>uint64 targetEquipGuid = 10;</code>
* @param value The targetEquipGuid to set.
* @return This builder for chaining.
*/
public Builder setTargetEquipGuid(long value) {
targetEquipGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 targetEquipGuid = 10;</code>
* @return This builder for chaining.
*/
public Builder clearTargetEquipGuid() {
targetEquipGuid_ = 0L;
onChanged();
return this;
}
private boolean isLocked_ ;
/**
* <code>bool isLocked = 3;</code>
* <code>bool is_locked = 10;</code>
* @return The isLocked.
*/
@java.lang.Override
@@ -640,7 +480,7 @@ public final class SetEquipLockStateReqOuterClass {
return isLocked_;
}
/**
* <code>bool isLocked = 3;</code>
* <code>bool is_locked = 10;</code>
* @param value The isLocked to set.
* @return This builder for chaining.
*/
@@ -651,7 +491,7 @@ public final class SetEquipLockStateReqOuterClass {
return this;
}
/**
* <code>bool isLocked = 3;</code>
* <code>bool is_locked = 10;</code>
* @return This builder for chaining.
*/
public Builder clearIsLocked() {
@@ -660,6 +500,37 @@ public final class SetEquipLockStateReqOuterClass {
onChanged();
return this;
}
private long targetEquipGuid_ ;
/**
* <code>uint64 target_equip_guid = 13;</code>
* @return The targetEquipGuid.
*/
@java.lang.Override
public long getTargetEquipGuid() {
return targetEquipGuid_;
}
/**
* <code>uint64 target_equip_guid = 13;</code>
* @param value The targetEquipGuid to set.
* @return This builder for chaining.
*/
public Builder setTargetEquipGuid(long value) {
targetEquipGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 target_equip_guid = 13;</code>
* @return This builder for chaining.
*/
public Builder clearTargetEquipGuid() {
targetEquipGuid_ = 0L;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -727,12 +598,10 @@ public final class SetEquipLockStateReqOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\032SetEquipLockStateReq.proto\"\243\001\n\024SetEqui" +
"pLockStateReq\022\027\n\017targetEquipGuid\030\n \001(\004\022\020" +
"\n\010isLocked\030\003 \001(\010\"`\n\013OHOCDDBFFKA\022\010\n\004NONE\020" +
"\000\022\020\n\013PEPPOHPHJOJ\020\254\005\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013" +
"NNBKOLMPOEA\020\001\022\017\n\013EAJIABGAOCI\020\001\032\002\020\001B\033\n\031em" +
"u.grasscutter.net.protob\006proto3"
"\n\032SetEquipLockStateReq.proto\"D\n\024SetEquip" +
"LockStateReq\022\021\n\tis_locked\030\n \001(\010\022\031\n\021targe" +
"t_equip_guid\030\r \001(\004B\033\n\031emu.grasscutter.ne" +
"t.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -743,7 +612,7 @@ public final class SetEquipLockStateReqOuterClass {
internal_static_SetEquipLockStateReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_SetEquipLockStateReq_descriptor,
new java.lang.String[] { "TargetEquipGuid", "IsLocked", });
new java.lang.String[] { "IsLocked", "TargetEquipGuid", });
}
// @@protoc_insertion_point(outer_class_scope)