Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-26 23:49: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/ChangeGameTimeReqOuterClass.java
+135 -266
View File
@@ -19,24 +19,29 @@ public final class ChangeGameTimeReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 extraDays = 7;</code>
* @return The extraDays.
* <code>uint32 game_time = 11;</code>
* @return The gameTime.
*/
int getExtraDays();
int getGameTime();
/**
* <code>bool isForceSet = 6;</code>
* <code>bool is_force_set = 13;</code>
* @return The isForceSet.
*/
boolean getIsForceSet();
/**
* <code>uint32 gameTime = 9;</code>
* @return The gameTime.
* <code>uint32 extra_days = 6;</code>
* @return The extraDays.
*/
int getGameTime();
int getExtraDays();
}
/**
* <pre>
* Name: IMMJMBKDKNO
* CmdId: 165
* </pre>
*
* Protobuf type {@code ChangeGameTimeReq}
*/
public static final class ChangeGameTimeReq extends
@@ -83,19 +88,19 @@ public final class ChangeGameTimeReqOuterClass {
break;
case 48: {
isForceSet_ = input.readBool();
break;
}
case 56: {
extraDays_ = input.readUInt32();
break;
}
case 72: {
case 88: {
gameTime_ = input.readUInt32();
break;
}
case 104: {
isForceSet_ = input.readBool();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -128,160 +133,21 @@ public final class ChangeGameTimeReqOuterClass {
emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq.class, emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq.Builder.class);
}
public static final int GAME_TIME_FIELD_NUMBER = 11;
private int gameTime_;
/**
* Protobuf enum {@code ChangeGameTimeReq.ALPCPKGFHFL}
*/
public enum ALPCPKGFHFL
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 162;</code>
*/
PEPPOHPHJOJ(1, 162),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final ALPCPKGFHFL DCDNILFDFLB = NONE;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final ALPCPKGFHFL EAJIABGAOCI = NNBKOLMPOEA;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 162;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 162;
/**
* <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 ALPCPKGFHFL 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 ALPCPKGFHFL forNumber(int value) {
switch (value) {
case 0: return NONE;
case 162: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<ALPCPKGFHFL>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
ALPCPKGFHFL> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<ALPCPKGFHFL>() {
public ALPCPKGFHFL findValueByNumber(int number) {
return ALPCPKGFHFL.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.ChangeGameTimeReqOuterClass.ChangeGameTimeReq.getDescriptor().getEnumTypes().get(0);
}
private static final ALPCPKGFHFL[] VALUES = getStaticValuesArray();
private static ALPCPKGFHFL[] getStaticValuesArray() {
return new ALPCPKGFHFL[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
};
}
public static ALPCPKGFHFL 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 ALPCPKGFHFL(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:ChangeGameTimeReq.ALPCPKGFHFL)
}
public static final int EXTRADAYS_FIELD_NUMBER = 7;
private int extraDays_;
/**
* <code>uint32 extraDays = 7;</code>
* @return The extraDays.
* <code>uint32 game_time = 11;</code>
* @return The gameTime.
*/
@java.lang.Override
public int getExtraDays() {
return extraDays_;
public int getGameTime() {
return gameTime_;
}
public static final int ISFORCESET_FIELD_NUMBER = 6;
public static final int IS_FORCE_SET_FIELD_NUMBER = 13;
private boolean isForceSet_;
/**
* <code>bool isForceSet = 6;</code>
* <code>bool is_force_set = 13;</code>
* @return The isForceSet.
*/
@java.lang.Override
@@ -289,15 +155,15 @@ public final class ChangeGameTimeReqOuterClass {
return isForceSet_;
}
public static final int GAMETIME_FIELD_NUMBER = 9;
private int gameTime_;
public static final int EXTRA_DAYS_FIELD_NUMBER = 6;
private int extraDays_;
/**
* <code>uint32 gameTime = 9;</code>
* @return The gameTime.
* <code>uint32 extra_days = 6;</code>
* @return The extraDays.
*/
@java.lang.Override
public int getGameTime() {
return gameTime_;
public int getExtraDays() {
return extraDays_;
}
private byte memoizedIsInitialized = -1;
@@ -314,14 +180,14 @@ public final class ChangeGameTimeReqOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (isForceSet_ != false) {
output.writeBool(6, isForceSet_);
}
if (extraDays_ != 0) {
output.writeUInt32(7, extraDays_);
output.writeUInt32(6, extraDays_);
}
if (gameTime_ != 0) {
output.writeUInt32(9, gameTime_);
output.writeUInt32(11, gameTime_);
}
if (isForceSet_ != false) {
output.writeBool(13, isForceSet_);
}
unknownFields.writeTo(output);
}
@@ -332,17 +198,17 @@ public final class ChangeGameTimeReqOuterClass {
if (size != -1) return size;
size = 0;
if (isForceSet_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(6, isForceSet_);
}
if (extraDays_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(7, extraDays_);
.computeUInt32Size(6, extraDays_);
}
if (gameTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, gameTime_);
.computeUInt32Size(11, gameTime_);
}
if (isForceSet_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(13, isForceSet_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -359,12 +225,12 @@ public final class ChangeGameTimeReqOuterClass {
}
emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq other = (emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq) obj;
if (getExtraDays()
!= other.getExtraDays()) return false;
if (getIsForceSet()
!= other.getIsForceSet()) return false;
if (getGameTime()
!= other.getGameTime()) return false;
if (getIsForceSet()
!= other.getIsForceSet()) return false;
if (getExtraDays()
!= other.getExtraDays()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -376,13 +242,13 @@ public final class ChangeGameTimeReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + EXTRADAYS_FIELD_NUMBER;
hash = (53 * hash) + getExtraDays();
hash = (37 * hash) + ISFORCESET_FIELD_NUMBER;
hash = (37 * hash) + GAME_TIME_FIELD_NUMBER;
hash = (53 * hash) + getGameTime();
hash = (37 * hash) + IS_FORCE_SET_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsForceSet());
hash = (37 * hash) + GAMETIME_FIELD_NUMBER;
hash = (53 * hash) + getGameTime();
hash = (37 * hash) + EXTRA_DAYS_FIELD_NUMBER;
hash = (53 * hash) + getExtraDays();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -479,6 +345,11 @@ public final class ChangeGameTimeReqOuterClass {
return builder;
}
/**
* <pre>
* Name: IMMJMBKDKNO
* CmdId: 165
* </pre>
*
* Protobuf type {@code ChangeGameTimeReq}
*/
public static final class Builder extends
@@ -516,11 +387,11 @@ public final class ChangeGameTimeReqOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
extraDays_ = 0;
gameTime_ = 0;
isForceSet_ = false;
gameTime_ = 0;
extraDays_ = 0;
return this;
}
@@ -548,9 +419,9 @@ public final class ChangeGameTimeReqOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq buildPartial() {
emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq result = new emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq(this);
result.extraDays_ = extraDays_;
result.isForceSet_ = isForceSet_;
result.gameTime_ = gameTime_;
result.isForceSet_ = isForceSet_;
result.extraDays_ = extraDays_;
onBuilt();
return result;
}
@@ -599,14 +470,14 @@ public final class ChangeGameTimeReqOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq other) {
if (other == emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq.getDefaultInstance()) return this;
if (other.getExtraDays() != 0) {
setExtraDays(other.getExtraDays());
if (other.getGameTime() != 0) {
setGameTime(other.getGameTime());
}
if (other.getIsForceSet() != false) {
setIsForceSet(other.getIsForceSet());
}
if (other.getGameTime() != 0) {
setGameTime(other.getGameTime());
if (other.getExtraDays() != 0) {
setExtraDays(other.getExtraDays());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -637,71 +508,9 @@ public final class ChangeGameTimeReqOuterClass {
return this;
}
private int extraDays_ ;
/**
* <code>uint32 extraDays = 7;</code>
* @return The extraDays.
*/
@java.lang.Override
public int getExtraDays() {
return extraDays_;
}
/**
* <code>uint32 extraDays = 7;</code>
* @param value The extraDays to set.
* @return This builder for chaining.
*/
public Builder setExtraDays(int value) {
extraDays_ = value;
onChanged();
return this;
}
/**
* <code>uint32 extraDays = 7;</code>
* @return This builder for chaining.
*/
public Builder clearExtraDays() {
extraDays_ = 0;
onChanged();
return this;
}
private boolean isForceSet_ ;
/**
* <code>bool isForceSet = 6;</code>
* @return The isForceSet.
*/
@java.lang.Override
public boolean getIsForceSet() {
return isForceSet_;
}
/**
* <code>bool isForceSet = 6;</code>
* @param value The isForceSet to set.
* @return This builder for chaining.
*/
public Builder setIsForceSet(boolean value) {
isForceSet_ = value;
onChanged();
return this;
}
/**
* <code>bool isForceSet = 6;</code>
* @return This builder for chaining.
*/
public Builder clearIsForceSet() {
isForceSet_ = false;
onChanged();
return this;
}
private int gameTime_ ;
/**
* <code>uint32 gameTime = 9;</code>
* <code>uint32 game_time = 11;</code>
* @return The gameTime.
*/
@java.lang.Override
@@ -709,7 +518,7 @@ public final class ChangeGameTimeReqOuterClass {
return gameTime_;
}
/**
* <code>uint32 gameTime = 9;</code>
* <code>uint32 game_time = 11;</code>
* @param value The gameTime to set.
* @return This builder for chaining.
*/
@@ -720,7 +529,7 @@ public final class ChangeGameTimeReqOuterClass {
return this;
}
/**
* <code>uint32 gameTime = 9;</code>
* <code>uint32 game_time = 11;</code>
* @return This builder for chaining.
*/
public Builder clearGameTime() {
@@ -729,6 +538,68 @@ public final class ChangeGameTimeReqOuterClass {
onChanged();
return this;
}
private boolean isForceSet_ ;
/**
* <code>bool is_force_set = 13;</code>
* @return The isForceSet.
*/
@java.lang.Override
public boolean getIsForceSet() {
return isForceSet_;
}
/**
* <code>bool is_force_set = 13;</code>
* @param value The isForceSet to set.
* @return This builder for chaining.
*/
public Builder setIsForceSet(boolean value) {
isForceSet_ = value;
onChanged();
return this;
}
/**
* <code>bool is_force_set = 13;</code>
* @return This builder for chaining.
*/
public Builder clearIsForceSet() {
isForceSet_ = false;
onChanged();
return this;
}
private int extraDays_ ;
/**
* <code>uint32 extra_days = 6;</code>
* @return The extraDays.
*/
@java.lang.Override
public int getExtraDays() {
return extraDays_;
}
/**
* <code>uint32 extra_days = 6;</code>
* @param value The extraDays to set.
* @return This builder for chaining.
*/
public Builder setExtraDays(int value) {
extraDays_ = value;
onChanged();
return this;
}
/**
* <code>uint32 extra_days = 6;</code>
* @return This builder for chaining.
*/
public Builder clearExtraDays() {
extraDays_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -796,12 +667,10 @@ public final class ChangeGameTimeReqOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\027ChangeGameTimeReq.proto\"\256\001\n\021ChangeGame" +
"TimeReq\022\021\n\textraDays\030\007 \001(\r\022\022\n\nisForceSet" +
"\030\006 \001(\010\022\020\n\010gameTime\030\t \001(\r\"`\n\013ALPCPKGFHFL\022" +
"\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\242\001\022\017\n\013DCDNILFDF" +
"LB\020\000\022\017\n\013NNBKOLMPOEA\020\001\022\017\n\013EAJIABGAOCI\020\001\032\002" +
"\020\001B\033\n\031emu.grasscutter.net.protob\006proto3"
"\n\027ChangeGameTimeReq.proto\"P\n\021ChangeGameT" +
"imeReq\022\021\n\tgame_time\030\013 \001(\r\022\024\n\014is_force_se" +
"t\030\r \001(\010\022\022\n\nextra_days\030\006 \001(\rB\033\n\031emu.grass" +
"cutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -812,7 +681,7 @@ public final class ChangeGameTimeReqOuterClass {
internal_static_ChangeGameTimeReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_ChangeGameTimeReq_descriptor,
new java.lang.String[] { "ExtraDays", "IsForceSet", "GameTime", });
new java.lang.String[] { "GameTime", "IsForceSet", "ExtraDays", });
}
// @@protoc_insertion_point(outer_class_scope)