diff --git a/gradle.properties b/gradle.properties
index af86da4e1..3aeb86821 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
-org.gradle.jvmargs=-Xmx1024m
+org.gradle.jvmargs=-Xmx4096m
# spikehd was here :)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityAiInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityAiInfoOuterClass.java
index 4e9e1633c..0e5b48ef0 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityAiInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityAiInfoOuterClass.java
@@ -18,11 +18,11 @@ public final class SceneEntityAiInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
- * bool PCIPPECCGJF = 1;
+ * bool is_ai_open = 1;
*
- * @return The pCIPPECCGJF.
+ * @return The isAiOpen.
*/
- boolean getPCIPPECCGJF();
+ boolean getIsAiOpen();
/**
* .Vector born_pos = 2;
@@ -163,7 +163,7 @@ public final class SceneEntityAiInfoOuterClass {
break;
case 8:
{
- pCIPPECCGJF_ = input.readBool();
+ isAiOpen_ = input.readBool();
break;
}
case 18:
@@ -309,16 +309,16 @@ public final class SceneEntityAiInfoOuterClass {
.class);
}
- public static final int PCIPPECCGJF_FIELD_NUMBER = 1;
- private boolean pCIPPECCGJF_;
+ public static final int IS_AI_OPEN_FIELD_NUMBER = 1;
+ private boolean isAiOpen_;
/**
- * bool PCIPPECCGJF = 1;
+ * bool is_ai_open = 1;
*
- * @return The pCIPPECCGJF.
+ * @return The isAiOpen.
*/
@java.lang.Override
- public boolean getPCIPPECCGJF() {
- return pCIPPECCGJF_;
+ public boolean getIsAiOpen() {
+ return isAiOpen_;
}
public static final int BORN_POS_FIELD_NUMBER = 2;
@@ -604,8 +604,8 @@ public final class SceneEntityAiInfoOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
- if (pCIPPECCGJF_ != false) {
- output.writeBool(1, pCIPPECCGJF_);
+ if (isAiOpen_ != false) {
+ output.writeBool(1, isAiOpen_);
}
if (bornPos_ != null) {
output.writeMessage(2, getBornPos());
@@ -634,8 +634,8 @@ public final class SceneEntityAiInfoOuterClass {
if (size != -1) return size;
size = 0;
- if (pCIPPECCGJF_ != false) {
- size += com.google.protobuf.CodedOutputStream.computeBoolSize(1, pCIPPECCGJF_);
+ if (isAiOpen_ != false) {
+ size += com.google.protobuf.CodedOutputStream.computeBoolSize(1, isAiOpen_);
}
if (bornPos_ != null) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getBornPos());
@@ -696,7 +696,7 @@ public final class SceneEntityAiInfoOuterClass {
emu.grasscutter.net.proto.SceneEntityAiInfoOuterClass.SceneEntityAiInfo other =
(emu.grasscutter.net.proto.SceneEntityAiInfoOuterClass.SceneEntityAiInfo) obj;
- if (getPCIPPECCGJF() != other.getPCIPPECCGJF()) return false;
+ if (getIsAiOpen() != other.getIsAiOpen()) return false;
if (hasBornPos() != other.hasBornPos()) return false;
if (hasBornPos()) {
if (!getBornPos().equals(other.getBornPos())) return false;
@@ -721,8 +721,8 @@ public final class SceneEntityAiInfoOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
- hash = (37 * hash) + PCIPPECCGJF_FIELD_NUMBER;
- hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getPCIPPECCGJF());
+ hash = (37 * hash) + IS_AI_OPEN_FIELD_NUMBER;
+ hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getIsAiOpen());
if (hasBornPos()) {
hash = (37 * hash) + BORN_POS_FIELD_NUMBER;
hash = (53 * hash) + getBornPos().hashCode();
@@ -926,7 +926,7 @@ public final class SceneEntityAiInfoOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
- pCIPPECCGJF_ = false;
+ isAiOpen_ = false;
if (bornPosBuilder_ == null) {
bornPos_ = null;
@@ -979,7 +979,7 @@ public final class SceneEntityAiInfoOuterClass {
emu.grasscutter.net.proto.SceneEntityAiInfoOuterClass.SceneEntityAiInfo result =
new emu.grasscutter.net.proto.SceneEntityAiInfoOuterClass.SceneEntityAiInfo(this);
int from_bitField0_ = bitField0_;
- result.pCIPPECCGJF_ = pCIPPECCGJF_;
+ result.isAiOpen_ = isAiOpen_;
if (bornPosBuilder_ == null) {
result.bornPos_ = bornPos_;
} else {
@@ -1054,8 +1054,8 @@ public final class SceneEntityAiInfoOuterClass {
if (other
== emu.grasscutter.net.proto.SceneEntityAiInfoOuterClass.SceneEntityAiInfo
.getDefaultInstance()) return this;
- if (other.getPCIPPECCGJF() != false) {
- setPCIPPECCGJF(other.getPCIPPECCGJF());
+ if (other.getIsAiOpen() != false) {
+ setIsAiOpen(other.getIsAiOpen());
}
if (other.hasBornPos()) {
mergeBornPos(other.getBornPos());
@@ -1106,36 +1106,36 @@ public final class SceneEntityAiInfoOuterClass {
private int bitField0_;
- private boolean pCIPPECCGJF_;
+ private boolean isAiOpen_;
/**
- * bool PCIPPECCGJF = 1;
+ * bool is_ai_open = 1;
*
- * @return The pCIPPECCGJF.
+ * @return The isAiOpen.
*/
@java.lang.Override
- public boolean getPCIPPECCGJF() {
- return pCIPPECCGJF_;
+ public boolean getIsAiOpen() {
+ return isAiOpen_;
}
/**
- * bool PCIPPECCGJF = 1;
+ * bool is_ai_open = 1;
*
- * @param value The pCIPPECCGJF to set.
+ * @param value The isAiOpen to set.
* @return This builder for chaining.
*/
- public Builder setPCIPPECCGJF(boolean value) {
+ public Builder setIsAiOpen(boolean value) {
- pCIPPECCGJF_ = value;
+ isAiOpen_ = value;
onChanged();
return this;
}
/**
- * bool PCIPPECCGJF = 1;
+ * bool is_ai_open = 1;
*
* @return This builder for chaining.
*/
- public Builder clearPCIPPECCGJF() {
+ public Builder clearIsAiOpen() {
- pCIPPECCGJF_ = false;
+ isAiOpen_ = false;
onChanged();
return this;
}
@@ -1804,20 +1804,20 @@ public final class SceneEntityAiInfoOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\027SceneEntityAiInfo.proto\032\014Vector.proto\032"
- + "\021ServantInfo.proto\"\352\003\n\021SceneEntityAiInfo"
- + "\022\023\n\013PCIPPECCGJF\030\001 \001(\010\022\031\n\010born_pos\030\002 \001(\0132"
- + "\007.Vector\0228\n\014skill_cd_map\030\003 \003(\0132\".SceneEn"
- + "tityAiInfo.SkillCdMapEntry\022\"\n\014servant_in"
- + "fo\030\004 \001(\0132\014.ServantInfo\022:\n\rai_threat_map\030"
- + "\005 \003(\0132#.SceneEntityAiInfo.AiThreatMapEnt"
- + "ry\022C\n\022skill_group_cd_map\030\006 \003(\0132\'.SceneEn"
- + "tityAiInfo.SkillGroupCdMapEntry\022\022\n\ncur_t"
- + "actic\030\007 \001(\r\022\023\n\013LHPKKKJLJHK\030\010 \001(\010\0321\n\017Skil"
- + "lCdMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:"
- + "\0028\001\0322\n\020AiThreatMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005"
- + "value\030\002 \001(\r:\0028\001\0326\n\024SkillGroupCdMapEntry\022"
- + "\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001B\033\n\031emu.g"
- + "rasscutter.net.protob\006proto3"
+ + "\021ServantInfo.proto\"\351\003\n\021SceneEntityAiInfo"
+ + "\022\022\n\nis_ai_open\030\001 \001(\010\022\031\n\010born_pos\030\002 \001(\0132\007"
+ + ".Vector\0228\n\014skill_cd_map\030\003 \003(\0132\".SceneEnt"
+ + "ityAiInfo.SkillCdMapEntry\022\"\n\014servant_inf"
+ + "o\030\004 \001(\0132\014.ServantInfo\022:\n\rai_threat_map\030\005"
+ + " \003(\0132#.SceneEntityAiInfo.AiThreatMapEntr"
+ + "y\022C\n\022skill_group_cd_map\030\006 \003(\0132\'.SceneEnt"
+ + "ityAiInfo.SkillGroupCdMapEntry\022\022\n\ncur_ta"
+ + "ctic\030\007 \001(\r\022\023\n\013LHPKKKJLJHK\030\010 \001(\010\0321\n\017Skill"
+ + "CdMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\002"
+ + "8\001\0322\n\020AiThreatMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005v"
+ + "alue\030\002 \001(\r:\0028\001\0326\n\024SkillGroupCdMapEntry\022\013"
+ + "\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001B\033\n\031emu.gr"
+ + "asscutter.net.protob\006proto3"
};
descriptor =
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -1831,7 +1831,7 @@ public final class SceneEntityAiInfoOuterClass {
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_SceneEntityAiInfo_descriptor,
new java.lang.String[] {
- "PCIPPECCGJF",
+ "IsAiOpen",
"BornPos",
"SkillCdMap",
"ServantInfo",
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarGrantRecordOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarGrantRecordOuterClass.java
index 90a1a8d9f..3d3c38edb 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarGrantRecordOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarGrantRecordOuterClass.java
@@ -127,6 +127,188 @@ public final class TrialAvatarGrantRecordOuterClass {
.Builder.class);
}
+ /** Protobuf enum {@code TrialAvatarGrantRecord.GrantReason} */
+ public enum GrantReason implements com.google.protobuf.ProtocolMessageEnum {
+ /** GRANT_REASON_INVALID = 0; */
+ GRANT_REASON_INVALID(0),
+ /** GRANT_REASON_BY_QUEST = 1; */
+ GRANT_REASON_BY_QUEST(1),
+ /** GRANT_REASON_BY_TRIAL_AVATAR_ACTIVITY = 2; */
+ GRANT_REASON_BY_TRIAL_AVATAR_ACTIVITY(2),
+ /** GRANT_REASON_BY_DUNGEON_ELEMENT_CHALLENGE = 3; */
+ GRANT_REASON_BY_DUNGEON_ELEMENT_CHALLENGE(3),
+ /** GRANT_REASON_BY_MIST_TRIAL_ACTIVITY = 4; */
+ GRANT_REASON_BY_MIST_TRIAL_ACTIVITY(4),
+ /** GRANT_REASON_BY_SUMO_ACTIVITY = 5; */
+ GRANT_REASON_BY_SUMO_ACTIVITY(5),
+ /** GRANT_REASON_BY_POTION_ACTIVITY = 6; */
+ GRANT_REASON_BY_POTION_ACTIVITY(6),
+ /** GRANT_REASON_BY_CRYSTAL_LINK_ACTIVITY = 7; */
+ GRANT_REASON_BY_CRYSTAL_LINK_ACTIVITY(7),
+ /** GRANT_REASON_BY_IRODORI_MASTER = 8; */
+ GRANT_REASON_BY_IRODORI_MASTER(8),
+ /** GRANT_REASON_BY_GM = 9; */
+ GRANT_REASON_BY_GM(9),
+ /** GRANT_REASON_BY_INSTABLE_SPRAY_ACTIVITY = 10; */
+ GRANT_REASON_BY_INSTABLE_SPRAY_ACTIVITY(10),
+ /** GRANT_REASON_BY_MUQADAS_POTION_ACTIVITY = 11; */
+ GRANT_REASON_BY_MUQADAS_POTION_ACTIVITY(11),
+ /** GRANT_REASON_BY_VINTAGE_HUNTING = 12; */
+ GRANT_REASON_BY_VINTAGE_HUNTING(12),
+ /** GRANT_REASON_BY_CHAR_AMUSEMENT = 13; */
+ GRANT_REASON_BY_CHAR_AMUSEMENT(13),
+ /** FJBKKFJNBHD_HMLDNDBKNFL = 14; */
+ FJBKKFJNBHD_HMLDNDBKNFL(14),
+ /** FJBKKFJNBHD_PJDEJIHFCPP = 15; */
+ FJBKKFJNBHD_PJDEJIHFCPP(15),
+ UNRECOGNIZED(-1),
+ ;
+
+ /** GRANT_REASON_INVALID = 0; */
+ public static final int GRANT_REASON_INVALID_VALUE = 0;
+ /** GRANT_REASON_BY_QUEST = 1; */
+ public static final int GRANT_REASON_BY_QUEST_VALUE = 1;
+ /** GRANT_REASON_BY_TRIAL_AVATAR_ACTIVITY = 2; */
+ public static final int GRANT_REASON_BY_TRIAL_AVATAR_ACTIVITY_VALUE = 2;
+ /** GRANT_REASON_BY_DUNGEON_ELEMENT_CHALLENGE = 3; */
+ public static final int GRANT_REASON_BY_DUNGEON_ELEMENT_CHALLENGE_VALUE = 3;
+ /** GRANT_REASON_BY_MIST_TRIAL_ACTIVITY = 4; */
+ public static final int GRANT_REASON_BY_MIST_TRIAL_ACTIVITY_VALUE = 4;
+ /** GRANT_REASON_BY_SUMO_ACTIVITY = 5; */
+ public static final int GRANT_REASON_BY_SUMO_ACTIVITY_VALUE = 5;
+ /** GRANT_REASON_BY_POTION_ACTIVITY = 6; */
+ public static final int GRANT_REASON_BY_POTION_ACTIVITY_VALUE = 6;
+ /** GRANT_REASON_BY_CRYSTAL_LINK_ACTIVITY = 7; */
+ public static final int GRANT_REASON_BY_CRYSTAL_LINK_ACTIVITY_VALUE = 7;
+ /** GRANT_REASON_BY_IRODORI_MASTER = 8; */
+ public static final int GRANT_REASON_BY_IRODORI_MASTER_VALUE = 8;
+ /** GRANT_REASON_BY_GM = 9; */
+ public static final int GRANT_REASON_BY_GM_VALUE = 9;
+ /** GRANT_REASON_BY_INSTABLE_SPRAY_ACTIVITY = 10; */
+ public static final int GRANT_REASON_BY_INSTABLE_SPRAY_ACTIVITY_VALUE = 10;
+ /** GRANT_REASON_BY_MUQADAS_POTION_ACTIVITY = 11; */
+ public static final int GRANT_REASON_BY_MUQADAS_POTION_ACTIVITY_VALUE = 11;
+ /** GRANT_REASON_BY_VINTAGE_HUNTING = 12; */
+ public static final int GRANT_REASON_BY_VINTAGE_HUNTING_VALUE = 12;
+ /** GRANT_REASON_BY_CHAR_AMUSEMENT = 13; */
+ public static final int GRANT_REASON_BY_CHAR_AMUSEMENT_VALUE = 13;
+ /** FJBKKFJNBHD_HMLDNDBKNFL = 14; */
+ public static final int FJBKKFJNBHD_HMLDNDBKNFL_VALUE = 14;
+ /** FJBKKFJNBHD_PJDEJIHFCPP = 15; */
+ public static final int FJBKKFJNBHD_PJDEJIHFCPP_VALUE = 15;
+
+ public final int getNumber() {
+ if (this == UNRECOGNIZED) {
+ 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 GrantReason 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 GrantReason forNumber(int value) {
+ switch (value) {
+ case 0:
+ return GRANT_REASON_INVALID;
+ case 1:
+ return GRANT_REASON_BY_QUEST;
+ case 2:
+ return GRANT_REASON_BY_TRIAL_AVATAR_ACTIVITY;
+ case 3:
+ return GRANT_REASON_BY_DUNGEON_ELEMENT_CHALLENGE;
+ case 4:
+ return GRANT_REASON_BY_MIST_TRIAL_ACTIVITY;
+ case 5:
+ return GRANT_REASON_BY_SUMO_ACTIVITY;
+ case 6:
+ return GRANT_REASON_BY_POTION_ACTIVITY;
+ case 7:
+ return GRANT_REASON_BY_CRYSTAL_LINK_ACTIVITY;
+ case 8:
+ return GRANT_REASON_BY_IRODORI_MASTER;
+ case 9:
+ return GRANT_REASON_BY_GM;
+ case 10:
+ return GRANT_REASON_BY_INSTABLE_SPRAY_ACTIVITY;
+ case 11:
+ return GRANT_REASON_BY_MUQADAS_POTION_ACTIVITY;
+ case 12:
+ return GRANT_REASON_BY_VINTAGE_HUNTING;
+ case 13:
+ return GRANT_REASON_BY_CHAR_AMUSEMENT;
+ case 14:
+ return FJBKKFJNBHD_HMLDNDBKNFL;
+ case 15:
+ return FJBKKFJNBHD_PJDEJIHFCPP;
+ default:
+ return null;
+ }
+ }
+
+ public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
+ return internalValueMap;
+ }
+
+ private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap =
+ new com.google.protobuf.Internal.EnumLiteMap() {
+ public GrantReason findValueByNumber(int number) {
+ return GrantReason.forNumber(number);
+ }
+ };
+
+ public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+ if (this == UNRECOGNIZED) {
+ throw new java.lang.IllegalStateException(
+ "Can't get the descriptor of an unrecognized enum value.");
+ }
+ return getDescriptor().getValues().get(ordinal());
+ }
+
+ public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+ return getDescriptor();
+ }
+
+ public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+ return emu.grasscutter.net.proto.TrialAvatarGrantRecordOuterClass.TrialAvatarGrantRecord
+ .getDescriptor()
+ .getEnumTypes()
+ .get(0);
+ }
+
+ private static final GrantReason[] VALUES = values();
+
+ public static GrantReason 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 value;
+
+ private GrantReason(int value) {
+ this.value = value;
+ }
+
+ // @@protoc_insertion_point(enum_scope:TrialAvatarGrantRecord.GrantReason)
+ }
+
public static final int GRANT_REASON_FIELD_NUMBER = 1;
private int grantReason_;
/**
@@ -652,10 +834,25 @@ public final class TrialAvatarGrantRecordOuterClass {
static {
java.lang.String[] descriptorData = {
- "\n\034TrialAvatarGrantRecord.proto\"L\n\026TrialA"
- + "vatarGrantRecord\022\024\n\014grant_reason\030\001 \001(\r\022\034"
- + "\n\024from_parent_quest_id\030\002 \001(\rB\033\n\031emu.gras"
- + "scutter.net.protob\006proto3"
+ "\n\034TrialAvatarGrantRecord.proto\"\240\005\n\026Trial"
+ + "AvatarGrantRecord\022\024\n\014grant_reason\030\001 \001(\r\022"
+ + "\034\n\024from_parent_quest_id\030\002 \001(\r\"\321\004\n\013GrantR"
+ + "eason\022\030\n\024GRANT_REASON_INVALID\020\000\022\031\n\025GRANT"
+ + "_REASON_BY_QUEST\020\001\022)\n%GRANT_REASON_BY_TR"
+ + "IAL_AVATAR_ACTIVITY\020\002\022-\n)GRANT_REASON_BY"
+ + "_DUNGEON_ELEMENT_CHALLENGE\020\003\022\'\n#GRANT_RE"
+ + "ASON_BY_MIST_TRIAL_ACTIVITY\020\004\022!\n\035GRANT_R"
+ + "EASON_BY_SUMO_ACTIVITY\020\005\022#\n\037GRANT_REASON"
+ + "_BY_POTION_ACTIVITY\020\006\022)\n%GRANT_REASON_BY"
+ + "_CRYSTAL_LINK_ACTIVITY\020\007\022\"\n\036GRANT_REASON"
+ + "_BY_IRODORI_MASTER\020\010\022\026\n\022GRANT_REASON_BY_"
+ + "GM\020\t\022+\n\'GRANT_REASON_BY_INSTABLE_SPRAY_A"
+ + "CTIVITY\020\n\022+\n\'GRANT_REASON_BY_MUQADAS_POT"
+ + "ION_ACTIVITY\020\013\022#\n\037GRANT_REASON_BY_VINTAG"
+ + "E_HUNTING\020\014\022\"\n\036GRANT_REASON_BY_CHAR_AMUS"
+ + "EMENT\020\r\022\033\n\027FJBKKFJNBHD_HMLDNDBKNFL\020\016\022\033\n\027"
+ + "FJBKKFJNBHD_PJDEJIHFCPP\020\017B\033\n\031emu.grasscu"
+ + "tter.net.protob\006proto3"
};
descriptor =
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(