Compare commits

..

4 Commits

Author SHA1 Message Date
Colbster937
9b6bc94def Merge branch 'main' of https://github.com/WebMCDevelopment/originblacklist 2026-02-17 09:56:21 -06:00
Colbster937
4dd81995d5 disable auto updater 2026-02-17 09:56:14 -06:00
dependabot[bot]
41ce550089 Bump me.clip:placeholderapi from 2.12.1 to 2.12.2 (#18)
Bumps me.clip:placeholderapi from 2.12.1 to 2.12.2.

---
updated-dependencies:
- dependency-name: me.clip:placeholderapi
  dependency-version: 2.12.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-02-12 15:58:08 +00:00
Colbster937
745622fa36 update build.gradle.kts 2026-02-11 07:38:31 -06:00
3 changed files with 15 additions and 13 deletions

View File

@@ -71,7 +71,7 @@ dependencies {
compileOnly("net.lax1dude.eaglercraft.backend:api-velocity:1.0.0")
compileOnly("net.lax1dude.eaglercraft.backend:api-bungee:1.0.0")
compileOnly("net.lax1dude.eaglercraft.backend:api-bukkit:1.0.0")
compileOnly("me.clip:placeholderapi:2.12.1")
compileOnly("me.clip:placeholderapi:2.12.2")
compileOnly("net.william278:papiproxybridge:1.8.4")
implementation("org.semver4j:semver4j:6.0.0")
implementation("de.marhali:json5-java:3.0.0")
@@ -111,12 +111,12 @@ val BUILD_PROPS = mapOf(
"git_cm_hash" to GIT_INFO.gitHashFull,
)
tasks.withType<JavaCompile>().configureEach {
tasks.named<JavaCompile>("compileJava") {
options.encoding = "UTF-8"
options.release.set(21)
}
tasks.withType<ProcessResources>().configureEach {
tasks.named<ProcessResources>("processResources") {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
outputs.upToDateWhen { false }
@@ -139,11 +139,12 @@ tasks.withType<ProcessResources>().configureEach {
inputs.files(tasks.named<JavaCompile>("compileJava").map { it.outputs.files })
}
tasks.withType<Jar>().configureEach {
if (this !is ShadowJar) enabled = false
tasks.named<Jar>("jar") {
enabled = false
}
tasks.withType<ShadowJar>().configureEach {
tasks.named<ShadowJar>("shadowJar") {
enabled = true
doFirst {
delete(layout.buildDirectory.dir("libs"))
mkdir(layout.buildDirectory.dir("libs"))
@@ -168,17 +169,17 @@ tasks.register("printVars") {
}
}
tasks.withType<RunServer>().configureEach {
tasks.named<RunServer>("runServer") {
minecraftVersion("1.12.2")
runDirectory.set(layout.projectDirectory.dir("run/paper"))
jvmArgs("-Dcom.mojang.eula.agree=true")
downloadPlugins {
github("lax1dude", "eaglerxserver", "v" + EAGXS_VER, "EaglerXServer.jar")
modrinth("placeholderapi", "2.12.1")
modrinth("placeholderapi", "2.12.2")
}
}
tasks.withType<RunWaterfall>().configureEach {
tasks.named<RunWaterfall>("runWaterfall") {
waterfallVersion("1.21")
runDirectory.set(layout.projectDirectory.dir("run/waterfall"))
downloadPlugins {
@@ -186,8 +187,8 @@ tasks.withType<RunWaterfall>().configureEach {
}
}
tasks.withType<RunVelocity>().configureEach {
velocityVersion("3.4.0-SNAPSHOT")
tasks.named<RunVelocity>("runVelocity") {
velocityVersion("3.5.0-SNAPSHOT")
runDirectory.set(layout.projectDirectory.dir("run/velocity"))
downloadPlugins {
github("lax1dude", "eaglerxserver", "v" + EAGXS_VER, "EaglerXServer.jar")

View File

@@ -510,7 +510,8 @@ public final class OriginBlacklist {
private final void checkForUpdates() {
this.checkForUpdates(() -> {
if (!this.config.getBoolean("update_checker.auto_update")) {
// if (!this.config.getBoolean("update_checker.auto_update")) {
if (true) {
this.plugin.log(EnumLogLevel.INFO, "An update is available! Download it at " + this.updateURL);
} else {
this.updatePlugin();

View File

@@ -242,7 +242,7 @@ public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {
@Override
public final void shutdown() {
for (ScheduledTask task : this.proxy.getScheduler().tasksByPlugin(this.plugin)) {
for (final ScheduledTask task : this.proxy.getScheduler().tasksByPlugin(this.plugin)) {
task.cancel();
}
}