SteamWar/BauSystem2.0
Archiviert
12
0

Add RBlockServer
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful

Signed-off-by: yoyosource <yoyosource@nidido.de>
Dieser Commit ist enthalten in:
yoyosource 2023-09-09 15:19:05 +02:00
Ursprung 2774b29342
Commit 8a3cce0a3a
2 geänderte Dateien mit 226 neuen und 10 gelöschten Zeilen

Datei anzeigen

@ -22,10 +22,12 @@ package de.steamwar.bausystem.features.simulator.preview;
import de.steamwar.bausystem.features.tracer.show.EntityShowMode; import de.steamwar.bausystem.features.tracer.show.EntityShowMode;
import de.steamwar.bausystem.features.tracer.show.Record; import de.steamwar.bausystem.features.tracer.show.Record;
import de.steamwar.bausystem.features.tracer.show.ShowModeParameter; import de.steamwar.bausystem.features.tracer.show.ShowModeParameter;
import de.steamwar.bausystem.utils.RBlockServer;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.bukkit.Location; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.data.BlockData; import org.bukkit.block.data.BlockData;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
@ -39,9 +41,10 @@ import java.util.function.Predicate;
public class PreviewRecord { public class PreviewRecord {
private static final BlockData AIR_BLOCK_DATA = Material.AIR.createBlockData(); private static final BlockData AIR_BLOCK_DATA = Material.AIR.createBlockData();
private static final World WORLD = Bukkit.getWorlds().get(0);
@Setter
private Set<Vector> destroyedBlocks; private Set<Vector> destroyedBlocks;
private RBlockServer rBlockServer = new RBlockServer();
@Setter @Setter
@Getter @Getter
@ -52,15 +55,20 @@ public class PreviewRecord {
private Map<Player, EntityShowMode> showModeMap = new HashMap<>(); private Map<Player, EntityShowMode> showModeMap = new HashMap<>();
public void setDestroyedBlocks(Set<Vector> airBlocks) {
destroyedBlocks = airBlocks;
airBlocks.forEach(vector -> {
rBlockServer.setBlock(vector.toLocation(WORLD), AIR_BLOCK_DATA);
});
}
public Set<Player> getPlayers() { public Set<Player> getPlayers() {
return new HashSet<>(showModeMap.keySet()); return new HashSet<>(showModeMap.keySet());
} }
public void show(Player player) { public void show(Player player) {
destroyedBlocks.forEach(vector -> {
player.sendBlockChange(vector.toLocation(player.getWorld()), AIR_BLOCK_DATA);
});
showModeMap.computeIfAbsent(player, p -> { showModeMap.computeIfAbsent(player, p -> {
rBlockServer.addPlayer(p);
ShowModeParameter showModeParameter = new ShowModeParameter(); ShowModeParameter showModeParameter = new ShowModeParameter();
showModeParameter.enableWater(); showModeParameter.enableWater();
showModeParameter.enableCount(); showModeParameter.enableCount();
@ -76,12 +84,13 @@ public class PreviewRecord {
EntityShowMode showMode = showModeMap.remove(player); EntityShowMode showMode = showModeMap.remove(player);
if (showMode != null) { if (showMode != null) {
showMode.hide(); showMode.hide();
destroyedBlocks.forEach(vector -> { rBlockServer.removePlayer(player);
Location location = vector.toLocation(player.getWorld());
player.sendBlockChange(location, location.getBlock().getBlockData());
});
} }
return showModeMap.isEmpty(); if (showModeMap.isEmpty()) {
rBlockServer.close();
return true;
}
return false;
} }
public boolean has(Player player) { public boolean has(Player player) {

Datei anzeigen

@ -0,0 +1,207 @@
/*
* This file is a part of the SteamWar software.
*
* Copyright (C) 2023 SteamWar.de-Serverteam
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.steamwar.bausystem.utils;
import de.steamwar.bausystem.BauSystem;
import de.steamwar.core.FlatteningWrapper;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.block.data.BlockData;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import java.util.*;
import java.util.function.BiConsumer;
public class RBlockServer implements Listener {
private final HashMap<Long, Map<Location, BlockData>> blocks = new HashMap<>();
private final HashMap<Long, Set<Player>> players = new HashMap<>();
private final HashMap<Player, Location> lastLocation = new HashMap<>();
private final HashMap<Player, Integer> viewDistance = new HashMap<>();
public RBlockServer() {
BauSystem.getInstance().getServer().getPluginManager().registerEvents(this, BauSystem.getInstance());
}
public void addPlayer(Player player) {
Location location = player.getLocation();
this.lastLocation.put(player, location);
this.viewDistance.put(player, this.viewRadius(player));
this.forChunkInView(player, location, (x, z) -> {
this.addPlayerToChunk(player, x, z);
});
}
public void removePlayer(Player player) {
this.forChunkInView(player, this.lastLocation.remove(player), (x, z) -> {
this.removePlayerFromChunk(player, x, z);
});
this.viewDistance.remove(player);
}
public void close() {
Player[] players = lastLocation.keySet().toArray(new Player[0]);
for (Player player : players) {
removePlayer(player);
}
blocks.clear();
HandlerList.unregisterAll(this);
}
public void setBlock(Location location, BlockData blockData) {
long chunkId = posToId(location.getX(), location.getZ());
if (blockData == null) {
Map<Location, BlockData> chunkData = blocks.get(chunkId);
if (chunkData == null) return;
chunkData.remove(location);
if (chunkData.isEmpty()) {
blocks.remove(chunkId);
}
BlockData data = location.getBlock().getBlockData();
players.getOrDefault(chunkId, Collections.emptySet()).forEach(player -> {
player.sendBlockChange(location, data);
});
} else {
blocks.computeIfAbsent(chunkId, i -> new HashMap<>()).put(location, blockData);
players.getOrDefault(chunkId, Collections.emptySet()).forEach(player -> {
player.sendBlockChange(location, blockData);
});
}
}
@EventHandler(
ignoreCancelled = true,
priority = EventPriority.MONITOR
)
public void onMove(PlayerMoveEvent e) {
Player player = e.getPlayer();
Location from = this.lastLocation.get(player);
Location to = e.getTo();
if (from != null && to != null) {
int fromX = this.posToChunk(from.getX());
int fromZ = this.posToChunk(from.getZ());
int toX = this.posToChunk(to.getX());
int toZ = this.posToChunk(to.getZ());
if (fromX != toX || fromZ != toZ) {
this.lastLocation.put(player, to);
int toViewDistance = this.viewRadius(player);
this.forChunkInView(player, from, (x, z) -> {
if (Math.abs(x - toX) > toViewDistance || Math.abs(z - toZ) > toViewDistance) {
this.removePlayerFromChunk(player, x, z);
}
});
this.viewDistance.put(player, toViewDistance);
this.forChunkInView(player, to, (x, z) -> {
this.addPlayerToChunk(player, x, z);
});
}
}
}
@EventHandler(
ignoreCancelled = true,
priority = EventPriority.MONITOR
)
public void onPlayerInteract(PlayerInteractEvent event) {
if (!event.hasBlock()) return;
Block block = event.getClickedBlock();
long chunkId = posToId(block.getX(), block.getZ());
if (!blocks.containsKey(chunkId)) return;
Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
this.addPlayerToChunk(event.getPlayer(), posToChunk(block.getX()), posToChunk(block.getZ()));
}, 1);
}
@EventHandler
public void onPlayerQuit(PlayerQuitEvent e) {
Player player = e.getPlayer();
Location location = this.lastLocation.remove(player);
if (location != null) {
this.forChunkInView(player, location, (x, z) -> {
long id = this.chunkToId(x, z);
Set<Player> playersInChunk = this.players.get(id);
playersInChunk.remove(player);
if (playersInChunk.isEmpty()) {
this.players.remove(id);
}
});
this.viewDistance.remove(player);
}
}
private void forChunkInView(Player player, Location location, BiConsumer<Integer, Integer> func) {
int chunkX = this.posToChunk(location.getX());
int chunkZ = this.posToChunk(location.getZ());
int viewDistance = this.viewDistance.get(player);
for(int x = chunkX - viewDistance; x <= chunkX + viewDistance; ++x) {
for(int z = chunkZ - viewDistance; z <= chunkZ + viewDistance; ++z) {
func.accept(x, z);
}
}
}
private void addPlayerToChunk(Player player, int x, int z) {
long id = this.chunkToId(x, z);
this.players.computeIfAbsent(id, i -> new HashSet<>()).add(player);
blocks.getOrDefault(id, Collections.emptyMap()).forEach(player::sendBlockChange);
}
private void removePlayerFromChunk(Player player, int x, int z) {
long id = this.chunkToId(x, z);
Set<Player> playersInChunk = this.players.get(id);
playersInChunk.remove(player);
if (playersInChunk.isEmpty()) {
this.players.remove(id);
}
blocks.getOrDefault(id, Collections.emptyMap()).forEach((location, block) -> {
player.sendBlockChange(location, location.getBlock().getBlockData());
});
}
private int posToChunk(double coord) {
return (int)(coord / 16.0) - (coord < 0.0 ? 1 : 0);
}
private int viewRadius(Player player) {
return FlatteningWrapper.impl.getViewDistance(player);
}
private long posToId(double x, double z) {
return this.chunkToId(this.posToChunk(x), this.posToChunk(z));
}
private long chunkToId(int x, int z) {
return ((long)x << 32) + (long)z;
}
}