mirror of
https://github.com/YouHaveTrouble/YardWatch.git
synced 2026-05-12 06:26:59 +00:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| acaf8ac233 | |||
| c30c3ee7c9 | |||
| a2d676044c | |||
| 813702596a | |||
| 6ba3acf5f6 | |||
| d9ea1265bf |
@@ -6,7 +6,7 @@
|
||||
|
||||
<groupId>me.youhavetrouble</groupId>
|
||||
<artifactId>YardWatch</artifactId>
|
||||
<version>1.3.0</version>
|
||||
<version>1.4.1</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>YardWatch</name>
|
||||
@@ -96,6 +96,18 @@
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.intellectualsites.bom</groupId>
|
||||
<artifactId>bom-newest</artifactId>
|
||||
<version>1.48</version>
|
||||
<scope>import</scope>
|
||||
<type>pom</type>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.destroystokyo.paper</groupId>
|
||||
@@ -151,5 +163,11 @@
|
||||
<version>0.100.1.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.intellectualsites.plotsquared</groupId>
|
||||
<artifactId>plotsquared-core</artifactId>
|
||||
<version>7.3.8</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
||||
@@ -20,6 +20,7 @@ You can download YardWatch plugin on [Modrinth](https://modrinth.com/plugin/yard
|
||||
- [FactionsUUID](https://www.spigotmc.org/resources/factionsuuid.1035/)
|
||||
- [SuperiorSkyBlock](https://bg-software.com/superiorskyblock/)
|
||||
- [Towny](https://github.com/TownyAdvanced/Towny)
|
||||
- [PlotSquared (6.0.0+)](https://www.spigotmc.org/resources/plotsquared.1177/)
|
||||
|
||||
## Plugin you're using is not implementing YardWatchAPI?
|
||||
Contact the plugin developer and send them [here](https://github.com/YouHaveTrouble/YardWatchAPI/blob/master/readme.md)!
|
||||
|
||||
@@ -5,6 +5,7 @@ import me.youhavetrouble.yardwatch.commands.YardWatchCommand;
|
||||
import me.youhavetrouble.yardwatch.hooks.FactionsUUIDProtection;
|
||||
import me.youhavetrouble.yardwatch.hooks.GriefPreventionProtection;
|
||||
import me.youhavetrouble.yardwatch.hooks.LWCXProtection;
|
||||
import me.youhavetrouble.yardwatch.hooks.PlotSquaredProtection;
|
||||
import me.youhavetrouble.yardwatch.hooks.SuperiorSkyBlockProtection;
|
||||
import me.youhavetrouble.yardwatch.hooks.TownyProtection;
|
||||
import me.youhavetrouble.yardwatch.hooks.WorldGuardProtection;
|
||||
@@ -27,8 +28,11 @@ public final class YardWatch extends JavaPlugin {
|
||||
public void onEnable() {
|
||||
|
||||
try {
|
||||
URL url = Resources.getResource("apiversion.txt");
|
||||
final URL url = getClassLoader().getResource("apiversion.txt");
|
||||
|
||||
if (url != null) {
|
||||
yardWatchApiVersion = Resources.toString(url, com.google.common.base.Charsets.UTF_8);
|
||||
}
|
||||
} catch (IOException e) {
|
||||
getLogger().warning("Failed to read YardWatch API version.");
|
||||
}
|
||||
@@ -80,6 +84,13 @@ public final class YardWatch extends JavaPlugin {
|
||||
);
|
||||
}
|
||||
|
||||
if (shouldRegisterService("PlotSquared")) {
|
||||
getLogger().info("Registering PlotSquared service.");
|
||||
getServer().getServicesManager().register(
|
||||
Protection.class, new PlotSquaredProtection(this), this, ServicePriority.Normal
|
||||
);
|
||||
}
|
||||
|
||||
List<RegisteredServiceProvider<?>> registrations = getServer().getServicesManager().getRegistrations(this);
|
||||
if (registrations.isEmpty()) {
|
||||
getLogger().info("Registered 0 services. This plugin can be safely removed.");
|
||||
|
||||
@@ -35,12 +35,13 @@ public class FactionsUUIDProtection implements Protection {
|
||||
if (!FactionsPlugin.getInstance().worldUtil().isEnabled(location.getWorld())) return false;
|
||||
FLocation fLocation = new FLocation(location);
|
||||
Faction faction = Board.getInstance().getFactionAt(fLocation);
|
||||
return faction != null;
|
||||
return !faction.isWilderness();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canBreakBlock(Player player, BlockState blockState) {
|
||||
if (!isEnabled()) return true;
|
||||
if (!FactionsPlugin.getInstance().worldUtil().isEnabled(blockState.getWorld())) return true;
|
||||
return FactionsBlockListener.playerCanBuildDestroyBlock(
|
||||
player,
|
||||
blockState.getLocation(),
|
||||
@@ -52,6 +53,7 @@ public class FactionsUUIDProtection implements Protection {
|
||||
@Override
|
||||
public boolean canPlaceBlock(Player player, Location location) {
|
||||
if (!isEnabled()) return true;
|
||||
if (!FactionsPlugin.getInstance().worldUtil().isEnabled(location.getWorld())) return true;
|
||||
return FactionsBlockListener.playerCanBuildDestroyBlock(
|
||||
player,
|
||||
location,
|
||||
@@ -63,18 +65,26 @@ public class FactionsUUIDProtection implements Protection {
|
||||
@Override
|
||||
public boolean canInteract(Player player, BlockState blockState) {
|
||||
if (!isEnabled()) return true;
|
||||
return FactionsPlayerListener.canInteractHere(player, blockState.getLocation());
|
||||
if (!FactionsPlugin.getInstance().worldUtil().isEnabled(blockState.getWorld())) return true;
|
||||
return FactionsPlayerListener.canUseBlock(
|
||||
player,
|
||||
blockState.getType(),
|
||||
blockState.getLocation(),
|
||||
true
|
||||
);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canInteract(Player player, Entity target) {
|
||||
if (!isEnabled()) return true;
|
||||
if (!FactionsPlugin.getInstance().worldUtil().isEnabled(target)) return true;
|
||||
return FactionsEntityListener.canInteractHere(player, target.getLocation());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canDamage(Entity damager, Entity target) {
|
||||
if (!isEnabled()) return true;
|
||||
if (!FactionsPlugin.getInstance().worldUtil().isEnabled(target)) return true;
|
||||
return FactionsEntityListener.canDamage(damager, target, false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
package me.youhavetrouble.yardwatch.hooks;
|
||||
|
||||
import com.plotsquared.core.plot.Plot;
|
||||
import com.plotsquared.core.plot.flag.implementations.PvpFlag;
|
||||
import me.youhavetrouble.yardwatch.Protection;
|
||||
import me.youhavetrouble.yardwatch.YardWatch;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.block.BlockState;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
public class PlotSquaredProtection implements Protection {
|
||||
|
||||
private final YardWatch plugin;
|
||||
|
||||
public PlotSquaredProtection(YardWatch plugin) {
|
||||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isEnabled() {
|
||||
return this.plugin.getServer().getPluginManager().isPluginEnabled("PlotSquared");
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isProtected(final Location location) {
|
||||
if (!isEnabled()) return false;
|
||||
|
||||
final com.plotsquared.core.location.Location arg1 = getLocation(location);
|
||||
|
||||
return arg1.isPlotArea() || arg1.isPlotRoad() || arg1.isUnownedPlotArea() || arg1.getOwnedPlot() != null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canBreakBlock(final Player player, final BlockState blockState) {
|
||||
if (!isEnabled()) return true;
|
||||
|
||||
final Location blockLocation = blockState.getLocation();
|
||||
final com.plotsquared.core.location.@NonNull Location location = getLocation(blockLocation);
|
||||
|
||||
final Plot plot = location.getOwnedPlot();
|
||||
|
||||
if (plot == null) return isProtected(blockLocation);
|
||||
|
||||
return plot.isAdded(player.getUniqueId());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canPlaceBlock(final Player player, final Location location) {
|
||||
return canBreakBlock(player, location.getBlock().getState());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canInteract(final Player player, final BlockState blockState) {
|
||||
if (!isEnabled()) return true;
|
||||
|
||||
final Location location = blockState.getLocation();
|
||||
|
||||
com.plotsquared.core.location.@NonNull Location plotLocation = getLocation(location);
|
||||
|
||||
final Plot plot = plotLocation.getOwnedPlot();
|
||||
|
||||
if (plot == null) return isProtected(location);
|
||||
|
||||
return plot.isAdded(player.getUniqueId());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canInteract(final Player player, final Entity target) {
|
||||
return canInteract(player, target.getLocation().getBlock().getState());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canDamage(final Entity damager, final Entity target) {
|
||||
if (!isEnabled() || !(damager instanceof Player)) return true;
|
||||
|
||||
final Location location = target.getLocation();
|
||||
|
||||
com.plotsquared.core.location.@NonNull Location plotLocation = getLocation(location);
|
||||
|
||||
final Plot plot = plotLocation.getOwnedPlot();
|
||||
|
||||
if (plot == null) return isProtected(location);
|
||||
|
||||
return plot.getFlag(PvpFlag.class);
|
||||
}
|
||||
|
||||
private com.plotsquared.core.location.@NonNull Location getLocation(final Location location) {
|
||||
final String world = location.getWorld().getName();
|
||||
final int x = (int) location.getX();
|
||||
final int y = (int) location.getY();
|
||||
final int z = (int) location.getZ();
|
||||
|
||||
return com.plotsquared.core.location.Location.at(world, x, y, z);
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,6 @@ package me.youhavetrouble.yardwatch.hooks;
|
||||
import com.palmergames.bukkit.towny.TownyAPI;
|
||||
import com.palmergames.bukkit.towny.object.Resident;
|
||||
import com.palmergames.bukkit.towny.object.TownBlock;
|
||||
import com.palmergames.bukkit.towny.object.TownyPermission;
|
||||
import com.palmergames.bukkit.towny.utils.CombatUtil;
|
||||
import me.youhavetrouble.yardwatch.Protection;
|
||||
import me.youhavetrouble.yardwatch.YardWatch;
|
||||
@@ -45,7 +44,7 @@ public class TownyProtection implements Protection {
|
||||
|
||||
@Override
|
||||
public boolean canPlaceBlock(Player player, Location location) {
|
||||
return canInteract(player, location.getBlock().getState(true));
|
||||
return canInteract(player, location.getBlock().getState());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -63,7 +62,7 @@ public class TownyProtection implements Protection {
|
||||
|
||||
@Override
|
||||
public boolean canInteract(Player player, Entity target) {
|
||||
return canInteract(player, target.getLocation().getBlock().getState(true));
|
||||
return canInteract(player, target.getLocation().getBlock().getState());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user