diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SealBattleBeginNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SealBattleBeginNotifyOuterClass.java
index 7b237983f..dbd9c5b71 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SealBattleBeginNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SealBattleBeginNotifyOuterClass.java
@@ -19,16 +19,16 @@ public final class SealBattleBeginNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
- * uint32 CMPKIKADOJJ = 10;
- * @return The cMPKIKADOJJ.
+ * uint32 seal_max_progress = 10;
+ * @return The sealMaxProgress.
*/
- int getCMPKIKADOJJ();
+ int getSealMaxProgress();
/**
- * uint32 PDKCGAJOEPC = 11;
- * @return The pDKCGAJOEPC.
+ * uint32 seal_radius = 11;
+ * @return The sealRadius.
*/
- int getPDKCGAJOEPC();
+ int getSealRadius();
/**
* .SealBattleType battle_type = 3;
@@ -106,12 +106,12 @@ public final class SealBattleBeginNotifyOuterClass {
}
case 80: {
- cMPKIKADOJJ_ = input.readUInt32();
+ sealMaxProgress_ = input.readUInt32();
break;
}
case 88: {
- pDKCGAJOEPC_ = input.readUInt32();
+ sealRadius_ = input.readUInt32();
break;
}
case 96: {
@@ -151,26 +151,26 @@ public final class SealBattleBeginNotifyOuterClass {
emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify.class, emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify.Builder.class);
}
- public static final int CMPKIKADOJJ_FIELD_NUMBER = 10;
- private int cMPKIKADOJJ_;
+ public static final int SEAL_MAX_PROGRESS_FIELD_NUMBER = 10;
+ private int sealMaxProgress_;
/**
- * uint32 CMPKIKADOJJ = 10;
- * @return The cMPKIKADOJJ.
+ * uint32 seal_max_progress = 10;
+ * @return The sealMaxProgress.
*/
@java.lang.Override
- public int getCMPKIKADOJJ() {
- return cMPKIKADOJJ_;
+ public int getSealMaxProgress() {
+ return sealMaxProgress_;
}
- public static final int PDKCGAJOEPC_FIELD_NUMBER = 11;
- private int pDKCGAJOEPC_;
+ public static final int SEAL_RADIUS_FIELD_NUMBER = 11;
+ private int sealRadius_;
/**
- * uint32 PDKCGAJOEPC = 11;
- * @return The pDKCGAJOEPC.
+ * uint32 seal_radius = 11;
+ * @return The sealRadius.
*/
@java.lang.Override
- public int getPDKCGAJOEPC() {
- return pDKCGAJOEPC_;
+ public int getSealRadius() {
+ return sealRadius_;
}
public static final int BATTLE_TYPE_FIELD_NUMBER = 3;
@@ -220,11 +220,11 @@ public final class SealBattleBeginNotifyOuterClass {
if (battleType_ != emu.grasscutter.net.proto.SealBattleTypeOuterClass.SealBattleType.SEAL_BATTLE_KEEP_ALIVE.getNumber()) {
output.writeEnum(3, battleType_);
}
- if (cMPKIKADOJJ_ != 0) {
- output.writeUInt32(10, cMPKIKADOJJ_);
+ if (sealMaxProgress_ != 0) {
+ output.writeUInt32(10, sealMaxProgress_);
}
- if (pDKCGAJOEPC_ != 0) {
- output.writeUInt32(11, pDKCGAJOEPC_);
+ if (sealRadius_ != 0) {
+ output.writeUInt32(11, sealRadius_);
}
if (sealEntityId_ != 0) {
output.writeUInt32(12, sealEntityId_);
@@ -242,13 +242,13 @@ public final class SealBattleBeginNotifyOuterClass {
size += com.google.protobuf.CodedOutputStream
.computeEnumSize(3, battleType_);
}
- if (cMPKIKADOJJ_ != 0) {
+ if (sealMaxProgress_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(10, cMPKIKADOJJ_);
+ .computeUInt32Size(10, sealMaxProgress_);
}
- if (pDKCGAJOEPC_ != 0) {
+ if (sealRadius_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(11, pDKCGAJOEPC_);
+ .computeUInt32Size(11, sealRadius_);
}
if (sealEntityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
@@ -269,10 +269,10 @@ public final class SealBattleBeginNotifyOuterClass {
}
emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify other = (emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify) obj;
- if (getCMPKIKADOJJ()
- != other.getCMPKIKADOJJ()) return false;
- if (getPDKCGAJOEPC()
- != other.getPDKCGAJOEPC()) return false;
+ if (getSealMaxProgress()
+ != other.getSealMaxProgress()) return false;
+ if (getSealRadius()
+ != other.getSealRadius()) return false;
if (battleType_ != other.battleType_) return false;
if (getSealEntityId()
!= other.getSealEntityId()) return false;
@@ -287,10 +287,10 @@ public final class SealBattleBeginNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
- hash = (37 * hash) + CMPKIKADOJJ_FIELD_NUMBER;
- hash = (53 * hash) + getCMPKIKADOJJ();
- hash = (37 * hash) + PDKCGAJOEPC_FIELD_NUMBER;
- hash = (53 * hash) + getPDKCGAJOEPC();
+ hash = (37 * hash) + SEAL_MAX_PROGRESS_FIELD_NUMBER;
+ hash = (53 * hash) + getSealMaxProgress();
+ hash = (37 * hash) + SEAL_RADIUS_FIELD_NUMBER;
+ hash = (53 * hash) + getSealRadius();
hash = (37 * hash) + BATTLE_TYPE_FIELD_NUMBER;
hash = (53 * hash) + battleType_;
hash = (37 * hash) + SEAL_ENTITY_ID_FIELD_NUMBER;
@@ -433,9 +433,9 @@ public final class SealBattleBeginNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
- cMPKIKADOJJ_ = 0;
+ sealMaxProgress_ = 0;
- pDKCGAJOEPC_ = 0;
+ sealRadius_ = 0;
battleType_ = 0;
@@ -467,8 +467,8 @@ public final class SealBattleBeginNotifyOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify buildPartial() {
emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify result = new emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify(this);
- result.cMPKIKADOJJ_ = cMPKIKADOJJ_;
- result.pDKCGAJOEPC_ = pDKCGAJOEPC_;
+ result.sealMaxProgress_ = sealMaxProgress_;
+ result.sealRadius_ = sealRadius_;
result.battleType_ = battleType_;
result.sealEntityId_ = sealEntityId_;
onBuilt();
@@ -519,11 +519,11 @@ public final class SealBattleBeginNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify other) {
if (other == emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify.getDefaultInstance()) return this;
- if (other.getCMPKIKADOJJ() != 0) {
- setCMPKIKADOJJ(other.getCMPKIKADOJJ());
+ if (other.getSealMaxProgress() != 0) {
+ setSealMaxProgress(other.getSealMaxProgress());
}
- if (other.getPDKCGAJOEPC() != 0) {
- setPDKCGAJOEPC(other.getPDKCGAJOEPC());
+ if (other.getSealRadius() != 0) {
+ setSealRadius(other.getSealRadius());
}
if (other.battleType_ != 0) {
setBattleTypeValue(other.getBattleTypeValue());
@@ -560,64 +560,64 @@ public final class SealBattleBeginNotifyOuterClass {
return this;
}
- private int cMPKIKADOJJ_ ;
+ private int sealMaxProgress_ ;
/**
- * uint32 CMPKIKADOJJ = 10;
- * @return The cMPKIKADOJJ.
+ * uint32 seal_max_progress = 10;
+ * @return The sealMaxProgress.
*/
@java.lang.Override
- public int getCMPKIKADOJJ() {
- return cMPKIKADOJJ_;
+ public int getSealMaxProgress() {
+ return sealMaxProgress_;
}
/**
- * uint32 CMPKIKADOJJ = 10;
- * @param value The cMPKIKADOJJ to set.
+ * uint32 seal_max_progress = 10;
+ * @param value The sealMaxProgress to set.
* @return This builder for chaining.
*/
- public Builder setCMPKIKADOJJ(int value) {
+ public Builder setSealMaxProgress(int value) {
- cMPKIKADOJJ_ = value;
+ sealMaxProgress_ = value;
onChanged();
return this;
}
/**
- * uint32 CMPKIKADOJJ = 10;
+ * uint32 seal_max_progress = 10;
* @return This builder for chaining.
*/
- public Builder clearCMPKIKADOJJ() {
+ public Builder clearSealMaxProgress() {
- cMPKIKADOJJ_ = 0;
+ sealMaxProgress_ = 0;
onChanged();
return this;
}
- private int pDKCGAJOEPC_ ;
+ private int sealRadius_ ;
/**
- * uint32 PDKCGAJOEPC = 11;
- * @return The pDKCGAJOEPC.
+ * uint32 seal_radius = 11;
+ * @return The sealRadius.
*/
@java.lang.Override
- public int getPDKCGAJOEPC() {
- return pDKCGAJOEPC_;
+ public int getSealRadius() {
+ return sealRadius_;
}
/**
- * uint32 PDKCGAJOEPC = 11;
- * @param value The pDKCGAJOEPC to set.
+ * uint32 seal_radius = 11;
+ * @param value The sealRadius to set.
* @return This builder for chaining.
*/
- public Builder setPDKCGAJOEPC(int value) {
+ public Builder setSealRadius(int value) {
- pDKCGAJOEPC_ = value;
+ sealRadius_ = value;
onChanged();
return this;
}
/**
- * uint32 PDKCGAJOEPC = 11;
+ * uint32 seal_radius = 11;
* @return This builder for chaining.
*/
- public Builder clearPDKCGAJOEPC() {
+ public Builder clearSealRadius() {
- pDKCGAJOEPC_ = 0;
+ sealRadius_ = 0;
onChanged();
return this;
}
@@ -774,11 +774,11 @@ public final class SealBattleBeginNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\033SealBattleBeginNotify.proto\032\024SealBattl" +
- "eType.proto\"\177\n\025SealBattleBeginNotify\022\023\n\013" +
- "CMPKIKADOJJ\030\n \001(\r\022\023\n\013PDKCGAJOEPC\030\013 \001(\r\022$" +
- "\n\013battle_type\030\003 \001(\0162\017.SealBattleType\022\026\n\016" +
- "seal_entity_id\030\014 \001(\rB\033\n\031emu.grasscutter." +
- "net.protob\006proto3"
+ "eType.proto\"\205\001\n\025SealBattleBeginNotify\022\031\n" +
+ "\021seal_max_progress\030\n \001(\r\022\023\n\013seal_radius\030" +
+ "\013 \001(\r\022$\n\013battle_type\030\003 \001(\0162\017.SealBattleT" +
+ "ype\022\026\n\016seal_entity_id\030\014 \001(\rB\033\n\031emu.grass" +
+ "cutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -790,7 +790,7 @@ public final class SealBattleBeginNotifyOuterClass {
internal_static_SealBattleBeginNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_SealBattleBeginNotify_descriptor,
- new java.lang.String[] { "CMPKIKADOJJ", "PDKCGAJOEPC", "BattleType", "SealEntityId", });
+ new java.lang.String[] { "SealMaxProgress", "SealRadius", "BattleType", "SealEntityId", });
emu.grasscutter.net.proto.SealBattleTypeOuterClass.getDescriptor();
}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SealBattleProgressNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SealBattleProgressNotifyOuterClass.java
index 6f99843cd..4fbd1e2c0 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SealBattleProgressNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SealBattleProgressNotifyOuterClass.java
@@ -19,10 +19,10 @@ public final class SealBattleProgressNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
- * uint32 PDKCGAJOEPC = 8;
- * @return The pDKCGAJOEPC.
+ * uint32 seal_radius = 8;
+ * @return The sealRadius.
*/
- int getPDKCGAJOEPC();
+ int getSealRadius();
/**
* uint32 end_time = 2;
@@ -43,10 +43,10 @@ public final class SealBattleProgressNotifyOuterClass {
int getSealEntityId();
/**
- * uint32 BAEKFBCJFJK = 5;
- * @return The bAEKFBCJFJK.
+ * uint32 max_progress = 5;
+ * @return The maxProgress.
*/
- int getBAEKFBCJFJK();
+ int getMaxProgress();
}
/**
*
@@ -105,12 +105,12 @@ public final class SealBattleProgressNotifyOuterClass {
}
case 40: {
- bAEKFBCJFJK_ = input.readUInt32();
+ maxProgress_ = input.readUInt32();
break;
}
case 64: {
- pDKCGAJOEPC_ = input.readUInt32();
+ sealRadius_ = input.readUInt32();
break;
}
case 112: {
@@ -155,15 +155,15 @@ public final class SealBattleProgressNotifyOuterClass {
emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify.class, emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify.Builder.class);
}
- public static final int PDKCGAJOEPC_FIELD_NUMBER = 8;
- private int pDKCGAJOEPC_;
+ public static final int SEAL_RADIUS_FIELD_NUMBER = 8;
+ private int sealRadius_;
/**
- * uint32 PDKCGAJOEPC = 8;
- * @return The pDKCGAJOEPC.
+ * uint32 seal_radius = 8;
+ * @return The sealRadius.
*/
@java.lang.Override
- public int getPDKCGAJOEPC() {
- return pDKCGAJOEPC_;
+ public int getSealRadius() {
+ return sealRadius_;
}
public static final int END_TIME_FIELD_NUMBER = 2;
@@ -199,15 +199,15 @@ public final class SealBattleProgressNotifyOuterClass {
return sealEntityId_;
}
- public static final int BAEKFBCJFJK_FIELD_NUMBER = 5;
- private int bAEKFBCJFJK_;
+ public static final int MAX_PROGRESS_FIELD_NUMBER = 5;
+ private int maxProgress_;
/**
- * uint32 BAEKFBCJFJK = 5;
- * @return The bAEKFBCJFJK.
+ * uint32 max_progress = 5;
+ * @return The maxProgress.
*/
@java.lang.Override
- public int getBAEKFBCJFJK() {
- return bAEKFBCJFJK_;
+ public int getMaxProgress() {
+ return maxProgress_;
}
private byte memoizedIsInitialized = -1;
@@ -227,11 +227,11 @@ public final class SealBattleProgressNotifyOuterClass {
if (endTime_ != 0) {
output.writeUInt32(2, endTime_);
}
- if (bAEKFBCJFJK_ != 0) {
- output.writeUInt32(5, bAEKFBCJFJK_);
+ if (maxProgress_ != 0) {
+ output.writeUInt32(5, maxProgress_);
}
- if (pDKCGAJOEPC_ != 0) {
- output.writeUInt32(8, pDKCGAJOEPC_);
+ if (sealRadius_ != 0) {
+ output.writeUInt32(8, sealRadius_);
}
if (sealEntityId_ != 0) {
output.writeUInt32(14, sealEntityId_);
@@ -252,13 +252,13 @@ public final class SealBattleProgressNotifyOuterClass {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(2, endTime_);
}
- if (bAEKFBCJFJK_ != 0) {
+ if (maxProgress_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(5, bAEKFBCJFJK_);
+ .computeUInt32Size(5, maxProgress_);
}
- if (pDKCGAJOEPC_ != 0) {
+ if (sealRadius_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(8, pDKCGAJOEPC_);
+ .computeUInt32Size(8, sealRadius_);
}
if (sealEntityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
@@ -283,16 +283,16 @@ public final class SealBattleProgressNotifyOuterClass {
}
emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify other = (emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify) obj;
- if (getPDKCGAJOEPC()
- != other.getPDKCGAJOEPC()) return false;
+ if (getSealRadius()
+ != other.getSealRadius()) return false;
if (getEndTime()
!= other.getEndTime()) return false;
if (getProgress()
!= other.getProgress()) return false;
if (getSealEntityId()
!= other.getSealEntityId()) return false;
- if (getBAEKFBCJFJK()
- != other.getBAEKFBCJFJK()) return false;
+ if (getMaxProgress()
+ != other.getMaxProgress()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -304,16 +304,16 @@ public final class SealBattleProgressNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
- hash = (37 * hash) + PDKCGAJOEPC_FIELD_NUMBER;
- hash = (53 * hash) + getPDKCGAJOEPC();
+ hash = (37 * hash) + SEAL_RADIUS_FIELD_NUMBER;
+ hash = (53 * hash) + getSealRadius();
hash = (37 * hash) + END_TIME_FIELD_NUMBER;
hash = (53 * hash) + getEndTime();
hash = (37 * hash) + PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getProgress();
hash = (37 * hash) + SEAL_ENTITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getSealEntityId();
- hash = (37 * hash) + BAEKFBCJFJK_FIELD_NUMBER;
- hash = (53 * hash) + getBAEKFBCJFJK();
+ hash = (37 * hash) + MAX_PROGRESS_FIELD_NUMBER;
+ hash = (53 * hash) + getMaxProgress();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -452,7 +452,7 @@ public final class SealBattleProgressNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
- pDKCGAJOEPC_ = 0;
+ sealRadius_ = 0;
endTime_ = 0;
@@ -460,7 +460,7 @@ public final class SealBattleProgressNotifyOuterClass {
sealEntityId_ = 0;
- bAEKFBCJFJK_ = 0;
+ maxProgress_ = 0;
return this;
}
@@ -488,11 +488,11 @@ public final class SealBattleProgressNotifyOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify buildPartial() {
emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify result = new emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify(this);
- result.pDKCGAJOEPC_ = pDKCGAJOEPC_;
+ result.sealRadius_ = sealRadius_;
result.endTime_ = endTime_;
result.progress_ = progress_;
result.sealEntityId_ = sealEntityId_;
- result.bAEKFBCJFJK_ = bAEKFBCJFJK_;
+ result.maxProgress_ = maxProgress_;
onBuilt();
return result;
}
@@ -541,8 +541,8 @@ public final class SealBattleProgressNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify other) {
if (other == emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify.getDefaultInstance()) return this;
- if (other.getPDKCGAJOEPC() != 0) {
- setPDKCGAJOEPC(other.getPDKCGAJOEPC());
+ if (other.getSealRadius() != 0) {
+ setSealRadius(other.getSealRadius());
}
if (other.getEndTime() != 0) {
setEndTime(other.getEndTime());
@@ -553,8 +553,8 @@ public final class SealBattleProgressNotifyOuterClass {
if (other.getSealEntityId() != 0) {
setSealEntityId(other.getSealEntityId());
}
- if (other.getBAEKFBCJFJK() != 0) {
- setBAEKFBCJFJK(other.getBAEKFBCJFJK());
+ if (other.getMaxProgress() != 0) {
+ setMaxProgress(other.getMaxProgress());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -585,33 +585,33 @@ public final class SealBattleProgressNotifyOuterClass {
return this;
}
- private int pDKCGAJOEPC_ ;
+ private int sealRadius_ ;
/**
- * uint32 PDKCGAJOEPC = 8;
- * @return The pDKCGAJOEPC.
+ * uint32 seal_radius = 8;
+ * @return The sealRadius.
*/
@java.lang.Override
- public int getPDKCGAJOEPC() {
- return pDKCGAJOEPC_;
+ public int getSealRadius() {
+ return sealRadius_;
}
/**
- * uint32 PDKCGAJOEPC = 8;
- * @param value The pDKCGAJOEPC to set.
+ * uint32 seal_radius = 8;
+ * @param value The sealRadius to set.
* @return This builder for chaining.
*/
- public Builder setPDKCGAJOEPC(int value) {
+ public Builder setSealRadius(int value) {
- pDKCGAJOEPC_ = value;
+ sealRadius_ = value;
onChanged();
return this;
}
/**
- * uint32 PDKCGAJOEPC = 8;
+ * uint32 seal_radius = 8;
* @return This builder for chaining.
*/
- public Builder clearPDKCGAJOEPC() {
+ public Builder clearSealRadius() {
- pDKCGAJOEPC_ = 0;
+ sealRadius_ = 0;
onChanged();
return this;
}
@@ -709,33 +709,33 @@ public final class SealBattleProgressNotifyOuterClass {
return this;
}
- private int bAEKFBCJFJK_ ;
+ private int maxProgress_ ;
/**
- * uint32 BAEKFBCJFJK = 5;
- * @return The bAEKFBCJFJK.
+ * uint32 max_progress = 5;
+ * @return The maxProgress.
*/
@java.lang.Override
- public int getBAEKFBCJFJK() {
- return bAEKFBCJFJK_;
+ public int getMaxProgress() {
+ return maxProgress_;
}
/**
- * uint32 BAEKFBCJFJK = 5;
- * @param value The bAEKFBCJFJK to set.
+ * uint32 max_progress = 5;
+ * @param value The maxProgress to set.
* @return This builder for chaining.
*/
- public Builder setBAEKFBCJFJK(int value) {
+ public Builder setMaxProgress(int value) {
- bAEKFBCJFJK_ = value;
+ maxProgress_ = value;
onChanged();
return this;
}
/**
- * uint32 BAEKFBCJFJK = 5;
+ * uint32 max_progress = 5;
* @return This builder for chaining.
*/
- public Builder clearBAEKFBCJFJK() {
+ public Builder clearMaxProgress() {
- bAEKFBCJFJK_ = 0;
+ maxProgress_ = 0;
onChanged();
return this;
}
@@ -806,11 +806,12 @@ public final class SealBattleProgressNotifyOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
- "\n\036SealBattleProgressNotify.proto\"\200\001\n\030Sea" +
- "lBattleProgressNotify\022\023\n\013PDKCGAJOEPC\030\010 \001" +
+ "\n\036SealBattleProgressNotify.proto\"\201\001\n\030Sea" +
+ "lBattleProgressNotify\022\023\n\013seal_radius\030\010 \001" +
"(\r\022\020\n\010end_time\030\002 \001(\r\022\020\n\010progress\030\017 \001(\r\022\026" +
- "\n\016seal_entity_id\030\016 \001(\r\022\023\n\013BAEKFBCJFJK\030\005 " +
- "\001(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
+ "\n\016seal_entity_id\030\016 \001(\r\022\024\n\014max_progress\030\005" +
+ " \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
+ "3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -821,7 +822,7 @@ public final class SealBattleProgressNotifyOuterClass {
internal_static_SealBattleProgressNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_SealBattleProgressNotify_descriptor,
- new java.lang.String[] { "PDKCGAJOEPC", "EndTime", "Progress", "SealEntityId", "BAEKFBCJFJK", });
+ new java.lang.String[] { "SealRadius", "EndTime", "Progress", "SealEntityId", "MaxProgress", });
}
// @@protoc_insertion_point(outer_class_scope)
diff --git a/src/main/java/emu/grasscutter/command/commands/InfoCommand.java b/src/main/java/emu/grasscutter/command/commands/InfoCommand.java
index 5f5c717c5..f7b1c6979 100644
--- a/src/main/java/emu/grasscutter/command/commands/InfoCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/InfoCommand.java
@@ -28,6 +28,7 @@ public final class InfoCommand implements CommandHandler {
var gameOptions = config.server.game;
var questingEnabled = gameOptions.gameOptions.questing.enabled;
var scriptsEnabled = gameOptions.enableScriptInBigWorld;
+ var fastRequire = config.server.fastRequire;
CommandHandler.sendMessage(sender, """
Created by Meledy
@@ -52,11 +53,12 @@ public final class InfoCommand implements CommandHandler {
Questing Enabled: %s
Scripts Enabled: %s
Operating System: %s
+ Using Fast Require: %s
Resource Information: %s
discord.gg/T5vZU6UyeG"""
.formatted(
- build, playerCount, questingEnabled, scriptsEnabled,
+ build, playerCount, questingEnabled, scriptsEnabled, fastRequire,
System.getProperty("os.name"), resourceInfo.toString()
)
);
diff --git a/src/main/java/emu/grasscutter/config/ConfigContainer.java b/src/main/java/emu/grasscutter/config/ConfigContainer.java
index d019aad7b..c913f81ed 100644
--- a/src/main/java/emu/grasscutter/config/ConfigContainer.java
+++ b/src/main/java/emu/grasscutter/config/ConfigContainer.java
@@ -29,9 +29,11 @@ public class ConfigContainer {
* Version 9 - 'limits' was added for handbook requests.
* Version 10 - 'trialCostumes' was added for enabling costumes
* on trial avatars.
+ * Version 11 - 'server.fastRequire' was added for disabling the new
+ * Lua script require system if performance is a concern.
*/
private static int version() {
- return 10;
+ return 11;
}
/**
diff --git a/src/main/java/emu/grasscutter/data/binout/AbilityModifier.java b/src/main/java/emu/grasscutter/data/binout/AbilityModifier.java
index 41d2279e0..44865e90b 100644
--- a/src/main/java/emu/grasscutter/data/binout/AbilityModifier.java
+++ b/src/main/java/emu/grasscutter/data/binout/AbilityModifier.java
@@ -3,12 +3,15 @@ package emu.grasscutter.data.binout;
import com.google.gson.annotations.SerializedName;
import emu.grasscutter.data.common.DynamicFloat;
import emu.grasscutter.game.props.ElementType;
-import java.io.Serializable;
import lombok.ToString;
+import java.io.Serializable;
+
public class AbilityModifier implements Serializable {
private static final long serialVersionUID = -2001232313615923575L;
+ public State state;
+
@SerializedName(
value = "onAdded",
alternate = {"KCICDEJLIJD"})
@@ -341,13 +344,12 @@ public class AbilityModifier implements Serializable {
public int param2;
public int param3;
+ public String funcName;
public LuaCallType luaCallType;
@SerializedName("CallParamList")
public int[] callParamList;
- public String funcName;
-
public String content;
public enum LuaCallType {
@@ -366,6 +368,20 @@ public class AbilityModifier implements Serializable {
}
}
+ public enum State {
+ LockHP,
+ Invincible,
+ ElementFreeze,
+ ElementPetrifaction,
+ DenyLockOn,
+ Limbo,
+ NoHeal,
+ IgnoreAddEnergy,
+ IsGhostToEnemy,
+ IsGhostToAllied,
+ UnlockFrequencyLimit
+ }
+
// The following should be implemented into DynamicFloat if older resource formats need to be
// supported
// public static class AbilityModifierValue {
diff --git a/src/main/java/emu/grasscutter/game/Account.java b/src/main/java/emu/grasscutter/game/Account.java
index 1f5845fe4..da1193b98 100644
--- a/src/main/java/emu/grasscutter/game/Account.java
+++ b/src/main/java/emu/grasscutter/game/Account.java
@@ -1,14 +1,13 @@
package emu.grasscutter.game;
+import static emu.grasscutter.config.Configuration.*;
+
import dev.morphia.annotations.*;
import emu.grasscutter.database.DatabaseHelper;
import emu.grasscutter.utils.*;
-import org.bson.Document;
-
import java.util.*;
import java.util.stream.Stream;
-
-import static emu.grasscutter.config.Configuration.*;
+import org.bson.Document;
@Entity(value = "accounts", useDiscriminator = false)
public class Account {
@@ -244,7 +243,6 @@ public class Account {
@Override
public String toString() {
- return "Account ID: %s; Username: %s"
- .formatted(this.id, this.username);
+ return "Account ID: %s; Username: %s".formatted(this.id, this.username);
}
}
diff --git a/src/main/java/emu/grasscutter/game/ability/actions/ActionHealHP.java b/src/main/java/emu/grasscutter/game/ability/actions/ActionHealHP.java
index 2a0d22c8c..f041af8f3 100644
--- a/src/main/java/emu/grasscutter/game/ability/actions/ActionHealHP.java
+++ b/src/main/java/emu/grasscutter/game/ability/actions/ActionHealHP.java
@@ -13,8 +13,6 @@ public final class ActionHealHP extends AbilityActionHandler {
@Override
public boolean execute(
Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity target) {
- Grasscutter.getLogger().debug("Heal ability action executing 1");
-
var owner = ability.getOwner();
// handle client gadgets, that the effective caster is the current local avatar
if (owner instanceof EntityClientGadget ownerGadget) {
diff --git a/src/main/java/emu/grasscutter/scripts/data/controller/EntityController.java b/src/main/java/emu/grasscutter/scripts/data/controller/EntityController.java
index 217bb0425..82b7c2a65 100644
--- a/src/main/java/emu/grasscutter/scripts/data/controller/EntityController.java
+++ b/src/main/java/emu/grasscutter/scripts/data/controller/EntityController.java
@@ -4,15 +4,12 @@ import emu.grasscutter.*;
import emu.grasscutter.game.entity.GameEntity;
import emu.grasscutter.game.props.ElementType;
import emu.grasscutter.scripts.*;
+import java.util.Set;
+import javax.script.*;
import org.luaj.vm2.*;
-import javax.script.*;
-import java.util.Set;
-
public class EntityController {
- private static final Set SERVER_CALLED = Set.of(
- "OnBeHurt", "OnDie", "OnTimer"
- );
+ private static final Set SERVER_CALLED = Set.of("OnBeHurt", "OnDie", "OnTimer");
private transient CompiledScript entityController;
private transient Bindings entityControllerBindings;
diff --git a/src/main/java/emu/grasscutter/server/event/player/PlayerNpcTalkEvent.java b/src/main/java/emu/grasscutter/server/event/player/PlayerNpcTalkEvent.java
index efa130df3..18d667df5 100644
--- a/src/main/java/emu/grasscutter/server/event/player/PlayerNpcTalkEvent.java
+++ b/src/main/java/emu/grasscutter/server/event/player/PlayerNpcTalkEvent.java
@@ -4,9 +4,8 @@ import emu.grasscutter.data.excels.TalkConfigData;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.server.event.Cancellable;
import emu.grasscutter.server.event.types.PlayerEvent;
-import lombok.Getter;
-
import javax.annotation.Nullable;
+import lombok.Getter;
@Getter
public final class PlayerNpcTalkEvent extends PlayerEvent implements Cancellable {