From 835f6877d4f6b91ea95b4b368aecf6765bac571e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Kleinekath=C3=B6fer?= Date: Fri, 12 May 2023 09:21:04 +0200 Subject: [PATCH 1/3] Added ability to adjust a sponsors display rate (#1070) --- .github/workflows/main.yml | 5 ++ ore/app/views/home.scala.html | 11 ++-- ore/conf/messages | 2 +- ore/conf/ore-default-settings.conf | 37 ++++++++++---- ore/public/images/sponsors/bisecthosting.svg | 1 + ore/public/images/sponsors/shockbyte.png | Bin 0 -> 11271 bytes .../resources/assets/entries/font-awesome.js | 4 +- oreClient/yarn.lock | 48 +++++++++--------- orePlayCommon/app/ore/OreConfig.scala | 4 +- .../app/views/layout/header.scala.html | 4 +- project/Settings.scala | 2 +- project/frontendDependencies.scala | 10 ++-- 12 files changed, 79 insertions(+), 49 deletions(-) create mode 100644 ore/public/images/sponsors/bisecthosting.svg create mode 100644 ore/public/images/sponsors/shockbyte.png diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b2464ef66..017c6a5f2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,6 +33,11 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Set up NodeJS + uses: actions/setup-node@v3 + with: + node-version: 16.16.0 + - name: Set up JDK uses: actions/setup-java@v1 with: diff --git a/ore/app/views/home.scala.html b/ore/app/views/home.scala.html index c228cb98b..b1ec7a8b6 100644 --- a/ore/app/views/home.scala.html +++ b/ore/app/views/home.scala.html @@ -6,13 +6,18 @@ @import controllers.sugar.Requests.OreRequest @import ore.OreConfig +@import ore.Sponsor @()(implicit messages: Messages, flash: Flash, request: OreRequest[_], config: OreConfig, assetsFinder: AssetsFinder) @randomSponsor = @{ - val logos = config.sponge.sponsors + val sponsors = config.sponge.sponsors - val index = new Random().nextInt(logos.size) - logos(index) + val totalWeight = sponsors.map(_.weight).sum + var randomNumber = Random.nextInt(totalWeight) + + sponsors.find { sponsor => + randomNumber < sponsor.weight || { randomNumber -= sponsor.weight; false } + }.getOrElse(sponsors.last) } @scripts = { diff --git a/ore/conf/messages b/ore/conf/messages index 9b37f3cfb..dc7d40b93 100644 --- a/ore/conf/messages +++ b/ore/conf/messages @@ -24,7 +24,7 @@ general.docs = Docs general.javadocs = Javadocs general.plugins = Plugins general.getsponge = Downloads -general.irc = Chat +general.discord = Discord general.edit = Edit general.cancel = Cancel general.save = Save diff --git a/ore/conf/ore-default-settings.conf b/ore/conf/ore-default-settings.conf index ffed70b99..046661468 100644 --- a/ore/conf/ore-default-settings.conf +++ b/ore/conf/ore-default-settings.conf @@ -234,30 +234,47 @@ sponge { # Sponsors from high to low donation amounts sponsors = [ + { + "name": "BisectHosting", + "image": "images/sponsors/bisecthosting.svg", + "link": "https://bisecthosting.com/sponge", + "weight": 37 + }, { "name": "Apex Hosting", "image": "images/sponsors/apexhosting.png", - "link": "https://apexminecrafthosting.com/" + "link": "https://apexminecrafthosting.com/", + "weight": 27 + }, + { + "name": "Minecraft Index", + "image": "images/sponsors/minecraftindex.svg", + "link": "https://minecraftindex.net/", + "weight": 17 + }, + { + "name": "Shockbyte", + "image":"images/sponsors/shockbyte.png", + "link": "https://shockbyte.com/", + "weight": 10 }, { "name": "CreeperHost", "image": "images/sponsors/creeperhost.svg", - "link": "https://billing.creeperhost.net/link.php?id=8" + "link": "https://billing.creeperhost.net/link.php?id=8", + "weight": 1 }, { "name": "JetBrains", "image": "images/sponsors/jetbrains.svg", - "link": "https://www.jetbrains.com/" + "link": "https://www.jetbrains.com/", + "weight": 1 }, { "name": "YourKit", "image": "images/sponsors/yourkit.png", - "link": "https://www.yourkit.com/" - }, - { - "name": "Minecraft Index", - "image": "images/sponsors/minecraftindex.svg", - "link": "https://minecraftindex.net/" - }, + "link": "https://www.yourkit.com/", + "weight": 1 + } ] } diff --git a/ore/public/images/sponsors/bisecthosting.svg b/ore/public/images/sponsors/bisecthosting.svg new file mode 100644 index 000000000..a842a668d --- /dev/null +++ b/ore/public/images/sponsors/bisecthosting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ore/public/images/sponsors/shockbyte.png b/ore/public/images/sponsors/shockbyte.png new file mode 100644 index 0000000000000000000000000000000000000000..d1fbb895b4d2bfd86fd905e1353c210f3d8908ef GIT binary patch literal 11271 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 @messages("general.getsponge") -
  • - @messages("general.irc") +
  • + @messages("general.discord")
    • diff --git a/project/Settings.scala b/project/Settings.scala index 65f61240c..abaf885f5 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -11,7 +11,7 @@ object Settings { val scalaVer = "2.13.6" val commonSettings = Seq( - version := "2.0.0-M2.9", + version := "2.0.0-M2.10", scalaVersion := scalaVer, scalacOptions ++= Seq( "-deprecation", diff --git a/project/frontendDependencies.scala b/project/frontendDependencies.scala index d5235deeb..2afd3c23d 100644 --- a/project/frontendDependencies.scala +++ b/project/frontendDependencies.scala @@ -11,10 +11,10 @@ object NPMDeps { val lodash = "lodash" -> "4.17.21" val queryString = "query-string" -> "7.1.1" - val fontAwesome = "@fortawesome/fontawesome-svg-core" -> "6.1.1" - val fontAwesomeSolid = "@fortawesome/free-solid-svg-icons" -> "6.1.1" - val fontAwesomeRegular = "@fortawesome/free-regular-svg-icons" -> "6.1.1" - val fontAwesomeBrands = "@fortawesome/free-brands-svg-icons" -> "6.1.1" + val fontAwesome = "@fortawesome/fontawesome-svg-core" -> "6.4.0" + val fontAwesomeSolid = "@fortawesome/free-solid-svg-icons" -> "6.4.0" + val fontAwesomeRegular = "@fortawesome/free-regular-svg-icons" -> "6.4.0" + val fontAwesomeBrands = "@fortawesome/free-brands-svg-icons" -> "6.4.0" val babel = "@babel/core" -> "7.18.9" val babelLoader = "babel-loader" -> "8.2.5" @@ -40,7 +40,7 @@ object NPMDeps { object WebjarsDeps { val jQuery = "org.webjars.npm" % "jquery" % "2.2.4" - val fontAwesome = "org.webjars" % "font-awesome" % "6.1.1" + val fontAwesome = "org.webjars" % "font-awesome" % "6.4.0" val filesize = "org.webjars.npm" % "filesize" % "9.0.1" val moment = "org.webjars.npm" % "moment" % "2.29.4" val clipboard = "org.webjars.npm" % "clipboard" % "2.0.11" From 943a6ddbab419b3b138ff5bde99702f5066490e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Kleinekath=C3=B6fer?= Date: Sat, 7 Oct 2023 19:05:26 +0200 Subject: [PATCH 2/3] Removed Apex Hosting as sponsor (#1072) --- ore/conf/ore-default-settings.conf | 6 ------ ore/public/images/sponsors/apexhosting.png | Bin 3535 -> 0 bytes 2 files changed, 6 deletions(-) delete mode 100644 ore/public/images/sponsors/apexhosting.png diff --git a/ore/conf/ore-default-settings.conf b/ore/conf/ore-default-settings.conf index 046661468..30ab25c29 100644 --- a/ore/conf/ore-default-settings.conf +++ b/ore/conf/ore-default-settings.conf @@ -240,12 +240,6 @@ sponge { "link": "https://bisecthosting.com/sponge", "weight": 37 }, - { - "name": "Apex Hosting", - "image": "images/sponsors/apexhosting.png", - "link": "https://apexminecrafthosting.com/", - "weight": 27 - }, { "name": "Minecraft Index", "image": "images/sponsors/minecraftindex.svg", diff --git a/ore/public/images/sponsors/apexhosting.png b/ore/public/images/sponsors/apexhosting.png deleted file mode 100644 index 272058d61790ee0ab0273eb2dc01593df7caf717..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3535 zcmV;=4KVVFP)pSfk{L`RCr$PorjlHMHa^Qf7l$|oZNgioegJq6-7~0%(w!A0R&Nk zm-Xxbx^?fZnlF9%yvEAY)3bKd3*FPR4CsaK=~)K!LihA61A3u*dX@pb&^(0F@4*L!sR%2%`Pz@jGtA2F(?P8mro)W##OU&=rZ?3Msr*|N3 zgj-b{{_I#F`fKldEND~uE>BNGFZ2=+Azsy?w;D71Ep_DBaV^z&oIZU<{}m0|q-_R} zb1u0}ya&(nrWbmV_`}Ous2e)=Rnz7#RVPkHo_l3pFfjb{mX7NF z0VCBrtJkZ~j-Sw_qH*-t2{mTce061qUg~@GZWZs%v;63VUIb!JA3l0aOD`J7Po7k( zHf&b?Mom$FX?%~^9{lCityRZ?qtvnwHY67P&V2{eg{``Z?Rl0Lz0ixmy)kQVX5E$R zH>z%f$Esgk)mm&Lia)ucrFvlCNVRm$M}cSl%$aZ#AMd@?hG%)v3%v+DbmTKFGa0YE z`HuQ+!?t4GH2lVeO@np$sne%*%lTmaF4grcFM6RDfk_>1Q{Gsj{?oj(`f8mfVmo0Z zEO$%yfoj{X_>i0zx+g5C(0@?BMJT26wUuc+>)_qYx*O-)x9Z+3wrBX$2Cag1dYr{z zoAN9Zq_#>)-aq$#?zMNRbFaBm{p`wCsrv-wf1FveP#=E<%NIWT%K7OA$uA0t)bJZw z+Cl!VP8hYILLV@8y6#@NpyStR`H)x#K0I`Mu-25wtVQUkY1jT@=lJ(+oz?zBM*`

    >sd!&gCNSbN#;8S@aGK7J%4zGL| z5ciHf`-64A9hSq{XSXGhq#gVUHh*({o4j)Wy0ueYIhGD?Ir#Mpng))*r^n9_ork>J zKF?1Mq61MGe?$&i_8g>UEnKc^=7M~LHjfRh6v3Oz*97?qX=vU(0|^dHo3w4;&s*<( z5cD^f_)P3_hUYc!l2dN(l9ggP$Uu)HchJPyL7s$*V<%1q5tY`xhXhd_sf{oeOz4a{ z?|-yO-%>vAd2)nU4~7j85_k}HU4)(#_3rGhety**>WyWq^(R^2*!uQG*%=kFEm^f* zU(I66r+ad~U!p7Y3v@?9D5SUY!lFR^?t{k#;Wb`t6cF`CTXv{sT?Yi;!F}6EBJ`WP z4b-Kx_*>Ka^U5{2yO+M2g)0R3r$!yr^V43}CF0R_&{$FIbY|&YNkEj;S^nWC`jh0i zw9O+yT?RK7FJyj)eNSN-j0{{-wqo5oy6F-XU|?~}z>8aVSL-%y*QMeye9AnroiG+m z=>NF+0euTHKH0ugtOwHw9b9tP!t5k_Q`3xriK3d8`=fA18IT9Vz=|PIyc1*ayIVk|3Xl&ri2cj z7(F$oEKDMF`p2hx59ku{U~vC?v;6lH#exaF|JZ5zHe_ImgqiPYg^t(S)UArpVc(Hc z^ru;TylrRT$;LX7W?g0}Q$LDvLbu7Xg_j={BD28&MFNc^L|D^8@AUL&eI*~CpE?z~ zeBpB=IEWc5f!~kc!F^r~p46*Jp>uDT|91H}q0`@3)`fxPn)}S6%>OVJMCf>p>3lX; zZ`ho7gROcE66;Gszr0 zD(Y5O=wSSuw{yzJ3BARm&*&?;pj_ijpI`vvH}SiBJ~uJwhdfKWjU+6H(EoVj-TL;j zXxDeRnv)TnjWF|F61ovGJFLos;->{-hZiVA%u?AVz1TX zguZe6E`22nd|id!omdc|v%a!{FzVd?pz1zky#AyD2M!+%ez;pdO6Y`7r1c9infS-({0fm3^3G#5nCn<#NpSuBkLR>&v)Dq%kw+NR1vwX#j}kil!iDW< zoA=K9`qO;i_b}y>u-ZcBm?Iaq({0jgi}a@z!29mbkZFZ}S=&b|>lQ-jy+=&arSf4+ z$u#sr&mw9@j}tl}Hhd#V;O18tmO|((FQo(*Cc0W9bm?Z;PffUujIh_1=3ghv&2A%& z(D72*b(0F+_UPIq6D`cs4S2CpS$z_{>7GTDV^r!p_8@LZ_8c+lC=f1n>%me8ozEpl zBw;|za~rPd?!tChpEW}N!++b0p|3dbu6#vw=&uE)G2@9OPor z`xQ%(q^u1>m%Q!>&PB1DaV~j(#GDDKNs$uLn5BB95<0UwB6UH=o()^*gr#v%+u*nT z`nrnrV?x4MG%R5z%w4EURG_3nC$G9HAdF(iq$Q!_l)?1D+sg^5l2Boo(5132qfB-i zbif-s^%L8WSX+f27haRz1=bQd0(Lu4a9#?rtu7kKq&a)e4kU=+hT0(_fn&n9QafN$5$#CsOB{`S$W43y#6UrkyZDyqbsQ z0{?`!1Q6tkT5fH`WyO61xhA#zFf)|e<@>Pkj-X@$sw&ZR;=4t*;b*2 z9tQK^Fxh#KE=WaWV+$QYN=uA#=-Dh+p~EOEFD?a^Y)I1%LU+N8Puy8D-NT|Ir4~Aq zNfcb6bC!Qto;%Nr-z@2@WI~rrFEY5KxTcgjXParI7P_0r1IQ`1Uz*g>m_^)R!%$8^N)gA*SajV(BaFkFVR=?;R+o}iAZrMnb4&lLte2|*6n@x1V zF=q|9P@mma_Qk^(f zS?HeOl&l?&QzA-%=UJ*_Gp*1O5(!G%gi&r002ov JPDHLkV1mYd?8X29 From 93d86d0af9f82af6cf22600dffe08780bf9cea41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Kleinekath=C3=B6fer?= Date: Wed, 15 May 2024 00:14:08 +0200 Subject: [PATCH 3/3] Sponsor changes and version bump (#1075) --- ore/conf/ore-default-settings.conf | 20 +++++++------------ ore/public/images/sponsors/creeperhost.svg | 1 - ore/public/images/sponsors/minecraftindex.svg | 1 - ore/public/images/sponsors/scalacube.svg | 1 + project/Settings.scala | 2 +- 5 files changed, 9 insertions(+), 16 deletions(-) delete mode 100644 ore/public/images/sponsors/creeperhost.svg delete mode 100644 ore/public/images/sponsors/minecraftindex.svg create mode 100644 ore/public/images/sponsors/scalacube.svg diff --git a/ore/conf/ore-default-settings.conf b/ore/conf/ore-default-settings.conf index 30ab25c29..bc9dcbc70 100644 --- a/ore/conf/ore-default-settings.conf +++ b/ore/conf/ore-default-settings.conf @@ -234,17 +234,17 @@ sponge { # Sponsors from high to low donation amounts sponsors = [ + { + "name": "ScalaCube", + "image": "images/sponsors/scalacube.svg", + "link": "https://scalacube.com/p/_hosting_server_minecraft/sponsored/spongepowered", + "weight": 30 + }, { "name": "BisectHosting", "image": "images/sponsors/bisecthosting.svg", "link": "https://bisecthosting.com/sponge", - "weight": 37 - }, - { - "name": "Minecraft Index", - "image": "images/sponsors/minecraftindex.svg", - "link": "https://minecraftindex.net/", - "weight": 17 + "weight": 20 }, { "name": "Shockbyte", @@ -252,12 +252,6 @@ sponge { "link": "https://shockbyte.com/", "weight": 10 }, - { - "name": "CreeperHost", - "image": "images/sponsors/creeperhost.svg", - "link": "https://billing.creeperhost.net/link.php?id=8", - "weight": 1 - }, { "name": "JetBrains", "image": "images/sponsors/jetbrains.svg", diff --git a/ore/public/images/sponsors/creeperhost.svg b/ore/public/images/sponsors/creeperhost.svg deleted file mode 100644 index c360924de..000000000 --- a/ore/public/images/sponsors/creeperhost.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/ore/public/images/sponsors/minecraftindex.svg b/ore/public/images/sponsors/minecraftindex.svg deleted file mode 100644 index 0fa886bef..000000000 --- a/ore/public/images/sponsors/minecraftindex.svg +++ /dev/null @@ -1 +0,0 @@ -Layer 1 diff --git a/ore/public/images/sponsors/scalacube.svg b/ore/public/images/sponsors/scalacube.svg new file mode 100644 index 000000000..05f7f98fa --- /dev/null +++ b/ore/public/images/sponsors/scalacube.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/project/Settings.scala b/project/Settings.scala index abaf885f5..c5842adea 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -11,7 +11,7 @@ object Settings { val scalaVer = "2.13.6" val commonSettings = Seq( - version := "2.0.0-M2.10", + version := "2.0.0-M2.11", scalaVersion := scalaVer, scalacOptions ++= Seq( "-deprecation",