From aed2c4971787d44f5dd8c9e7cde35ae03f1e5c2e Mon Sep 17 00:00:00 2001 From: SamB440 Date: Sun, 21 May 2023 13:29:14 +0100 Subject: [PATCH] Add option to set opacity and line opacity on dynmap --- .../managers/data/region/ConfiguredRegion.java | 10 ++++++++++ .../net/islandearth/rpgregions/tasks/DynmapTask.java | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/net/islandearth/rpgregions/managers/data/region/ConfiguredRegion.java b/api/src/main/java/net/islandearth/rpgregions/managers/data/region/ConfiguredRegion.java index 002e7d5..7b03125 100644 --- a/api/src/main/java/net/islandearth/rpgregions/managers/data/region/ConfiguredRegion.java +++ b/api/src/main/java/net/islandearth/rpgregions/managers/data/region/ConfiguredRegion.java @@ -75,6 +75,7 @@ public class ConfiguredRegion { @EditableField(material = Material.NETHER_STAR, name = "Set teleport cost", description = "Set the cost for teleportation") private double teleportCost; private boolean showActionbar; + private double opacity, lineOpacity; @EditableField(material = Material.RED_DYE, name = "Hex display colour", description = "Set the colour of the region. It is a hex colour (e.g 0x42f4f1 for red) and is used in dynmap.") private final String colour; private final String lineColour; @@ -107,6 +108,7 @@ public class ConfiguredRegion { this.teleportCooldown = 0; this.teleportCost = 0.00; this.showActionbar = true; + this.opacity = this.lineOpacity = 0.5; this.colour = String.valueOf(13369344); this.lineColour = String.valueOf(13369344); this.dynmap = true; @@ -384,11 +386,19 @@ public class ConfiguredRegion { return RPGRegionsAPI.getAPI().getManagers().getIntegrationManager().getBoundingBoxPoints(this); } + public double getOpacity() { + return opacity; + } + public String getColour() { if (colour == null) return "0"; return colour; } + public double getLineOpacity() { + return lineOpacity; + } + public String getLineColour() { if (lineColour == null) return "0"; return lineColour; diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/tasks/DynmapTask.java b/rpgregions/src/main/java/net/islandearth/rpgregions/tasks/DynmapTask.java index 6414f65..36c6273 100644 --- a/rpgregions/src/main/java/net/islandearth/rpgregions/tasks/DynmapTask.java +++ b/rpgregions/src/main/java/net/islandearth/rpgregions/tasks/DynmapTask.java @@ -50,8 +50,8 @@ public class DynmapTask implements Runnable { am.setCornerLocations(x, z); am.setLabel(region.getCustomName(), true); - if (!region.getColour().equals("0")) am.setFillStyle(0.5, Integer.parseInt(region.getColour())); - if (!region.getLineColour().equals("0")) am.setLineStyle(1, 0.5, Integer.parseInt(region.getLineColour())); + if (!region.getColour().equals("0")) am.setFillStyle(region.getOpacity(), Integer.parseInt(region.getColour())); + if (!region.getLineColour().equals("0")) am.setLineStyle(1, region.getLineOpacity(), Integer.parseInt(region.getLineColour())); am.setDescription("" + region.getCustomName() + ""); }); }