Bump 0.8.4 (#97)

SimplyVanilla · Mar 9, 2024 · 60d273e · 60d273e
1 parent 8cb32dd
commit 60d273e
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 175 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 group 'net.simplyvanilla'
-version '0.8.3'
+version '0.8.4'
 
 java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(17))
@@ -25,15 +25,10 @@ repositories {
     maven {
         url 'https://repo.papermc.io/repository/maven-public/'
     }
-
-    maven {
-        url 'https://repo.extendedclip.com/content/repositories/placeholderapi/'
-    }
 }
 
 dependencies {
     compileOnly 'io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT'
-    compileOnly 'me.clip:placeholderapi:2.11.5'
     compileOnly 'io.github.miniplaceholders:miniplaceholders-api:2.2.3'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew.bat b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

diff --git a/src/main/java/net/simplyvanilla/simplyrank/SimplyRankPlugin.java b/src/main/java/net/simplyvanilla/simplyrank/SimplyRankPlugin.java
@@ -20,8 +20,6 @@
 import net.simplyvanilla.simplyrank.permission.PlayerDataService;
 import net.simplyvanilla.simplyrank.permission.PlayerPermissionService;
 import net.simplyvanilla.simplyrank.placeholder.MiniPlaceholderRegister;
-import net.simplyvanilla.simplyrank.placeholder.ScoreboardTeamsPlaceholderExtension;
-import net.simplyvanilla.simplyrank.placeholder.SimplyRankPlaceholderExpansion;
 import net.simplyvanilla.simplyrank.proxy.ProxyService;
 import net.simplyvanilla.simplyrank.proxy.ProxyTtlCleanupTask;
 import net.simplyvanilla.simplyrank.proxy.provider.ProxyCheckProvider;
@@ -150,12 +148,7 @@ public void onEnable() {
             e.printStackTrace();
         }
 
-        @Nullable Plugin plugin = this.getServer().getPluginManager().getPlugin("PlaceholderAPI");
-        if (plugin != null && plugin.isEnabled()) {
-            new SimplyRankPlaceholderExpansion().register();
-            new ScoreboardTeamsPlaceholderExtension().register();
-        }
-        plugin = this.getServer().getPluginManager().getPlugin("MiniPlaceholders");
+        @Nullable Plugin plugin = this.getServer().getPluginManager().getPlugin("MiniPlaceholders");
         if (plugin != null && plugin.isEnabled())
             new MiniPlaceholderRegister(this).register();
     }

diff --git a/...in/java/net/simplyvanilla/simplyrank/placeholder/ScoreboardTeamsPlaceholderExtension.java b/...in/java/net/simplyvanilla/simplyrank/placeholder/ScoreboardTeamsPlaceholderExtension.java
diff --git a/src/main/java/net/simplyvanilla/simplyrank/placeholder/SimplyRankPlaceholderExpansion.java b/src/main/java/net/simplyvanilla/simplyrank/placeholder/SimplyRankPlaceholderExpansion.java
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -9,4 +9,4 @@ database:
 proxycache-ttl: 720
 proxycheck-api-url: 'https://proxycheck.io/v2/%s&vpn=1'
 
-proxy-denied-message: 'You are using a proxy or VPN. Please disable it and try again.'
+proxy-denied-message: '<red>You are using a proxy or VPN. Please disable it and try again.</red>'
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -2,12 +2,12 @@ main: net.simplyvanilla.simplyrank.SimplyRankPlugin
 name: SimplyRank
 version: @version@
 api-version: 1.19
+folia-supported: true
 
 author: Simply Vanilla
 website: https://github.com/SimplyVanilla/SimplyRank
-folia-supported: true
 
-softdepend: [PlaceholderAPI, MiniPlaceholders]
+depend: [MiniPlaceholders]
 
 commands:
   simplyrank: