Skip to content

Commit

Permalink
wip: switching visualising over to particles
Browse files Browse the repository at this point in the history
  • Loading branch information
@sekwah41
sekwah41 committed Nov 30, 2024
1 parent acdf7a7 commit b9a8d33
Show file tree
Hide file tree
Showing 11 changed files with 112 additions and 394 deletions.
14 changes: 8 additions & 6 deletions .../java/com/sekwah/advancedportals/core/commands/subcommands/desti/ShowDestiSubCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
import com.sekwah.advancedportals.core.destination.Destination;
import com.sekwah.advancedportals.core.permissions.Permissions;
import com.sekwah.advancedportals.core.repository.ConfigRepository;
import com.sekwah.advancedportals.core.serializeddata.Vector;
import com.sekwah.advancedportals.core.services.DestinationServices;
import com.sekwah.advancedportals.core.services.PlayerDataServices;
import com.sekwah.advancedportals.core.util.Debug;
import com.sekwah.advancedportals.core.util.GameScheduler;
import com.sekwah.advancedportals.core.util.Lang;
import java.awt.*;
Expand Down Expand Up @@ -95,19 +95,21 @@ public void registered() {
continue;
}

var size = 0.2;

for (Destination destination :
destinationServices.getDestinations()) {
var pos = destination.getLoc();
if (Objects.equals(pos.getWorldName(),
player.getWorldName())
&& pos.distanceTo(player.getLoc())
< config.getShowVisibleRange()) {
Debug.addMarker(player, pos.toBlockPos(),
destination.getArgValues("name")[0],
new Color(100, 100, 100, 100), 1300);
}
player.spawnColoredDust(
pos.add(new Vector(0, 0.5, 0)), size, size, size, 20,
new Color(255, 221, 0));

} }
}
}
}, 1, 20);
}
}
191 changes: 70 additions & 121 deletions ...ava/com/sekwah/advancedportals/core/commands/subcommands/portal/ShowPortalSubCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
import com.sekwah.advancedportals.core.portal.AdvancedPortal;
import com.sekwah.advancedportals.core.repository.ConfigRepository;
import com.sekwah.advancedportals.core.serializeddata.BlockLocation;
import com.sekwah.advancedportals.core.serializeddata.Vector;
import com.sekwah.advancedportals.core.services.PlayerDataServices;
import com.sekwah.advancedportals.core.services.PortalServices;
import com.sekwah.advancedportals.core.tags.NameTag;
import com.sekwah.advancedportals.core.util.Debug;
import com.sekwah.advancedportals.core.util.GameScheduler;
import com.sekwah.advancedportals.core.util.Lang;
import java.awt.*;
Expand Down Expand Up @@ -57,7 +57,7 @@ public class ShowPortalSubCommand

final Color TRIGGER_COLOR = new Color(0, 0, 255, 100);

final Color TRIGGER_OUTLINE_COLOR = new Color(0, 117, 200, 100);
final Vector OFFSET = new Vector(0.5, 0.5, 0.5);

@Override
public void onCommand(CommandSenderContainer sender, String[] args) {
Expand Down Expand Up @@ -108,92 +108,98 @@ public void registered() {
alternate_show_trigger = !alternate_show_trigger;
for (PlayerContainer player : serverContainer.getPlayers()) {
var tempData = playerDataServices.getPlayerData(player);

if (!tempData.isPortalVisible()) {
continue;
}

if (tempData.getPos1() != null && tempData.getPos2() != null
&& tempData.getPos1().getWorldName().equals(
var pos1 = tempData.getPos1();
var pos2 = tempData.getPos2();

if (pos1 != null && pos2 != null
&& pos1.getWorldName().equals(
player.getWorldName())
&& tempData.getPos2().getWorldName().equals(
&& pos2.getWorldName().equals(
player.getWorldName())) {
int widthX = Math.abs(tempData.getPos1().getPosX()
- tempData.getPos2().getPosX());
int widthY = Math.abs(tempData.getPos1().getPosY()
- tempData.getPos2().getPosY());
int widthZ = Math.abs(tempData.getPos1().getPosZ()
- tempData.getPos2().getPosZ());
int widthX = Math.abs(pos1.getPosX()
- pos2.getPosX());
int widthY = Math.abs(pos1.getPosY()
- pos2.getPosY());
int widthZ = Math.abs(pos1.getPosZ()
- pos2.getPosZ());
int totalBlocks = widthX * widthY * widthZ;
if (totalBlocks <= config.getMaxTriggerVisualisationSize())
debugVisuals(player, tempData.getPos1(),
tempData.getPos2(), SELECTION_COLOR,
SHOW_TICKS);
debugVisuals(player, pos1,
pos2, SELECTION_COLOR);
}

if (tempData.getPos1() != null
&& tempData.getPos1().getWorldName().equals(
if (pos1 != null
&& pos1.getWorldName().equals(
player.getWorldName())) {
Debug.addMarker(player, tempData.getPos1(), "Pos1",
POS1_COLOR, SHOW_TICKS);
player.spawnColoredDust(pos1.toVector().add(OFFSET), 0.3, 0.3, 0.3,
10, POS1_COLOR);
}
if (tempData.getPos2() != null
&& tempData.getPos2().getWorldName().equals(
if (pos2 != null
&& pos2.getWorldName().equals(
player.getWorldName())) {
Debug.addMarker(player, tempData.getPos2(), "Pos2",
POS2_COLOR, SHOW_TICKS);
player.spawnColoredDust(pos2.toVector().add(OFFSET), 0.3,0.3,0.3,
10, POS2_COLOR);
}

// If both are selected and both worlds are the same as the player
if(pos1 != null && pos2 != null &&
pos1.getWorldName().equals(player.getWorldName()) &&
pos2.getWorldName().equals(player.getWorldName())) {
drawBox(player, pos1, pos2, SELECTION_COLOR);
}

var world = player.getWorld();
for (var portal : portalServices.getPortals()) {
if (Objects.equals(portal.getMinLoc().getWorldName(),
player.getWorldName())
&& portal.isLocationInPortal(
player.getLoc(), config.getShowVisibleRange())) {
BlockLocation minLoc = portal.getMinLoc();
BlockLocation maxLoc = portal.getMaxLoc();
int midX = (minLoc.getPosX() + maxLoc.getPosX()) / 2;
int midZ = (minLoc.getPosZ() + maxLoc.getPosZ()) / 2;
BlockLocation midPoint =
new BlockLocation(minLoc.getWorldName(), midX,
maxLoc.getPosY(), midZ);
Color color;
if (portal.isTriggerBlock(world.getBlock(midPoint))) {
color = TRIGGER_OUTLINE_COLOR;
} else {
if (midPoint.getPosX() == minLoc.getPosX()
|| midPoint.getPosX() == maxLoc.getPosX()
|| midPoint.getPosZ() == minLoc.getPosZ()
|| midPoint.getPosZ() == maxLoc.getPosZ())
color = OUTLINE_COLOR;
else
color = new Color(0, 0, 0, 0);
}
debugVisuals(player, portal, OUTLINE_COLOR, SHOW_TICKS,
debugVisuals(player, portal, OUTLINE_COLOR,
TRIGGER_COLOR);
var name = portal.getArgValues(NameTag.TAG_NAME);
if (name != null && name.length > 0) {
Debug.addMarker(player, midPoint, name[0], color,
SHOW_TICKS);
}
}
}
}
}, 1, 20);
}, 1,20);
}

private void debugVisuals(PlayerContainer player, BlockLocation pos1,
BlockLocation pos2, Color color, int time) {
debugVisuals(player, pos1, pos2, color, time, null, null);
BlockLocation pos2, Color color) {
debugVisuals(player, pos1, pos2, color, null, null);
}

private void debugVisuals(PlayerContainer player, AdvancedPortal portal,
Color color, int time, Color triggerColor) {
debugVisuals(player, portal.getMinLoc(), portal.getMaxLoc(), color,
time, triggerColor, portal);
Color color, Color triggerColor) {
debugVisuals(player, portal.getMinLoc(), portal.getMaxLoc(), color, triggerColor, portal);
}

private void drawBox(PlayerContainer player, BlockLocation pos1,
BlockLocation pos2, Color color) {
int minX = Math.min(pos1.getPosX(), pos2.getPosX());
int minY = Math.min(pos1.getPosY(), pos2.getPosY());
int minZ = Math.min(pos1.getPosZ(), pos2.getPosZ());

int maxX = Math.max(pos1.getPosX(), pos2.getPosX());
int maxY = Math.max(pos1.getPosY(), pos2.getPosY());
int maxZ = Math.max(pos1.getPosZ(), pos2.getPosZ());

float middleX = (maxX - minX) / 2f + minX;
float middleY = (maxY - minY) / 2f + minY;
float middleZ = (maxZ - minZ) / 2f + minZ;

float widthX = maxX - minX;
float widthY = maxY - minY;
float widthZ = maxZ - minZ;

player.spawnColoredDust(new Vector(minX, middleY, minZ + 1), 0, widthY / 2f, 0, (int) widthY,
color);
}

private void debugVisuals(PlayerContainer player, BlockLocation pos1,
BlockLocation pos2, Color color, int time,
BlockLocation pos2, Color color,
Color triggerColor, AdvancedPortal portal) {
int minX = Math.min(pos1.getPosX(), pos2.getPosX());
int minY = Math.min(pos1.getPosY(), pos2.getPosY());
Expand All @@ -207,6 +213,8 @@ private void debugVisuals(PlayerContainer player, BlockLocation pos1,

var world = player.getWorld();

//drawBox(player, pos1, pos2, color);

if (size <= config.getMaxTriggerVisualisationSize()) {
for (int x = minX; x <= maxX; x++) {
for (int y = minY; y <= maxY; y++) {
Expand All @@ -220,75 +228,16 @@ private void debugVisuals(PlayerContainer player, BlockLocation pos1,
|| z == maxZ)
|| (z == minZ || z == maxZ)
&& (x == minX || x == maxX);
if (isTrigger && isOutline && alternate_show_trigger) {
Debug.addMarker(player, pos, "",
TRIGGER_OUTLINE_COLOR, time);
} else if (isOutline) {
Debug.addMarker(player, pos, "", color, time);
} else if (isTrigger) {
if (alternate_show_trigger)
Debug.addMarker(player, pos, "", triggerColor,
time);
}

/* player.spawnColoredDust(pos.toVector().add(OFFSET), 0.2, 0.2, 0.2, 5,
color);*/
if (!isOutline && isTrigger && alternate_show_trigger)
player.spawnColoredDust(pos.toVector().add(OFFSET), 0.2, 0.2, 0.2, 1,
triggerColor);

}
}
}
} else {
for (int x = minX; x <= maxX; x++) {
Debug.addMarker(
player,
new BlockLocation(pos1.getWorldName(), x, minY, minZ), "",
color, time);
Debug.addMarker(
player,
new BlockLocation(pos1.getWorldName(), x, minY, maxZ), "",
color, time);
Debug.addMarker(
player,
new BlockLocation(pos1.getWorldName(), x, maxY, minZ), "",
color, time);
Debug.addMarker(
player,
new BlockLocation(pos1.getWorldName(), x, maxY, maxZ), "",
color, time);
}
for (int z = minZ + 1; z < maxZ; z++) {
Debug.addMarker(
player,
new BlockLocation(pos1.getWorldName(), minX, minY, z), "",
color, time);
Debug.addMarker(
player,
new BlockLocation(pos1.getWorldName(), maxX, minY, z), "",
color, time);
Debug.addMarker(
player,
new BlockLocation(pos1.getWorldName(), minX, maxY, z), "",
color, time);
Debug.addMarker(
player,
new BlockLocation(pos1.getWorldName(), maxX, maxY, z), "",
color, time);
}

for (int y = minY + 1; y < maxY; y++) {
Debug.addMarker(
player,
new BlockLocation(pos1.getWorldName(), minX, y, minZ), "",
color, time);
Debug.addMarker(
player,
new BlockLocation(pos1.getWorldName(), maxX, y, minZ), "",
color, time);
Debug.addMarker(
player,
new BlockLocation(pos1.getWorldName(), minX, y, maxZ), "",
color, time);
Debug.addMarker(
player,
new BlockLocation(pos1.getWorldName(), maxX, y, maxZ), "",
color, time);
}
}
}
}
21 changes: 11 additions & 10 deletions core/src/main/java/com/sekwah/advancedportals/core/connector/containers/PlayerContainer.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package com.sekwah.advancedportals.core.connector.containers;

import com.sekwah.advancedportals.core.serializeddata.BlockLocation;
import com.sekwah.advancedportals.core.serializeddata.Vector;

import java.awt.*;
import java.util.UUID;

/**
Expand All @@ -20,23 +23,21 @@ public interface PlayerContainer extends EntityContainer, HasPermission {
*/
void sendFakeBlock(BlockLocation blockPos, String material);

/**
* Only 1.12 and below supported
*
* @param blockPos
* @param material
* @param data
*/
void sendFakeBlockWithData(BlockLocation blockPos, String material,
byte data);

void giveItem(String material, String itemName, String... itemDescription);

/**
* Send packets down any channel except the minecraft: one.
* @param channel
* @param bytes
* @return
*/
boolean sendPacket(String channel, byte[] bytes);

void playSound(String sound, float volume, float pitch);

ServerContainer getServer();

GameMode getGameMode();

void spawnColoredDust(Vector pos, double xSpread, double ySpread, double zSpread, int count, Color color);
}
3 changes: 0 additions & 3 deletions core/src/main/java/com/sekwah/advancedportals/core/connector/containers/WorldContainer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.sekwah.advancedportals.core.data.BlockAxis;
import com.sekwah.advancedportals.core.portal.AdvancedPortal;
import com.sekwah.advancedportals.core.serializeddata.BlockLocation;

import java.awt.*;

public interface WorldContainer {
Expand All @@ -18,6 +17,4 @@ public interface WorldContainer {
void setBlockAxis(BlockLocation location, BlockAxis axis);

void disableBeacon(AdvancedPortal portal);

void spawnColoredDust(BlockLocation blockPos, double xSpread, double ySpread, double zSpread, int count, Color color);
}
8 changes: 8 additions & 0 deletions core/src/main/java/com/sekwah/advancedportals/core/serializeddata/BlockLocation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,12 @@ public int getSize(BlockLocation pos2) {

return widthX * widthY * widthZ;
}

public Vector toVector() {
return new Vector(this.posX, this.posY, this.posZ);
}

public WorldLocation toWorldLocation() {
return new WorldLocation(this.worldName, this.posX, this.posY, this.posZ);
}
}
Loading

0 comments on commit b9a8d33

Please sign in to comment.