diff --git a/pom.xml b/pom.xml index d3ffb40..539ddc9 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ paper-repo - https://papermc.io/repo/content/groups/public + https://papermc.io/repo/repository/maven-public/ minebench-repo @@ -58,7 +58,7 @@ io.papermc paperlib - 1.0.2 + 1.0.6 compile diff --git a/randomteleport-plugin-hooks/chunkyborder/pom.xml b/randomteleport-plugin-hooks/chunkyborder/pom.xml new file mode 100644 index 0000000..7e722f2 --- /dev/null +++ b/randomteleport-plugin-hooks/chunkyborder/pom.xml @@ -0,0 +1,44 @@ + + + + randomteleport-plugin-hooks + de.themoep.randomteleport.pluginhook + 2.0-SNAPSHOT + + 4.0.0 + + chunkyborder + + + jitpack.io + https://jitpack.io + + + codemc + https://repo.codemc.io/repository/maven-public/ + + + + + org.popcraft + chunkyborder + 1.0.43 + provided + + + org.popcraft + chunky-bukkit + 1.2.93 + provided + + + org.bukkit + bukkit + 1.13-R0.1-SNAPSHOT + provided + + + + \ No newline at end of file diff --git a/randomteleport-plugin-hooks/chunkyborder/src/main/java/de/themoep/randomteleport/hook/plugin/ChunkyBorderHook.java b/randomteleport-plugin-hooks/chunkyborder/src/main/java/de/themoep/randomteleport/hook/plugin/ChunkyBorderHook.java new file mode 100644 index 0000000..701036b --- /dev/null +++ b/randomteleport-plugin-hooks/chunkyborder/src/main/java/de/themoep/randomteleport/hook/plugin/ChunkyBorderHook.java @@ -0,0 +1,45 @@ +package de.themoep.randomteleport.hook.plugin; + +import de.themoep.randomteleport.hook.WorldborderHook; +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.World; +import org.bukkit.plugin.Plugin; +import org.popcraft.chunkyborder.BorderData; +import org.popcraft.chunkyborder.ChunkyBorder; + +public class ChunkyBorderHook implements WorldborderHook { + private final ChunkyBorder plugin; + + public ChunkyBorderHook() { + this.plugin = (ChunkyBorder) Bukkit.getPluginManager().getPlugin("ChunkyBorder"); + } + + @Override + public Plugin getPlugin() { + return this.plugin; + } + + @Override + public Location getCenter(World world) { + BorderData borderData = plugin.getBorders().get(world.getName()); + return new Location(world, borderData.getCenterX(),0D,borderData.getCenterZ()); + } + + @Override + public double getBorderRadius(World world) { + BorderData borderData = plugin.getBorders().get(world.getName()); + return borderData.getRadiusX(); + } + + @Override + public boolean isInsideBorder(Location location) { + BorderData borderData = plugin.getBorders().get(location.getWorld().getName()); + return borderData.getBorder().isBounding(location.getBlockX(),location.getBlockZ()); + } + + @Override + public String getPluginName() { + return plugin.getName(); + } +} \ No newline at end of file diff --git a/randomteleport-plugin-hooks/griefdefender/pom.xml b/randomteleport-plugin-hooks/griefdefender/pom.xml new file mode 100644 index 0000000..6988dfc --- /dev/null +++ b/randomteleport-plugin-hooks/griefdefender/pom.xml @@ -0,0 +1,39 @@ + + + + randomteleport-plugin-hooks + de.themoep.randomteleport.pluginhook + 2.0-SNAPSHOT + + 4.0.0 + + griefdefender + + + jitpack.io + https://jitpack.io + + + + + com.github.bloodmc + GriefDefenderAPI + -dd5aa2224c-1 + + + org.bukkit + bukkit + + + + + org.bukkit + bukkit + 1.13-R0.1-SNAPSHOT + provided + + + + \ No newline at end of file diff --git a/randomteleport-plugin-hooks/griefdefender/src/main/java/de/themoep/randomteleport/hook/plugin/GriefDefenderHook.java b/randomteleport-plugin-hooks/griefdefender/src/main/java/de/themoep/randomteleport/hook/plugin/GriefDefenderHook.java new file mode 100644 index 0000000..1fb9281 --- /dev/null +++ b/randomteleport-plugin-hooks/griefdefender/src/main/java/de/themoep/randomteleport/hook/plugin/GriefDefenderHook.java @@ -0,0 +1,36 @@ +package de.themoep.randomteleport.hook.plugin; + +import com.griefdefender.api.GriefDefender; +import com.griefdefender.api.claim.ClaimTypes; +import de.themoep.randomteleport.hook.ProtectionHook; +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.World; +import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; + +public class GriefDefenderHook implements ProtectionHook { + + @Override + public Plugin getPlugin() { + return Bukkit.getPluginManager().getPlugin("GriefDefender"); + } + + @Override + public String getPluginName() { + return "GriefDefender"; + } + + @Override + public boolean canBuild(Player player, Location location) { + return GriefDefender.getCore().getClaimManager(location.getWorld().getUID()).getClaimAt(location.getBlockX(), location.getBlockY(), location.getBlockZ()).getType() == ClaimTypes.WILDERNESS; + } + + @Override + public boolean canBuild(Player player, World world, int chunkX, int chunkZ) { + if(GriefDefender.getCore().isEnabled(world.getUID())) { + return GriefDefender.getCore().getClaimManager(world.getUID()).getClaimAt(chunkX,0,chunkZ).isTrusted(player.getUniqueId()); + } + return true; + } +} \ No newline at end of file diff --git a/randomteleport-plugin-hooks/pom.xml b/randomteleport-plugin-hooks/pom.xml index 977c0c9..a36b30c 100644 --- a/randomteleport-plugin-hooks/pom.xml +++ b/randomteleport-plugin-hooks/pom.xml @@ -18,10 +18,12 @@ worldguard-6 worldguard-7 griefprevention + griefdefender redprotect factions factions-uuid worldborder + chunkyborder diff --git a/randomteleport-plugin/pom.xml b/randomteleport-plugin/pom.xml index d7d7e9c..39f9e3c 100644 --- a/randomteleport-plugin/pom.xml +++ b/randomteleport-plugin/pom.xml @@ -42,6 +42,18 @@ ${project.version} compile + + ${project.groupId}.pluginhook + chunkyborder + ${project.version} + compile + + + ${project.groupId}.pluginhook + griefdefender + ${project.version} + compile + diff --git a/randomteleport-plugin/src/main/java/de/themoep/randomteleport/RandomTeleportCommand.java b/randomteleport-plugin/src/main/java/de/themoep/randomteleport/RandomTeleportCommand.java index 3910a10..9caabfd 100644 --- a/randomteleport-plugin/src/main/java/de/themoep/randomteleport/RandomTeleportCommand.java +++ b/randomteleport-plugin/src/main/java/de/themoep/randomteleport/RandomTeleportCommand.java @@ -57,7 +57,7 @@ public class RandomTeleportCommand implements CommandExecutor { } } else { try { - if (sender.hasPermission("randomteleport.manual")){ + if (sender.hasPermission("randomteleport.manual")) { plugin.parseAndRun(sender, getLocation(sender), args); return true; } else {