Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-25 08:44:45 +00:00
Code Issues Projects Releases Wiki Activity

Run formatter & update protocol

Browse Source
This commit is contained in:
KingRainbow44 2023-08-31 23:46:55 -04:00
parent 541433c01b
commit e04df0526a
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
1175 changed files with 3512 additions and 5070 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

866
src/generated/main/java/emu/grasscutter/net/proto/AbilityFireworkBornTypeOuterClass.java
View File

File diff suppressed because it is too large Load Diff

44
src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaSetPoseParameterOuterClass.java
View File

@ -19,23 +19,23 @@ public final class AbilityMetaSetPoseParameterOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.AnimatorParameterValueInfoPair value = 15;</code>
* <code>.AnimatorParameterValueInfoPair value = 1;</code>
* @return Whether the value field is set.
*/
boolean hasValue();
/**
* <code>.AnimatorParameterValueInfoPair value = 15;</code>
* <code>.AnimatorParameterValueInfoPair value = 1;</code>
* @return The value.
*/
emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair getValue();
/**
* <code>.AnimatorParameterValueInfoPair value = 15;</code>
* <code>.AnimatorParameterValueInfoPair value = 1;</code>
*/
emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPairOrBuilder getValueOrBuilder();
}
/**
* <pre>
* Obf: FOHAAJOMMPL
* Obf: AFDPLNIIALH
* </pre>
*
* Protobuf type {@code AbilityMetaSetPoseParameter}
@ -82,7 +82,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
case 0:
done = true;
break;
case 122: {
case 10: {
emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.Builder subBuilder = null;
if (value_ != null) {
subBuilder = value_.toBuilder();
@ -127,10 +127,10 @@ public final class AbilityMetaSetPoseParameterOuterClass {
emu.grasscutter.net.proto.AbilityMetaSetPoseParameterOuterClass.AbilityMetaSetPoseParameter.class, emu.grasscutter.net.proto.AbilityMetaSetPoseParameterOuterClass.AbilityMetaSetPoseParameter.Builder.class);
}
public static final int VALUE_FIELD_NUMBER = 15;
public static final int VALUE_FIELD_NUMBER = 1;
private emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair value_;
/**
* <code>.AnimatorParameterValueInfoPair value = 15;</code>
* <code>.AnimatorParameterValueInfoPair value = 1;</code>
* @return Whether the value field is set.
*/
@java.lang.Override
@ -138,7 +138,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
return value_ != null;
}
/**
* <code>.AnimatorParameterValueInfoPair value = 15;</code>
* <code>.AnimatorParameterValueInfoPair value = 1;</code>
* @return The value.
*/
@java.lang.Override
@ -146,7 +146,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
return value_ == null ? emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.getDefaultInstance() : value_;
}
/**
* <code>.AnimatorParameterValueInfoPair value = 15;</code>
* <code>.AnimatorParameterValueInfoPair value = 1;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPairOrBuilder getValueOrBuilder() {
@ -168,7 +168,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (value_ != null) {
output.writeMessage(15, getValue());
output.writeMessage(1, getValue());
}
unknownFields.writeTo(output);
}
@ -181,7 +181,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
size = 0;
if (value_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(15, getValue());
.computeMessageSize(1, getValue());
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@ -315,7 +315,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
}
/**
* <pre>
* Obf: FOHAAJOMMPL
* Obf: AFDPLNIIALH
* </pre>
*
* Protobuf type {@code AbilityMetaSetPoseParameter}
@ -476,14 +476,14 @@ public final class AbilityMetaSetPoseParameterOuterClass {
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair, emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.Builder, emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPairOrBuilder> valueBuilder_;
/**
* <code>.AnimatorParameterValueInfoPair value = 15;</code>
* <code>.AnimatorParameterValueInfoPair value = 1;</code>
* @return Whether the value field is set.
*/
public boolean hasValue() {
return valueBuilder_ != null || value_ != null;
}
/**
* <code>.AnimatorParameterValueInfoPair value = 15;</code>
* <code>.AnimatorParameterValueInfoPair value = 1;</code>
* @return The value.
*/
public emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair getValue() {
@ -494,7 +494,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
}
}
/**
* <code>.AnimatorParameterValueInfoPair value = 15;</code>
* <code>.AnimatorParameterValueInfoPair value = 1;</code>
*/
public Builder setValue(emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair value) {
if (valueBuilder_ == null) {
@ -510,7 +510,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
return this;
}
/**
* <code>.AnimatorParameterValueInfoPair value = 15;</code>
* <code>.AnimatorParameterValueInfoPair value = 1;</code>
*/
public Builder setValue(
emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.Builder builderForValue) {
@ -524,7 +524,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
return this;
}
/**
* <code>.AnimatorParameterValueInfoPair value = 15;</code>
* <code>.AnimatorParameterValueInfoPair value = 1;</code>
*/
public Builder mergeValue(emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair value) {
if (valueBuilder_ == null) {
@ -542,7 +542,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
return this;
}
/**
* <code>.AnimatorParameterValueInfoPair value = 15;</code>
* <code>.AnimatorParameterValueInfoPair value = 1;</code>
*/
public Builder clearValue() {
if (valueBuilder_ == null) {
@ -556,7 +556,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
return this;
}
/**
* <code>.AnimatorParameterValueInfoPair value = 15;</code>
* <code>.AnimatorParameterValueInfoPair value = 1;</code>
*/
public emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.Builder getValueBuilder() {
@ -564,7 +564,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
return getValueFieldBuilder().getBuilder();
}
/**
* <code>.AnimatorParameterValueInfoPair value = 15;</code>
* <code>.AnimatorParameterValueInfoPair value = 1;</code>
*/
public emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPairOrBuilder getValueOrBuilder() {
if (valueBuilder_ != null) {
@ -575,7 +575,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
}
}
/**
* <code>.AnimatorParameterValueInfoPair value = 15;</code>
* <code>.AnimatorParameterValueInfoPair value = 1;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair, emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair.Builder, emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPairOrBuilder>
@ -659,7 +659,7 @@ public final class AbilityMetaSetPoseParameterOuterClass {
java.lang.String[] descriptorData = {
"\n!AbilityMetaSetPoseParameter.proto\032$Ani" +
"matorParameterValueInfoPair.proto\"M\n\033Abi" +
"lityMetaSetPoseParameter\022.\n\005value\030\017 \001(\0132" +
"lityMetaSetPoseParameter\022.\n\005value\030\001 \001(\0132" +
"\037.AnimatorParameterValueInfoPairB\033\n\031emu." +
"grasscutter.net.protob\006proto3"
};

28
src/generated/main/java/emu/grasscutter/net/proto/ActivityGetFriendGiftWishListReqOuterClass.java
View File

@ -19,15 +19,15 @@ public final class ActivityGetFriendGiftWishListReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 schedule_id = 6;</code>
* <code>uint32 schedule_id = 14;</code>
* @return The scheduleId.
*/
int getScheduleId();
}
/**
* <pre>
* CmdId: 8127
* Obf: KMIKAFFCKAL
* CmdId: 4453
* Obf: FKDKFJNGBMH
* </pre>
*
* Protobuf type {@code ActivityGetFriendGiftWishListReq}
@ -74,7 +74,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass {
case 0:
done = true;
break;
case 48: {
case 112: {
scheduleId_ = input.readUInt32();
break;
@ -111,10 +111,10 @@ public final class ActivityGetFriendGiftWishListReqOuterClass {
emu.grasscutter.net.proto.ActivityGetFriendGiftWishListReqOuterClass.ActivityGetFriendGiftWishListReq.class, emu.grasscutter.net.proto.ActivityGetFriendGiftWishListReqOuterClass.ActivityGetFriendGiftWishListReq.Builder.class);
}
public static final int SCHEDULE_ID_FIELD_NUMBER = 6;
public static final int SCHEDULE_ID_FIELD_NUMBER = 14;
private int scheduleId_;
/**
* <code>uint32 schedule_id = 6;</code>
* <code>uint32 schedule_id = 14;</code>
* @return The scheduleId.
*/
@java.lang.Override
@ -137,7 +137,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (scheduleId_ != 0) {
output.writeUInt32(6, scheduleId_);
output.writeUInt32(14, scheduleId_);
}
unknownFields.writeTo(output);
}
@ -150,7 +150,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass {
size = 0;
if (scheduleId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, scheduleId_);
.computeUInt32Size(14, scheduleId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@ -279,8 +279,8 @@ public final class ActivityGetFriendGiftWishListReqOuterClass {
}
/**
* <pre>
* CmdId: 8127
* Obf: KMIKAFFCKAL
* CmdId: 4453
* Obf: FKDKFJNGBMH
* </pre>
*
* Protobuf type {@code ActivityGetFriendGiftWishListReq}
@ -431,7 +431,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass {
private int scheduleId_ ;
/**
* <code>uint32 schedule_id = 6;</code>
* <code>uint32 schedule_id = 14;</code>
* @return The scheduleId.
*/
@java.lang.Override
@ -439,7 +439,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass {
return scheduleId_;
}
/**
* <code>uint32 schedule_id = 6;</code>
* <code>uint32 schedule_id = 14;</code>
* @param value The scheduleId to set.
* @return This builder for chaining.
*/
@ -450,7 +450,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass {
return this;
}
/**
* <code>uint32 schedule_id = 6;</code>
* <code>uint32 schedule_id = 14;</code>
* @return This builder for chaining.
*/
public Builder clearScheduleId() {
@ -528,7 +528,7 @@ public final class ActivityGetFriendGiftWishListReqOuterClass {
java.lang.String[] descriptorData = {
"\n&ActivityGetFriendGiftWishListReq.proto" +
"\"7\n ActivityGetFriendGiftWishListReq\022\023\n\013" +
"schedule_id\030\006 \001(\rB\033\n\031emu.grasscutter.net" +
"schedule_id\030\016 \001(\rB\033\n\031emu.grasscutter.net" +
".protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor

251
src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataOuterClass.java
View File

@ -31,29 +31,29 @@ public final class ForgeQueueDataOuterClass {
int getAvatarId();
/**
* <code>uint32 queue_id = 3;</code>
* @return The queueId.
*/
int getQueueId();
/**
* <code>uint32 finish_count = 14;</code>
* <code>uint32 finish_count = 3;</code>
* @return The finishCount.
*/
int getFinishCount();
/**
* <code>uint32 next_finish_timestamp = 11;</code>
* @return The nextFinishTimestamp.
* <code>uint32 queueId = 14;</code>
* @return The queueId.
*/
int getNextFinishTimestamp();
int getQueueId();
/**
* <code>uint32 unfinish_count = 4;</code>
* <code>uint32 unfinishCount = 11;</code>
* @return The unfinishCount.
*/
int getUnfinishCount();
/**
* <code>uint32 next_finish_timestamp = 4;</code>
* @return The nextFinishTimestamp.
*/
int getNextFinishTimestamp();
/**
* <code>uint32 forge_id = 15;</code>
* @return The forgeId.
@ -111,12 +111,12 @@ public final class ForgeQueueDataOuterClass {
break;
case 24: {
queueId_ = input.readUInt32();
finishCount_ = input.readUInt32();
break;
}
case 32: {
unfinishCount_ = input.readUInt32();
nextFinishTimestamp_ = input.readUInt32();
break;
}
case 64: {
@ -126,7 +126,7 @@ public final class ForgeQueueDataOuterClass {
}
case 88: {
nextFinishTimestamp_ = input.readUInt32();
unfinishCount_ = input.readUInt32();
break;
}
case 104: {
@ -136,7 +136,7 @@ public final class ForgeQueueDataOuterClass {
}
case 112: {
finishCount_ = input.readUInt32();
queueId_ = input.readUInt32();
break;
}
case 120: {
@ -198,21 +198,10 @@ public final class ForgeQueueDataOuterClass {
return avatarId_;
}
public static final int QUEUE_ID_FIELD_NUMBER = 3;
private int queueId_;
/**
* <code>uint32 queue_id = 3;</code>
* @return The queueId.
*/
@java.lang.Override
public int getQueueId() {
return queueId_;
}
public static final int FINISH_COUNT_FIELD_NUMBER = 14;
public static final int FINISH_COUNT_FIELD_NUMBER = 3;
private int finishCount_;
/**
* <code>uint32 finish_count = 14;</code>
* <code>uint32 finish_count = 3;</code>
* @return The finishCount.
*/
@java.lang.Override
@ -220,21 +209,21 @@ public final class ForgeQueueDataOuterClass {
return finishCount_;
}
public static final int NEXT_FINISH_TIMESTAMP_FIELD_NUMBER = 11;
private int nextFinishTimestamp_;
public static final int QUEUEID_FIELD_NUMBER = 14;
private int queueId_;
/**
* <code>uint32 next_finish_timestamp = 11;</code>
* @return The nextFinishTimestamp.
* <code>uint32 queueId = 14;</code>
* @return The queueId.
*/
@java.lang.Override
public int getNextFinishTimestamp() {
return nextFinishTimestamp_;
public int getQueueId() {
return queueId_;
}
public static final int UNFINISH_COUNT_FIELD_NUMBER = 4;
public static final int UNFINISHCOUNT_FIELD_NUMBER = 11;
private int unfinishCount_;
/**
* <code>uint32 unfinish_count = 4;</code>
* <code>uint32 unfinishCount = 11;</code>
* @return The unfinishCount.
*/
@java.lang.Override
@ -242,6 +231,17 @@ public final class ForgeQueueDataOuterClass {
return unfinishCount_;
}
public static final int NEXT_FINISH_TIMESTAMP_FIELD_NUMBER = 4;
private int nextFinishTimestamp_;
/**
* <code>uint32 next_finish_timestamp = 4;</code>
* @return The nextFinishTimestamp.
*/
@java.lang.Override
public int getNextFinishTimestamp() {
return nextFinishTimestamp_;
}
public static final int FORGE_ID_FIELD_NUMBER = 15;
private int forgeId_;
/**
@ -267,23 +267,23 @@ public final class ForgeQueueDataOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (queueId_ != 0) {
output.writeUInt32(3, queueId_);
if (finishCount_ != 0) {
output.writeUInt32(3, finishCount_);
}
if (unfinishCount_ != 0) {
output.writeUInt32(4, unfinishCount_);
if (nextFinishTimestamp_ != 0) {
output.writeUInt32(4, nextFinishTimestamp_);
}
if (avatarId_ != 0) {
output.writeUInt32(8, avatarId_);
}
if (nextFinishTimestamp_ != 0) {
output.writeUInt32(11, nextFinishTimestamp_);
if (unfinishCount_ != 0) {
output.writeUInt32(11, unfinishCount_);
}
if (totalFinishTimestamp_ != 0) {
output.writeUInt32(13, totalFinishTimestamp_);
}
if (finishCount_ != 0) {
output.writeUInt32(14, finishCount_);
if (queueId_ != 0) {
output.writeUInt32(14, queueId_);
}
if (forgeId_ != 0) {
output.writeUInt32(15, forgeId_);
@ -297,29 +297,29 @@ public final class ForgeQueueDataOuterClass {
if (size != -1) return size;
size = 0;
if (queueId_ != 0) {
if (finishCount_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, queueId_);
.computeUInt32Size(3, finishCount_);
}
if (unfinishCount_ != 0) {
if (nextFinishTimestamp_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(4, unfinishCount_);
.computeUInt32Size(4, nextFinishTimestamp_);
}
if (avatarId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(8, avatarId_);
}
if (nextFinishTimestamp_ != 0) {
if (unfinishCount_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, nextFinishTimestamp_);
.computeUInt32Size(11, unfinishCount_);
}
if (totalFinishTimestamp_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, totalFinishTimestamp_);
}
if (finishCount_ != 0) {
if (queueId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, finishCount_);
.computeUInt32Size(14, queueId_);
}
if (forgeId_ != 0) {
size += com.google.protobuf.CodedOutputStream
@ -344,14 +344,14 @@ public final class ForgeQueueDataOuterClass {
!= other.getTotalFinishTimestamp()) return false;
if (getAvatarId()
!= other.getAvatarId()) return false;
if (getQueueId()
!= other.getQueueId()) return false;
if (getFinishCount()
!= other.getFinishCount()) return false;
if (getNextFinishTimestamp()
!= other.getNextFinishTimestamp()) return false;
if (getQueueId()
!= other.getQueueId()) return false;
if (getUnfinishCount()
!= other.getUnfinishCount()) return false;
if (getNextFinishTimestamp()
!= other.getNextFinishTimestamp()) return false;
if (getForgeId()
!= other.getForgeId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
@ -369,14 +369,14 @@ public final class ForgeQueueDataOuterClass {
hash = (53 * hash) + getTotalFinishTimestamp();
hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
hash = (53 * hash) + getAvatarId();
hash = (37 * hash) + QUEUE_ID_FIELD_NUMBER;
hash = (53 * hash) + getQueueId();
hash = (37 * hash) + FINISH_COUNT_FIELD_NUMBER;
hash = (53 * hash) + getFinishCount();
hash = (37 * hash) + QUEUEID_FIELD_NUMBER;
hash = (53 * hash) + getQueueId();
hash = (37 * hash) + UNFINISHCOUNT_FIELD_NUMBER;
hash = (53 * hash) + getUnfinishCount();
hash = (37 * hash) + NEXT_FINISH_TIMESTAMP_FIELD_NUMBER;
hash = (53 * hash) + getNextFinishTimestamp();
hash = (37 * hash) + UNFINISH_COUNT_FIELD_NUMBER;
hash = (53 * hash) + getUnfinishCount();
hash = (37 * hash) + FORGE_ID_FIELD_NUMBER;
hash = (53 * hash) + getForgeId();
hash = (29 * hash) + unknownFields.hashCode();
@ -520,14 +520,14 @@ public final class ForgeQueueDataOuterClass {
avatarId_ = 0;
queueId_ = 0;
finishCount_ = 0;
nextFinishTimestamp_ = 0;
queueId_ = 0;
unfinishCount_ = 0;
nextFinishTimestamp_ = 0;
forgeId_ = 0;
return this;
@ -558,10 +558,10 @@ public final class ForgeQueueDataOuterClass {
emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData result = new emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData(this);
result.totalFinishTimestamp_ = totalFinishTimestamp_;
result.avatarId_ = avatarId_;
result.queueId_ = queueId_;
result.finishCount_ = finishCount_;
result.nextFinishTimestamp_ = nextFinishTimestamp_;
result.queueId_ = queueId_;
result.unfinishCount_ = unfinishCount_;
result.nextFinishTimestamp_ = nextFinishTimestamp_;
result.forgeId_ = forgeId_;
onBuilt();
return result;
@ -617,18 +617,18 @@ public final class ForgeQueueDataOuterClass {
if (other.getAvatarId() != 0) {
setAvatarId(other.getAvatarId());
}
if (other.getQueueId() != 0) {
setQueueId(other.getQueueId());
}
if (other.getFinishCount() != 0) {
setFinishCount(other.getFinishCount());
}
if (other.getNextFinishTimestamp() != 0) {
setNextFinishTimestamp(other.getNextFinishTimestamp());
if (other.getQueueId() != 0) {
setQueueId(other.getQueueId());
}
if (other.getUnfinishCount() != 0) {
setUnfinishCount(other.getUnfinishCount());
}
if (other.getNextFinishTimestamp() != 0) {
setNextFinishTimestamp(other.getNextFinishTimestamp());
}
if (other.getForgeId() != 0) {
setForgeId(other.getForgeId());
}
@ -723,40 +723,9 @@ public final class ForgeQueueDataOuterClass {
return this;
}
private int queueId_ ;
/**
* <code>uint32 queue_id = 3;</code>
* @return The queueId.
*/
@java.lang.Override
public int getQueueId() {
return queueId_;
}
/**
* <code>uint32 queue_id = 3;</code>
* @param value The queueId to set.
* @return This builder for chaining.
*/
public Builder setQueueId(int value) {
queueId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 queue_id = 3;</code>
* @return This builder for chaining.
*/
public Builder clearQueueId() {
queueId_ = 0;
onChanged();
return this;
}
private int finishCount_ ;
/**
* <code>uint32 finish_count = 14;</code>
* <code>uint32 finish_count = 3;</code>
* @return The finishCount.
*/
@java.lang.Override
@ -764,7 +733,7 @@ public final class ForgeQueueDataOuterClass {
return finishCount_;
}
/**
* <code>uint32 finish_count = 14;</code>
* <code>uint32 finish_count = 3;</code>
* @param value The finishCount to set.
* @return This builder for chaining.
*/
@ -775,7 +744,7 @@ public final class ForgeQueueDataOuterClass {
return this;
}
/**
* <code>uint32 finish_count = 14;</code>
* <code>uint32 finish_count = 3;</code>
* @return This builder for chaining.
*/
public Builder clearFinishCount() {
@ -785,40 +754,40 @@ public final class ForgeQueueDataOuterClass {
return this;
}
private int nextFinishTimestamp_ ;
private int queueId_ ;
/**
* <code>uint32 next_finish_timestamp = 11;</code>
* @return The nextFinishTimestamp.
* <code>uint32 queueId = 14;</code>
* @return The queueId.
*/
@java.lang.Override
public int getNextFinishTimestamp() {
return nextFinishTimestamp_;
public int getQueueId() {
return queueId_;
}
/**
* <code>uint32 next_finish_timestamp = 11;</code>
* @param value The nextFinishTimestamp to set.
* <code>uint32 queueId = 14;</code>
* @param value The queueId to set.
* @return This builder for chaining.
*/
public Builder setNextFinishTimestamp(int value) {
public Builder setQueueId(int value) {
nextFinishTimestamp_ = value;
queueId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 next_finish_timestamp = 11;</code>
* <code>uint32 queueId = 14;</code>
* @return This builder for chaining.
*/
public Builder clearNextFinishTimestamp() {
public Builder clearQueueId() {
nextFinishTimestamp_ = 0;
queueId_ = 0;
onChanged();
return this;
}
private int unfinishCount_ ;
/**
* <code>uint32 unfinish_count = 4;</code>
* <code>uint32 unfinishCount = 11;</code>
* @return The unfinishCount.
*/
@java.lang.Override
@ -826,7 +795,7 @@ public final class ForgeQueueDataOuterClass {
return unfinishCount_;
}
/**
* <code>uint32 unfinish_count = 4;</code>
* <code>uint32 unfinishCount = 11;</code>
* @param value The unfinishCount to set.
* @return This builder for chaining.
*/
@ -837,7 +806,7 @@ public final class ForgeQueueDataOuterClass {
return this;
}
/**
* <code>uint32 unfinish_count = 4;</code>
* <code>uint32 unfinishCount = 11;</code>
* @return This builder for chaining.
*/
public Builder clearUnfinishCount() {
@ -847,6 +816,37 @@ public final class ForgeQueueDataOuterClass {
return this;
}
private int nextFinishTimestamp_ ;
/**
* <code>uint32 next_finish_timestamp = 4;</code>
* @return The nextFinishTimestamp.
*/
@java.lang.Override
public int getNextFinishTimestamp() {
return nextFinishTimestamp_;
}
/**
* <code>uint32 next_finish_timestamp = 4;</code>
* @param value The nextFinishTimestamp to set.
* @return This builder for chaining.
*/
public Builder setNextFinishTimestamp(int value) {
nextFinishTimestamp_ = value;
onChanged();
return this;
}
/**
* <code>uint32 next_finish_timestamp = 4;</code>
* @return This builder for chaining.
*/
public Builder clearNextFinishTimestamp() {
nextFinishTimestamp_ = 0;
onChanged();
return this;
}
private int forgeId_ ;
/**
* <code>uint32 forge_id = 15;</code>
@ -944,13 +944,12 @@ public final class ForgeQueueDataOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\024ForgeQueueData.proto\"\264\001\n\016ForgeQueueDat" +
"\n\024ForgeQueueData.proto\"\262\001\n\016ForgeQueueDat" +
"a\022\036\n\026total_finish_timestamp\030\r \001(\r\022\021\n\tava" +
"tar_id\030\010 \001(\r\022\020\n\010queue_id\030\003 \001(\r\022\024\n\014finish" +
"_count\030\016 \001(\r\022\035\n\025next_finish_timestamp\030\013 " +
"\001(\r\022\026\n\016unfinish_count\030\004 \001(\r\022\020\n\010forge_id\030" +
"\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
"o3"
"tar_id\030\010 \001(\r\022\024\n\014finish_count\030\003 \001(\r\022\017\n\007qu" +
"eueId\030\016 \001(\r\022\025\n\runfinishCount\030\013 \001(\r\022\035\n\025ne" +
"xt_finish_timestamp\030\004 \001(\r\022\020\n\010forge_id\030\017 " +
"\001(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@ -961,7 +960,7 @@ public final class ForgeQueueDataOuterClass {
internal_static_ForgeQueueData_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_ForgeQueueData_descriptor,
new java.lang.String[] { "TotalFinishTimestamp", "AvatarId", "QueueId", "FinishCount", "NextFinishTimestamp", "UnfinishCount", "ForgeId", });
new java.lang.String[] { "TotalFinishTimestamp", "AvatarId", "FinishCount", "QueueId", "UnfinishCount", "NextFinishTimestamp", "ForgeId", });
}
// @@protoc_insertion_point(outer_class_scope)

706
src/generated/main/java/emu/grasscutter/net/proto/GetScenePointRspOuterClass.java
View File

File diff suppressed because it is too large Load Diff

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 {
/**
* <code>uint32 seal_max_progress = 10;</code>
* @return The sealMaxProgress.
* <code>uint32 CMPKIKADOJJ = 10;</code>
* @return The cMPKIKADOJJ.
*/
int getSealMaxProgress();
int getCMPKIKADOJJ();
/**
* <code>uint32 seal_radius = 11;</code>
* @return The sealRadius.
* <code>uint32 PDKCGAJOEPC = 11;</code>
* @return The pDKCGAJOEPC.
*/
int getSealRadius();
int getPDKCGAJOEPC();
/**
* <code>.SealBattleType battle_type = 3;</code>
@ -106,12 +106,12 @@ public final class SealBattleBeginNotifyOuterClass {
}
case 80: {
sealMaxProgress_ = input.readUInt32();
cMPKIKADOJJ_ = input.readUInt32();
break;
}
case 88: {
sealRadius_ = input.readUInt32();
pDKCGAJOEPC_ = 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 SEAL_MAX_PROGRESS_FIELD_NUMBER = 10;
private int sealMaxProgress_;
public static final int CMPKIKADOJJ_FIELD_NUMBER = 10;
private int cMPKIKADOJJ_;
/**
* <code>uint32 seal_max_progress = 10;</code>
* @return The sealMaxProgress.
* <code>uint32 CMPKIKADOJJ = 10;</code>
* @return The cMPKIKADOJJ.
*/
@java.lang.Override
public int getSealMaxProgress() {
return sealMaxProgress_;
public int getCMPKIKADOJJ() {
return cMPKIKADOJJ_;
}
public static final int SEAL_RADIUS_FIELD_NUMBER = 11;
private int sealRadius_;
public static final int PDKCGAJOEPC_FIELD_NUMBER = 11;
private int pDKCGAJOEPC_;
/**
* <code>uint32 seal_radius = 11;</code>
* @return The sealRadius.
* <code>uint32 PDKCGAJOEPC = 11;</code>
* @return The pDKCGAJOEPC.
*/
@java.lang.Override
public int getSealRadius() {
return sealRadius_;
public int getPDKCGAJOEPC() {
return pDKCGAJOEPC_;
}
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 (sealMaxProgress_ != 0) {
output.writeUInt32(10, sealMaxProgress_);
if (cMPKIKADOJJ_ != 0) {
output.writeUInt32(10, cMPKIKADOJJ_);
}
if (sealRadius_ != 0) {
output.writeUInt32(11, sealRadius_);
if (pDKCGAJOEPC_ != 0) {
output.writeUInt32(11, pDKCGAJOEPC_);
}
if (sealEntityId_ != 0) {
output.writeUInt32(12, sealEntityId_);
@ -242,13 +242,13 @@ public final class SealBattleBeginNotifyOuterClass {
size += com.google.protobuf.CodedOutputStream
.computeEnumSize(3, battleType_);
}
if (sealMaxProgress_ != 0) {
if (cMPKIKADOJJ_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, sealMaxProgress_);
.computeUInt32Size(10, cMPKIKADOJJ_);
}
if (sealRadius_ != 0) {
if (pDKCGAJOEPC_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, sealRadius_);
.computeUInt32Size(11, pDKCGAJOEPC_);
}
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 (getSealMaxProgress()
!= other.getSealMaxProgress()) return false;
if (getSealRadius()
!= other.getSealRadius()) return false;
if (getCMPKIKADOJJ()
!= other.getCMPKIKADOJJ()) return false;
if (getPDKCGAJOEPC()
!= other.getPDKCGAJOEPC()) 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) + SEAL_MAX_PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getSealMaxProgress();
hash = (37 * hash) + SEAL_RADIUS_FIELD_NUMBER;
hash = (53 * hash) + getSealRadius();
hash = (37 * hash) + CMPKIKADOJJ_FIELD_NUMBER;
hash = (53 * hash) + getCMPKIKADOJJ();
hash = (37 * hash) + PDKCGAJOEPC_FIELD_NUMBER;
hash = (53 * hash) + getPDKCGAJOEPC();
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();
sealMaxProgress_ = 0;
cMPKIKADOJJ_ = 0;
sealRadius_ = 0;
pDKCGAJOEPC_ = 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.sealMaxProgress_ = sealMaxProgress_;
result.sealRadius_ = sealRadius_;
result.cMPKIKADOJJ_ = cMPKIKADOJJ_;
result.pDKCGAJOEPC_ = pDKCGAJOEPC_;
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.getSealMaxProgress() != 0) {
setSealMaxProgress(other.getSealMaxProgress());
if (other.getCMPKIKADOJJ() != 0) {
setCMPKIKADOJJ(other.getCMPKIKADOJJ());
}
if (other.getSealRadius() != 0) {
setSealRadius(other.getSealRadius());
if (other.getPDKCGAJOEPC() != 0) {
setPDKCGAJOEPC(other.getPDKCGAJOEPC());
}
if (other.battleType_ != 0) {
setBattleTypeValue(other.getBattleTypeValue());
@ -560,64 +560,64 @@ public final class SealBattleBeginNotifyOuterClass {
return this;
}
private int sealMaxProgress_ ;
private int cMPKIKADOJJ_ ;
/**
* <code>uint32 seal_max_progress = 10;</code>
* @return The sealMaxProgress.
* <code>uint32 CMPKIKADOJJ = 10;</code>
* @return The cMPKIKADOJJ.
*/
@java.lang.Override
public int getSealMaxProgress() {
return sealMaxProgress_;
public int getCMPKIKADOJJ() {
return cMPKIKADOJJ_;
}
/**
* <code>uint32 seal_max_progress = 10;</code>
* @param value The sealMaxProgress to set.
* <code>uint32 CMPKIKADOJJ = 10;</code>
* @param value The cMPKIKADOJJ to set.
* @return This builder for chaining.
*/
public Builder setSealMaxProgress(int value) {
public Builder setCMPKIKADOJJ(int value) {
sealMaxProgress_ = value;
cMPKIKADOJJ_ = value;
onChanged();
return this;
}
/**
* <code>uint32 seal_max_progress = 10;</code>
* <code>uint32 CMPKIKADOJJ = 10;</code>
* @return This builder for chaining.
*/
public Builder clearSealMaxProgress() {
public Builder clearCMPKIKADOJJ() {
sealMaxProgress_ = 0;
cMPKIKADOJJ_ = 0;
onChanged();
return this;
}
private int sealRadius_ ;
private int pDKCGAJOEPC_ ;
/**
* <code>uint32 seal_radius = 11;</code>
* @return The sealRadius.
* <code>uint32 PDKCGAJOEPC = 11;</code>
* @return The pDKCGAJOEPC.
*/
@java.lang.Override
public int getSealRadius() {
return sealRadius_;
public int getPDKCGAJOEPC() {
return pDKCGAJOEPC_;
}
/**
* <code>uint32 seal_radius = 11;</code>
* @param value The sealRadius to set.
* <code>uint32 PDKCGAJOEPC = 11;</code>
* @param value The pDKCGAJOEPC to set.
* @return This builder for chaining.
*/
public Builder setSealRadius(int value) {
public Builder setPDKCGAJOEPC(int value) {
sealRadius_ = value;
pDKCGAJOEPC_ = value;
onChanged();
return this;
}
/**
* <code>uint32 seal_radius = 11;</code>
* <code>uint32 PDKCGAJOEPC = 11;</code>
* @return This builder for chaining.
*/
public Builder clearSealRadius() {
public Builder clearPDKCGAJOEPC() {
sealRadius_ = 0;
pDKCGAJOEPC_ = 0;
onChanged();
return this;
}
@ -774,11 +774,11 @@ public final class SealBattleBeginNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\033SealBattleBeginNotify.proto\032\024SealBattl" +
"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"
"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"
};
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[] { "SealMaxProgress", "SealRadius", "BattleType", "SealEntityId", });
new java.lang.String[] { "CMPKIKADOJJ", "PDKCGAJOEPC", "BattleType", "SealEntityId", });
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 {
/**
* <code>uint32 seal_radius = 8;</code>
* @return The sealRadius.
* <code>uint32 PDKCGAJOEPC = 8;</code>
* @return The pDKCGAJOEPC.
*/
int getSealRadius();
int getPDKCGAJOEPC();
/**
* <code>uint32 end_time = 2;</code>
@ -43,10 +43,10 @@ public final class SealBattleProgressNotifyOuterClass {
int getSealEntityId();
/**
* <code>uint32 max_progress = 5;</code>
* @return The maxProgress.
* <code>uint32 BAEKFBCJFJK = 5;</code>
* @return The bAEKFBCJFJK.
*/
int getMaxProgress();
int getBAEKFBCJFJK();
}
/**
* <pre>
@ -105,12 +105,12 @@ public final class SealBattleProgressNotifyOuterClass {
}
case 40: {
maxProgress_ = input.readUInt32();
bAEKFBCJFJK_ = input.readUInt32();
break;
}
case 64: {
sealRadius_ = input.readUInt32();
pDKCGAJOEPC_ = 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 SEAL_RADIUS_FIELD_NUMBER = 8;
private int sealRadius_;
public static final int PDKCGAJOEPC_FIELD_NUMBER = 8;
private int pDKCGAJOEPC_;
/**
* <code>uint32 seal_radius = 8;</code>
* @return The sealRadius.
* <code>uint32 PDKCGAJOEPC = 8;</code>
* @return The pDKCGAJOEPC.
*/
@java.lang.Override
public int getSealRadius() {
return sealRadius_;
public int getPDKCGAJOEPC() {
return pDKCGAJOEPC_;
}
public static final int END_TIME_FIELD_NUMBER = 2;
@ -199,15 +199,15 @@ public final class SealBattleProgressNotifyOuterClass {
return sealEntityId_;
}
public static final int MAX_PROGRESS_FIELD_NUMBER = 5;
private int maxProgress_;
public static final int BAEKFBCJFJK_FIELD_NUMBER = 5;
private int bAEKFBCJFJK_;
/**
* <code>uint32 max_progress = 5;</code>
* @return The maxProgress.
* <code>uint32 BAEKFBCJFJK = 5;</code>
* @return The bAEKFBCJFJK.
*/
@java.lang.Override
public int getMaxProgress() {
return maxProgress_;
public int getBAEKFBCJFJK() {
return bAEKFBCJFJK_;
}
private byte memoizedIsInitialized = -1;
@ -227,11 +227,11 @@ public final class SealBattleProgressNotifyOuterClass {
if (endTime_ != 0) {
output.writeUInt32(2, endTime_);
}
if (maxProgress_ != 0) {
output.writeUInt32(5, maxProgress_);
if (bAEKFBCJFJK_ != 0) {
output.writeUInt32(5, bAEKFBCJFJK_);
}
if (sealRadius_ != 0) {
output.writeUInt32(8, sealRadius_);
if (pDKCGAJOEPC_ != 0) {
output.writeUInt32(8, pDKCGAJOEPC_);
}
if (sealEntityId_ != 0) {
output.writeUInt32(14, sealEntityId_);
@ -252,13 +252,13 @@ public final class SealBattleProgressNotifyOuterClass {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(2, endTime_);
}
if (maxProgress_ != 0) {
if (bAEKFBCJFJK_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, maxProgress_);
.computeUInt32Size(5, bAEKFBCJFJK_);
}
if (sealRadius_ != 0) {
if (pDKCGAJOEPC_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(8, sealRadius_);
.computeUInt32Size(8, pDKCGAJOEPC_);
}
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 (getSealRadius()
!= other.getSealRadius()) return false;
if (getPDKCGAJOEPC()
!= other.getPDKCGAJOEPC()) return false;
if (getEndTime()
!= other.getEndTime()) return false;
if (getProgress()
!= other.getProgress()) return false;
if (getSealEntityId()
!= other.getSealEntityId()) return false;
if (getMaxProgress()
!= other.getMaxProgress()) return false;
if (getBAEKFBCJFJK()
!= other.getBAEKFBCJFJK()) 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) + SEAL_RADIUS_FIELD_NUMBER;
hash = (53 * hash) + getSealRadius();
hash = (37 * hash) + PDKCGAJOEPC_FIELD_NUMBER;
hash = (53 * hash) + getPDKCGAJOEPC();
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) + MAX_PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getMaxProgress();
hash = (37 * hash) + BAEKFBCJFJK_FIELD_NUMBER;
hash = (53 * hash) + getBAEKFBCJFJK();
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();
sealRadius_ = 0;
pDKCGAJOEPC_ = 0;
endTime_ = 0;
@ -460,7 +460,7 @@ public final class SealBattleProgressNotifyOuterClass {
sealEntityId_ = 0;
maxProgress_ = 0;
bAEKFBCJFJK_ = 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.sealRadius_ = sealRadius_;
result.pDKCGAJOEPC_ = pDKCGAJOEPC_;
result.endTime_ = endTime_;
result.progress_ = progress_;
result.sealEntityId_ = sealEntityId_;
result.maxProgress_ = maxProgress_;
result.bAEKFBCJFJK_ = bAEKFBCJFJK_;
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.getSealRadius() != 0) {
setSealRadius(other.getSealRadius());
if (other.getPDKCGAJOEPC() != 0) {
setPDKCGAJOEPC(other.getPDKCGAJOEPC());
}
if (other.getEndTime() != 0) {
setEndTime(other.getEndTime());
@ -553,8 +553,8 @@ public final class SealBattleProgressNotifyOuterClass {
if (other.getSealEntityId() != 0) {
setSealEntityId(other.getSealEntityId());
}
if (other.getMaxProgress() != 0) {
setMaxProgress(other.getMaxProgress());
if (other.getBAEKFBCJFJK() != 0) {
setBAEKFBCJFJK(other.getBAEKFBCJFJK());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@ -585,33 +585,33 @@ public final class SealBattleProgressNotifyOuterClass {
return this;
}
private int sealRadius_ ;
private int pDKCGAJOEPC_ ;
/**
* <code>uint32 seal_radius = 8;</code>
* @return The sealRadius.
* <code>uint32 PDKCGAJOEPC = 8;</code>
* @return The pDKCGAJOEPC.
*/
@java.lang.Override
public int getSealRadius() {
return sealRadius_;
public int getPDKCGAJOEPC() {
return pDKCGAJOEPC_;
}
/**
* <code>uint32 seal_radius = 8;</code>
* @param value The sealRadius to set.
* <code>uint32 PDKCGAJOEPC = 8;</code>
* @param value The pDKCGAJOEPC to set.
* @return This builder for chaining.
*/
public Builder setSealRadius(int value) {
public Builder setPDKCGAJOEPC(int value) {
sealRadius_ = value;
pDKCGAJOEPC_ = value;
onChanged();
return this;
}
/**
* <code>uint32 seal_radius = 8;</code>
* <code>uint32 PDKCGAJOEPC = 8;</code>
* @return This builder for chaining.
*/
public Builder clearSealRadius() {
public Builder clearPDKCGAJOEPC() {
sealRadius_ = 0;
pDKCGAJOEPC_ = 0;
onChanged();
return this;
}
@ -709,33 +709,33 @@ public final class SealBattleProgressNotifyOuterClass {
return this;
}
private int maxProgress_ ;
private int bAEKFBCJFJK_ ;
/**
* <code>uint32 max_progress = 5;</code>
* @return The maxProgress.
* <code>uint32 BAEKFBCJFJK = 5;</code>
* @return The bAEKFBCJFJK.
*/
@java.lang.Override
public int getMaxProgress() {
return maxProgress_;
public int getBAEKFBCJFJK() {
return bAEKFBCJFJK_;
}
/**
* <code>uint32 max_progress = 5;</code>
* @param value The maxProgress to set.
* <code>uint32 BAEKFBCJFJK = 5;</code>
* @param value The bAEKFBCJFJK to set.
* @return This builder for chaining.
*/
public Builder setMaxProgress(int value) {
public Builder setBAEKFBCJFJK(int value) {
maxProgress_ = value;
bAEKFBCJFJK_ = value;
onChanged();
return this;
}
/**
* <code>uint32 max_progress = 5;</code>
* <code>uint32 BAEKFBCJFJK = 5;</code>
* @return This builder for chaining.
*/
public Builder clearMaxProgress() {
public Builder clearBAEKFBCJFJK() {
maxProgress_ = 0;
bAEKFBCJFJK_ = 0;
onChanged();
return this;
}
@ -806,12 +806,11 @@ public final class SealBattleProgressNotifyOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\036SealBattleProgressNotify.proto\"\201\001\n\030Sea" +
"lBattleProgressNotify\022\023\n\013seal_radius\030\010 \001" +
"\n\036SealBattleProgressNotify.proto\"\200\001\n\030Sea" +
"lBattleProgressNotify\022\023\n\013PDKCGAJOEPC\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\024\n\014max_progress\030\005" +
" \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
"3"
"\n\016seal_entity_id\030\016 \001(\r\022\023\n\013BAEKFBCJFJK\030\005 " +
"\001(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@ -822,7 +821,7 @@ public final class SealBattleProgressNotifyOuterClass {
internal_static_SealBattleProgressNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_SealBattleProgressNotify_descriptor,
new java.lang.String[] { "SealRadius", "EndTime", "Progress", "SealEntityId", "MaxProgress", });
new java.lang.String[] { "PDKCGAJOEPC", "EndTime", "Progress", "SealEntityId", "BAEKFBCJFJK", });
}
// @@protoc_insertion_point(outer_class_scope)

5
src/main/java/emu/grasscutter/auth/AuthenticationSystem.java
View File

@ -4,10 +4,9 @@ import emu.grasscutter.game.Account;
import emu.grasscutter.server.http.objects.*;
import emu.grasscutter.utils.DispatchUtils;
import io.javalin.http.Context;
import lombok.*;
import javax.annotation.Nullable;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
/** Defines an authenticator for the server. Can be changed by plugins. */
public interface AuthenticationSystem {

3
src/main/java/emu/grasscutter/auth/Authenticator.java
View File

@ -1,7 +1,6 @@
package emu.grasscutter.auth;
import emu.grasscutter.server.http.objects.ComboTokenResJson;
import emu.grasscutter.server.http.objects.LoginResultJson;
import emu.grasscutter.server.http.objects.*;
/**
* Handles username/password authentication from the client.

9
src/main/java/emu/grasscutter/auth/DefaultAuthentication.java
View File

@ -1,13 +1,12 @@
package emu.grasscutter.auth;
import static emu.grasscutter.config.Configuration.ACCOUNT;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.auth.DefaultAuthenticators.*;
import emu.grasscutter.game.Account;
import emu.grasscutter.server.http.objects.ComboTokenResJson;
import emu.grasscutter.server.http.objects.LoginResultJson;
import emu.grasscutter.server.http.objects.*;
import static emu.grasscutter.config.Configuration.ACCOUNT;
import static emu.grasscutter.utils.lang.Language.translate;
/**
* The default Grasscutter authentication implementation. Allows all users to access any account.

9
src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java
View File

@ -1,8 +1,5 @@
package emu.grasscutter.auth;
import static emu.grasscutter.config.Configuration.ACCOUNT;
import static emu.grasscutter.utils.lang.Language.translate;
import at.favre.lib.crypto.bcrypt.BCrypt;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.Grasscutter.ServerRunMode;
@ -13,12 +10,16 @@ import emu.grasscutter.server.dispatch.*;
import emu.grasscutter.server.http.objects.*;
import emu.grasscutter.utils.*;
import io.javalin.http.ContentType;
import javax.crypto.Cipher;
import java.nio.charset.StandardCharsets;
import java.security.KeyFactory;
import java.security.interfaces.RSAPrivateKey;
import java.security.spec.PKCS8EncodedKeySpec;
import java.util.concurrent.*;
import javax.crypto.Cipher;
import static emu.grasscutter.config.Configuration.ACCOUNT;
import static emu.grasscutter.utils.lang.Language.translate;
/** A class containing default authenticators. */
public final class DefaultAuthenticators {

3
src/main/java/emu/grasscutter/auth/HandbookAuthenticator.java
View File

@ -1,8 +1,7 @@
package emu.grasscutter.auth;
import emu.grasscutter.auth.AuthenticationSystem.AuthenticationRequest;
import lombok.Builder;
import lombok.Getter;
import lombok.*;
/** Handles player authentication for the web GM handbook. */
public interface HandbookAuthenticator {

3
src/main/java/emu/grasscutter/command/Command.java
View File

@ -1,7 +1,6 @@
package emu.grasscutter.command;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.*;
@Retention(RetentionPolicy.RUNTIME)
public @interface Command {

8
src/main/java/emu/grasscutter/command/CommandHandler.java
View File

@ -1,12 +1,12 @@
package emu.grasscutter.command;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.server.event.game.ReceiveCommandFeedbackEvent;
import java.util.List;
import java.util.StringJoiner;
import java.util.*;
import static emu.grasscutter.utils.lang.Language.translate;
public interface CommandHandler {

8
src/main/java/emu/grasscutter/command/CommandHelpers.java
View File

@ -1,11 +1,9 @@
package emu.grasscutter.command;
import java.util.List;
import java.util.Map;
import java.util.function.BiConsumer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.annotation.Nonnull;
import java.util.*;
import java.util.function.BiConsumer;
import java.util.regex.*;
public class CommandHelpers {
public static final Pattern lvlRegex =

5
src/main/java/emu/grasscutter/command/commands/AccountCommand.java
View File

@ -1,7 +1,5 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import at.favre.lib.crypto.bcrypt.BCrypt;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.*;
@ -9,9 +7,12 @@ import emu.grasscutter.config.Configuration;
import emu.grasscutter.database.*;
import emu.grasscutter.game.Account;
import emu.grasscutter.game.player.Player;
import java.util.List;
import java.util.stream.Collectors;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "account",
usage = {

10
src/main/java/emu/grasscutter/command/commands/AchievementCommand.java
View File

@ -1,14 +1,12 @@
package emu.grasscutter.command.commands;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.excels.achievement.AchievementData;
import emu.grasscutter.game.achievement.AchievementControlReturns;
import emu.grasscutter.game.achievement.Achievements;
import emu.grasscutter.game.achievement.*;
import emu.grasscutter.game.player.Player;
import java.util.List;
import java.util.Optional;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
@Command(

12
src/main/java/emu/grasscutter/command/commands/AnnounceCommand.java
View File

@ -1,15 +1,13 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.server.packet.send.PacketServerAnnounceNotify;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import java.util.*;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "announce",

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

@ -1,10 +1,10 @@
package emu.grasscutter.command.commands;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.Account;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.server.game.GameSession;
import java.util.List;
@Command(

17
src/main/java/emu/grasscutter/command/commands/ClearCommand.java
View File

@ -1,19 +1,16 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.command.CommandHelpers.*;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.game.inventory.GameItem;
import emu.grasscutter.game.inventory.Inventory;
import emu.grasscutter.game.inventory.ItemType;
import emu.grasscutter.command.*;
import emu.grasscutter.game.inventory.*;
import emu.grasscutter.game.player.Player;
import java.util.List;
import java.util.Map;
import lombok.Setter;
import java.util.*;
import java.util.function.BiConsumer;
import java.util.regex.Pattern;
import java.util.stream.Stream;
import lombok.Setter;
import static emu.grasscutter.command.CommandHelpers.*;
@Command(
label = "clear",

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

@ -1,9 +1,9 @@
package emu.grasscutter.command.commands;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.player.Player;
import java.util.List;
@Command(

6
src/main/java/emu/grasscutter/command/commands/CutsceneCommand.java
View File

@ -1,12 +1,12 @@
package emu.grasscutter.command.commands;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.server.packet.send.PacketCutsceneBeginNotify;
import java.util.List;
import lombok.val;
import java.util.List;
@Command(
label = "cutscene",
aliases = {"c"},

1
src/main/java/emu/grasscutter/command/commands/DebugCommand.java
View File

@ -3,6 +3,7 @@ package emu.grasscutter.command.commands;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.*;
import emu.grasscutter.game.player.Player;
import java.util.List;
@Command(

8
src/main/java/emu/grasscutter/command/commands/EnterDungeonCommand.java
View File

@ -1,12 +1,12 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.player.Player;
import java.util.List;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "enter_dungeon",
aliases = {"enterdungeon", "dungeon"},

19
src/main/java/emu/grasscutter/command/commands/EntityCommand.java
View File

@ -1,23 +1,20 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.command.CommandHelpers.*;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.entity.*;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.ElementType;
import emu.grasscutter.game.props.FightProperty;
import emu.grasscutter.game.props.*;
import emu.grasscutter.game.world.Scene;
import emu.grasscutter.server.event.entity.EntityDamageEvent;
import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import lombok.Setter;
import java.util.*;
import java.util.function.BiConsumer;
import java.util.regex.Pattern;
import lombok.Setter;
import static emu.grasscutter.command.CommandHelpers.*;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "entity",

36
src/main/java/emu/grasscutter/command/commands/GiveCommand.java
View File

@ -1,29 +1,23 @@
package emu.grasscutter.command.commands;
import emu.grasscutter.command.*;
import emu.grasscutter.data.*;
import emu.grasscutter.data.excels.ItemData;
import emu.grasscutter.data.excels.avatar.AvatarData;
import emu.grasscutter.data.excels.reliquary.*;
import emu.grasscutter.game.avatar.Avatar;
import emu.grasscutter.game.inventory.*;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.*;
import lombok.Setter;
import java.util.*;
import java.util.function.BiConsumer;
import java.util.regex.Pattern;
import static emu.grasscutter.GameConstants.*;
import static emu.grasscutter.command.CommandHelpers.*;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.GameDepot;
import emu.grasscutter.data.excels.ItemData;
import emu.grasscutter.data.excels.avatar.AvatarData;
import emu.grasscutter.data.excels.reliquary.ReliquaryAffixData;
import emu.grasscutter.data.excels.reliquary.ReliquaryMainPropData;
import emu.grasscutter.game.avatar.Avatar;
import emu.grasscutter.game.inventory.GameItem;
import emu.grasscutter.game.inventory.ItemType;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.ActionReason;
import emu.grasscutter.game.props.FightProperty;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.function.BiConsumer;
import java.util.regex.Pattern;
import lombok.Setter;
@Command(
label = "give",
aliases = {"g", "item", "giveitem"},

8
src/main/java/emu/grasscutter/command/commands/GroupCommand.java
View File

@ -1,13 +1,13 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.world.SceneGroupInstance;
import java.util.List;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "group",
aliases = {"gr"},

11
src/main/java/emu/grasscutter/command/commands/HealCommand.java
View File

@ -1,15 +1,14 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.FightProperty;
import emu.grasscutter.server.packet.send.PacketAvatarFightPropUpdateNotify;
import emu.grasscutter.server.packet.send.PacketAvatarLifeStateChangeNotify;
import emu.grasscutter.server.packet.send.*;
import java.util.List;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "heal",
aliases = {"h"},

12
src/main/java/emu/grasscutter/command/commands/HelpCommand.java
View File

@ -1,14 +1,12 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.CommandMap;
import emu.grasscutter.command.*;
import emu.grasscutter.game.Account;
import emu.grasscutter.game.player.Player;
import java.util.ArrayList;
import java.util.List;
import java.util.*;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "help",

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

@ -1,9 +1,7 @@
package emu.grasscutter.command.commands;
import emu.grasscutter.BuildConfig;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.*;
import emu.grasscutter.command.*;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.tools.Tools;

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

@ -1,8 +1,8 @@
package emu.grasscutter.command.commands;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.player.Player;
import java.util.List;
@Command(

11
src/main/java/emu/grasscutter/command/commands/KillAllCommand.java
View File

@ -1,15 +1,14 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.game.entity.EntityMonster;
import emu.grasscutter.game.entity.GameEntity;
import emu.grasscutter.command.*;
import emu.grasscutter.game.entity.*;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.world.Scene;
import java.util.List;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "killall",
usage = {"[<sceneId>]"},

14
src/main/java/emu/grasscutter/command/commands/KillCharacterCommand.java
View File

@ -1,17 +1,15 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.entity.EntityAvatar;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.FightProperty;
import emu.grasscutter.game.props.LifeState;
import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
import emu.grasscutter.server.packet.send.PacketLifeStateChangeNotify;
import emu.grasscutter.game.props.*;
import emu.grasscutter.server.packet.send.*;
import java.util.List;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "killCharacter",
aliases = {"suicide", "kill"},

11
src/main/java/emu/grasscutter/command/commands/LanguageCommand.java
View File

@ -1,14 +1,13 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.utils.Utils;
import java.util.List;
import java.util.Locale;
import java.util.*;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "language",

11
src/main/java/emu/grasscutter/command/commands/ListCommand.java
View File

@ -1,13 +1,12 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.player.Player;
import java.util.List;
import java.util.Map;
import java.util.*;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "list",

8
src/main/java/emu/grasscutter/command/commands/PermissionCommand.java
View File

@ -1,15 +1,15 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.*;
import emu.grasscutter.command.Command.TargetRequirement;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.game.Account;
import emu.grasscutter.game.player.Player;
import java.util.List;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "permission",
usage = {"add <permission>", "remove <permission>", "clear", "list"},

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

@ -1,9 +1,9 @@
package emu.grasscutter.command.commands;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.world.Position;
import java.util.List;
@Command(

5
src/main/java/emu/grasscutter/command/commands/QuestCommand.java
View File

@ -1,14 +1,15 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.*;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.quest.GameQuest;
import emu.grasscutter.game.quest.enums.*;
import java.util.*;
import java.util.stream.Collectors;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "quest",
aliases = {"q"},

8
src/main/java/emu/grasscutter/command/commands/ReloadCommand.java
View File

@ -1,13 +1,13 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.player.Player;
import java.util.List;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "reload",
permission = "server.reload",

8
src/main/java/emu/grasscutter/command/commands/ResetConstCommand.java
View File

@ -1,14 +1,14 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.avatar.Avatar;
import emu.grasscutter.game.entity.EntityAvatar;
import emu.grasscutter.game.player.Player;
import java.util.List;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "resetConst",
aliases = {"resetconstellation"},

8
src/main/java/emu/grasscutter/command/commands/ResetShopLimitCommand.java
View File

@ -1,12 +1,12 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.player.Player;
import java.util.List;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "resetShopLimit",
aliases = {"resetshop"},

12
src/main/java/emu/grasscutter/command/commands/SendMailCommand.java
View File

@ -1,16 +1,14 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.database.DatabaseHelper;
import emu.grasscutter.game.mail.Mail;
import emu.grasscutter.game.player.Player;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
import java.util.*;
import static emu.grasscutter.utils.lang.Language.translate;
@SuppressWarnings("ConstantConditions")
@Command(

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

@ -1,10 +1,10 @@
package emu.grasscutter.command.commands;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.*;
import emu.grasscutter.command.Command.TargetRequirement;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.game.player.Player;
import java.util.List;
@Command(

8
src/main/java/emu/grasscutter/command/commands/SetConstCommand.java
View File

@ -1,14 +1,12 @@
package emu.grasscutter.command.commands;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.avatar.Avatar;
import emu.grasscutter.game.entity.EntityAvatar;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.world.Position;
import emu.grasscutter.game.world.Scene;
import emu.grasscutter.game.world.World;
import emu.grasscutter.game.world.*;
import emu.grasscutter.server.packet.send.PacketSceneEntityAppearNotify;
import java.util.List;
@Command(

8
src/main/java/emu/grasscutter/command/commands/SetFetterLevelCommand.java
View File

@ -1,15 +1,15 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.data.GameData;
import emu.grasscutter.game.avatar.Avatar;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.server.packet.send.PacketAvatarFetterDataNotify;
import java.util.List;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "setFetterLevel",
usage = {"<level>"},

12
src/main/java/emu/grasscutter/command/commands/SetPropCommand.java
View File

@ -1,17 +1,13 @@
package emu.grasscutter.command.commands;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.data.GameData;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.PlayerProperty;
import emu.grasscutter.game.tower.TowerLevelRecord;
import emu.grasscutter.server.packet.send.PacketOpenStateChangeNotify;
import emu.grasscutter.server.packet.send.PacketSceneAreaUnlockNotify;
import emu.grasscutter.server.packet.send.PacketScenePointUnlockNotify;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import emu.grasscutter.server.packet.send.*;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.stream.IntStream;

8
src/main/java/emu/grasscutter/command/commands/SetStatsCommand.java
View File

@ -1,15 +1,13 @@
package emu.grasscutter.command.commands;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.avatar.Avatar;
import emu.grasscutter.game.entity.EntityAvatar;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.FightProperty;
import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
@Command(
label = "setStats",

10
src/main/java/emu/grasscutter/command/commands/SoundCommand.java
View File

@ -1,15 +1,15 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.world.Position;
import emu.grasscutter.server.packet.send.PacketScenePlayerSoundNotify;
import java.util.List;
import lombok.val;
import java.util.List;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "sound",
aliases = {"audio"},

32
src/main/java/emu/grasscutter/command/commands/SpawnCommand.java
View File

@ -1,27 +1,23 @@
package emu.grasscutter.command.commands;
import emu.grasscutter.command.*;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.excels.*;
import emu.grasscutter.data.excels.monster.MonsterData;
import emu.grasscutter.game.entity.*;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.*;
import emu.grasscutter.game.world.*;
import lombok.Setter;
import java.util.*;
import java.util.function.BiConsumer;
import java.util.regex.Pattern;
import static emu.grasscutter.command.CommandHelpers.*;
import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.excels.GadgetData;
import emu.grasscutter.data.excels.ItemData;
import emu.grasscutter.data.excels.monster.MonsterData;
import emu.grasscutter.game.entity.*;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.EntityType;
import emu.grasscutter.game.props.FightProperty;
import emu.grasscutter.game.world.Position;
import emu.grasscutter.game.world.Scene;
import java.util.List;
import java.util.Map;
import java.util.function.BiConsumer;
import java.util.regex.Pattern;
import lombok.Setter;
@Command(
label = "spawn",
aliases = {"drop", "s"},

8
src/main/java/emu/grasscutter/command/commands/StopCommand.java
View File

@ -1,13 +1,13 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.player.Player;
import java.util.List;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "stop",
aliases = {"shutdown"},

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

@ -1,12 +1,12 @@
package emu.grasscutter.command.commands;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.excels.avatar.AvatarSkillDepotData;
import emu.grasscutter.game.avatar.Avatar;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.utils.lang.Language;
import java.util.List;
@Command(

12
src/main/java/emu/grasscutter/command/commands/TeamCommand.java
View File

@ -1,14 +1,12 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.server.packet.send.PacketChangeMpTeamAvatarRsp;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.*;
import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
@Command(
label = "team",

8
src/main/java/emu/grasscutter/command/commands/TeleportAllCommand.java
View File

@ -1,13 +1,13 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType;
import java.util.List;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "teleportAll",
aliases = {"tpall"},

8
src/main/java/emu/grasscutter/command/commands/TeleportCommand.java
View File

@ -1,14 +1,14 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.world.Position;
import emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType;
import java.util.List;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "teleport",
aliases = {"tp"},

11
src/main/java/emu/grasscutter/command/commands/TrialAvatarActivityCommand.java
View File

@ -1,17 +1,16 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.game.activity.trialavatar.TrialAvatarActivityHandler;
import emu.grasscutter.game.activity.trialavatar.TrialAvatarPlayerData;
import emu.grasscutter.command.*;
import emu.grasscutter.game.activity.trialavatar.*;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.ActivityType;
import emu.grasscutter.server.packet.send.PacketActivityInfoNotify;
import emu.grasscutter.utils.JsonUtils;
import java.util.List;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "trialAvatarActivity",
aliases = {"taa"},

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

@ -1,9 +1,9 @@
package emu.grasscutter.command.commands;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.Account;
import emu.grasscutter.game.player.Player;
import java.util.List;
@Command(

15
src/main/java/emu/grasscutter/command/commands/UnlockAllCommand.java
View File

@ -1,16 +1,13 @@
package emu.grasscutter.command.commands;
import static emu.grasscutter.utils.lang.Language.translate;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.data.GameData;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.player.PlayerProgressManager;
import emu.grasscutter.game.player.*;
import emu.grasscutter.server.packet.send.PacketOpenStateChangeNotify;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import static emu.grasscutter.utils.lang.Language.translate;
@Command(
label = "unlockall",

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

@ -1,9 +1,9 @@
package emu.grasscutter.command.commands;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.command.*;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.ClimateType;
import java.util.List;
@Command(

47
src/main/java/emu/grasscutter/data/GameData.java
View File

@ -4,53 +4,30 @@ import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.binout.*;
import emu.grasscutter.data.binout.config.*;
import emu.grasscutter.data.binout.routes.Route;
import emu.grasscutter.data.custom.TrialAvatarActivityCustomData;
import emu.grasscutter.data.custom.TrialAvatarCustomData;
import emu.grasscutter.data.custom.*;
import emu.grasscutter.data.excels.*;
import emu.grasscutter.data.excels.achievement.AchievementData;
import emu.grasscutter.data.excels.achievement.AchievementGoalData;
import emu.grasscutter.data.excels.activity.ActivityCondExcelConfigData;
import emu.grasscutter.data.excels.activity.ActivityData;
import emu.grasscutter.data.excels.activity.ActivityShopData;
import emu.grasscutter.data.excels.activity.ActivityWatcherData;
import emu.grasscutter.data.excels.achievement.*;
import emu.grasscutter.data.excels.activity.*;
import emu.grasscutter.data.excels.avatar.*;
import emu.grasscutter.data.excels.codex.*;
import emu.grasscutter.data.excels.dungeon.*;
import emu.grasscutter.data.excels.giving.GivingData;
import emu.grasscutter.data.excels.giving.GivingGroupData;
import emu.grasscutter.data.excels.monster.MonsterCurveData;
import emu.grasscutter.data.excels.monster.MonsterData;
import emu.grasscutter.data.excels.monster.MonsterDescribeData;
import emu.grasscutter.data.excels.monster.MonsterSpecialNameData;
import emu.grasscutter.data.excels.quest.QuestData;
import emu.grasscutter.data.excels.quest.QuestGlobalVarData;
import emu.grasscutter.data.excels.reliquary.ReliquaryAffixData;
import emu.grasscutter.data.excels.reliquary.ReliquaryLevelData;
import emu.grasscutter.data.excels.reliquary.ReliquaryMainPropData;
import emu.grasscutter.data.excels.reliquary.ReliquarySetData;
import emu.grasscutter.data.excels.giving.*;
import emu.grasscutter.data.excels.monster.*;
import emu.grasscutter.data.excels.quest.*;
import emu.grasscutter.data.excels.reliquary.*;
import emu.grasscutter.data.excels.scene.*;
import emu.grasscutter.data.excels.tower.TowerFloorData;
import emu.grasscutter.data.excels.tower.TowerLevelData;
import emu.grasscutter.data.excels.tower.TowerScheduleData;
import emu.grasscutter.data.excels.tower.*;
import emu.grasscutter.data.excels.trial.*;
import emu.grasscutter.data.excels.weapon.WeaponCurveData;
import emu.grasscutter.data.excels.weapon.WeaponLevelData;
import emu.grasscutter.data.excels.weapon.WeaponPromoteData;
import emu.grasscutter.data.excels.world.WeatherData;
import emu.grasscutter.data.excels.world.WorldAreaData;
import emu.grasscutter.data.excels.world.WorldLevelData;
import emu.grasscutter.data.excels.weapon.*;
import emu.grasscutter.data.excels.world.*;
import emu.grasscutter.data.server.*;
import emu.grasscutter.game.dungeons.DungeonDropEntry;
import emu.grasscutter.game.quest.QuestEncryptionKey;
import emu.grasscutter.game.quest.RewindData;
import emu.grasscutter.game.quest.TeleportData;
import emu.grasscutter.game.quest.*;
import emu.grasscutter.game.quest.enums.QuestCond;
import emu.grasscutter.game.world.GroupReplacementData;
import emu.grasscutter.utils.Utils;
import it.unimi.dsi.fastutil.ints.*;
import lombok.Getter;
import lombok.Setter;
import lombok.val;
import lombok.*;
import javax.annotation.Nullable;
import java.lang.reflect.Field;

15
src/main/java/emu/grasscutter/data/GameDepot.java
View File

@ -2,19 +2,14 @@ package emu.grasscutter.data;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.ResourceLoader.AvatarConfig;
import emu.grasscutter.data.excels.reliquary.ReliquaryAffixData;
import emu.grasscutter.data.excels.reliquary.ReliquaryMainPropData;
import emu.grasscutter.data.excels.reliquary.*;
import emu.grasscutter.game.managers.blossom.BlossomConfig;
import emu.grasscutter.game.world.SpawnDataEntry;
import emu.grasscutter.utils.objects.WeightedList;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import lombok.Getter;
import lombok.Setter;
import it.unimi.dsi.fastutil.ints.*;
import lombok.*;
import java.util.*;
public class GameDepot {
public static final int[] BLOCK_SIZE = new int[] {50, 500}; // Scales

3
src/main/java/emu/grasscutter/data/ResourceType.java
View File

@ -1,7 +1,6 @@
package emu.grasscutter.data;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.*;
import java.util.List;
import java.util.stream.Stream;

4
src/main/java/emu/grasscutter/data/binout/AbilityData.java
View File

@ -3,8 +3,8 @@ package emu.grasscutter.data.binout;
import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
import emu.grasscutter.game.ability.AbilityLocalIdGenerator;
import emu.grasscutter.game.ability.AbilityLocalIdGenerator.ConfigAbilitySubContainerType;
import java.util.HashMap;
import java.util.Map;
import java.util.*;
public class AbilityData {
public String abilityName;

7
src/main/java/emu/grasscutter/data/binout/AbilityMixinData.java
View File

@ -1,12 +1,11 @@
package emu.grasscutter.data.binout;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.*;
import com.google.gson.annotations.SerializedName;
import com.google.gson.reflect.TypeToken;
import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
import java.util.*;
public class AbilityMixinData implements Serializable {
private static final long serialVersionUID = -2001232313615923575L;

4
src/main/java/emu/grasscutter/data/binout/AbilityModifierEntry.java
View File

@ -1,8 +1,8 @@
package emu.grasscutter.data.binout;
import emu.grasscutter.data.binout.AbilityModifier.AbilityModifierAction;
import java.util.ArrayList;
import java.util.List;
import java.util.*;
public class AbilityModifierEntry {
public List<AbilityModifierAction> onModifierAdded;

6
src/main/java/emu/grasscutter/data/binout/ConfigGadget.java
View File

@ -1,10 +1,10 @@
package emu.grasscutter.data.binout;
import javax.annotation.Nullable;
import lombok.AccessLevel;
import lombok.Data;
import lombok.*;
import lombok.experimental.FieldDefaults;
import javax.annotation.Nullable;
@Data
@FieldDefaults(level = AccessLevel.PRIVATE)
public class ConfigGadget {

3
src/main/java/emu/grasscutter/data/binout/ConfigGadgetCombat.java
View File

@ -1,7 +1,6 @@
package emu.grasscutter.data.binout;
import lombok.AccessLevel;
import lombok.Data;
import lombok.*;
import lombok.experimental.FieldDefaults;
@Data

3
src/main/java/emu/grasscutter/data/binout/ConfigGadgetCombatProperty.java
View File

@ -1,7 +1,6 @@
package emu.grasscutter.data.binout;
import lombok.AccessLevel;
import lombok.Data;
import lombok.*;
import lombok.experimental.FieldDefaults;
@Data

3
src/main/java/emu/grasscutter/data/binout/HomeworldDefaultSaveData.java
View File

@ -2,8 +2,7 @@ package emu.grasscutter.data.binout;
import com.google.gson.annotations.SerializedName;
import emu.grasscutter.game.world.Position;
import lombok.AccessLevel;
import lombok.Data;
import lombok.*;
import lombok.experimental.FieldDefaults;
import java.util.List;

6
src/main/java/emu/grasscutter/data/binout/MainQuestData.java
View File

@ -3,12 +3,10 @@ package emu.grasscutter.data.binout;
import dev.morphia.annotations.Entity;
import emu.grasscutter.data.GameData;
import emu.grasscutter.game.quest.enums.QuestType;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import lombok.Data;
import java.util.*;
public class MainQuestData {
private int id;
private int ICLLDPJFIMA;

4
src/main/java/emu/grasscutter/data/binout/OpenConfigEntry.java
View File

@ -1,8 +1,8 @@
package emu.grasscutter.data.binout;
import emu.grasscutter.data.ResourceLoader.OpenConfigData;
import java.util.ArrayList;
import java.util.List;
import java.util.*;
public class OpenConfigEntry {
private final String name;

9
src/main/java/emu/grasscutter/data/binout/SceneNpcBornData.java
View File

@ -3,13 +3,12 @@ package emu.grasscutter.data.binout;
import com.github.davidmoten.rtreemulti.RTree;
import com.github.davidmoten.rtreemulti.geometry.Geometry;
import emu.grasscutter.scripts.data.SceneGroup;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import lombok.AccessLevel;
import lombok.Data;
import lombok.*;
import lombok.experimental.FieldDefaults;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@Data
@FieldDefaults(level = AccessLevel.PRIVATE)
public class SceneNpcBornData {

6
src/main/java/emu/grasscutter/data/binout/SceneNpcBornEntry.java
View File

@ -2,11 +2,11 @@ package emu.grasscutter.data.binout;
import com.google.gson.annotations.SerializedName;
import emu.grasscutter.game.world.Position;
import java.util.List;
import lombok.AccessLevel;
import lombok.Data;
import lombok.*;
import lombok.experimental.FieldDefaults;
import java.util.List;
@Data
@FieldDefaults(level = AccessLevel.PRIVATE)
public class SceneNpcBornEntry {

4
src/main/java/emu/grasscutter/data/binout/ScriptSceneData.java
View File

@ -1,10 +1,10 @@
package emu.grasscutter.data.binout;
import com.google.gson.annotations.SerializedName;
import java.util.List;
import java.util.Map;
import lombok.Data;
import java.util.*;
@Data
public class ScriptSceneData {
Map<String, ScriptObject> scriptObjectList;

1
src/main/java/emu/grasscutter/data/binout/TalentData.java
View File

@ -2,6 +2,7 @@ package emu.grasscutter.data.binout;
import com.google.gson.annotations.SerializedName;
import emu.grasscutter.data.common.DynamicFloat;
import java.io.Serializable;
public class TalentData implements Serializable {

10
src/main/java/emu/grasscutter/data/binout/config/ConfigEntityBase.java
View File

@ -1,13 +1,11 @@
package emu.grasscutter.data.binout.config;
import emu.grasscutter.data.binout.config.fields.ConfigAbilityData;
import emu.grasscutter.data.binout.config.fields.ConfigCombat;
import emu.grasscutter.data.binout.config.fields.ConfigCommon;
import emu.grasscutter.data.binout.config.fields.ConfigGlobalValue;
import java.util.Collection;
import javax.annotation.Nullable;
import emu.grasscutter.data.binout.config.fields.*;
import lombok.Data;
import javax.annotation.Nullable;
import java.util.Collection;
@Data
public class ConfigEntityBase {
@Nullable ConfigCommon configCommon;

4
src/main/java/emu/grasscutter/data/binout/config/ConfigEntityGadget.java
View File

@ -1,8 +1,6 @@
package emu.grasscutter.data.binout.config;
import lombok.AccessLevel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.*;
import lombok.experimental.FieldDefaults;
@Data

3
src/main/java/emu/grasscutter/data/binout/config/ConfigEntityMonster.java
View File

@ -1,7 +1,6 @@
package emu.grasscutter.data.binout.config;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.*;
@Data
@EqualsAndHashCode(callSuper = true)

3
src/main/java/emu/grasscutter/data/binout/config/ConfigGlobalCombat.java
View File

@ -1,8 +1,9 @@
package emu.grasscutter.data.binout.config;
import java.util.List;
import lombok.Data;
import java.util.List;
@Data
public class ConfigGlobalCombat {
private DefaultAbilities defaultAbilities;

3
src/main/java/emu/grasscutter/data/binout/config/ConfigLevelEntity.java
View File

@ -1,9 +1,10 @@
package emu.grasscutter.data.binout.config;
import emu.grasscutter.data.binout.config.fields.ConfigAbilityData;
import java.util.List;
import lombok.Getter;
import java.util.List;
public class ConfigLevelEntity {
@Getter private List<ConfigAbilityData> abilities;

3
src/main/java/emu/grasscutter/data/binout/config/fields/ConfigCombat.java
View File

@ -1,7 +1,6 @@
package emu.grasscutter.data.binout.config.fields;
import lombok.AccessLevel;
import lombok.Data;
import lombok.*;
import lombok.experimental.FieldDefaults;
@Data

3
src/main/java/emu/grasscutter/data/binout/config/fields/ConfigCombatDie.java
View File

@ -1,8 +1,7 @@
package emu.grasscutter.data.binout.config.fields;
import com.google.gson.annotations.SerializedName;
import lombok.AccessLevel;
import lombok.Data;
import lombok.*;
import lombok.experimental.FieldDefaults;
@Data

3
src/main/java/emu/grasscutter/data/binout/config/fields/ConfigCombatProperty.java
View File

@ -1,7 +1,6 @@
package emu.grasscutter.data.binout.config.fields;
import lombok.AccessLevel;
import lombok.Data;
import lombok.*;
import lombok.experimental.FieldDefaults;
@Data

4
src/main/java/emu/grasscutter/data/binout/config/fields/ConfigGlobalValue.java
View File

@ -1,9 +1,9 @@
package emu.grasscutter.data.binout.config.fields;
import java.util.Map;
import java.util.Set;
import lombok.Data;
import java.util.*;
/** Contains information about the entities SGVs */
@Data
public class ConfigGlobalValue {

4
src/main/java/emu/grasscutter/data/binout/routes/Route.java
View File

@ -1,10 +1,8 @@
package emu.grasscutter.data.binout.routes;
import emu.grasscutter.net.proto.RouteOuterClass;
import lombok.AccessLevel;
import lombok.Data;
import lombok.*;
import lombok.experimental.FieldDefaults;
import lombok.val;
@Data
@FieldDefaults(level = AccessLevel.PRIVATE)

4
src/main/java/emu/grasscutter/data/binout/routes/RoutePoint.java
View File

@ -2,10 +2,8 @@ package emu.grasscutter.data.binout.routes;
import emu.grasscutter.game.world.Position;
import emu.grasscutter.net.proto.RoutePointOuterClass;
import lombok.AccessLevel;
import lombok.Data;
import lombok.*;
import lombok.experimental.FieldDefaults;
import lombok.val;
@Data
@FieldDefaults(level = AccessLevel.PRIVATE)

6
src/main/java/emu/grasscutter/data/binout/routes/SceneRoutes.java
View File

@ -1,10 +1,10 @@
package emu.grasscutter.data.binout.routes;
import javax.annotation.Nullable;
import lombok.AccessLevel;
import lombok.Data;
import lombok.*;
import lombok.experimental.FieldDefaults;
import javax.annotation.Nullable;
@Data
@FieldDefaults(level = AccessLevel.PRIVATE)
public class SceneRoutes {

3
src/main/java/emu/grasscutter/data/common/DynamicFloat.java
View File

@ -4,9 +4,10 @@ import emu.grasscutter.data.excels.ProudSkillData;
import emu.grasscutter.game.ability.Ability;
import it.unimi.dsi.fastutil.floats.FloatArrayList;
import it.unimi.dsi.fastutil.objects.*;
import java.util.*;
import lombok.*;
import java.util.*;
@Getter
public class DynamicFloat {
public static DynamicFloat ZERO = new DynamicFloat(0f);

6
src/main/java/emu/grasscutter/data/common/PointData.java
View File

@ -5,10 +5,8 @@ import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.excels.dungeon.DailyDungeonData;
import emu.grasscutter.game.world.Position;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList;
import lombok.Getter;
import lombok.Setter;
import it.unimi.dsi.fastutil.ints.*;
import lombok.*;
public final class PointData {
@Getter @Setter private int id;

3
src/main/java/emu/grasscutter/data/custom/TrialAvatarActivityCustomData.java
View File

@ -1,8 +1,9 @@
package emu.grasscutter.data.custom;
import emu.grasscutter.data.common.BaseTrialActivityData;
import lombok.Data;
import java.util.List;
import lombok.*;
@Data
public class TrialAvatarActivityCustomData implements BaseTrialActivityData {

3
src/main/java/emu/grasscutter/data/custom/TrialAvatarCustomData.java
View File

@ -1,7 +1,8 @@
package emu.grasscutter.data.custom;
import lombok.Data;
import java.util.List;
import lombok.*;
@Data
public class TrialAvatarCustomData {

3
src/main/java/emu/grasscutter/data/excels/BargainData.java
View File

@ -1,9 +1,10 @@
package emu.grasscutter.data.excels;
import emu.grasscutter.data.*;
import java.util.List;
import lombok.Getter;
import java.util.List;
@Getter
@ResourceType(name = "BargainExcelConfigData.json")
public final class BargainData extends GameResource {

12
src/main/java/emu/grasscutter/data/excels/BattlePassMissionData.java
View File

@ -1,15 +1,13 @@
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.game.props.BattlePassMissionRefreshType;
import emu.grasscutter.game.props.WatcherTriggerType;
import emu.grasscutter.data.*;
import emu.grasscutter.game.props.*;
import emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus;
import java.util.Arrays;
import java.util.Set;
import java.util.stream.Collectors;
import lombok.Getter;
import java.util.*;
import java.util.stream.Collectors;
@ResourceType(name = {"BattlePassMissionExcelConfigData.json"})
@Getter
public class BattlePassMissionData extends GameResource {

6
src/main/java/emu/grasscutter/data/excels/BattlePassRewardData.java
View File

@ -1,10 +1,10 @@
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import java.util.List;
import emu.grasscutter.data.*;
import lombok.Getter;
import java.util.List;
@ResourceType(name = "BattlePassRewardExcelConfigData.json")
@Getter
public class BattlePassRewardData extends GameResource {

6
src/main/java/emu/grasscutter/data/excels/BlossomRefreshExcelConfigData.java
View File

@ -1,10 +1,10 @@
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import java.util.List;
import emu.grasscutter.data.*;
import lombok.Getter;
import java.util.List;
@ResourceType(name = "BlossomRefreshExcelConfigData.json")
@Getter
public class BlossomRefreshExcelConfigData extends GameResource {

3
src/main/java/emu/grasscutter/data/excels/BuffData.java
View File

@ -1,7 +1,6 @@
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.*;
import emu.grasscutter.game.props.ServerBuffType;
import lombok.Getter;

7
src/main/java/emu/grasscutter/data/excels/ChapterData.java
View File

@ -1,11 +1,10 @@
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import java.util.HashMap;
import java.util.Map;
import emu.grasscutter.data.*;
import lombok.Getter;
import java.util.*;
@Getter
@ResourceType(name = "ChapterExcelConfigData.json")
public class ChapterData extends GameResource {

10
src/main/java/emu/grasscutter/data/excels/CityData.java
View File

@ -1,13 +1,11 @@
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import java.util.List;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import emu.grasscutter.data.*;
import lombok.*;
import lombok.experimental.FieldDefaults;
import java.util.List;
@ResourceType(name = "CityConfigData.json", loadPriority = ResourceType.LoadPriority.HIGH)
@Getter
@Setter

4
src/main/java/emu/grasscutter/data/excels/CombineData.java
View File

@ -1,8 +1,8 @@
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.*;
import emu.grasscutter.data.common.ItemParamData;
import java.util.List;
import java.util.stream.Collectors;

6
src/main/java/emu/grasscutter/data/excels/CompoundData.java
View File

@ -1,12 +1,12 @@
package emu.grasscutter.data.excels;
import com.google.gson.annotations.SerializedName;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.*;
import emu.grasscutter.data.common.ItemParamData;
import java.util.List;
import lombok.Getter;
import java.util.List;
@ResourceType(
name = {"CompoundExcelConfigData.json"},
loadPriority = ResourceType.LoadPriority.LOW)

3
src/main/java/emu/grasscutter/data/excels/CookBonusData.java
View File

@ -1,7 +1,6 @@
package emu.grasscutter.data.excels;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.*;
import emu.grasscutter.data.ResourceType.LoadPriority;
@ResourceType(

Some files were not shown because too many files have changed in this diff Show More