Netherite-Public/ZNPCsPlus
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

add look property

Browse source
This commit is contained in:
Pyrbu 2023-05-24 21:47:30 +01:00
parent b7a8776162
commit 0b9262720a
7 changed files with 88 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
api/src/main/java/lol/pyr/znpcsplus/util/NpcLocation.java
View file

@ -4,6 +4,8 @@ import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.util.NumberConversions;
import java.util.Objects;
public class NpcLocation {
private final double x;
private final double y;
@ -65,8 +67,8 @@ public class NpcLocation {
private static final double _2PI = 2 * Math.PI;
public Location lookingAt(Location loc) {
return lookingAt(new NpcLocation(loc)).toBukkitLocation(loc.getWorld());
public NpcLocation lookingAt(Location loc) {
return lookingAt(new NpcLocation(loc));
}
public NpcLocation lookingAt(NpcLocation loc) {
@ -88,4 +90,17 @@ public class NpcLocation {
return new NpcLocation(this.x, this.y, this.z, yaw, pitch);
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
NpcLocation that = (NpcLocation) o;
return Double.compare(that.x, x) == 0 && Double.compare(that.y, y) == 0 && Double.compare(that.z, z) == 0 && Float.compare(that.yaw, yaw) == 0 && Float.compare(that.pitch, pitch) == 0;
}
@Override
public int hashCode() {
return Objects.hash(x, y, z, yaw, pitch);
}
}

4
plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlus.java
View file

@ -35,7 +35,7 @@ import lol.pyr.znpcsplus.scheduling.SpigotScheduler;
import lol.pyr.znpcsplus.scheduling.TaskScheduler;
import lol.pyr.znpcsplus.skin.cache.SkinCache;
import lol.pyr.znpcsplus.skin.cache.SkinCacheCleanTask;
import lol.pyr.znpcsplus.tasks.NpcVisibilityTask;
import lol.pyr.znpcsplus.tasks.NpcProcessorTask;
import lol.pyr.znpcsplus.updater.UpdateChecker;
import lol.pyr.znpcsplus.updater.UpdateNotificationListener;
import lol.pyr.znpcsplus.user.UserListener;
@ -131,7 +131,7 @@ public class ZNpcsPlus extends JavaPlugin {
pluginManager.registerEvents(new UpdateNotificationListener(this, adventure, updateChecker), this);
}
scheduler.runDelayedTimerAsync(new NpcVisibilityTask(npcRegistry, configManager), 60L, 10L);
scheduler.runDelayedTimerAsync(new NpcProcessorTask(npcRegistry, configManager, propertyRegistry), 60L, 3L);
scheduler.runDelayedTimerAsync(new SkinCacheCleanTask(skinCache), 1200, 1200);
log(ChatColor.WHITE + " * Loading data...");

5
plugin/src/main/java/lol/pyr/znpcsplus/config/MainConfig.java
View file

@ -45,4 +45,9 @@ public interface MainConfig {
default boolean autoSaveEnabled() {
return autoSaveInterval() != -1;
}
@ConfKey("look-property-distance")
@ConfComments("How far should the look property work from in blocks")
@DefaultDouble(10)
double lookPropertyDistance();
}

6
plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcRegistryImpl.java
View file

@ -56,6 +56,12 @@ public class NpcRegistryImpl implements NpcRegistry {
return Collections.unmodifiableCollection(npcMap.values());
}
public Collection<NpcEntryImpl> getProcessable() {
return Collections.unmodifiableCollection(npcMap.values().stream()
.filter(NpcEntryImpl::isProcessed)
.collect(Collectors.toList()));
}
public Collection<NpcEntryImpl> getAllModifiable() {
return Collections.unmodifiableCollection(npcMap.values().stream()
.filter(NpcEntryImpl::isAllowCommandModification)

1
plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeImpl.java
View file

@ -74,6 +74,7 @@ public class NpcTypeImpl implements NpcType {
allowedProperties.add(propertyRegistry.getByName("fire"));
allowedProperties.add(propertyRegistry.getByName("invisible"));
allowedProperties.add(propertyRegistry.getByName("silent"));
allowedProperties.add(propertyRegistry.getByName("look"));
if (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_9))
allowedProperties.add(propertyRegistry.getByName("glow"));
}

57
plugin/src/main/java/lol/pyr/znpcsplus/tasks/NpcProcessorTask.java Normal file
View file

@ -0,0 +1,57 @@
package lol.pyr.znpcsplus.tasks;
import lol.pyr.znpcsplus.config.ConfigManager;
import lol.pyr.znpcsplus.entity.EntityPropertyImpl;
import lol.pyr.znpcsplus.entity.EntityPropertyRegistryImpl;
import lol.pyr.znpcsplus.npc.NpcEntryImpl;
import lol.pyr.znpcsplus.npc.NpcImpl;
import lol.pyr.znpcsplus.npc.NpcRegistryImpl;
import lol.pyr.znpcsplus.util.NpcLocation;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.util.NumberConversions;
public class NpcProcessorTask extends BukkitRunnable {
private final NpcRegistryImpl npcRegistry;
private final ConfigManager configManager;
private final EntityPropertyRegistryImpl propertyRegistry;
public NpcProcessorTask(NpcRegistryImpl npcRegistry, ConfigManager configManager, EntityPropertyRegistryImpl propertyRegistry) {
this.npcRegistry = npcRegistry;
this.configManager = configManager;
this.propertyRegistry = propertyRegistry;
}
public void run() {
double distSq = NumberConversions.square(configManager.getConfig().viewDistance());
double lookPropertyDistSq = NumberConversions.square(configManager.getConfig().lookPropertyDistance());
EntityPropertyImpl<Boolean> lookProperty = propertyRegistry.getByName("look", Boolean.class);
for (NpcEntryImpl entry : npcRegistry.getProcessable()) {
NpcImpl npc = entry.getNpc();
double closestDist = Double.MAX_VALUE;
Player closest = null;
for (Player player : Bukkit.getOnlinePlayers()) {
if (!player.getWorld().equals(npc.getWorld())) continue;
double distance = player.getLocation().distanceSquared(npc.getBukkitLocation());
// visibility
boolean inRange = distance <= distSq;
if (!inRange && npc.isShown(player)) npc.hide(player);
if (inRange) {
if (!npc.isShown(player)) npc.show(player);
if (distance < closestDist) {
closestDist = distance;
closest = player;
}
}
}
// look property
if (closest != null && npc.getProperty(lookProperty) && lookPropertyDistSq >= closestDist) {
NpcLocation expected = npc.getLocation().lookingAt(closest.getLocation());
if (!expected.equals(npc.getLocation())) npc.setLocation(expected);
}
}
}
}

33
plugin/src/main/java/lol/pyr/znpcsplus/tasks/NpcVisibilityTask.java
View file

@ -1,33 +0,0 @@
package lol.pyr.znpcsplus.tasks;
import lol.pyr.znpcsplus.config.ConfigManager;
import lol.pyr.znpcsplus.npc.NpcEntryImpl;
import lol.pyr.znpcsplus.npc.NpcImpl;
import lol.pyr.znpcsplus.npc.NpcRegistryImpl;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.util.NumberConversions;
public class NpcVisibilityTask extends BukkitRunnable {
private final NpcRegistryImpl npcRegistry;
private final ConfigManager configManager;
public NpcVisibilityTask(NpcRegistryImpl npcRegistry, ConfigManager configManager) {
this.npcRegistry = npcRegistry;
this.configManager = configManager;
}
public void run() {
double distSq = NumberConversions.square(configManager.getConfig().viewDistance());
for (NpcEntryImpl entry : npcRegistry.getAll()) {
if (!entry.isProcessed()) continue;
NpcImpl npc = entry.getNpc();
for (Player player : Bukkit.getOnlinePlayers()) {
boolean inRange = (player.getWorld() == npc.getWorld() && player.getLocation().distanceSquared(npc.getBukkitLocation()) <= distSq);
if (!inRange && npc.isShown(player)) npc.hide(player);
if (inRange && !npc.isShown(player)) npc.show(player);
}
}
}
}