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

Run formatter & 'protogen'

Browse Source
This commit is contained in:
KingRainbow44 2023-08-30 19:36:58 -04:00
parent 1ca451559c
commit aad4529b0e
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
11 changed files with 528 additions and 537 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

File diff suppressed because it is too large Load Diff

8
src/main/java/emu/grasscutter/game/ability/AbilityManager.java
View File

@ -20,11 +20,10 @@ import emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalar
import emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction; import emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction;
import emu.grasscutter.server.event.player.PlayerUseSkillEvent; import emu.grasscutter.server.event.player.PlayerUseSkillEvent;
import io.netty.util.concurrent.FastThreadLocalThread; import io.netty.util.concurrent.FastThreadLocalThread;
import lombok.Getter;
import org.reflections.Reflections;
import java.util.HashMap; import java.util.HashMap;
import java.util.concurrent.*; import java.util.concurrent.*;
import lombok.Getter;
import org.reflections.Reflections;
public final class AbilityManager extends BasePlayerManager { public final class AbilityManager extends BasePlayerManager {
private static final HashMap<AbilityModifierAction.Type, AbilityActionHandler> actionHandlers = private static final HashMap<AbilityModifierAction.Type, AbilityActionHandler> actionHandlers =
@ -276,8 +275,7 @@ public final class AbilityManager extends BasePlayerManager {
} }
// Invoke PlayerUseSkillEvent. // Invoke PlayerUseSkillEvent.
var event = new PlayerUseSkillEvent(player, var event = new PlayerUseSkillEvent(player, skillData, currentAvatar.getAvatar());
skillData, currentAvatar.getAvatar());
if (!event.call()) return; if (!event.call()) return;
// Check if the skill is an elemental burst. // Check if the skill is an elemental burst.

5
src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java
View File

@ -14,12 +14,11 @@ import emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePass
import emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule; import emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule;
import emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus; import emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus;
import emu.grasscutter.server.packet.send.*; import emu.grasscutter.server.packet.send.*;
import lombok.Getter;
import org.bson.types.ObjectId;
import java.time.*; import java.time.*;
import java.time.temporal.TemporalAdjusters; import java.time.temporal.TemporalAdjusters;
import java.util.*; import java.util.*;
import lombok.Getter;
import org.bson.types.ObjectId;
@Entity(value = "battlepass", useDiscriminator = false) @Entity(value = "battlepass", useDiscriminator = false)
public class BattlePassManager extends BasePlayerDataManager { public class BattlePassManager extends BasePlayerDataManager {

7
src/main/java/emu/grasscutter/game/gacha/GachaSystem.java
View File

@ -1,5 +1,7 @@
package emu.grasscutter.game.gacha; package emu.grasscutter.game.gacha;
import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
import com.sun.nio.file.SensitivityWatchEventModifier; import com.sun.nio.file.SensitivityWatchEventModifier;
import emu.grasscutter.Grasscutter; import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.*; import emu.grasscutter.data.*;
@ -21,13 +23,10 @@ import emu.grasscutter.server.game.*;
import emu.grasscutter.server.packet.send.PacketDoGachaRsp; import emu.grasscutter.server.packet.send.PacketDoGachaRsp;
import emu.grasscutter.utils.*; import emu.grasscutter.utils.*;
import it.unimi.dsi.fastutil.ints.*; import it.unimi.dsi.fastutil.ints.*;
import org.greenrobot.eventbus.Subscribe;
import java.nio.file.*; import java.nio.file.*;
import java.util.*; import java.util.*;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
import org.greenrobot.eventbus.Subscribe;
import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
public class GachaSystem extends BaseGameSystem { public class GachaSystem extends BaseGameSystem {
private static final int starglitterId = 221; private static final int starglitterId = 221;

20
src/main/java/emu/grasscutter/game/player/TeamManager.java
View File

@ -1,5 +1,7 @@
package emu.grasscutter.game.player; package emu.grasscutter.game.player;
import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
import dev.morphia.annotations.*; import dev.morphia.annotations.*;
import emu.grasscutter.*; import emu.grasscutter.*;
import emu.grasscutter.data.GameData; import emu.grasscutter.data.GameData;
@ -21,12 +23,9 @@ import emu.grasscutter.server.packet.send.*;
import emu.grasscutter.utils.Utils; import emu.grasscutter.utils.Utils;
import it.unimi.dsi.fastutil.ints.*; import it.unimi.dsi.fastutil.ints.*;
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import lombok.*;
import java.util.*; import java.util.*;
import java.util.stream.Stream; import java.util.stream.Stream;
import lombok.*;
import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
@Entity @Entity
public final class TeamManager extends BasePlayerDataManager { public final class TeamManager extends BasePlayerDataManager {
@ -426,12 +425,11 @@ public final class TeamManager extends BasePlayerDataManager {
// Check if character changed // Check if character changed
var newAvatarEntity = this.getCurrentAvatarEntity(); var newAvatarEntity = this.getCurrentAvatarEntity();
if (currentEntity != null && if (currentEntity != null && newAvatarEntity != null && currentEntity != newAvatarEntity) {
newAvatarEntity != null &&
currentEntity != newAvatarEntity) {
// Call PlayerSwitchAvatarEvent. // Call PlayerSwitchAvatarEvent.
var event = new PlayerSwitchAvatarEvent(this.getPlayer(), var event =
currentEntity.getAvatar(), newAvatarEntity.getAvatar()); new PlayerSwitchAvatarEvent(
this.getPlayer(), currentEntity.getAvatar(), newAvatarEntity.getAvatar());
if (!event.call()) return; if (!event.call()) return;
// Remove and Add // Remove and Add
@ -766,8 +764,8 @@ public final class TeamManager extends BasePlayerDataManager {
} }
// Call PlayerSwitchAvatarEvent. // Call PlayerSwitchAvatarEvent.
var event = new PlayerSwitchAvatarEvent(this.getPlayer(), var event =
oldEntity.getAvatar(), newEntity.getAvatar()); new PlayerSwitchAvatarEvent(this.getPlayer(), oldEntity.getAvatar(), newEntity.getAvatar());
if (!event.call()) return; if (!event.call()) return;
newEntity = event.getNewAvatarEntity(); newEntity = event.getNewAvatarEntity();

6
src/main/java/emu/grasscutter/game/talk/TalkManager.java
View File

@ -1,14 +1,14 @@
package emu.grasscutter.game.talk; package emu.grasscutter.game.talk;
import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_COMPLETE_TALK;
import static emu.grasscutter.game.quest.enums.QuestContent.*;
import emu.grasscutter.data.GameData; import emu.grasscutter.data.GameData;
import emu.grasscutter.data.binout.MainQuestData.TalkData; import emu.grasscutter.data.binout.MainQuestData.TalkData;
import emu.grasscutter.game.player.*; import emu.grasscutter.game.player.*;
import emu.grasscutter.server.event.player.PlayerNpcTalkEvent; import emu.grasscutter.server.event.player.PlayerNpcTalkEvent;
import lombok.NonNull; import lombok.NonNull;
import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_COMPLETE_TALK;
import static emu.grasscutter.game.quest.enums.QuestContent.*;
public final class TalkManager extends BasePlayerManager { public final class TalkManager extends BasePlayerManager {
public TalkManager(@NonNull Player player) { public TalkManager(@NonNull Player player) {
super(player); super(player);

2
src/main/java/emu/grasscutter/game/world/Scene.java
View File

@ -431,7 +431,7 @@ public final class Scene {
.map(this::removeEntityDirectly) .map(this::removeEntityDirectly)
.filter(Objects::nonNull) .filter(Objects::nonNull)
.toList(); .toList();
if (toRemove.size() > 0) { if (!toRemove.isEmpty()) {
this.broadcastPacket(new PacketSceneEntityDisappearNotify(toRemove, visionType)); this.broadcastPacket(new PacketSceneEntityDisappearNotify(toRemove, visionType));
} }
} }

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

@ -13,10 +13,8 @@ public final class PlayerNpcTalkEvent extends PlayerEvent implements Cancellable
private final TalkConfigData talk; private final TalkConfigData talk;
private final int talkId, npcEntityId; private final int talkId, npcEntityId;
public PlayerNpcTalkEvent(Player player, public PlayerNpcTalkEvent(
@Nullable TalkConfigData talk, Player player, @Nullable TalkConfigData talk, int talkId, int npcEntityId) {
int talkId,
int npcEntityId) {
super(player); super(player);
this.talk = talk; this.talk = talk;

4
src/main/java/emu/grasscutter/server/event/player/PlayerSwitchAvatarEvent.java
View File

@ -12,9 +12,7 @@ public final class PlayerSwitchAvatarEvent extends PlayerEvent implements Cancel
private final Avatar previousAvatar; private final Avatar previousAvatar;
@Setter private Avatar newAvatar; @Setter private Avatar newAvatar;
public PlayerSwitchAvatarEvent(Player player, public PlayerSwitchAvatarEvent(Player player, Avatar previousAvatar, Avatar newAvatar) {
Avatar previousAvatar,
Avatar newAvatar) {
super(player); super(player);
this.previousAvatar = previousAvatar; this.previousAvatar = previousAvatar;

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

@ -6,9 +6,8 @@ import emu.grasscutter.game.player.Player;
import emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem; import emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem;
import emu.grasscutter.server.event.Cancellable; import emu.grasscutter.server.event.Cancellable;
import emu.grasscutter.server.event.types.PlayerEvent; import emu.grasscutter.server.event.types.PlayerEvent;
import lombok.*;
import java.util.List; import java.util.List;
import lombok.*;
@Getter @Getter
public final class PlayerWishEvent extends PlayerEvent implements Cancellable { public final class PlayerWishEvent extends PlayerEvent implements Cancellable {