SteamWar/BauSystem2.0
SteamWar/BauSystem2.0
Archiviert
12
0
Fork 0
Code Issues 39 Pull-Requests Projekte Releases Wiki Aktivität

Fix SmartPlaceListener
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details

Quellcode durchsuchen
Dieser Commit ist enthalten in:
yoyosource 2023-10-14 13:09:57 +02:00
Ursprung 8128aa7324
Commit 2b3f2a72d7
1 geänderte Dateien mit 168 neuen und 69 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

203
BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceListener.java
Datei anzeigen

@ -1,7 +1,7 @@
/* /*
* This file is a part of the SteamWar software. * This file is a part of the SteamWar software.
* *
* Copyright (C) 2021 SteamWar.de-Serverteam * Copyright (C) 2023 SteamWar.de-Serverteam
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU Affero General Public License as published by
@ -19,39 +19,96 @@
package de.steamwar.bausystem.features.smartplace; package de.steamwar.bausystem.features.smartplace;
import com.comphenix.tinyprotocol.Reflection;
import com.comphenix.tinyprotocol.TinyProtocol;
import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.configplayer.Config; import de.steamwar.bausystem.configplayer.Config;
import de.steamwar.bausystem.utils.PlaceItemUtils;
import de.steamwar.linkage.Linked; import de.steamwar.linkage.Linked;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.SoundGroup; import org.bukkit.World;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.data.BlockData; import org.bukkit.block.BlockFace;
import org.bukkit.block.data.type.Repeater; import org.bukkit.block.BlockState;
import org.bukkit.block.data.type.Sign; import org.bukkit.block.TileState;
import org.bukkit.block.data.type.Switch; import org.bukkit.block.data.*;
import org.bukkit.block.data.type.*;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.block.Action; import org.bukkit.event.block.Action;
import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@Linked @Linked
public class SmartPlaceListener implements Listener { public class SmartPlaceListener implements Listener {
@EventHandler(priority = EventPriority.HIGHEST) // TODO: Sneaking not reset sometimes
private static final Set<Material> CONTAINERS = new HashSet<>();
static {
World world = Bukkit.getWorlds().get(0);
Block block = world.getBlockAt(0, 0, 0);
BlockState state = block.getState();
for (Material material : Material.values()) {
if (material.isLegacy()) continue;
if (!material.isInteractable() && !material.isBlock()) continue;
BlockData blockData = material.createBlockData();
block.setBlockData(blockData);
if (block.getState() instanceof TileState) {
CONTAINERS.add(material);
} else if (blockData instanceof Stairs) {
CONTAINERS.add(material);
}
}
CONTAINERS.add(Material.GRINDSTONE);
state.update(true, false);
}
private static final Class<?> useItem = Reflection.getClass("{nms.network.protocol.game}.PacketPlayInUseItem");
private static final Set<Player> SMART_PLACING = new HashSet<>();
public SmartPlaceListener() {
TinyProtocol.instance.addFilter(useItem, (player, object) -> {
if (!Config.getInstance().get(player).getPlainValueOrDefault("smartPlace", false)) {
return object;
}
Block block = player.getTargetBlockExact(6);
if (block != null && (block.getType().isInteractable() || block.getType() == Material.NOTE_BLOCK) && !CONTAINERS.contains(block.getType())) {
return object;
}
boolean isSneaking = player.isSneaking();
if (isSneaking) {
SMART_PLACING.add(player);
}
if (!isSneaking) {
player.setSneaking(true);
}
Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
player.setSneaking(isSneaking);
SMART_PLACING.remove(player);
}, 0);
return object;
});
}
@EventHandler
public void onPlayerInteract(PlayerInteractEvent event) { public void onPlayerInteract(PlayerInteractEvent event) {
if (!Config.getInstance().get(event.getPlayer()).getPlainValueOrDefault("smartPlace", false)) return;
if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return; if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
if (event.getPlayer().getGameMode() == GameMode.SPECTATOR) return; if (event.getPlayer().getGameMode() == GameMode.SPECTATOR) return;
if (!event.getPlayer().isSneaking()) return;
boolean shouldRotate = event.getPlayer().isSneaking(); if (event.getClickedBlock().getType() != Material.REPEATER) return;
Material blockType = event.getClickedBlock().getType(); if ((event.getItem() == null || event.getItem().getType() == Material.REPEATER)) {
switch (blockType) {
case REPEATER:
if (shouldRotate && (event.getItem() == null || event.getItem().getType() == Material.REPEATER)) {
Repeater repeater = (Repeater) event.getClickedBlock().getBlockData(); Repeater repeater = (Repeater) event.getClickedBlock().getBlockData();
int i = repeater.getDelay() - 1; int i = repeater.getDelay() - 1;
if (i <= 0) i += 4; if (i <= 0) i += 4;
@ -59,45 +116,87 @@ public class SmartPlaceListener implements Listener {
event.getClickedBlock().setBlockData(repeater); event.getClickedBlock().setBlockData(repeater);
event.setCancelled(true); event.setCancelled(true);
} }
return;
}
BlockData blockData = event.getClickedBlock().getBlockData();
if (blockData instanceof Switch) {
if (!shouldRotate && (event.getItem() == null || event.getItem().getType() == event.getClickedBlock().getType())) {
return;
}
shouldRotate = false;
}
PlaceItemUtils.PlaceItemResult result = PlaceItemUtils.placeItem(event.getPlayer(), event.getItem(), event.getClickedBlock(), event.getBlockFace(), event.getHand(), true, true, shouldRotate, false);
if (result.isSuccess()) {
event.setCancelled(true);
Block block = event.getClickedBlock().getRelative(event.getBlockFace());
SoundGroup soundGroup = block.getBlockData().getSoundGroup();
Bukkit.getOnlinePlayers().forEach(player -> {
if (!(event.getClickedBlock().getBlockData() instanceof Sign) && player == event.getPlayer()) {
return;
}
player.playSound(block.getLocation(), soundGroup.getPlaceSound(), soundGroup.getVolume() * 0.8F, soundGroup.getPitch() * 0.8F);
});
if (result.wasForced()) {
event.getPlayer().playSound(block.getLocation(), soundGroup.getPlaceSound(), soundGroup.getVolume() * 0.8F, soundGroup.getPitch() * 0.8F);
}
}
// Fix Double sound for original player
} }
@EventHandler @EventHandler
public void onBlockBreak(BlockBreakEvent event) { public void onBlockPlace(BlockPlaceEvent event) {
if (!Config.getInstance().get(event.getPlayer()).getPlainValueOrDefault("smartPlace", false)) return; if (!SMART_PLACING.contains(event.getPlayer())) return;
if (!event.getPlayer().isSneaking()) return; BlockData blockData = event.getBlock().getBlockData();
event.setCancelled(true); if (blockData instanceof Bed) {
event.getBlock().setType(Material.AIR, false); Bed bed = (Bed) blockData;
Block bedHead = event.getBlock().getRelative(bed.getFacing());
bed.setPart(Bed.Part.HEAD);
bed.setFacing(bed.getFacing().getOppositeFace());
SoundGroup soundGroup = event.getBlock().getBlockData().getSoundGroup(); bed = (Bed) bedHead.getBlockData();
Bukkit.getOnlinePlayers().forEach(player -> { bed.setPart(Bed.Part.FOOT);
if (player == event.getPlayer()) return; bed.setFacing(bed.getFacing().getOppositeFace());
player.playSound(event.getBlock().getLocation(), soundGroup.getBreakSound(), soundGroup.getVolume() * 0.8F, soundGroup.getPitch() * 0.8F); bedHead.setBlockData(bed, false);
} else if (blockData instanceof FaceAttachable && ((FaceAttachable) blockData).getAttachedFace() != FaceAttachable.AttachedFace.WALL) {
FaceAttachable faceAttachable = (FaceAttachable) blockData;
faceAttachable.setAttachedFace(faceAttachable.getAttachedFace() == FaceAttachable.AttachedFace.CEILING ? FaceAttachable.AttachedFace.FLOOR : FaceAttachable.AttachedFace.CEILING);
} else if (blockData instanceof Rotatable) {
Rotatable rotatable = (Rotatable) blockData;
rotatable.setRotation(rotatable.getRotation().getOppositeFace());
} else if (blockData instanceof Directional) {
Directional directional = (Directional) blockData;
BlockFace face = directional.getFacing().getOppositeFace();
if (directional.getFaces().contains(face)) {
directional.setFacing(face);
}
} else if (blockData instanceof MultipleFacing && !(blockData instanceof Fence)) {
MultipleFacing multipleFacing = (MultipleFacing) blockData;
List<BlockFace> blockFaceList = multipleFacing.getFaces()
.stream()
.map(BlockFace::getOppositeFace)
.collect(Collectors.toList());
if (multipleFacing.getAllowedFaces().containsAll(blockFaceList)) {
multipleFacing.getFaces().forEach(blockFace -> {
multipleFacing.setFace(blockFace, false);
});
blockFaceList.forEach(blockFace -> {
multipleFacing.setFace(blockFace, true);
}); });
} }
} }
if (blockData instanceof Stairs) {
Stairs stairs = (Stairs) blockData;
switch (stairs.getShape()) {
case OUTER_LEFT:
stairs.setShape(Stairs.Shape.INNER_RIGHT);
break;
case INNER_LEFT:
stairs.setShape(Stairs.Shape.OUTER_RIGHT);
break;
case OUTER_RIGHT:
stairs.setShape(Stairs.Shape.INNER_LEFT);
break;
case INNER_RIGHT:
stairs.setShape(Stairs.Shape.OUTER_LEFT);
break;
case STRAIGHT:
break;
}
}
if (blockData instanceof Piston) {
Piston piston = (Piston) blockData;
Block block = event.getBlock().getRelative(piston.getFacing().getOppositeFace());
Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
event.getPlayer().sendBlockChange(block.getLocation(), block.getBlockData());
}, 2);
} else if (blockData.getMaterial() == Material.REPEATER || blockData.getMaterial() == Material.COMPARATOR) {
Block block = event.getBlock().getRelative(BlockFace.DOWN);
BlockState old = block.getState();
Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
block.setType(Material.GLASS);
old.update(true, false);
}, 1);
}
event.getBlock().setBlockData(blockData, true);
}
@EventHandler
public void onPlayerQuit(PlayerQuitEvent event) {
SMART_PLACING.remove(event.getPlayer());
}
}