diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 00000000..e1f80c26 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.10.1 +7b1921e2b29e57146f70837222e2cf3834a5e4db diff --git a/.scalafmt.conf b/.scalafmt.conf index 4c4067af..26a14b45 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.6 +version = 3.10.1 runner.dialect = scala3 style = defaultWithAlign maxColumn = 100 diff --git a/build.sbt b/build.sbt index 70b15ca6..949ec578 100644 --- a/build.sbt +++ b/build.sbt @@ -28,10 +28,10 @@ lazy val commonSettings: Seq[sbt.Def.Setting[_]] = Seq( lazy val publishSettings = { import xerial.sbt.Sonatype._ Seq( - publishTo := sonatypePublishToBundle.value, - publishMavenStyle := true, - sonatypeProfileName := "io.indigoengine", - licenses := Seq("MIT" -> url("https://opensource.org/licenses/MIT")), + publishTo := sonatypePublishToBundle.value, + publishMavenStyle := true, + sonatypeProfileName := "io.indigoengine", + licenses := Seq("MIT" -> url("https://opensource.org/licenses/MIT")), sonatypeProjectHosting := Some( GitHubHosting("PurpleKingdomGames", "roguelike-starterkit", "indigo@purplekingdomgames.com") ), @@ -138,7 +138,7 @@ lazy val roguelikeStarterKit = ) .aggregate(roguelike, demo, benchmarks) .settings( - logo := rawLogo + "(v" + version.value.toString + ")", + logo := rawLogo + "(v" + version.value.toString + ")", usefulTasks := Seq( UsefulTask("runGame", "Run the game").noAlias, UsefulTask("publishLocal", "Local publish").noAlias diff --git a/roguelike-starterkit/src/main/scala/roguelikestarterkit/terminal/TerminalMaterial.scala b/roguelike-starterkit/src/main/scala/roguelikestarterkit/terminal/TerminalMaterial.scala index eb0a2f95..dc2df331 100644 --- a/roguelike-starterkit/src/main/scala/roguelikestarterkit/terminal/TerminalMaterial.scala +++ b/roguelike-starterkit/src/main/scala/roguelikestarterkit/terminal/TerminalMaterial.scala @@ -181,7 +181,7 @@ object TerminalMaterial: step(0.001f, abs(((color.x + color.y + color.z) / 3.0f) - color.x)) def fragment(color: vec4): vec4 = - val bg = vec4(env.BACKGROUND.rgb * env.BACKGROUND.a, env.BACKGROUND.a) + val bg = vec4(env.BACKGROUND.rgb * env.BACKGROUND.a, env.BACKGROUND.a) val tint = mix(env.CHANNEL_0 * env.FOREGROUND, env.CHANNEL_0, distanceToGreyscale(env.CHANNEL_0)) val fg = vec4(tint.rgb * tint.a, tint.a) diff --git a/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/components/TerminalInput.scala b/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/components/TerminalInput.scala index 3b75d666..b0501c2f 100644 --- a/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/components/TerminalInput.scala +++ b/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/components/TerminalInput.scala @@ -60,7 +60,7 @@ object TerminalInput: borderTiles: TerminalBorderTiles ): (UIContext[ReferenceData], Input[ReferenceData]) => Outcome[Layer] = (context, input) => - val bounds = input.bounds(context) + val bounds = input.bounds(context) val correctedLabel = if input.text.length == bounds.width then input.text else if input.text.length > bounds.width then input.text.take(bounds.width) diff --git a/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/components/TerminalSwitch.scala b/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/components/TerminalSwitch.scala index 75caa35d..a748fa7e 100644 --- a/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/components/TerminalSwitch.scala +++ b/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/components/TerminalSwitch.scala @@ -18,7 +18,7 @@ object TerminalSwitch: charSheet: CharSheet ): (UIContext[ReferenceData], Switch[ReferenceData]) => Outcome[Layer] = (context, switch) => - val bounds = switch.bounds(context) + val bounds = switch.bounds(context) val terminal = RogueTerminalEmulator(Size(1)) .put(Point.zero, tile.tile, tile.colors.foreground, tile.colors.background) diff --git a/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/components/TerminalTextArea.scala b/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/components/TerminalTextArea.scala index 4481ebdf..9cd6d5b3 100644 --- a/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/components/TerminalTextArea.scala +++ b/roguelike-starterkit/src/main/scala/roguelikestarterkit/ui/components/TerminalTextArea.scala @@ -11,7 +11,7 @@ import roguelikestarterkit.ui.* object TerminalTextArea: private def findBounds(text: String): Bounds = - val lines = text.split("\n").toList + val lines = text.split("\n").toList val maxLength = lines.foldLeft(0) { (acc, line) => if line.length > acc then line.length else acc