diff --git a/.scalafmt.conf b/.scalafmt.conf index 10c5fc817b..5701df8ade 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.2 +version = 3.8.3 preset=IntelliJ runner.dialect = scala213 diff --git a/src/main/scala/com/github/unchama/seichiassist/menus/home/HomeMenu.scala b/src/main/scala/com/github/unchama/seichiassist/menus/home/HomeMenu.scala index bb69d80b18..c9b95d4f57 100644 --- a/src/main/scala/com/github/unchama/seichiassist/menus/home/HomeMenu.scala +++ b/src/main/scala/com/github/unchama/seichiassist/menus/home/HomeMenu.scala @@ -170,8 +170,9 @@ case class HomeMenuButtonComputations(player: Player)( val commandInfo = List(s"$DARK_RED${UNDERLINE}クリックで名称変更", s"${DARK_GRAY}command->[/home name $homeId]") - val coordinates = List(s"$GRAY$worldName x:${Math.floor(location.x)} y:${Math - .floor(location.y)} z:${Math.floor(location.z)}") + val coordinates = List( + s"$GRAY$worldName x:${Math.floor(location.x)} y:${Math.floor(location.y)} z:${Math.floor(location.z)}" + ) nameStatus ++ commandInfo ++ coordinates }) Button( diff --git a/src/main/scala/com/github/unchama/seichiassist/subsystems/buildcount/BuildCountAPI.scala b/src/main/scala/com/github/unchama/seichiassist/subsystems/buildcount/BuildCountAPI.scala index 107dde5198..9116673b67 100644 --- a/src/main/scala/com/github/unchama/seichiassist/subsystems/buildcount/BuildCountAPI.scala +++ b/src/main/scala/com/github/unchama/seichiassist/subsystems/buildcount/BuildCountAPI.scala @@ -16,15 +16,11 @@ trait BuildCountAPI[F[_], G[_], Player] { implicit val incrementBuildExpWhenBuiltByHand: IncrementBuildExpWhenBuiltByHand[G, Player] - implicit val incrementBuildExpWhenBuiltWithSkill: IncrementBuildExpWhenBuiltWithSkill[ - G, - Player - ] - - implicit val playerBuildAmountRepository: KeyedDataRepository[ - Player, - ReadOnlyRef[G, BuildAmountData] - ] + implicit val incrementBuildExpWhenBuiltWithSkill + : IncrementBuildExpWhenBuiltWithSkill[G, Player] + + implicit val playerBuildAmountRepository + : KeyedDataRepository[Player, ReadOnlyRef[G, BuildAmountData]] val buildAmountUpdates: fs2.Stream[F, (Player, BuildAmountData)] diff --git a/src/main/scala/com/github/unchama/seichiassist/subsystems/fastdiggingeffect/FastDiggingEffectApi.scala b/src/main/scala/com/github/unchama/seichiassist/subsystems/fastdiggingeffect/FastDiggingEffectApi.scala index 2fe77ede3d..e9ca3fb02b 100644 --- a/src/main/scala/com/github/unchama/seichiassist/subsystems/fastdiggingeffect/FastDiggingEffectApi.scala +++ b/src/main/scala/com/github/unchama/seichiassist/subsystems/fastdiggingeffect/FastDiggingEffectApi.scala @@ -63,18 +63,14 @@ trait FastDiggingSettingsReadApi[F[_], Player] { /** * 採掘速度上昇抑制の設定をプレーヤーごとに保持するデータレポジトリ。 */ - val currentSuppressionSettings: KeyedDataRepository[ - Player, - ReadOnlyRef[F, FastDiggingEffectSuppressionState] - ] + val currentSuppressionSettings + : KeyedDataRepository[Player, ReadOnlyRef[F, FastDiggingEffectSuppressionState]] /** * 採掘速度上昇効果の統計を受け取るかどうかの設定をプレーヤーごとに保持するデータレポジトリ。 */ - val currentStatsSettings: KeyedDataRepository[ - Player, - ReadOnlyRef[F, FastDiggingEffectStatsSettings] - ] + val currentStatsSettings + : KeyedDataRepository[Player, ReadOnlyRef[F, FastDiggingEffectStatsSettings]] } diff --git a/src/main/scala/com/github/unchama/seichiassist/subsystems/gacha/bukkit/GachaCommand.scala b/src/main/scala/com/github/unchama/seichiassist/subsystems/gacha/bukkit/GachaCommand.scala index 439ebfa09d..11f4857e1b 100644 --- a/src/main/scala/com/github/unchama/seichiassist/subsystems/gacha/bukkit/GachaCommand.scala +++ b/src/main/scala/com/github/unchama/seichiassist/subsystems/gacha/bukkit/GachaCommand.scala @@ -259,9 +259,7 @@ class GachaCommand[F[_]: OnMinecraftServerThread: ConcurrentEffect]( val itemStack = gachaPrize.itemStack val probability = gachaPrize.probability.value - s"${gachaPrize.id.id}|${itemStack.getType.toString}/${itemStack - .getItemMeta - .getDisplayName}$RESET|${itemStack.getAmount}|$probability(${probability * 100}%)" + s"${gachaPrize.id.id}|${itemStack.getType.toString}/${itemStack.getItemMeta.getDisplayName}$RESET|${itemStack.getAmount}|$probability(${probability * 100}%)" } .toList