Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-24 05:13:11 +08:00
Code Issues Projects Releases Wiki Activity

De-obfuscate definitions & run formatter

Browse Source
This commit is contained in:
KingRainbow44 2023-08-31 19:29:31 -04:00
parent d43e5ca608
commit 58b3570f27
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
9 changed files with 181 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
src/generated/main/java/emu/grasscutter/net/proto/SealBattleBeginNotifyOuterClass.java
View File

@ -19,16 +19,16 @@ public final class SealBattleBeginNotifyOuterClass {
com.google.protobuf.MessageOrBuilder { com.google.protobuf.MessageOrBuilder {
/** /**
* <code>uint32 CMPKIKADOJJ = 10;</code> * <code>uint32 seal_max_progress = 10;</code>
* @return The cMPKIKADOJJ. * @return The sealMaxProgress.
*/ */
int getCMPKIKADOJJ(); int getSealMaxProgress();
/** /**
* <code>uint32 PDKCGAJOEPC = 11;</code> * <code>uint32 seal_radius = 11;</code>
* @return The pDKCGAJOEPC. * @return The sealRadius.
*/ */
int getPDKCGAJOEPC(); int getSealRadius();
/** /**
* <code>.SealBattleType battle_type = 3;</code> * <code>.SealBattleType battle_type = 3;</code>
@ -106,12 +106,12 @@ public final class SealBattleBeginNotifyOuterClass {
} }
case 80: { case 80: {
cMPKIKADOJJ_ = input.readUInt32(); sealMaxProgress_ = input.readUInt32();
break; break;
} }
case 88: { case 88: {
pDKCGAJOEPC_ = input.readUInt32(); sealRadius_ = input.readUInt32();
break; break;
} }
case 96: { 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); emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify.class, emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify.Builder.class);
} }
public static final int CMPKIKADOJJ_FIELD_NUMBER = 10; public static final int SEAL_MAX_PROGRESS_FIELD_NUMBER = 10;
private int cMPKIKADOJJ_; private int sealMaxProgress_;
/** /**
* <code>uint32 CMPKIKADOJJ = 10;</code> * <code>uint32 seal_max_progress = 10;</code>
* @return The cMPKIKADOJJ. * @return The sealMaxProgress.
*/ */
@java.lang.Override @java.lang.Override
public int getCMPKIKADOJJ() { public int getSealMaxProgress() {
return cMPKIKADOJJ_; return sealMaxProgress_;
} }
public static final int PDKCGAJOEPC_FIELD_NUMBER = 11; public static final int SEAL_RADIUS_FIELD_NUMBER = 11;
private int pDKCGAJOEPC_; private int sealRadius_;
/** /**
* <code>uint32 PDKCGAJOEPC = 11;</code> * <code>uint32 seal_radius = 11;</code>
* @return The pDKCGAJOEPC. * @return The sealRadius.
*/ */
@java.lang.Override @java.lang.Override
public int getPDKCGAJOEPC() { public int getSealRadius() {
return pDKCGAJOEPC_; return sealRadius_;
} }
public static final int BATTLE_TYPE_FIELD_NUMBER = 3; 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()) { if (battleType_ != emu.grasscutter.net.proto.SealBattleTypeOuterClass.SealBattleType.SEAL_BATTLE_KEEP_ALIVE.getNumber()) {
output.writeEnum(3, battleType_); output.writeEnum(3, battleType_);
} }
if (cMPKIKADOJJ_ != 0) { if (sealMaxProgress_ != 0) {
output.writeUInt32(10, cMPKIKADOJJ_); output.writeUInt32(10, sealMaxProgress_);
} }
if (pDKCGAJOEPC_ != 0) { if (sealRadius_ != 0) {
output.writeUInt32(11, pDKCGAJOEPC_); output.writeUInt32(11, sealRadius_);
} }
if (sealEntityId_ != 0) { if (sealEntityId_ != 0) {
output.writeUInt32(12, sealEntityId_); output.writeUInt32(12, sealEntityId_);
@ -242,13 +242,13 @@ public final class SealBattleBeginNotifyOuterClass {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
.computeEnumSize(3, battleType_); .computeEnumSize(3, battleType_);
} }
if (cMPKIKADOJJ_ != 0) { if (sealMaxProgress_ != 0) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, cMPKIKADOJJ_); .computeUInt32Size(10, sealMaxProgress_);
} }
if (pDKCGAJOEPC_ != 0) { if (sealRadius_ != 0) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, pDKCGAJOEPC_); .computeUInt32Size(11, sealRadius_);
} }
if (sealEntityId_ != 0) { if (sealEntityId_ != 0) {
size += com.google.protobuf.CodedOutputStream 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; emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify other = (emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify) obj;
if (getCMPKIKADOJJ() if (getSealMaxProgress()
!= other.getCMPKIKADOJJ()) return false; != other.getSealMaxProgress()) return false;
if (getPDKCGAJOEPC() if (getSealRadius()
!= other.getPDKCGAJOEPC()) return false; != other.getSealRadius()) return false;
if (battleType_ != other.battleType_) return false; if (battleType_ != other.battleType_) return false;
if (getSealEntityId() if (getSealEntityId()
!= other.getSealEntityId()) return false; != other.getSealEntityId()) return false;
@ -287,10 +287,10 @@ public final class SealBattleBeginNotifyOuterClass {
} }
int hash = 41; int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode(); hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + CMPKIKADOJJ_FIELD_NUMBER; hash = (37 * hash) + SEAL_MAX_PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getCMPKIKADOJJ(); hash = (53 * hash) + getSealMaxProgress();
hash = (37 * hash) + PDKCGAJOEPC_FIELD_NUMBER; hash = (37 * hash) + SEAL_RADIUS_FIELD_NUMBER;
hash = (53 * hash) + getPDKCGAJOEPC(); hash = (53 * hash) + getSealRadius();
hash = (37 * hash) + BATTLE_TYPE_FIELD_NUMBER; hash = (37 * hash) + BATTLE_TYPE_FIELD_NUMBER;
hash = (53 * hash) + battleType_; hash = (53 * hash) + battleType_;
hash = (37 * hash) + SEAL_ENTITY_ID_FIELD_NUMBER; hash = (37 * hash) + SEAL_ENTITY_ID_FIELD_NUMBER;
@ -433,9 +433,9 @@ public final class SealBattleBeginNotifyOuterClass {
@java.lang.Override @java.lang.Override
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
cMPKIKADOJJ_ = 0; sealMaxProgress_ = 0;
pDKCGAJOEPC_ = 0; sealRadius_ = 0;
battleType_ = 0; battleType_ = 0;
@ -467,8 +467,8 @@ public final class SealBattleBeginNotifyOuterClass {
@java.lang.Override @java.lang.Override
public emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify buildPartial() { public emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify buildPartial() {
emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify result = new emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify(this); emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify result = new emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify(this);
result.cMPKIKADOJJ_ = cMPKIKADOJJ_; result.sealMaxProgress_ = sealMaxProgress_;
result.pDKCGAJOEPC_ = pDKCGAJOEPC_; result.sealRadius_ = sealRadius_;
result.battleType_ = battleType_; result.battleType_ = battleType_;
result.sealEntityId_ = sealEntityId_; result.sealEntityId_ = sealEntityId_;
onBuilt(); onBuilt();
@ -519,11 +519,11 @@ public final class SealBattleBeginNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify other) { public Builder mergeFrom(emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify other) {
if (other == emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify.getDefaultInstance()) return this; if (other == emu.grasscutter.net.proto.SealBattleBeginNotifyOuterClass.SealBattleBeginNotify.getDefaultInstance()) return this;
if (other.getCMPKIKADOJJ() != 0) { if (other.getSealMaxProgress() != 0) {
setCMPKIKADOJJ(other.getCMPKIKADOJJ()); setSealMaxProgress(other.getSealMaxProgress());
} }
if (other.getPDKCGAJOEPC() != 0) { if (other.getSealRadius() != 0) {
setPDKCGAJOEPC(other.getPDKCGAJOEPC()); setSealRadius(other.getSealRadius());
} }
if (other.battleType_ != 0) { if (other.battleType_ != 0) {
setBattleTypeValue(other.getBattleTypeValue()); setBattleTypeValue(other.getBattleTypeValue());
@ -560,64 +560,64 @@ public final class SealBattleBeginNotifyOuterClass {
return this; return this;
} }
private int cMPKIKADOJJ_ ; private int sealMaxProgress_ ;
/** /**
* <code>uint32 CMPKIKADOJJ = 10;</code> * <code>uint32 seal_max_progress = 10;</code>
* @return The cMPKIKADOJJ. * @return The sealMaxProgress.
*/ */
@java.lang.Override @java.lang.Override
public int getCMPKIKADOJJ() { public int getSealMaxProgress() {
return cMPKIKADOJJ_; return sealMaxProgress_;
} }
/** /**
* <code>uint32 CMPKIKADOJJ = 10;</code> * <code>uint32 seal_max_progress = 10;</code>
* @param value The cMPKIKADOJJ to set. * @param value The sealMaxProgress to set.
* @return This builder for chaining. * @return This builder for chaining.
*/ */
public Builder setCMPKIKADOJJ(int value) { public Builder setSealMaxProgress(int value) {
cMPKIKADOJJ_ = value; sealMaxProgress_ = value;
onChanged(); onChanged();
return this; return this;
} }
/** /**
* <code>uint32 CMPKIKADOJJ = 10;</code> * <code>uint32 seal_max_progress = 10;</code>
* @return This builder for chaining. * @return This builder for chaining.
*/ */
public Builder clearCMPKIKADOJJ() { public Builder clearSealMaxProgress() {
cMPKIKADOJJ_ = 0; sealMaxProgress_ = 0;
onChanged(); onChanged();
return this; return this;
} }
private int pDKCGAJOEPC_ ; private int sealRadius_ ;
/** /**
* <code>uint32 PDKCGAJOEPC = 11;</code> * <code>uint32 seal_radius = 11;</code>
* @return The pDKCGAJOEPC. * @return The sealRadius.
*/ */
@java.lang.Override @java.lang.Override
public int getPDKCGAJOEPC() { public int getSealRadius() {
return pDKCGAJOEPC_; return sealRadius_;
} }
/** /**
* <code>uint32 PDKCGAJOEPC = 11;</code> * <code>uint32 seal_radius = 11;</code>
* @param value The pDKCGAJOEPC to set. * @param value The sealRadius to set.
* @return This builder for chaining. * @return This builder for chaining.
*/ */
public Builder setPDKCGAJOEPC(int value) { public Builder setSealRadius(int value) {
pDKCGAJOEPC_ = value; sealRadius_ = value;
onChanged(); onChanged();
return this; return this;
} }
/** /**
* <code>uint32 PDKCGAJOEPC = 11;</code> * <code>uint32 seal_radius = 11;</code>
* @return This builder for chaining. * @return This builder for chaining.
*/ */
public Builder clearPDKCGAJOEPC() { public Builder clearSealRadius() {
pDKCGAJOEPC_ = 0; sealRadius_ = 0;
onChanged(); onChanged();
return this; return this;
} }
@ -774,11 +774,11 @@ public final class SealBattleBeginNotifyOuterClass {
static { static {
java.lang.String[] descriptorData = { java.lang.String[] descriptorData = {
"\n\033SealBattleBeginNotify.proto\032\024SealBattl" + "\n\033SealBattleBeginNotify.proto\032\024SealBattl" +
"eType.proto\"\177\n\025SealBattleBeginNotify\022\023\n\013" + "eType.proto\"\205\001\n\025SealBattleBeginNotify\022\031\n" +
"CMPKIKADOJJ\030\n \001(\r\022\023\n\013PDKCGAJOEPC\030\013 \001(\r\022$" + "\021seal_max_progress\030\n \001(\r\022\023\n\013seal_radius\030" +
"\n\013battle_type\030\003 \001(\0162\017.SealBattleType\022\026\n\016" + "\013 \001(\r\022$\n\013battle_type\030\003 \001(\0162\017.SealBattleT" +
"seal_entity_id\030\014 \001(\rB\033\n\031emu.grasscutter." + "ype\022\026\n\016seal_entity_id\030\014 \001(\rB\033\n\031emu.grass" +
"net.protob\006proto3" "cutter.net.protob\006proto3"
}; };
descriptor = com.google.protobuf.Descriptors.FileDescriptor descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData, .internalBuildGeneratedFileFrom(descriptorData,
@ -790,7 +790,7 @@ public final class SealBattleBeginNotifyOuterClass {
internal_static_SealBattleBeginNotify_fieldAccessorTable = new internal_static_SealBattleBeginNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_SealBattleBeginNotify_descriptor, 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(); emu.grasscutter.net.proto.SealBattleTypeOuterClass.getDescriptor();
} }

147
src/generated/main/java/emu/grasscutter/net/proto/SealBattleProgressNotifyOuterClass.java
View File

@ -19,10 +19,10 @@ public final class SealBattleProgressNotifyOuterClass {
com.google.protobuf.MessageOrBuilder { com.google.protobuf.MessageOrBuilder {
/** /**
* <code>uint32 PDKCGAJOEPC = 8;</code> * <code>uint32 seal_radius = 8;</code>
* @return The pDKCGAJOEPC. * @return The sealRadius.
*/ */
int getPDKCGAJOEPC(); int getSealRadius();
/** /**
* <code>uint32 end_time = 2;</code> * <code>uint32 end_time = 2;</code>
@ -43,10 +43,10 @@ public final class SealBattleProgressNotifyOuterClass {
int getSealEntityId(); int getSealEntityId();
/** /**
* <code>uint32 BAEKFBCJFJK = 5;</code> * <code>uint32 max_progress = 5;</code>
* @return The bAEKFBCJFJK. * @return The maxProgress.
*/ */
int getBAEKFBCJFJK(); int getMaxProgress();
} }
/** /**
* <pre> * <pre>
@ -105,12 +105,12 @@ public final class SealBattleProgressNotifyOuterClass {
} }
case 40: { case 40: {
bAEKFBCJFJK_ = input.readUInt32(); maxProgress_ = input.readUInt32();
break; break;
} }
case 64: { case 64: {
pDKCGAJOEPC_ = input.readUInt32(); sealRadius_ = input.readUInt32();
break; break;
} }
case 112: { 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); emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify.class, emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify.Builder.class);
} }
public static final int PDKCGAJOEPC_FIELD_NUMBER = 8; public static final int SEAL_RADIUS_FIELD_NUMBER = 8;
private int pDKCGAJOEPC_; private int sealRadius_;
/** /**
* <code>uint32 PDKCGAJOEPC = 8;</code> * <code>uint32 seal_radius = 8;</code>
* @return The pDKCGAJOEPC. * @return The sealRadius.
*/ */
@java.lang.Override @java.lang.Override
public int getPDKCGAJOEPC() { public int getSealRadius() {
return pDKCGAJOEPC_; return sealRadius_;
} }
public static final int END_TIME_FIELD_NUMBER = 2; public static final int END_TIME_FIELD_NUMBER = 2;
@ -199,15 +199,15 @@ public final class SealBattleProgressNotifyOuterClass {
return sealEntityId_; return sealEntityId_;
} }
public static final int BAEKFBCJFJK_FIELD_NUMBER = 5; public static final int MAX_PROGRESS_FIELD_NUMBER = 5;
private int bAEKFBCJFJK_; private int maxProgress_;
/** /**
* <code>uint32 BAEKFBCJFJK = 5;</code> * <code>uint32 max_progress = 5;</code>
* @return The bAEKFBCJFJK. * @return The maxProgress.
*/ */
@java.lang.Override @java.lang.Override
public int getBAEKFBCJFJK() { public int getMaxProgress() {
return bAEKFBCJFJK_; return maxProgress_;
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
@ -227,11 +227,11 @@ public final class SealBattleProgressNotifyOuterClass {
if (endTime_ != 0) { if (endTime_ != 0) {
output.writeUInt32(2, endTime_); output.writeUInt32(2, endTime_);
} }
if (bAEKFBCJFJK_ != 0) { if (maxProgress_ != 0) {
output.writeUInt32(5, bAEKFBCJFJK_); output.writeUInt32(5, maxProgress_);
} }
if (pDKCGAJOEPC_ != 0) { if (sealRadius_ != 0) {
output.writeUInt32(8, pDKCGAJOEPC_); output.writeUInt32(8, sealRadius_);
} }
if (sealEntityId_ != 0) { if (sealEntityId_ != 0) {
output.writeUInt32(14, sealEntityId_); output.writeUInt32(14, sealEntityId_);
@ -252,13 +252,13 @@ public final class SealBattleProgressNotifyOuterClass {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(2, endTime_); .computeUInt32Size(2, endTime_);
} }
if (bAEKFBCJFJK_ != 0) { if (maxProgress_ != 0) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, bAEKFBCJFJK_); .computeUInt32Size(5, maxProgress_);
} }
if (pDKCGAJOEPC_ != 0) { if (sealRadius_ != 0) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(8, pDKCGAJOEPC_); .computeUInt32Size(8, sealRadius_);
} }
if (sealEntityId_ != 0) { if (sealEntityId_ != 0) {
size += com.google.protobuf.CodedOutputStream 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; emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify other = (emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify) obj;
if (getPDKCGAJOEPC() if (getSealRadius()
!= other.getPDKCGAJOEPC()) return false; != other.getSealRadius()) return false;
if (getEndTime() if (getEndTime()
!= other.getEndTime()) return false; != other.getEndTime()) return false;
if (getProgress() if (getProgress()
!= other.getProgress()) return false; != other.getProgress()) return false;
if (getSealEntityId() if (getSealEntityId()
!= other.getSealEntityId()) return false; != other.getSealEntityId()) return false;
if (getBAEKFBCJFJK() if (getMaxProgress()
!= other.getBAEKFBCJFJK()) return false; != other.getMaxProgress()) return false;
if (!unknownFields.equals(other.unknownFields)) return false; if (!unknownFields.equals(other.unknownFields)) return false;
return true; return true;
} }
@ -304,16 +304,16 @@ public final class SealBattleProgressNotifyOuterClass {
} }
int hash = 41; int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode(); hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + PDKCGAJOEPC_FIELD_NUMBER; hash = (37 * hash) + SEAL_RADIUS_FIELD_NUMBER;
hash = (53 * hash) + getPDKCGAJOEPC(); hash = (53 * hash) + getSealRadius();
hash = (37 * hash) + END_TIME_FIELD_NUMBER; hash = (37 * hash) + END_TIME_FIELD_NUMBER;
hash = (53 * hash) + getEndTime(); hash = (53 * hash) + getEndTime();
hash = (37 * hash) + PROGRESS_FIELD_NUMBER; hash = (37 * hash) + PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getProgress(); hash = (53 * hash) + getProgress();
hash = (37 * hash) + SEAL_ENTITY_ID_FIELD_NUMBER; hash = (37 * hash) + SEAL_ENTITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getSealEntityId(); hash = (53 * hash) + getSealEntityId();
hash = (37 * hash) + BAEKFBCJFJK_FIELD_NUMBER; hash = (37 * hash) + MAX_PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getBAEKFBCJFJK(); hash = (53 * hash) + getMaxProgress();
hash = (29 * hash) + unknownFields.hashCode(); hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash; memoizedHashCode = hash;
return hash; return hash;
@ -452,7 +452,7 @@ public final class SealBattleProgressNotifyOuterClass {
@java.lang.Override @java.lang.Override
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
pDKCGAJOEPC_ = 0; sealRadius_ = 0;
endTime_ = 0; endTime_ = 0;
@ -460,7 +460,7 @@ public final class SealBattleProgressNotifyOuterClass {
sealEntityId_ = 0; sealEntityId_ = 0;
bAEKFBCJFJK_ = 0; maxProgress_ = 0;
return this; return this;
} }
@ -488,11 +488,11 @@ public final class SealBattleProgressNotifyOuterClass {
@java.lang.Override @java.lang.Override
public emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify buildPartial() { public emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify buildPartial() {
emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify result = new emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify(this); 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.endTime_ = endTime_;
result.progress_ = progress_; result.progress_ = progress_;
result.sealEntityId_ = sealEntityId_; result.sealEntityId_ = sealEntityId_;
result.bAEKFBCJFJK_ = bAEKFBCJFJK_; result.maxProgress_ = maxProgress_;
onBuilt(); onBuilt();
return result; return result;
} }
@ -541,8 +541,8 @@ public final class SealBattleProgressNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify other) { public Builder mergeFrom(emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify other) {
if (other == emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify.getDefaultInstance()) return this; if (other == emu.grasscutter.net.proto.SealBattleProgressNotifyOuterClass.SealBattleProgressNotify.getDefaultInstance()) return this;
if (other.getPDKCGAJOEPC() != 0) { if (other.getSealRadius() != 0) {
setPDKCGAJOEPC(other.getPDKCGAJOEPC()); setSealRadius(other.getSealRadius());
} }
if (other.getEndTime() != 0) { if (other.getEndTime() != 0) {
setEndTime(other.getEndTime()); setEndTime(other.getEndTime());
@ -553,8 +553,8 @@ public final class SealBattleProgressNotifyOuterClass {
if (other.getSealEntityId() != 0) { if (other.getSealEntityId() != 0) {
setSealEntityId(other.getSealEntityId()); setSealEntityId(other.getSealEntityId());
} }
if (other.getBAEKFBCJFJK() != 0) { if (other.getMaxProgress() != 0) {
setBAEKFBCJFJK(other.getBAEKFBCJFJK()); setMaxProgress(other.getMaxProgress());
} }
this.mergeUnknownFields(other.unknownFields); this.mergeUnknownFields(other.unknownFields);
onChanged(); onChanged();
@ -585,33 +585,33 @@ public final class SealBattleProgressNotifyOuterClass {
return this; return this;
} }
private int pDKCGAJOEPC_ ; private int sealRadius_ ;
/** /**
* <code>uint32 PDKCGAJOEPC = 8;</code> * <code>uint32 seal_radius = 8;</code>
* @return The pDKCGAJOEPC. * @return The sealRadius.
*/ */
@java.lang.Override @java.lang.Override
public int getPDKCGAJOEPC() { public int getSealRadius() {
return pDKCGAJOEPC_; return sealRadius_;
} }
/** /**
* <code>uint32 PDKCGAJOEPC = 8;</code> * <code>uint32 seal_radius = 8;</code>
* @param value The pDKCGAJOEPC to set. * @param value The sealRadius to set.
* @return This builder for chaining. * @return This builder for chaining.
*/ */
public Builder setPDKCGAJOEPC(int value) { public Builder setSealRadius(int value) {
pDKCGAJOEPC_ = value; sealRadius_ = value;
onChanged(); onChanged();
return this; return this;
} }
/** /**
* <code>uint32 PDKCGAJOEPC = 8;</code> * <code>uint32 seal_radius = 8;</code>
* @return This builder for chaining. * @return This builder for chaining.
*/ */
public Builder clearPDKCGAJOEPC() { public Builder clearSealRadius() {
pDKCGAJOEPC_ = 0; sealRadius_ = 0;
onChanged(); onChanged();
return this; return this;
} }
@ -709,33 +709,33 @@ public final class SealBattleProgressNotifyOuterClass {
return this; return this;
} }
private int bAEKFBCJFJK_ ; private int maxProgress_ ;
/** /**
* <code>uint32 BAEKFBCJFJK = 5;</code> * <code>uint32 max_progress = 5;</code>
* @return The bAEKFBCJFJK. * @return The maxProgress.
*/ */
@java.lang.Override @java.lang.Override
public int getBAEKFBCJFJK() { public int getMaxProgress() {
return bAEKFBCJFJK_; return maxProgress_;
} }
/** /**
* <code>uint32 BAEKFBCJFJK = 5;</code> * <code>uint32 max_progress = 5;</code>
* @param value The bAEKFBCJFJK to set. * @param value The maxProgress to set.
* @return This builder for chaining. * @return This builder for chaining.
*/ */
public Builder setBAEKFBCJFJK(int value) { public Builder setMaxProgress(int value) {
bAEKFBCJFJK_ = value; maxProgress_ = value;
onChanged(); onChanged();
return this; return this;
} }
/** /**
* <code>uint32 BAEKFBCJFJK = 5;</code> * <code>uint32 max_progress = 5;</code>
* @return This builder for chaining. * @return This builder for chaining.
*/ */
public Builder clearBAEKFBCJFJK() { public Builder clearMaxProgress() {
bAEKFBCJFJK_ = 0; maxProgress_ = 0;
onChanged(); onChanged();
return this; return this;
} }
@ -806,11 +806,12 @@ public final class SealBattleProgressNotifyOuterClass {
descriptor; descriptor;
static { static {
java.lang.String[] descriptorData = { java.lang.String[] descriptorData = {
"\n\036SealBattleProgressNotify.proto\"\200\001\n\030Sea" + "\n\036SealBattleProgressNotify.proto\"\201\001\n\030Sea" +
"lBattleProgressNotify\022\023\n\013PDKCGAJOEPC\030\010 \001" + "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" + "(\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 " + "\n\016seal_entity_id\030\016 \001(\r\022\024\n\014max_progress\030\005" +
"\001(\rB\033\n\031emu.grasscutter.net.protob\006proto3" " \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
"3"
}; };
descriptor = com.google.protobuf.Descriptors.FileDescriptor descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData, .internalBuildGeneratedFileFrom(descriptorData,
@ -821,7 +822,7 @@ public final class SealBattleProgressNotifyOuterClass {
internal_static_SealBattleProgressNotify_fieldAccessorTable = new internal_static_SealBattleProgressNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_SealBattleProgressNotify_descriptor, 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) // @@protoc_insertion_point(outer_class_scope)

4
src/main/java/emu/grasscutter/command/commands/InfoCommand.java
View File

@ -28,6 +28,7 @@ public final class InfoCommand implements CommandHandler {
var gameOptions = config.server.game; var gameOptions = config.server.game;
var questingEnabled = gameOptions.gameOptions.questing.enabled; var questingEnabled = gameOptions.gameOptions.questing.enabled;
var scriptsEnabled = gameOptions.enableScriptInBigWorld; var scriptsEnabled = gameOptions.enableScriptInBigWorld;
var fastRequire = config.server.fastRequire;
CommandHandler.sendMessage(sender, """ CommandHandler.sendMessage(sender, """
Created by Meledy Created by Meledy
@ -52,11 +53,12 @@ public final class InfoCommand implements CommandHandler {
Questing Enabled: %s Questing Enabled: %s
Scripts Enabled: %s Scripts Enabled: %s
Operating System: %s Operating System: %s
Using Fast Require: %s
Resource Information: %s Resource Information: %s
discord.gg/T5vZU6UyeG""" discord.gg/T5vZU6UyeG"""
.formatted( .formatted(
build, playerCount, questingEnabled, scriptsEnabled, build, playerCount, questingEnabled, scriptsEnabled, fastRequire,
System.getProperty("os.name"), resourceInfo.toString() System.getProperty("os.name"), resourceInfo.toString()
) )
); );

4
src/main/java/emu/grasscutter/config/ConfigContainer.java
View File

@ -29,9 +29,11 @@ public class ConfigContainer {
* Version 9 - 'limits' was added for handbook requests. * Version 9 - 'limits' was added for handbook requests.
* Version 10 - 'trialCostumes' was added for enabling costumes * Version 10 - 'trialCostumes' was added for enabling costumes
* on trial avatars. * 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() { private static int version() {
return 10; return 11;
} }
/** /**

22
src/main/java/emu/grasscutter/data/binout/AbilityModifier.java
View File

@ -3,12 +3,15 @@ package emu.grasscutter.data.binout;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
import emu.grasscutter.data.common.DynamicFloat; import emu.grasscutter.data.common.DynamicFloat;
import emu.grasscutter.game.props.ElementType; import emu.grasscutter.game.props.ElementType;
import java.io.Serializable;
import lombok.ToString; import lombok.ToString;
import java.io.Serializable;
public class AbilityModifier implements Serializable { public class AbilityModifier implements Serializable {
private static final long serialVersionUID = -2001232313615923575L; private static final long serialVersionUID = -2001232313615923575L;
public State state;
@SerializedName( @SerializedName(
value = "onAdded", value = "onAdded",
alternate = {"KCICDEJLIJD"}) alternate = {"KCICDEJLIJD"})
@ -341,13 +344,12 @@ public class AbilityModifier implements Serializable {
public int param2; public int param2;
public int param3; public int param3;
public String funcName;
public LuaCallType luaCallType; public LuaCallType luaCallType;
@SerializedName("CallParamList") @SerializedName("CallParamList")
public int[] callParamList; public int[] callParamList;
public String funcName;
public String content; public String content;
public enum LuaCallType { 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 // The following should be implemented into DynamicFloat if older resource formats need to be
// supported // supported
// public static class AbilityModifierValue { // public static class AbilityModifierValue {

10
src/main/java/emu/grasscutter/game/Account.java
View File

@ -1,14 +1,13 @@
package emu.grasscutter.game; package emu.grasscutter.game;
import static emu.grasscutter.config.Configuration.*;
import dev.morphia.annotations.*; import dev.morphia.annotations.*;
import emu.grasscutter.database.DatabaseHelper; import emu.grasscutter.database.DatabaseHelper;
import emu.grasscutter.utils.*; import emu.grasscutter.utils.*;
import org.bson.Document;
import java.util.*; import java.util.*;
import java.util.stream.Stream; import java.util.stream.Stream;
import org.bson.Document;
import static emu.grasscutter.config.Configuration.*;
@Entity(value = "accounts", useDiscriminator = false) @Entity(value = "accounts", useDiscriminator = false)
public class Account { public class Account {
@ -244,7 +243,6 @@ public class Account {
@Override @Override
public String toString() { public String toString() {
return "Account ID: %s; Username: %s" return "Account ID: %s; Username: %s".formatted(this.id, this.username);
.formatted(this.id, this.username);
} }
} }

2
src/main/java/emu/grasscutter/game/ability/actions/ActionHealHP.java
View File

@ -13,8 +13,6 @@ public final class ActionHealHP extends AbilityActionHandler {
@Override @Override
public boolean execute( public boolean execute(
Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity target) { Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity target) {
Grasscutter.getLogger().debug("Heal ability action executing 1");
var owner = ability.getOwner(); var owner = ability.getOwner();
// handle client gadgets, that the effective caster is the current local avatar // handle client gadgets, that the effective caster is the current local avatar
if (owner instanceof EntityClientGadget ownerGadget) { if (owner instanceof EntityClientGadget ownerGadget) {

9
src/main/java/emu/grasscutter/scripts/data/controller/EntityController.java
View File

@ -4,15 +4,12 @@ import emu.grasscutter.*;
import emu.grasscutter.game.entity.GameEntity; import emu.grasscutter.game.entity.GameEntity;
import emu.grasscutter.game.props.ElementType; import emu.grasscutter.game.props.ElementType;
import emu.grasscutter.scripts.*; import emu.grasscutter.scripts.*;
import java.util.Set;
import javax.script.*;
import org.luaj.vm2.*; import org.luaj.vm2.*;
import javax.script.*;
import java.util.Set;
public class EntityController { public class EntityController {
private static final Set<String> SERVER_CALLED = Set.of( private static final Set<String> SERVER_CALLED = Set.of("OnBeHurt", "OnDie", "OnTimer");
"OnBeHurt", "OnDie", "OnTimer"
);
private transient CompiledScript entityController; private transient CompiledScript entityController;
private transient Bindings entityControllerBindings; private transient Bindings entityControllerBindings;

3
src/main/java/emu/grasscutter/server/event/player/PlayerNpcTalkEvent.java
View File

@ -4,9 +4,8 @@ import emu.grasscutter.data.excels.TalkConfigData;
import emu.grasscutter.game.player.Player; import emu.grasscutter.game.player.Player;
import emu.grasscutter.server.event.Cancellable; import emu.grasscutter.server.event.Cancellable;
import emu.grasscutter.server.event.types.PlayerEvent; import emu.grasscutter.server.event.types.PlayerEvent;
import lombok.Getter;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import lombok.Getter;
@Getter @Getter
public final class PlayerNpcTalkEvent extends PlayerEvent implements Cancellable { public final class PlayerNpcTalkEvent extends PlayerEvent implements Cancellable {