Skip to content

Added new ways to view plot borders with rainbow effects and also sam… #8303

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
xghostxcodex wants to merge 1 commit into
base: master
Choose a base branch
from
+108 −2
Open

Added new ways to view plot borders with rainbow effects and also sam… #8303

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
110 changes: 108 additions & 2 deletions Towny/src/main/java/com/palmergames/bukkit/towny/tasks/DrawSmokeTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import org.bukkit.Color;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.Nullable;
import org.bukkit.Location;
import org.bukkit.Particle;
import org.bukkit.World;

import com.google.common.cache.Cache;
Expand All @@ -26,6 +28,17 @@
import com.palmergames.bukkit.util.DrawSmokeTaskFactory;

public class DrawSmokeTask extends TownyTimerTask {

// --- CONFIG PLACEHOLDERS - xghostxcodex additions ---
// leaving these here to make wiring up the config options easier later...
// quick breakdown of how I set up the logic:
// - USE_3D_BOX = false -> completely bypasses my addition regardless of if colors are true or not, your original code kicks in
// - USE_3D_BOX = true, but others false -> my 3D moving(y-axis) box, but with your original green/grey colors
// - All true = the full xghostxcodex way (3dbox, rainbow town, red wilderness)
// Feel free to delete these notes as I just wanted to explain it all
private final boolean USE_3D_BOX = true;
private final boolean USE_RAINBOW = true;
private final boolean SHOW_WILDERNESS_RED = true;

private static final Cache<String, List<CellBorder>> cellBorderCache = CacheBuilder.newBuilder().expireAfterWrite(Duration.ofSeconds(30)).build();

Expand All @@ -39,7 +52,43 @@ public void run() {
Resident resident = TownyAPI.getInstance().getResident(player);
if (resident == null)
continue;

// xghostxcodex addition
if (USE_3D_BOX) {
double y1 = player.getLocation().getY() + 0.1;
double y2 = y1 + 4.0;

if (resident.hasMode("constantplotborder")) {
WorldCoord wc = new WorldCoord(player.getWorld().getName(), Coord.parseCoord(player.getLocation()));
boolean isWilderness = (wc.getTownOrNull() == null);
drawBox(player, wc.getX(), wc.getZ(), y1, y2, isWilderness, USE_RAINBOW);
continue;
}

if (resident.hasMode("townborder")) {
Town town = TownyAPI.getInstance().getTown(player.getLocation());
if (town == null)
continue;

for (TownBlock tb : town.getTownBlocks()) {
if (!tb.getWorld().getName().equals(player.getWorld().getName()))
continue;
int tbX = tb.getX();
int tbZ = tb.getZ();

double minX = tbX * 16.0;
double minZ = tbZ * 16.0;
double maxX = minX + 16.0;
double maxZ = minZ + 16.0;

if (!hasSameTown(town, tbX, tbZ - 1)) drawFace(player, minX, minZ, maxX, minZ, y1, y2, false, USE_RAINBOW);
if (!hasSameTown(town, tbX, tbZ + 1)) drawFace(player, minX, maxZ, maxX, maxZ, y1, y2, false, USE_RAINBOW);
if (!hasSameTown(town, tbX - 1, tbZ)) drawFace(player, minX, minZ, minX, maxZ, y1, y2, false, USE_RAINBOW);
if (!hasSameTown(town, tbX + 1, tbZ)) drawFace(player, maxX, minZ, maxX, maxZ, y1, y2, false, USE_RAINBOW);
}
}
continue;
}
// original
if (resident.hasMode("constantplotborder")) {
WorldCoord wc = new WorldCoord(player.getWorld().getName(), Coord.parseCoord(player.getLocation()));
CellBorder cellBorder = BorderUtil.getPlotBorder(wc);
Expand Down Expand Up @@ -88,4 +137,61 @@ private static List<CellBorder> getCellBordersForTownInWorld(final Town town, fi

return BorderUtil.getOuterBorder(wcs);
}
}
// --- Draw math for xghostxcodex addition---
private boolean hasSameTown(Town town, int x, int z) {
for (TownBlock tb : town.getTownBlocks()) {
if (tb.getX() == x && tb.getZ() == z)
return true;
}
return false;
}

private void drawBox(Player player, int tbX, int tbZ, double y1, double y2, boolean isWilderness, boolean useRainbow) {
double minX = tbX * 16.0;
double minZ = tbZ * 16.0;
double maxX = minX + 16.0;
double maxZ = minZ + 16.0;

drawFace(player, minX, minZ, maxX, minZ, y1, y2, isWilderness, useRainbow);
drawFace(player, minX, maxZ, maxX, maxZ, y1, y2, isWilderness, useRainbow);
drawFace(player, minX, minZ, minX, maxZ, y1, y2, isWilderness, useRainbow);
drawFace(player, maxX, minZ, maxX, maxZ, y1, y2, isWilderness, useRainbow);
}

private void drawFace(Player player, double x1, double z1, double x2, double z2, double y1, double y2, boolean isWilderness, boolean useRainbow) {
drawLine(player, x1, y1, z1, x2, y1, z2, isWilderness, useRainbow);
drawLine(player, x1, y2, z1, x2, y2, z2, isWilderness, useRainbow);
drawLine(player, x1, y1, z1, x1, y2, z1, isWilderness, useRainbow);
drawLine(player, x2, y1, z2, x2, y2, z2, isWilderness, useRainbow);
}

private void drawLine(Player player, double x1, double y1, double z1, double x2, double y2, double z2, boolean isWilderness, boolean useRainbow) {
double distance = Math.sqrt(Math.pow(x2 - x1, 2) + Math.pow(y2 - y1, 2) + Math.pow(z2 - z1, 2));
int particles = (int) (distance * 2);
if (particles == 0)
return;

long time = System.currentTimeMillis();

for (int i = 0; i <= particles; i++) {
double lerpX = x1 + (x2 - x1) * ((double) i / particles);
double lerpY = y1 + (y2 - y1) * ((double) i / particles);
double lerpZ = z1 + (z2 - z1) * ((double) i / particles);

Color color;
if (isWilderness) {
color = SHOW_WILDERNESS_RED ? Color.RED : Color.GRAY;
} else if (useRainbow) {
float hue = (float) ((Math.abs(lerpX * 15 + lerpZ * 15 + (time / 15)) % 360) / 360.0);
java.awt.Color awt = java.awt.Color.getHSBColor(hue, 1.0f, 1.0f);
color = Color.fromRGB(awt.getRed(), awt.getGreen(), awt.getBlue());
} else {
color = Color.GREEN;
}

Particle.DustOptions dust = new Particle.DustOptions(color, 1.5F);
Location particleLoc = new Location(player.getWorld(), lerpX, lerpY, lerpZ);
player.spawnParticle(com.palmergames.bukkit.util.BukkitParticle.getBorderParticle(), particleLoc, 1, 0, 0, 0, 0, dust);
}
} // thank you for trying this out, hope you like it! xghostxcodex
}
Loading