From 5615bbcb224875a95da5b2fdd35340c8c9ce4381 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Sat, 1 Jul 2023 20:13:07 +0200 Subject: [PATCH] FIx things and attempt to add test The test can't find a YAML method --- build.sbt | 14 +++++++++----- project/build.properties | 2 +- .../discordplugin/mcchat/MinecraftChatModule.scala | 5 +---- .../mcchat/sender/DiscordConnectedPlayer.scala | 3 --- .../discordplugin/role/GameRoleModule.scala | 2 +- src/test/scala/DiscordTest.scala | 12 ++++++++++++ 6 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 src/test/scala/DiscordTest.scala diff --git a/build.sbt b/build.sbt index b8197e1..fcc7be1 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ name := "Chroma-Discord" version := "1.1" -scalaVersion := "2.13.0" +scalaVersion := "2.13.11" resolvers += "jitpack.io" at "https://jitpack.io" resolvers += "paper-repo" at "https://papermc.io/repo/repository/maven-public/" @@ -11,11 +11,10 @@ resolvers += Resolver.mavenLocal // assembly / assemblyOption := (assembly / assemblyOption).value.copy(includeScala = false) libraryDependencies ++= Seq( - "io.papermc.paper" % "paper-api" % "1.19.4-R0.1-SNAPSHOT" % Provided, + "io.papermc.paper" % "paper-api" % "1.19.1-R0.1-SNAPSHOT" % Provided, "com.discord4j" % "discord4j-core" % "3.2.3", "com.vdurmont" % "emoji-java" % "5.1.1", - "org.mockito" % "mockito-core" % "5.2.0", "io.projectreactor" % "reactor-scala-extensions_2.13" % "0.8.0", "com.github.TBMCPlugins.ChromaCore" % "Chroma-Core" % "v2.0.0-SNAPSHOT" % Provided, @@ -25,12 +24,17 @@ libraryDependencies ++= Seq( // https://mvnrepository.com/artifact/net.kyori/examination-api "net.kyori" % "examination-api" % "1.3.0" % "provided", // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib - "org.jetbrains.kotlin" % "kotlin-stdlib" % "1.8.20" % "provided" + "org.jetbrains.kotlin" % "kotlin-stdlib" % "1.8.20" % "provided", + // https://mvnrepository.com/artifact/org.scalatest/scalatest + "org.scalatest" %% "scalatest" % "3.2.16" % Test, + // https://mvnrepository.com/artifact/com.github.seeseemelk/MockBukkit-v1.19 + "com.github.seeseemelk" % "MockBukkit-v1.19" % "2.29.0" % Test, + "org.yaml" % "snakeyaml" % "1.32" % Compile ) assembly / assemblyJarName := "Chroma-Discord.jar" assembly / assemblyShadeRules := Seq( - "io.netty", "com.fasterxml", "org.mockito", "org.slf4j" + "io.netty", "com.fasterxml", "org.slf4j" ).map { p => ShadeRule.rename(s"$p.**" -> "btndvtm.dp.@0").inAll } diff --git a/project/build.properties b/project/build.properties index 2003f65..e78a78f 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,2 +1,2 @@ sbt.version=1.8.2 -scala.version=2.13.0 \ No newline at end of file +scala.version=2.13.11 \ No newline at end of file diff --git a/src/main/scala/buttondevteam/discordplugin/mcchat/MinecraftChatModule.scala b/src/main/scala/buttondevteam/discordplugin/mcchat/MinecraftChatModule.scala index b1ce7d8..929c679 100644 --- a/src/main/scala/buttondevteam/discordplugin/mcchat/MinecraftChatModule.scala +++ b/src/main/scala/buttondevteam/discordplugin/mcchat/MinecraftChatModule.scala @@ -5,8 +5,8 @@ import buttondevteam.discordplugin.DPUtils.MonoExtensions import buttondevteam.discordplugin.mcchat.sender.DiscordConnectedPlayer import buttondevteam.discordplugin.util.DPState import buttondevteam.discordplugin.{ChannelconBroadcast, DPUtils, DiscordPlugin} +import buttondevteam.lib.architecture.Component import buttondevteam.lib.architecture.config.IConfigData -import buttondevteam.lib.architecture.{Component, ConfigData} import buttondevteam.lib.{TBMCCoreAPI, TBMCSystemChatEvent} import com.google.common.collect.Lists import discord4j.common.util.Snowflake @@ -14,13 +14,10 @@ import discord4j.core.`object`.entity.channel.MessageChannel import discord4j.core.spec.EmbedCreateSpec import discord4j.rest.util.Color import org.bukkit.Bukkit -import reactor.core.publisher.Mono import reactor.core.scala.publisher.SMono import java.util -import java.util.stream.Collectors import java.util.{Objects, UUID} -import scala.collection.mutable import scala.jdk.CollectionConverters.IterableHasAsScala /** diff --git a/src/main/scala/buttondevteam/discordplugin/mcchat/sender/DiscordConnectedPlayer.scala b/src/main/scala/buttondevteam/discordplugin/mcchat/sender/DiscordConnectedPlayer.scala index 1393102..e40be65 100644 --- a/src/main/scala/buttondevteam/discordplugin/mcchat/sender/DiscordConnectedPlayer.scala +++ b/src/main/scala/buttondevteam/discordplugin/mcchat/sender/DiscordConnectedPlayer.scala @@ -191,9 +191,6 @@ abstract class DiscordConnectedPlayer(user: User, channel: MessageChannel, val u override def getValue: Double = getDefaultValue override def getDefaultValue: Double = 20 //Works for max health, should be okay for the rest - - override def addTransientModifier(modifier: AttributeModifier): Unit = { - } } override def getGameMode = GameMode.SPECTATOR diff --git a/src/main/scala/buttondevteam/discordplugin/role/GameRoleModule.scala b/src/main/scala/buttondevteam/discordplugin/role/GameRoleModule.scala index 3088e3b..fa4ae1d 100644 --- a/src/main/scala/buttondevteam/discordplugin/role/GameRoleModule.scala +++ b/src/main/scala/buttondevteam/discordplugin/role/GameRoleModule.scala @@ -120,7 +120,7 @@ import scala.jdk.CollectionConverters.SeqHasAsJava val rc = roleColor.get if (r.getColor equals rc) DiscordPlugin.dc.getSelf.^^().flatMap(u => u.asMember(DiscordPlugin.mainServer.getId).^^()) - .flatMap(_.hasHigherRoles(Collections.singleton(r.getId)).^^()).cast[Boolean].defaultIfEmpty(false) //Below one of our roles + .flatMap(_.hasHigherRoles(Collections.singleton(r.getId)).^^().map(b => b: Boolean)).defaultIfEmpty(false) //Below one of our roles else SMono.just(false) } } \ No newline at end of file diff --git a/src/test/scala/DiscordTest.scala b/src/test/scala/DiscordTest.scala new file mode 100644 index 0000000..0cc3876 --- /dev/null +++ b/src/test/scala/DiscordTest.scala @@ -0,0 +1,12 @@ +import be.seeseemelk.mockbukkit.MockBukkit.{load, mock} +import buttondevteam.core.MainPlugin +import org.scalatest.flatspec.AnyFlatSpec + +class DiscordTest extends AnyFlatSpec { + "DiscordPlugin" should "boot" in { + println("Mocking Bukkit") + mock() + println("Loading Core") + load(classOf[MainPlugin], true) + } +}