Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
ziqian zhang
Grasscutter
Commits
5287882f
Commit
5287882f
authored
Jan 10, 2023
by
github-actions
Browse files
Fix whitespace [skip actions]
parent
8a5a6ab8
Changes
17
Show whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/data/ResourceType.java
View file @
5287882f
src/main/java/emu/grasscutter/game/activity/musicgame/MusicGameBeatmap.java
View file @
5287882f
...
...
@@ -32,12 +32,12 @@ public class MusicGameBeatmap {
List
<
List
<
BeatmapNote
>>
beatmap
;
public
static
MusicGameBeatmap
getByShareId
(
long
musicShareId
){
public
static
MusicGameBeatmap
getByShareId
(
long
musicShareId
)
{
return
DatabaseHelper
.
getMusicGameBeatmap
(
musicShareId
);
}
public
void
save
(){
if
(
musicShareId
==
0
){
public
void
save
()
{
if
(
musicShareId
==
0
)
{
musicShareId
=
new
Random
().
nextLong
(
100000000000000L
,
999999999999999L
);
}
DatabaseHelper
.
saveMusicGameBeatmap
(
this
);
...
...
@@ -51,7 +51,7 @@ public class MusicGameBeatmap {
.
toList
();
}
public
UgcMusicRecordOuterClass
.
UgcMusicRecord
toProto
(){
public
UgcMusicRecordOuterClass
.
UgcMusicRecord
toProto
()
{
return
UgcMusicRecordOuterClass
.
UgcMusicRecord
.
newBuilder
()
.
setMusicId
(
musicId
)
.
addAllMusicTrackList
(
beatmap
.
stream
()
...
...
@@ -60,7 +60,7 @@ public class MusicGameBeatmap {
.
build
();
}
public
UgcMusicBriefInfoOuterClass
.
UgcMusicBriefInfo
.
Builder
toBriefProto
(){
public
UgcMusicBriefInfoOuterClass
.
UgcMusicBriefInfo
.
Builder
toBriefProto
()
{
var
player
=
DatabaseHelper
.
getPlayerByUid
(
authorUid
);
return
UgcMusicBriefInfoOuterClass
.
UgcMusicBriefInfo
.
newBuilder
()
...
...
@@ -73,7 +73,7 @@ public class MusicGameBeatmap {
.
setVersion
(
1
);
}
private
UgcMusicTrackOuterClass
.
UgcMusicTrack
musicBeatmapListToProto
(
List
<
BeatmapNote
>
beatmapNoteList
){
private
UgcMusicTrackOuterClass
.
UgcMusicTrack
musicBeatmapListToProto
(
List
<
BeatmapNote
>
beatmapNoteList
)
{
return
UgcMusicTrackOuterClass
.
UgcMusicTrack
.
newBuilder
()
.
addAllMusicNoteList
(
beatmapNoteList
.
stream
()
.
map
(
BeatmapNote:
:
toProto
)
...
...
@@ -89,14 +89,14 @@ public class MusicGameBeatmap {
int
startTime
;
int
endTime
;
public
static
BeatmapNote
parse
(
UgcMusicNoteOuterClass
.
UgcMusicNote
note
){
public
static
BeatmapNote
parse
(
UgcMusicNoteOuterClass
.
UgcMusicNote
note
)
{
return
BeatmapNote
.
of
()
.
startTime
(
note
.
getStartTime
())
.
endTime
(
note
.
getEndTime
())
.
build
();
}
public
UgcMusicNoteOuterClass
.
UgcMusicNote
toProto
(){
public
UgcMusicNoteOuterClass
.
UgcMusicNote
toProto
()
{
return
UgcMusicNoteOuterClass
.
UgcMusicNote
.
newBuilder
()
.
setStartTime
(
startTime
)
.
setEndTime
(
endTime
)
...
...
src/main/java/emu/grasscutter/game/friends/Friendship.java
View file @
5287882f
src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChangeEditModeReq.java
View file @
5287882f
src/main/java/emu/grasscutter/server/packet/recv/HandlerMusicGameCreateBeatmapReq.java
View file @
5287882f
...
...
@@ -36,7 +36,7 @@
// musicGameBeatmap.save();
//
// var playerData = session.getPlayer().getActivityManager().getPlayerActivityDataByActivityType(ActivityType.NEW_ACTIVITY_MUSIC_GAME);
// if(playerData.isEmpty()){
// if
(playerData.isEmpty())
{
// return;
// }
//
...
...
src/main/java/emu/grasscutter/server/packet/recv/HandlerMusicGameGetBeatmapReq.java
View file @
5287882f
...
...
@@ -17,7 +17,7 @@
//
// var musicGameBeatmap = MusicGameBeatmap.getByShareId(req.getMusicShareId());
//
// if(musicGameBeatmap == null){
// if
(musicGameBeatmap == null)
{
// return;
// }
//
...
...
src/main/java/emu/grasscutter/server/packet/recv/HandlerMusicGameSearchBeatmapReq.java
View file @
5287882f
...
...
@@ -17,7 +17,7 @@
//
// var musicGameBeatmap = MusicGameBeatmap.getByShareId(req.getMusicShareId());
//
// if(musicGameBeatmap == null){
// if
(musicGameBeatmap == null)
{
// session.send(new PacketMusicGameSearchBeatmapRsp(11153, req.getUnknownEnum1()));
// return;
// }
...
...
src/main/java/emu/grasscutter/server/packet/recv/HandlerMusicGameStartReq.java
View file @
5287882f
src/main/java/emu/grasscutter/server/packet/send/PacketEntityFightPropChangeReasonNotify.java
View file @
5287882f
...
...
@@ -23,7 +23,7 @@ public class PacketEntityFightPropChangeReasonNotify extends BasePacket {
.
setReason
(
reason
)
.
setChangeHpReason
(
changeHpReason
);
for
(
int
p
:
param
){
for
(
int
p
:
param
)
{
proto
.
addParamList
(
p
);
}
...
...
src/main/java/emu/grasscutter/server/packet/send/PacketMusicGameStartRsp.java
View file @
5287882f
src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterMpResultNotify.java
View file @
5287882f
src/main/java/emu/grasscutter/server/packet/send/PacketPlayerChatNotify.java
View file @
5287882f
src/main/java/emu/grasscutter/server/packet/send/PacketScenePointUnlockNotify.java
View file @
5287882f
src/main/java/emu/grasscutter/server/packet/send/PacketTowerCurLevelRecordChangeNotify.java
View file @
5287882f
src/main/java/emu/grasscutter/server/packet/send/PacketTowerLevelStarCondNotify.java
View file @
5287882f
src/main/java/emu/grasscutter/utils/JsonAdapters.java
View file @
5287882f
src/main/java/emu/grasscutter/utils/TsvUtils.java
View file @
5287882f
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment