Compare commits

...
49 Commits
Author SHA1 Message Date
Adrian f2c6aa08f4 release: Version 2.2.4 2024-02-03 22:06:57 -05:00
Adrian 7727dca940 misc: Removed old Krypton module sources 2024-02-03 21:57:41 -05:00
Adrian 151b2dc2a4 misc: Deprecated TagsUtils#staticTag 2024-02-03 21:57:06 -05:00
Adrian 62c11dd84a Merge pull request #176 from MiniPlaceholders/renovate/fabric.loader
fix(deps): update dependency net.fabricmc:fabric-loader to v0.15.6
2024-02-03 21:54:18 -05:00
Adrian 77913be0fa Merge pull request #178 from MiniPlaceholders/renovate/fabric-loom-1.x
chore(deps): update plugin fabric-loom to v1.5.7
2024-02-03 21:54:03 -05:00
Adrian 685f67146d Merge pull request #179 from MiniPlaceholders/renovate/adventurefabric
fix(deps): update dependency net.kyori:adventure-platform-fabric to v5.11.0
2024-02-03 21:53:56 -05:00
Adrian 6f524b056a Merge pull request #180 from MiniPlaceholders/renovate/nick-invision-retry-3.x
chore(deps): update nick-invision/retry action to v3
2024-02-03 21:53:50 -05:00
Adrian 36f1cce813 Merge pull request #181 from MiniPlaceholders/renovate/gradle-8.x
chore(deps): update dependency gradle to v8.6
2024-02-03 21:53:43 -05:00
renovate[bot] 4061c8acbe chore(deps): update dependency gradle to v8.6 2024-02-02 18:22:06 +00:00
renovate[bot] 319731cef0 chore(deps): update nick-invision/retry action to v3 2024-01-31 18:53:24 +00:00
renovate[bot] 9e29afa9c5 chore(deps): update plugin fabric-loom to v1.5.7 2024-01-25 09:35:54 +00:00
renovate[bot] 9655509c2f fix(deps): update dependency net.kyori:adventure-platform-fabric to v5.11.0 2024-01-21 07:40:06 +00:00
renovate[bot] 26f1042d17 fix(deps): update dependency net.fabricmc:fabric-loader to v0.15.6 2024-01-18 03:44:36 +00:00
Adrian 84c39e9205 Merge pull request #171 from MiniPlaceholders/renovate/fabric-loom-1.x
chore(deps): update plugin fabric-loom to v1.5.5
2024-01-15 21:25:24 -05:00
Adrian 77327661f3 Merge pull request #172 from MiniPlaceholders/renovate/fabric.api
fix(deps): update dependency net.fabricmc.fabric-api:fabric-api to v0.93.1+1.20.5
2024-01-15 21:25:17 -05:00
Adrian b725fd2bae Merge pull request #173 from MiniPlaceholders/renovate/org.gradle.toolchains.foojay-resolver-convention-0.x
chore(deps): update plugin org.gradle.toolchains.foojay-resolver-convention to v0.8.0
2024-01-15 21:25:10 -05:00
renovate[bot] f9a5acaaaf chore(deps): update plugin fabric-loom to v1.5.5 2024-01-13 11:05:36 +00:00
renovate[bot] fe613ce82d chore(deps): update plugin org.gradle.toolchains.foojay-resolver-convention to v0.8.0 2024-01-12 16:49:57 +00:00
renovate[bot] 21839e1e37 fix(deps): update dependency net.fabricmc.fabric-api:fabric-api to v0.93.1+1.20.5 2024-01-12 14:14:32 +00:00
Adrian 25d1588032 Merge pull request #167 from MiniPlaceholders/renovate/fabric.api
fix(deps): update dependency net.fabricmc.fabric-api:fabric-api to v0.92.0+1.20.5
2023-12-29 19:45:03 -05:00
renovate[bot] 92583013db fix(deps): update dependency net.fabricmc.fabric-api:fabric-api to v0.92.0+1.20.5 2023-12-29 15:38:27 +00:00
Adrian 89a7bdb208 Merge pull request #165 from MiniPlaceholders/renovate/fabric.loader
fix(deps): update dependency net.fabricmc:fabric-loader to v0.15.3
2023-12-29 10:37:41 -05:00
Adrian 0e7d4cb6dd Merge pull request #169 from MiniPlaceholders/renovate/kotlin-monorepo
fix(deps): update kotlin monorepo to v1.9.22
2023-12-29 10:37:23 -05:00
renovate[bot] 159b96579f fix(deps): update kotlin monorepo to v1.9.22 2023-12-21 17:01:40 +00:00
renovate[bot] efb155a171 fix(deps): update dependency net.fabricmc:fabric-loader to v0.15.3 2023-12-18 18:01:40 +00:00
Adrian 71ad7fb399 Merge pull request #168 from MiniPlaceholders/renovate/adventure
fix(deps): update adventure to v4.15.0
2023-12-18 07:04:22 -05:00
renovate[bot] 8b219fd553 fix(deps): update adventure to v4.15.0 2023-12-18 10:44:32 +00:00
Adrian 9899f0bab4 Merge pull request #166 from MiniPlaceholders/renovate/actions-upload-artifact-4.x
chore(deps): update actions/upload-artifact action to v4
2023-12-14 18:29:38 -05:00
renovate[bot] 7044e43483 chore(deps): update actions/upload-artifact action to v4 2023-12-14 20:59:42 +00:00
Adrian 36f1739704 Merge pull request #162 from MiniPlaceholders/renovate/actions-setup-java-4.x
chore(deps): update actions/setup-java action to v4
2023-12-12 18:11:11 -05:00
Adrian d173de4250 Merge pull request #163 from MiniPlaceholders/renovate/userdev
chore(deps): update dependency io.papermc.paperweight.userdev to v1.5.11
2023-12-12 18:10:25 -05:00
Adrian 410fe06117 Merge pull request #164 from MiniPlaceholders/renovate/fabric-loom-1.x
chore(deps): update plugin fabric-loom to v1.4.5
2023-12-12 18:10:08 -05:00
Adrian e198769698 Merge pull request #161 from MiniPlaceholders/renovate/fabric.loader
fix(deps): update dependency net.fabricmc:fabric-loader to v0.15.1
2023-12-12 12:59:04 -05:00
renovate[bot] 41ff8c1e12 fix(deps): update dependency net.fabricmc:fabric-loader to v0.15.1 2023-12-11 16:06:24 +00:00
Adrian 344af47d19 Merge pull request #144 from MiniPlaceholders/renovate/fabric.api
fix(deps): update dependency net.fabricmc.fabric-api:fabric-api to v0.91.2+1.20.4
2023-12-11 11:06:00 -05:00
Adrian 756b1e9b43 Merge pull request #160 from MiniPlaceholders/renovate/gradle-8.x
chore(deps): update dependency gradle to v8.5
2023-12-11 11:05:48 -05:00
renovate[bot] 85b7a24770 chore(deps): update plugin fabric-loom to v1.4.5 2023-12-10 01:26:49 +00:00
renovate[bot] 7f484f33f0 fix(deps): update dependency net.fabricmc.fabric-api:fabric-api to v0.91.2+1.20.4 2023-12-09 01:44:53 +00:00
renovate[bot] 5d21522fa7 chore(deps): update dependency io.papermc.paperweight.userdev to v1.5.11 2023-12-08 18:53:59 +00:00
renovate[bot] 176266c9d5 chore(deps): update actions/setup-java action to v4 2023-11-29 16:22:40 +00:00
renovate[bot] c5bf073888 chore(deps): update dependency gradle to v8.5 2023-11-29 14:51:10 +00:00
Adrian f2cbd1db75 Merge pull request #159 from MiniPlaceholders/renovate/fabric.loader
fix(deps): update dependency net.fabricmc:fabric-loader to v0.14.25
2023-11-29 09:46:01 -05:00
renovate[bot] e995e5441e fix(deps): update dependency net.fabricmc:fabric-loader to v0.14.25 2023-11-28 12:37:22 +00:00
Adrian f776f8ae61 Merge pull request #157 from MiniPlaceholders/renovate/org.jetbrains.kotlin.jvm-1.x
chore(deps): update plugin org.jetbrains.kotlin.jvm to v1.9.21
2023-11-27 17:04:38 -05:00
Adrian a26f92e75c Merge pull request #158 from MiniPlaceholders/renovate/kotlin-monorepo
fix(deps): update dependency org.jetbrains.kotlin:kotlin-gradle-plugin to v1.9.21
2023-11-27 17:04:30 -05:00
renovate[bot] b030f02aac fix(deps): update dependency org.jetbrains.kotlin:kotlin-gradle-plugin to v1.9.21 2023-11-24 07:39:15 +00:00
renovate[bot] 4336746bf3 chore(deps): update plugin org.jetbrains.kotlin.jvm to v1.9.21 2023-11-23 16:49:59 +00:00
Adrian e7e87a72dd Merge pull request #156 from MiniPlaceholders/renovate/userdev
chore(deps): update dependency io.papermc.paperweight.userdev to v1.5.10
2023-11-21 19:11:24 -05:00
renovate[bot] 0dce995222 chore(deps): update dependency io.papermc.paperweight.userdev to v1.5.10 2023-11-21 22:38:10 +00:00
11 changed files with 17 additions and 127 deletions

No files matched your search

+3 -3
View File
@@ -11,21 +11,21 @@ jobs:
uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'temurin'
cache: 'gradle'
- name: Build with Gradle
uses: nick-invision/retry@v2
uses: nick-invision/retry@v3
with:
timeout_minutes: 10
max_attempts: 2
command: gradle build
- name: Upload Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: MiniPlaceholders
path: jar/MiniPlaceholders-*.jar
@@ -41,6 +41,7 @@ public final class TagsUtils {
* @return a new basic self closing Tag of a string
* @since 1.1.0
*/
@Deprecated
public static @NotNull Tag staticTag(@NotNull String string) {
return Tag.selfClosingInserting(Component.text(string));
}
@@ -51,6 +52,7 @@ public final class TagsUtils {
* @return a new basic self closing Tag of a component
* @since 1.1.0
*/
@Deprecated
public static @NotNull Tag staticTag(@NotNull Component component) {
return Tag.selfClosingInserting(component);
}
+1 -1
View File
@@ -15,5 +15,5 @@ dependencyResolutionManagement {
}
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
}
+1 -1
View File
@@ -1,5 +1,5 @@
plugins {
kotlin("jvm") version "1.9.20" apply false
kotlin("jvm") version "1.9.22" apply false
}
tasks {
+1 -1
View File
@@ -1,5 +1,5 @@
group = io.github.miniplaceholders
version = 2.2.3
version = 2.2.4
description = MiniMessage Component-based Placeholders for Paper, Fabric, Sponge, Folia and Velocity platforms
org.gradle.jvmargs=-Xmx2G
+6 -6
View File
@@ -8,7 +8,7 @@ minecraft = "1.20.2"
runtask = "2.2.2"
pluginyml = "0.6.0"
userdev = "1.5.9"
userdev = "1.5.11"
blossom = "2.1.0"
indra = "3.1.3"
shadow = "8.1.1"
@@ -16,13 +16,13 @@ jmh = "0.7.2"
dokka = "1.9.10"
cloud = "1.8.4"
adventure = "4.14.0"
adventurefabric = "5.10.1"
adventure = "4.15.0"
adventurefabric = "5.11.0"
brigadier = "1.0.500"
kotlin="1.9.20"
kotlin="1.9.22"
fabric-api = "0.90.1+1.20.3"
fabric-loader = "0.14.24"
fabric-api = "0.93.1+1.20.5"
fabric-loader = "0.15.6"
desertwell = "2.0.4"
Binary file not shown.
+1 -1
View File
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
-27
View File
@@ -1,27 +0,0 @@
plugins {
kotlin("jvm")
kotlin("kapt")
alias(libs.plugins.shadow)
}
repositories {
maven("https://repo.kryptonmc.org/releases")
maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
maven("https://repo.kryptonmc.org/snapshots")
}
dependencies {
compileOnly(libs.krypton.server)
compileOnly(kotlin("stdlib"))
kapt(libs.krypton.annotation)
implementation(projects.miniplaceholdersCommon)
implementation(projects.miniplaceholdersApi)
implementation(projects.miniplaceholdersConnect)
implementation(projects.miniplaceholdersKotlinExt)
}
kotlin {
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(17))
}
}
@@ -1,85 +0,0 @@
package io.github.miniplaceholders.krypton
import com.google.inject.Inject
import io.github.miniplaceholders.api.utils.TagsUtils
import io.github.miniplaceholders.common.PlaceholdersCommand
import io.github.miniplaceholders.common.PlaceholdersPlugin
import io.github.miniplaceholders.common.PluginConstants
import io.github.miniplaceholders.connect.InternalPlatform
import io.github.miniplaceholders.kotlin.asClosingTag
import io.github.miniplaceholders.kotlin.expansion
import net.kyori.adventure.text.Component
import org.apache.logging.log4j.Logger
import org.kryptonmc.api.command.BrigadierCommand
import org.kryptonmc.api.command.CommandExecutionContext
import org.kryptonmc.api.event.Listener
import org.kryptonmc.api.event.server.ServerStartEvent
import org.kryptonmc.api.plugin.annotation.Plugin
import org.kryptonmc.krypton.KryptonServer
import org.kryptonmc.krypton.command.KryptonCommandMeta
@Plugin(
name = "MiniPlaceholders",
id = "miniplaceholders",
version = PluginConstants.VERSION,
authors = ["4drian3d"]
)
class KotlinKryptonPlugin @Inject constructor(
private val server: KryptonServer,
private val logger: Logger
) : PlaceholdersPlugin {
init {
InternalPlatform.platform(InternalPlatform.KRYPTON)
}
@Listener
@Suppress("UNUSED")
fun onServerStart(event: ServerStartEvent) {
logger.info("Starting MiniPlaceholders Krypton")
this.loadDefaultExpansions()
this.registerPlatformCommand()
}
override fun loadDefaultExpansions() {
expansion("server") {
globalPlaceholder("total_entities") { _, _ ->
var entityCount = 0
for ((_, value) in server.worldManager.worlds) {
entityCount += value.entities.size
}
Component.text(entityCount).asClosingTag()
}
globalPlaceholder("total_chunks") { _, _ ->
var chunkCount = 0
for ((_, value) in server.worldManager.worlds) {
chunkCount += value.chunks.size
}
Component.text(chunkCount).asClosingTag()
}
globalPlaceholder("name", TagsUtils.staticTag(server.platform.name))
globalPlaceholder("online") { queue, _ ->
if (queue.hasNext()) {
val worldName = queue.pop().value()
val players = server.players.filter { it.world.name == worldName }
return@globalPlaceholder Component.text(players.joinToString(", ")).asClosingTag()
}
Component.text(server.players.size).asClosingTag()
}
globalPlaceholder("version", TagsUtils.staticTag(server.platform.version))
globalPlaceholder("max_players", Component.text(server.config.maxPlayers).asClosingTag())
}.register()
}
override fun registerPlatformCommand() {
/*val command = PlaceholdersCommand.builder<CommandExecutionContext>()
.fromSourceToAudience { it.sender }
.playerSuggestions { server.players.map { it.name } }
.toAudience { server.getPlayer(it) }
.build()
val brigadierCMD = BrigadierCommand.of(command.asNode("miniplaceholders"))
val meta = KryptonCommandMeta.Builder("miniplaceholders").build()
server.commandManager.register(brigadierCMD, meta)*/
}
}
+2 -2
View File
@@ -30,9 +30,9 @@ dependencyResolutionManagement {
}
plugins {
id("fabric-loom") version "1.4.4"
id("fabric-loom") version "1.5.7"
id("org.spongepowered.gradle.plugin") version "2.2.0"
id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
}
arrayOf(