Skip to content

Implement Squaremap Support #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
James-P-Bennett wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Implement Squaremap Support #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84e4ada
Squaremap Support
James-P-Bennett Nov 13, 2025
9b05165
Update ClaimSquaremap.java
James-P-Bennett Nov 13, 2025
e69115e
Fix Timing / Claims Update Issue
James-P-Bennett Nov 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/main/java/fr/xyness/SCS/ClaimMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1681,7 +1681,7 @@ public void transferClaims() {
}

boolean check = false;
boolean check2 = false;
boolean check2 = false;
HikariConfig localConfig = new HikariConfig();
localConfig.setJdbcUrl("jdbc:sqlite:plugins/SimpleClaimSystem/storage.db");
localConfig.setDriverClassName("org.sqlite.JDBC");
Expand Down Expand Up @@ -2200,6 +2200,7 @@ public CompletableFuture<Boolean> createClaim(Player player, Chunk chunk) {
if (instance.getSettings().getBooleanSetting("dynmap")) instance.getDynmap().createClaimZone(newClaim);
if (instance.getSettings().getBooleanSetting("bluemap")) instance.getBluemap().createClaimZone(newClaim);
if (instance.getSettings().getBooleanSetting("pl3xmap")) instance.getPl3xMap().createClaimZone(newClaim);
if (instance.getSettings().getBooleanSetting("squaremap")) instance.getSquaremap().createClaimZone(newClaim);
if (instance.getSettings().getBooleanSetting("keep-chunks-loaded")) {
if(instance.isFolia()) {
Bukkit.getRegionScheduler().execute(instance, chunk.getWorld(), chunk.getX(), chunk.getZ(), () -> chunk.setForceLoaded(true));
Expand Down Expand Up @@ -2282,6 +2283,7 @@ public CompletableFuture<Boolean> createAdminClaim(Player player, Chunk chunk) {
if (instance.getSettings().getBooleanSetting("dynmap")) instance.getDynmap().createClaimZone(newClaim);
if (instance.getSettings().getBooleanSetting("bluemap")) instance.getBluemap().createClaimZone(newClaim);
if (instance.getSettings().getBooleanSetting("pl3xmap")) instance.getPl3xMap().createClaimZone(newClaim);
if (instance.getSettings().getBooleanSetting("squaremap")) instance.getSquaremap().createClaimZone(newClaim);
if (instance.getSettings().getBooleanSetting("keep-chunks-loaded")) {
if(instance.isFolia()) {
Bukkit.getRegionScheduler().execute(instance, chunk.getWorld(), chunk.getX(), chunk.getZ(), () -> chunk.setForceLoaded(true));
Expand Down Expand Up @@ -3213,7 +3215,8 @@ public CompletableFuture<Boolean> setClaimName(Claim claim, String name) {
if (instance.getSettings().getBooleanSetting("dynmap")) instance.getDynmap().updateName(claim);
if (instance.getSettings().getBooleanSetting("bluemap")) instance.getBluemap().updateName(claim);
if (instance.getSettings().getBooleanSetting("pl3xmap")) instance.getPl3xMap().updateName(claim);

if (instance.getSettings().getBooleanSetting("squaremap")) instance.getSquaremap().updateName(claim);

// Update database
try (Connection connection = instance.getDataSource().getConnection()) {
String updateQuery = "UPDATE scs_claims_1 SET claim_name = ? WHERE owner_uuid = ? AND claim_name = ?";
Expand Down Expand Up @@ -3291,6 +3294,7 @@ public CompletableFuture<Boolean> deleteClaim(Claim claim) {
if (instance.getSettings().getBooleanSetting("dynmap")) instance.getDynmap().deleteMarker(chunks);
if (instance.getSettings().getBooleanSetting("bluemap")) instance.getBluemap().deleteMarker(chunks);
if (instance.getSettings().getBooleanSetting("pl3xmap")) instance.getPl3xMap().deleteMarker(chunks);
if (instance.getSettings().getBooleanSetting("squaremap")) instance.getSquaremap().deleteMarker(claim);
chunks.stream().forEach(c -> listClaims.remove(c));
resetWeatherChunk(claim);
resetFlyChunk(claim);
Expand Down Expand Up @@ -3361,6 +3365,7 @@ public CompletableFuture<Boolean> deleteAllClaims(String owner) {
if (instance.getSettings().getBooleanSetting("dynmap")) instance.getDynmap().deleteMarker(chunks);
if (instance.getSettings().getBooleanSetting("bluemap")) instance.getBluemap().deleteMarker(chunks);
if (instance.getSettings().getBooleanSetting("pl3xmap")) instance.getPl3xMap().deleteMarker(chunks);
if (instance.getSettings().getBooleanSetting("squaremap")) instance.getSquaremap().deleteMarker(claim);
chunks.stream().forEach(c -> listClaims.remove(c));
updateWeatherChunk(claim);
updateFlyChunk(claim);
Expand Down Expand Up @@ -3965,6 +3970,7 @@ public CompletableFuture<Boolean> removeClaimChunk(Claim claim, String chunk_def
if (instance.getSettings().getBooleanSetting("dynmap")) instance.getDynmap().deleteMarker(Set.of(chunk));
if (instance.getSettings().getBooleanSetting("bluemap")) instance.getBluemap().deleteMarker(Set.of(chunk));
if (instance.getSettings().getBooleanSetting("pl3xmap")) instance.getPl3xMap().deleteMarker(Set.of(chunk));
if (instance.getSettings().getBooleanSetting("squaremap")) instance.getSquaremap().createClaimZone(claim);
instance.executeSync(() -> instance.getBossBars().deactivateBossBar(Set.of(chunk)));
updateWeatherChunk(claim);
updateFlyChunk(claim);
Expand Down Expand Up @@ -4004,6 +4010,7 @@ public CompletableFuture<Boolean> removeClaimChunk(Claim claim, String chunk_def
if (instance.getSettings().getBooleanSetting("dynmap")) instance.getDynmap().deleteMarker(Set.of(chunk));
if (instance.getSettings().getBooleanSetting("bluemap")) instance.getBluemap().deleteMarker(Set.of(chunk));
if (instance.getSettings().getBooleanSetting("pl3xmap")) instance.getPl3xMap().deleteMarker(Set.of(chunk));
if (instance.getSettings().getBooleanSetting("squaremap")) instance.getSquaremap().createClaimZone(claim);
instance.executeSync(() -> instance.getBossBars().deactivateBossBar(Set.of(chunk)));
updateWeatherChunk(claim);
updateFlyChunk(claim);
Expand Down Expand Up @@ -4056,6 +4063,7 @@ public CompletableFuture<Boolean> removeClaimChunk(Claim claim, Chunk chunk){
if (instance.getSettings().getBooleanSetting("dynmap")) instance.getDynmap().deleteMarker(Set.of(chunk));
if (instance.getSettings().getBooleanSetting("bluemap")) instance.getBluemap().deleteMarker(Set.of(chunk));
if (instance.getSettings().getBooleanSetting("pl3xmap")) instance.getPl3xMap().deleteMarker(Set.of(chunk));
if (instance.getSettings().getBooleanSetting("squaremap")) instance.getSquaremap().createClaimZone(claim);
instance.executeSync(() -> instance.getBossBars().deactivateBossBar(Set.of(chunk)));
updateWeatherChunk(claim);
updateFlyChunk(claim);
Expand Down Expand Up @@ -4109,6 +4117,7 @@ public CompletableFuture<Boolean> addClaimChunk(Claim claim, Chunk chunk){
if (instance.getSettings().getBooleanSetting("dynmap")) instance.getDynmap().createClaimZone(claim);
if (instance.getSettings().getBooleanSetting("bluemap")) instance.getBluemap().createClaimZone(claim);
if (instance.getSettings().getBooleanSetting("pl3xmap")) instance.getPl3xMap().createClaimZone(claim);
if (instance.getSettings().getBooleanSetting("squaremap")) instance.getSquaremap().createClaimZone(claim);
instance.executeSync(() -> instance.getBossBars().activateBossBar(Set.of(chunk)));
updateWeatherChunk(claim);
updateFlyChunk(claim);
Expand Down
45 changes: 40 additions & 5 deletions src/main/java/fr/xyness/SCS/SimpleClaimSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,10 @@ public class SimpleClaimSystem extends JavaPlugin {

/** Instance of ClaimPl3xMap for Pl3xmap integration */
private ClaimPl3xMap pl3xmapInstance;


/** Instance of ClaimSquaremap for Squaremap integration */
private ClaimSquaremap squaremapInstance;

/** Instance of ClaimWorldguard for WorldGuard integration */
private ClaimWorldGuard claimWorldguardInstance;

Expand Down Expand Up @@ -329,6 +332,13 @@ public boolean loadConfig(boolean reload, CommandSender sender) {
claimSettingsInstance.addSetting("pl3xmap", "false");
}

Plugin squaremap = Bukkit.getPluginManager().getPlugin("squaremap");
if (squaremap != null) {
claimSettingsInstance.addSetting("squaremap", "true");
} else {
claimSettingsInstance.addSetting("squaremap", "false");
}

// Check "langs" folder
File dossier = new File(getDataFolder(), "langs");
if (!dossier.exists()) {
Expand Down Expand Up @@ -635,7 +645,18 @@ public boolean loadConfig(boolean reload, CommandSender sender) {
claimSettingsInstance.addSetting("pl3xmap-claim-border-color", getConfig().getString("pl3xmap-settings.claim-border-color"));
claimSettingsInstance.addSetting("pl3xmap-claim-fill-color", getConfig().getString("pl3xmap-settings.claim-fill-color"));
claimSettingsInstance.addSetting("pl3xmap-claim-hover-text", getConfig().getString("pl3xmap-settings.claim-hover-text"));


// Add Squaremap settings
configC = getConfig().getString("squaremap");
if(configC.equalsIgnoreCase("true") && claimSettingsInstance.getBooleanSetting("squaremap")) {
if (!reload) squaremapInstance = new ClaimSquaremap(this);
} else {
claimSettingsInstance.addSetting("squaremap", "false");
}
claimSettingsInstance.addSetting("squaremap-claim-border-color", getConfig().getString("squaremap-settings.claim-border-color"));
claimSettingsInstance.addSetting("squaremap-claim-fill-color", getConfig().getString("squaremap-settings.claim-fill-color"));
claimSettingsInstance.addSetting("squaremap-claim-hover-text", getConfig().getString("squaremap-settings.claim-hover-text"));

// Add the message type for protection
configC = getConfig().getString("protection-message");
if (configC.equalsIgnoreCase("action_bar") ||
Expand Down Expand Up @@ -924,7 +945,12 @@ public boolean loadConfig(boolean reload, CommandSender sender) {

// Load claims system
claimInstance.loadClaims();


// Initialize map integrations after claims are loaded
if (claimSettingsInstance.getBooleanSetting("squaremap") && squaremapInstance != null) {
squaremapInstance.initializeLayers();
}

// Load players
cPlayerMainInstance.loadPlayers();

Expand Down Expand Up @@ -2122,13 +2148,22 @@ public ClaimBluemap getBluemap() {

/**
* Returns the ClaimPl3xMap instance.
*
*
* @return The ClaimPl3xMap instance
*/
public ClaimPl3xMap getPl3xMap() {
return pl3xmapInstance;
}


/**
* Returns the ClaimSquaremap instance.
*
* @return The ClaimSquaremap instance
*/
public ClaimSquaremap getSquaremap() {
return squaremapInstance;
}

/**
* Returns the ClaimPurge instance.
*
Expand Down
Loading