Skip to content

Commit

Permalink
Merge pull request #2359 from GiganticMinecraft/hoge
Browse files Browse the repository at this point in the history
Hoge
  • Loading branch information
outductor authored Aug 5, 2024
2 parents bd4c2c4 + a9c81cd commit e9db600
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.2
version = 3.8.3
preset=IntelliJ
runner.dialect = scala213

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]]

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit e9db600

Please sign in to comment.