diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..13698eb4d --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,32 @@ +version: 2 +updates: +- package-ecosystem: gradle + directory: "/" + schedule: + interval: weekly + open-pull-requests-limit: 10 + target-branch: v6 + ignore: + - dependency-name: com.google.guava:guava + versions: + - ">= 22.a" + - "< 23" + - dependency-name: com.google.guava:guava + versions: + - ">= 23.a" + - "< 24" + - dependency-name: com.squareup.okhttp3:okhttp + versions: + - "> 4.2.2" + - dependency-name: com.squareup.okio:okio + versions: + - "> 2.4.1" + - "< 3" + - dependency-name: com.squareup.retrofit2:retrofit + versions: + - "> 2.4.0" + - "< 3" + - dependency-name: net.kyori:text-adapter-bukkit + versions: + - "> 3.0.3" + - "< 3.1" diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ServerListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ServerListener.java index 9c20fd425..1fa5ed699 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ServerListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ServerListener.java @@ -31,6 +31,7 @@ import com.plotsquared.bukkit.placeholder.MVdWPlaceholders; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.configuration.caption.TranslatableCaption; import com.plotsquared.core.player.ConsolePlayer; +import com.plotsquared.core.configuration.Settings; import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -47,7 +48,7 @@ public class ServerListener implements Listener { } @EventHandler public void onServerLoad(ServerLoadEvent event) { - if (Bukkit.getPluginManager().getPlugin("MVdWPlaceholderAPI") != null) { + if (Bukkit.getPluginManager().getPlugin("MVdWPlaceholderAPI") != null && Settings.Enabled_Components.USE_MVDWAPI) { new MVdWPlaceholders(this.plugin, PlotSquared.get().getPlaceholderRegistry()); ConsolePlayer.getConsole().sendMessage(TranslatableCaption.of("placeholder.hooked")); } diff --git a/Core/build.gradle b/Core/build.gradle index 7e69cbeb3..b47d359d0 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -6,7 +6,7 @@ repositories { def textVersion = "3.0.2" dependencies { - implementation("org.yaml:snakeyaml:1.25") + implementation("org.yaml:snakeyaml:1.26") implementation("com.google.code.gson:gson:2.8.6") { because("Minecraft uses GSON 2.8.0") force = true diff --git a/Core/src/main/java/com/plotsquared/core/configuration/Settings.java b/Core/src/main/java/com/plotsquared/core/configuration/Settings.java index e59c73677..fed29c9f0 100644 --- a/Core/src/main/java/com/plotsquared/core/configuration/Settings.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/Settings.java @@ -587,6 +587,8 @@ public class Settings extends Config { public static boolean EXTENDED_USERNAME_COMPLETION = true; @Comment("Command aliases that will be tab completed") public static List TAB_COMPLETED_ALIASES = Arrays.asList("plot", "plots", "p", "plotsquared", "plot2", "p2", "ps", "2", "plotme", "plotz", "ap"); + @Comment("Whether PlotSquared should hook into MvDWPlaceholderAPI or not") + public static boolean USE_MVDWAPI = true; } } diff --git a/build.gradle b/build.gradle index 3b0474633..3ca0cf1ba 100644 --- a/build.gradle +++ b/build.gradle @@ -14,14 +14,14 @@ buildscript { configurations.all { resolutionStrategy { force("org.ow2.asm:asm:8.0.1") - force("org.jetbrains:annotations:20.0.0") + force("org.jetbrains:annotations:20.1.0") } } } plugins { id "maven-publish" - id "org.ajoberstar.grgit" version "4.0.1" + id "org.ajoberstar.grgit" version "4.0.2" } group = "com.plotsquared" @@ -96,7 +96,7 @@ subprojects { subproject -> resolutionStrategy { force("junit:junit:4.12") force("com.google.guava:guava:21.0") - force("org.jetbrains:annotations:20.0.0") + force("org.jetbrains:annotations:20.1.0") force("com.google.code.findbugs:jsr305:3.0.2") } }