mirrors/BetterRTP
1
0
Fork 0
mirror of https://github.com/RonanPlugins/BetterRTP.git synced 2025-07-03 16:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Kingdoms & Use Residence public build (#189)

Browse Source 
* Remove refernece to org.kingdoms in CmdWorld

* Remove unused imports

* Update Kingdoms API

* Use public build of Residence instead of reflection
This commit is contained in:
TechnicallyCoded 2024-01-04 17:44:01 +01:00 committed by GitHub
parent 7923c3b223
commit 6cc8eb7d4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pom.xml
View File

@ -255,7 +255,7 @@
<dependency> <dependency>
<groupId>com.github.cryptomorin</groupId> <groupId>com.github.cryptomorin</groupId>
<artifactId>kingdoms</artifactId> <artifactId>kingdoms</artifactId>
<version>1.13.9</version> <version>1.16.8.1.1</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
@ -372,15 +372,13 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency>--> </dependency>-->
<!-- CAN BE UNCOMMENTED IF YOU HAVE ACCESS TO THE PLUGIN --> <!-- Provided by repo: devmart-public -->
<!-- Private Repoed --> <dependency>
<!-- This is uploaded to our private repo on https://repo.ronanplugins.com --> <groupId>com.bekvon.bukkit.residence</groupId>
<!--<dependency>
<groupId>com.ronanplugins</groupId>
<artifactId>Residence</artifactId> <artifactId>Residence</artifactId>
<version>4.9.1.9</version> <version>5.1.4.1</version>
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency>--> </dependency>
</dependencies> </dependencies>
</project> </project>

1
src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdWorld.java
View File

@ -15,7 +15,6 @@ import org.bukkit.Bukkit;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.kingdoms.commands.general.misc.CommandTeleport;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

6
src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/regionPlugins/RTP_KingdomsX.java
View File

@ -1,13 +1,11 @@
package me.SuperRonanCraft.BetterRTP.references.depends.regionPlugins; package me.SuperRonanCraft.BetterRTP.references.depends.regionPlugins;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.references.settings.SoftDepends;
import org.bukkit.Location; import org.bukkit.Location;
public class RTP_KingdomsX implements RegionPluginCheck { public class RTP_KingdomsX implements RegionPluginCheck {
// NOT TESTED (3.0.2) // NOT TESTED (3.6.12)
// KingdomsX (v1.10.5.2) // KingdomsX (v1.16.8.1.1)
// https://www.spigotmc.org/resources/kingdomsx.77670/ // https://www.spigotmc.org/resources/kingdomsx.77670/
public boolean check(Location loc) { public boolean check(Location loc) {
boolean result = true; boolean result = true;

12
src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/regionPlugins/RTP_Residence.java
View File

@ -4,18 +4,16 @@ import org.bukkit.Location;
public class RTP_Residence implements RegionPluginCheck { public class RTP_Residence implements RegionPluginCheck {
// NOT TESTED (2.14.3) // NOT TESTED (3.6.12)
// Residence (v4.9.1.9) // Residence (v5.1.4.1)
// https://www.spigotmc.org/resources/residence.11480/ // https://www.spigotmc.org/resources/residence.11480/
public boolean check(Location loc) { public boolean check(Location loc) {
boolean result = true; boolean result = true;
if (REGIONPLUGINS.RESIDENCE.isEnabled()) if (REGIONPLUGINS.RESIDENCE.isEnabled())
try { try {
// Using reflection // Don't import to avoid class loader issues
Class<?> residenceClass = Class.forName("com.bekvon.bukkit.residence.api.ResidenceApi"); com.bekvon.bukkit.residence.Residence instance = com.bekvon.bukkit.residence.Residence.getInstance();
Object residenceManager = residenceClass.getMethod("getResidenceManager").invoke(null); com.bekvon.bukkit.residence.protection.ClaimedResidence claim = instance.getResidenceManagerAPI().getByLoc(loc);
Class<?> residenceManagerClass = residenceManager.getClass();
Object claim = residenceManagerClass.getMethod("getByLoc", Location.class).invoke(residenceManager, loc);
result = claim == null; result = claim == null;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();