Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-21 06:19:50 +08:00
Code Issues Projects Releases Wiki Activity

Revert "Run spotlessApply"

Browse Source 
This reverts commit d67e2d0c5e.
This commit is contained in:
KingRainbow44
2023-05-03 10:48:00 -04:00
Unverified
parent 40a7d088d0
commit 3df5f79ebf
1412 changed files with 1213844 additions and 1308701 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/emu/grasscutter/command/commands/QuestCommand.java
+22 -39
View File
@@ -6,6 +6,7 @@ import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.quest.GameQuest;
import java.util.List;
@Command(
@@ -63,22 +64,15 @@ public final class QuestCommand implements CommandHandler {
return;
}
CommandHandler.sendMessage(
sender,
translate(
sender,
"commands.quest.running",
questId,
translate(
sender,
switch (quest.state) {
case QUEST_STATE_NONE, NONE -> "commands.quest.state.none";
case QUEST_STATE_UNSTARTED, UNSTARTED -> "commands.quest.state.unstarted";
case QUEST_STATE_UNFINISHED, UNFINISHED -> "commands.quest.state.unfinished";
case QUEST_STATE_FINISHED, FINISHED -> "commands.quest.state.finished";
case QUEST_STATE_FAILED, FAILED -> "commands.quest.state.failed";
}),
quest.getState().getValue()));
CommandHandler.sendMessage(sender, translate(sender, "commands.quest.running",
questId, translate(sender, switch(quest.state) {
case QUEST_STATE_NONE, NONE -> "commands.quest.state.none";
case QUEST_STATE_UNSTARTED, UNSTARTED -> "commands.quest.state.unstarted";
case QUEST_STATE_UNFINISHED, UNFINISHED -> "commands.quest.state.unfinished";
case QUEST_STATE_FINISHED, FINISHED -> "commands.quest.state.finished";
case QUEST_STATE_FAILED, FAILED -> "commands.quest.state.failed";
}), quest.getState().getValue())
);
}
case "talking" -> {
var mainQuest = targetPlayer.getQuestManager().getMainQuestByTalkId(questId);
@@ -88,24 +82,17 @@ public final class QuestCommand implements CommandHandler {
}
var talk = mainQuest.getTalks().get(questId);
CommandHandler.sendMessage(
sender,
translate(
sender,
"commands.quest.talking",
questId,
talk == null
? translate(sender, "commands.quest.state.not_exists")
: translate(sender, "commands.quest.state.exists"),
mainQuest.getParentQuestId(),
mainQuest.getState().getValue()));
CommandHandler.sendMessage(sender, translate(sender, "commands.quest.talking",
questId, talk == null ?
translate(sender, "commands.quest.state.not_exists") :
translate(sender, "commands.quest.state.exists"),
mainQuest.getParentQuestId(), mainQuest.getState().getValue()));
}
case "dungeons" -> {
var dungeons = targetPlayer.getPlayerProgress().getCompletedDungeons();
CommandHandler.sendMessage(
sender,
"Dungeons completed: "
+ String.join(", ", dungeons.intStream().mapToObj(String::valueOf).toList()));
CommandHandler.sendMessage(sender, "Dungeons completed: " +
String.join(", ", dungeons.intStream()
.mapToObj(String::valueOf).toList()));
}
case "debug" -> {
var loggedQuests = targetPlayer.getQuestManager().getLoggedQuests();
@@ -114,10 +101,8 @@ public final class QuestCommand implements CommandHandler {
if (shouldAdd) loggedQuests.add(questId);
else loggedQuests.remove(questId);
CommandHandler.sendMessage(
sender,
"Quest %s will %s."
.formatted(questId, shouldAdd ? "now be logged" : "no longer be logged"));
CommandHandler.sendMessage(sender, "Quest %s will %s."
.formatted(questId, shouldAdd ? "now be logged" : "no longer be logged"));
}
case "triggers" -> {
var quest = targetPlayer.getQuestManager().getQuestById(questId);
@@ -126,10 +111,8 @@ public final class QuestCommand implements CommandHandler {
return;
}
CommandHandler.sendMessage(
sender,
"Triggers registered for %s: %s."
.formatted(questId, String.join(", ", quest.getTriggers().keySet())));
CommandHandler.sendMessage(sender, "Triggers registered for %s: %s."
.formatted(questId, String.join(", ", quest.getTriggers().keySet())));
}
default -> this.sendUsageMessage(sender);
}
src/main/java/emu/grasscutter/command/commands/SetPropCommand.java
+5 -4
View File
@@ -1,5 +1,10 @@
package emu.grasscutter.command.commands;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.IntStream;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.data.GameData;
@@ -9,10 +14,6 @@ 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 java.util.stream.IntStream;
@Command(
label = "setProp",