Compare commits
5 Commits
0565f5de9e
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 469cd19b55 | |||
| e745ff4721 | |||
| bc5c9a2a13 | |||
| 78f87d97f0 | |||
| db13a9f0a2 |
@@ -21,18 +21,17 @@ class ChatMessagesListener extends ApplianceListener<ChatMessages> {
|
|||||||
public void onPlayerChatEvent(AsyncChatEvent event) {
|
public void onPlayerChatEvent(AsyncChatEvent event) {
|
||||||
event.renderer(
|
event.renderer(
|
||||||
(source, sourceDisplayName, message, viewer) ->
|
(source, sourceDisplayName, message, viewer) ->
|
||||||
Component.text("")
|
Component.text()
|
||||||
.append(this.getAppliance().getReportablePlayerName(source))
|
.append(this.getAppliance().getReportablePlayerName(source))
|
||||||
.append(Component.text(" > ").color(TextColor.color(Color.GRAY.asRGB())))
|
.append(Component.text(" > ").color(TextColor.color(Color.GRAY.asRGB())))
|
||||||
.append(message).color(TextColor.color(Color.SILVER.asRGB()))
|
.append(message).color(TextColor.color(Color.SILVER.asRGB()))
|
||||||
|
.build()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.HIGH)
|
@EventHandler(priority = EventPriority.HIGH)
|
||||||
public void onPlayerJoin(PlayerJoinEvent event) {
|
public void onPlayerJoin(PlayerJoinEvent event) {
|
||||||
boolean wasHidden = event.joinMessage() == null;
|
if(event.joinMessage() == null) return;
|
||||||
event.joinMessage(null);
|
|
||||||
if(wasHidden) return;
|
|
||||||
IteratorUtil.onlinePlayers(player -> {
|
IteratorUtil.onlinePlayers(player -> {
|
||||||
if(!Settings.instance().getSetting(player, Settings.Key.ShowJoinAndLeaveMessages, Boolean.class)) return;
|
if(!Settings.instance().getSetting(player, Settings.Key.ShowJoinAndLeaveMessages, Boolean.class)) return;
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
@@ -45,9 +44,7 @@ class ChatMessagesListener extends ApplianceListener<ChatMessages> {
|
|||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onPlayerLeave(PlayerQuitEvent event) {
|
public void onPlayerLeave(PlayerQuitEvent event) {
|
||||||
boolean wasHidden = event.quitMessage() == null;
|
if(event.quitMessage() == null) return;
|
||||||
event.quitMessage(null);
|
|
||||||
if(wasHidden) return;
|
|
||||||
IteratorUtil.onlinePlayers(player -> {
|
IteratorUtil.onlinePlayers(player -> {
|
||||||
if(!Settings.instance().getSetting(player, Settings.Key.ShowJoinAndLeaveMessages, Boolean.class)) return;
|
if(!Settings.instance().getSetting(player, Settings.Key.ShowJoinAndLeaveMessages, Boolean.class)) return;
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
|
|||||||
@@ -38,8 +38,7 @@ public class Settings extends Appliance {
|
|||||||
BorderWarning,
|
BorderWarning,
|
||||||
LocatorBar,
|
LocatorBar,
|
||||||
InfoBars,
|
InfoBars,
|
||||||
CoordinateDisplay,
|
CoordinateDisplay
|
||||||
Bloodmoon
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Settings instance() {
|
public static Settings instance() {
|
||||||
|
|||||||
@@ -0,0 +1,51 @@
|
|||||||
|
package eu.mhsl.craftattack.spawn.common.appliances.security.antiBoatFreecam;
|
||||||
|
|
||||||
|
import eu.mhsl.craftattack.spawn.common.appliances.tooling.acInform.AcInform;
|
||||||
|
import eu.mhsl.craftattack.spawn.core.Main;
|
||||||
|
import eu.mhsl.craftattack.spawn.core.appliance.Appliance;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.entity.Boat;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@SuppressWarnings("unused")
|
||||||
|
public class AntiBoatFreecam extends Appliance {
|
||||||
|
private static final float MAX_YAW_OFFSET = 106.0f;
|
||||||
|
private final Map<Player, Float> violatedPlayers = new HashMap<>();
|
||||||
|
|
||||||
|
public AntiBoatFreecam() {
|
||||||
|
Bukkit.getScheduler().runTaskTimerAsynchronously(
|
||||||
|
Main.instance(),
|
||||||
|
() -> Bukkit.getOnlinePlayers().forEach(player -> {
|
||||||
|
if(!(player.getVehicle() instanceof Boat boat)) return;
|
||||||
|
if(!boat.getPassengers().getFirst().equals(player)) return;
|
||||||
|
float playerYaw = player.getYaw();
|
||||||
|
float boatYaw = boat.getYaw();
|
||||||
|
|
||||||
|
float yawDelta = wrapDegrees(playerYaw - boatYaw);
|
||||||
|
if(Math.abs(yawDelta) <= MAX_YAW_OFFSET) return;
|
||||||
|
|
||||||
|
this.violatedPlayers.merge(player, 1f, Float::sum);
|
||||||
|
float violationCount = this.violatedPlayers.get(player);
|
||||||
|
if(violationCount != 1 && violationCount % 100 != 0) return;
|
||||||
|
Main.instance().getAppliance(AcInform.class).notifyAdmins(
|
||||||
|
"internal",
|
||||||
|
player.getName(),
|
||||||
|
"illegalBoatLookYaw",
|
||||||
|
violationCount
|
||||||
|
);
|
||||||
|
}),
|
||||||
|
1L,
|
||||||
|
1L
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static float wrapDegrees(float deg) {
|
||||||
|
deg = deg % 360f;
|
||||||
|
if (deg >= 180f) deg -= 360f;
|
||||||
|
if (deg < -180f) deg += 360f;
|
||||||
|
return deg;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
package eu.mhsl.craftattack.spawn.common.appliances.security.antiFormattedBook;
|
||||||
|
|
||||||
|
import eu.mhsl.craftattack.spawn.core.appliance.Appliance;
|
||||||
|
import net.kyori.adventure.text.*;
|
||||||
|
import net.kyori.adventure.text.format.Style;
|
||||||
|
import net.kyori.adventure.text.format.TextColor;
|
||||||
|
import net.kyori.adventure.text.format.TextDecoration;
|
||||||
|
import org.bukkit.event.Listener;
|
||||||
|
import org.bukkit.inventory.meta.BookMeta;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
public class AntiFormattedBook extends Appliance {
|
||||||
|
private static final char SECTION = '\u00A7';
|
||||||
|
|
||||||
|
public boolean containsFormatting(BookMeta meta) {
|
||||||
|
if (this.hasFormattingDeep(meta.title())) return true;
|
||||||
|
if (this.hasFormattingDeep(meta.author())) return true;
|
||||||
|
|
||||||
|
for (Component c : meta.pages()) {
|
||||||
|
if (this.hasFormattingDeep(c)) return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean hasFormattingDeep(@Nullable Component component) {
|
||||||
|
if(component == null) return false;
|
||||||
|
if (this.hastFormatting(component)) return true;
|
||||||
|
|
||||||
|
if (component instanceof TextComponent tc && tc.content().indexOf(SECTION) >= 0) return true;
|
||||||
|
|
||||||
|
if (component instanceof NBTComponent<?, ?> nbt) {
|
||||||
|
if (nbt.separator() != null && this.hasFormattingDeep(nbt.separator())) return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (Component child : component.children()) {
|
||||||
|
if (this.hasFormattingDeep(child)) return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean hastFormatting(Component component) {
|
||||||
|
Style style = component.style();
|
||||||
|
|
||||||
|
TextColor color = style.color();
|
||||||
|
if (color != null) return true;
|
||||||
|
if (style.font() != null) return true;
|
||||||
|
if (style.insertion() != null && !Objects.requireNonNull(style.insertion()).isEmpty()) return true;
|
||||||
|
|
||||||
|
for (var decoration : style.decorations().entrySet()) {
|
||||||
|
if (decoration.getValue() == TextDecoration.State.TRUE) return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return style.hoverEvent() != null || style.clickEvent() != null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected @NotNull List<Listener> listeners() {
|
||||||
|
return List.of(
|
||||||
|
new BookEditListener()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
package eu.mhsl.craftattack.spawn.common.appliances.security.antiFormattedBook;
|
||||||
|
|
||||||
|
import eu.mhsl.craftattack.spawn.common.appliances.tooling.acInform.AcInform;
|
||||||
|
import eu.mhsl.craftattack.spawn.core.Main;
|
||||||
|
import eu.mhsl.craftattack.spawn.core.appliance.ApplianceListener;
|
||||||
|
import net.kyori.adventure.text.Component;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.event.EventHandler;
|
||||||
|
import org.bukkit.event.player.PlayerEditBookEvent;
|
||||||
|
import org.bukkit.inventory.meta.BookMeta;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
class BookEditListener extends ApplianceListener<AntiFormattedBook> {
|
||||||
|
@EventHandler
|
||||||
|
public void onBookEdit(PlayerEditBookEvent event) {
|
||||||
|
Player player = event.getPlayer();
|
||||||
|
BookMeta meta = event.getNewBookMeta();
|
||||||
|
|
||||||
|
if (this.getAppliance().containsFormatting(meta)) {
|
||||||
|
Main.instance().getAppliance(AcInform.class).notifyAdmins(
|
||||||
|
"internal",
|
||||||
|
player.getName(),
|
||||||
|
"illegalBookFormatting",
|
||||||
|
1f
|
||||||
|
);
|
||||||
|
|
||||||
|
BookMeta sanitized = meta.clone();
|
||||||
|
sanitized.title(null);
|
||||||
|
sanitized.author(null);
|
||||||
|
//noinspection ResultOfMethodCallIgnored
|
||||||
|
sanitized.pages(List.of(Component.empty()));
|
||||||
|
event.setNewBookMeta(sanitized);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,78 @@
|
|||||||
|
package eu.mhsl.craftattack.spawn.common.appliances.security.antiIllegalBundlePicker;
|
||||||
|
|
||||||
|
import eu.mhsl.craftattack.spawn.common.appliances.tooling.acInform.AcInform;
|
||||||
|
import eu.mhsl.craftattack.spawn.core.Main;
|
||||||
|
import eu.mhsl.craftattack.spawn.core.appliance.Appliance;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.Material;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.event.Listener;
|
||||||
|
import org.bukkit.event.inventory.InventoryClickEvent;
|
||||||
|
import org.bukkit.inventory.InventoryView;
|
||||||
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
import org.bukkit.inventory.meta.BundleMeta;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
import java.util.*;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
public class AntiIllegalBundlePicker extends Appliance {
|
||||||
|
private static final int visibleSlotsInBundle = 9;
|
||||||
|
|
||||||
|
public void trackBundle(InventoryClickEvent event) {
|
||||||
|
ItemStack bundle = Objects.requireNonNull(event.getCurrentItem());
|
||||||
|
final int rawSlot = event.getRawSlot();
|
||||||
|
final Player player = (Player) event.getWhoClicked();
|
||||||
|
final InventoryView view = event.getView();
|
||||||
|
final List<ItemStack> before = this.getBundleContents(bundle);
|
||||||
|
|
||||||
|
Bukkit.getScheduler().runTask(Main.instance(), () -> {
|
||||||
|
ItemStack afterStack = view.getItem(rawSlot);
|
||||||
|
if(afterStack == null || afterStack.getType() != Material.BUNDLE) return;
|
||||||
|
|
||||||
|
List<ItemStack> after = this.getBundleContents(afterStack);
|
||||||
|
int removedSlotIndex = this.findRemoved(before, after);
|
||||||
|
|
||||||
|
if(removedSlotIndex >= visibleSlotsInBundle) {
|
||||||
|
Main.instance().getAppliance(AcInform.class).notifyAdmins(
|
||||||
|
"internal",
|
||||||
|
player.getName(),
|
||||||
|
"illegalBundlePick",
|
||||||
|
(float) removedSlotIndex
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private int findRemoved(@NotNull List<ItemStack> before, @NotNull List<ItemStack> after) {
|
||||||
|
for (int i = 0; i < Math.max(before.size(), after.size()); i++) {
|
||||||
|
ItemStack a = i < after.size() ? after.get(i) : null;
|
||||||
|
ItemStack b = i < before.size() ? before.get(i) : null;
|
||||||
|
|
||||||
|
if (b == null && a == null) continue;
|
||||||
|
if (b == null) throw new IllegalStateException("Size of bundle was smaller before pickup Action");
|
||||||
|
|
||||||
|
if (a == null) return i;
|
||||||
|
if (!a.isSimilar(b)) return i;
|
||||||
|
if (a.getAmount() != b.getAmount()) return i;
|
||||||
|
}
|
||||||
|
throw new IllegalStateException("Failed to find picked Item in bundle");
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<ItemStack> getBundleContents(@NotNull ItemStack bundle) {
|
||||||
|
if (bundle.getType() != Material.BUNDLE)
|
||||||
|
throw new IllegalStateException("ItemStack is not a bundle");
|
||||||
|
|
||||||
|
BundleMeta meta = (BundleMeta) bundle.getItemMeta();
|
||||||
|
return meta.getItems().stream()
|
||||||
|
.map(ItemStack::clone)
|
||||||
|
.collect(Collectors.toCollection(ArrayList::new));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected @NotNull List<Listener> listeners() {
|
||||||
|
return List.of(
|
||||||
|
new OnBundlePickListener()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package eu.mhsl.craftattack.spawn.common.appliances.security.antiIllegalBundlePicker;
|
||||||
|
|
||||||
|
import eu.mhsl.craftattack.spawn.core.appliance.ApplianceListener;
|
||||||
|
import org.bukkit.Material;
|
||||||
|
import org.bukkit.event.EventHandler;
|
||||||
|
import org.bukkit.event.inventory.InventoryAction;
|
||||||
|
import org.bukkit.event.inventory.InventoryClickEvent;
|
||||||
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
|
class OnBundlePickListener extends ApplianceListener<AntiIllegalBundlePicker> {
|
||||||
|
@EventHandler
|
||||||
|
public void onBundlePick(InventoryClickEvent event) {
|
||||||
|
if(!event.getAction().equals(InventoryAction.PICKUP_FROM_BUNDLE)) return;
|
||||||
|
final ItemStack bundle = event.getCurrentItem();
|
||||||
|
if (bundle == null || bundle.getType() != Material.BUNDLE) return;
|
||||||
|
this.getAppliance().trackBundle(event);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,224 +0,0 @@
|
|||||||
package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.bloodmoon;
|
|
||||||
|
|
||||||
import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
|
|
||||||
import eu.mhsl.craftattack.spawn.core.Main;
|
|
||||||
import eu.mhsl.craftattack.spawn.core.appliance.Appliance;
|
|
||||||
import eu.mhsl.craftattack.spawn.core.appliance.ApplianceCommand;
|
|
||||||
import eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.bloodmoon.commands.BloodmoonCommand;
|
|
||||||
import eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.bloodmoon.listener.BloodmoonEntityDamageListener;
|
|
||||||
import eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.bloodmoon.listener.BloodmoonMonsterDeathListener;
|
|
||||||
import eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.bloodmoon.listener.BloodmoonPlayerJoinListener;
|
|
||||||
import net.kyori.adventure.bossbar.BossBar;
|
|
||||||
import net.kyori.adventure.text.Component;
|
|
||||||
import net.kyori.adventure.text.format.NamedTextColor;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.Location;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.entity.Entity;
|
|
||||||
import org.bukkit.entity.EntityType;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.event.Listener;
|
|
||||||
import org.bukkit.inventory.ItemStack;
|
|
||||||
import org.bukkit.potion.PotionEffectType;
|
|
||||||
import org.bukkit.scheduler.BukkitTask;
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
|
||||||
import org.jetbrains.annotations.Nullable;
|
|
||||||
|
|
||||||
import java.util.*;
|
|
||||||
import java.util.concurrent.ThreadLocalRandom;
|
|
||||||
|
|
||||||
public class Bloodmoon extends Appliance {
|
|
||||||
// für alle Dimensionen? einstellbar machen?
|
|
||||||
|
|
||||||
public final Map<EntityType, Set<MobEffect>> affectedMobEffectMap = Map.of(
|
|
||||||
EntityType.ZOMBIE, Set.of(
|
|
||||||
new MobEffect.PotionMobEffect(PotionEffectType.WITHER, 7, 1)
|
|
||||||
),
|
|
||||||
EntityType.SKELETON, Set.of(
|
|
||||||
new MobEffect.PotionMobEffect(PotionEffectType.SLOWNESS, 3.5, 1)
|
|
||||||
),
|
|
||||||
EntityType.SPIDER, Set.of(
|
|
||||||
new MobEffect.PotionMobEffect(PotionEffectType.POISON, 4, 1),
|
|
||||||
new MobEffect.PotionMobEffect(PotionEffectType.NAUSEA, 6, 10)
|
|
||||||
),
|
|
||||||
EntityType.CREEPER, Set.of(
|
|
||||||
new MobEffect.LightningMobEffect()
|
|
||||||
),
|
|
||||||
EntityType.HUSK, Set.of(
|
|
||||||
new MobEffect.PotionMobEffect(PotionEffectType.WITHER, 7, 1)
|
|
||||||
),
|
|
||||||
EntityType.DROWNED, Set.of(
|
|
||||||
new MobEffect.PotionMobEffect(PotionEffectType.WITHER, 7, 1)
|
|
||||||
),
|
|
||||||
EntityType.WITCH, Set.of(),
|
|
||||||
EntityType.ZOMBIE_VILLAGER, Set.of(
|
|
||||||
new MobEffect.PotionMobEffect(PotionEffectType.WITHER, 7, 1)
|
|
||||||
),
|
|
||||||
EntityType.PHANTOM, Set.of(
|
|
||||||
new MobEffect.PotionMobEffect(PotionEffectType.LEVITATION, 1.5, 3)
|
|
||||||
),
|
|
||||||
EntityType.ENDERMAN, Set.of(
|
|
||||||
new MobEffect.PotionMobEffect(PotionEffectType.SLOWNESS, 2.5, 2)
|
|
||||||
)
|
|
||||||
);
|
|
||||||
public final int expMultiplier = 4;
|
|
||||||
public final double mobDamageMultipier = 2;
|
|
||||||
public final double mobHealthMultiplier = 3;
|
|
||||||
|
|
||||||
private boolean isActive = false;
|
|
||||||
private final BossBar bossBar = BossBar.bossBar(
|
|
||||||
Component.text("Blutmond", NamedTextColor.DARK_RED),
|
|
||||||
1f,
|
|
||||||
BossBar.Color.RED,
|
|
||||||
BossBar.Overlay.NOTCHED_12,
|
|
||||||
Set.of(BossBar.Flag.CREATE_WORLD_FOG, BossBar.Flag.DARKEN_SCREEN)
|
|
||||||
);
|
|
||||||
private final boolean hordesEnabled = true;
|
|
||||||
private final int hordeSpawnRateTicks = 800;
|
|
||||||
private final int hordeSpawnRateVariationTicks = 800;
|
|
||||||
private final int hordeMinPopulation = 3;
|
|
||||||
private final int hordeMaxPopulation = 10;
|
|
||||||
private final int hordeSpawnDistance = 10;
|
|
||||||
private final List<EntityType> hordeMobList = List.of(
|
|
||||||
EntityType.ZOMBIE,
|
|
||||||
EntityType.SKELETON,
|
|
||||||
EntityType.SPIDER
|
|
||||||
);
|
|
||||||
private final Map<Player, @Nullable BukkitTask> hordeSpawnTasks = new HashMap<>();
|
|
||||||
private final int bloodmoonLegth = 12000;
|
|
||||||
private final int bloodmoonStartTime = 12000;
|
|
||||||
private final int daysBetweenBloodmoons = 1;
|
|
||||||
private final int minBonusDrops = 1;
|
|
||||||
private final int maxBonusDrops = 4;
|
|
||||||
private final Map<ItemStack, Integer> bonusDropWeightMap = Map.of(
|
|
||||||
new ItemStack(Material.IRON_INGOT, 5), 10,
|
|
||||||
new ItemStack(Material.GOLD_INGOT, 2), 5,
|
|
||||||
new ItemStack(Material.DIAMOND, 1), 1,
|
|
||||||
new ItemStack(Material.IRON_BLOCK, 1), 5,
|
|
||||||
new ItemStack(Material.GOLD_BLOCK, 1), 2
|
|
||||||
);
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onEnable() {
|
|
||||||
Settings.instance().declareSetting(BloodmoonSetting.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean bloodmoonIsActive() {
|
|
||||||
return this.isActive;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void startBloodmoon() {
|
|
||||||
this.isActive = true;
|
|
||||||
Bukkit.getOnlinePlayers().forEach(this::addPlayerToBossBar);
|
|
||||||
this.startHordeSpawning(this.getRandomHordeSpawnDelay());
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getRandomHordeSpawnDelay() {
|
|
||||||
return this.hordeSpawnRateTicks + ThreadLocalRandom.current().nextInt(this.hordeSpawnRateVariationTicks);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void startHordeSpawning(int delay) {
|
|
||||||
Bukkit.getOnlinePlayers().forEach(player -> this.startHordeSpawning(delay, player));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void startHordeSpawning(int delay, Player player) {
|
|
||||||
@Nullable BukkitTask task = this.hordeSpawnTasks.get(player);
|
|
||||||
if(task != null) task.cancel();
|
|
||||||
task = Bukkit.getScheduler().runTaskLater(
|
|
||||||
Main.instance(),
|
|
||||||
() -> {
|
|
||||||
if(!this.bloodmoonIsActive()) return;
|
|
||||||
this.spawnRandomHorde();
|
|
||||||
this.startHordeSpawning(this.getRandomHordeSpawnDelay());
|
|
||||||
},
|
|
||||||
delay
|
|
||||||
);
|
|
||||||
this.hordeSpawnTasks.put(player, task);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void stopBloodmoon() {
|
|
||||||
this.isActive = false;
|
|
||||||
Bukkit.getOnlinePlayers().forEach(player -> player.hideBossBar(this.bossBar));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void addPlayerToBossBar(Player player) {
|
|
||||||
if(!this.getBloodmoonSetting(player)) return;
|
|
||||||
player.showBossBar(this.bossBar);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isAffectedMob(Entity entity) {
|
|
||||||
return this.affectedMobEffectMap.containsKey(entity.getType());
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean getBloodmoonSetting(Player player) {
|
|
||||||
return Settings.instance().getSetting(
|
|
||||||
player,
|
|
||||||
Settings.Key.Bloodmoon,
|
|
||||||
Boolean.class
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void spawnRandomHorde() {
|
|
||||||
if(Bukkit.getOnlinePlayers().isEmpty()) return;
|
|
||||||
if(!this.hordesEnabled) return;
|
|
||||||
List<? extends Player> onlinePlayerList = Bukkit.getOnlinePlayers().stream()
|
|
||||||
.filter(this::getBloodmoonSetting)
|
|
||||||
// .filter(player -> player.getGameMode().equals(GameMode.SURVIVAL))
|
|
||||||
.toList();
|
|
||||||
ThreadLocalRandom random = ThreadLocalRandom.current();
|
|
||||||
Player player = onlinePlayerList.get(random.nextInt(onlinePlayerList.size()));
|
|
||||||
EntityType hordeEntityType = this.hordeMobList.get(random.nextInt(this.hordeMobList.size()));
|
|
||||||
int hordeSize = random.nextInt(this.hordeMinPopulation, this.hordeMaxPopulation + 1);
|
|
||||||
this.spawnHorde(player, hordeSize, hordeEntityType);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void spawnHorde(Player player, int size, EntityType type) {
|
|
||||||
for(int i = 0; i < size; i++) {
|
|
||||||
double spawnRadiant = ThreadLocalRandom.current().nextDouble(0, 2*Math.PI);
|
|
||||||
Location mobSpawnLocation = player.getLocation().add(
|
|
||||||
Math.sin(spawnRadiant)*this.hordeSpawnDistance,
|
|
||||||
0,
|
|
||||||
Math.cos(spawnRadiant)*this.hordeSpawnDistance
|
|
||||||
);
|
|
||||||
mobSpawnLocation.setY(player.getWorld().getHighestBlockYAt(mobSpawnLocation) + 1);
|
|
||||||
player.getWorld().spawnEntity(mobSpawnLocation, type);
|
|
||||||
player.getWorld().strikeLightningEffect(mobSpawnLocation);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<ItemStack> getRandomBonusDrops() {
|
|
||||||
int itemCount = ThreadLocalRandom.current().nextInt(this.minBonusDrops, this.maxBonusDrops + 1);
|
|
||||||
List<ItemStack> result = new ArrayList<>();
|
|
||||||
for(int i = 0; i < itemCount; i++) {
|
|
||||||
result.add(this.getRandomBonusDrop());
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
private ItemStack getRandomBonusDrop() {
|
|
||||||
int totalWeight = this.bonusDropWeightMap.values().stream().mapToInt(value -> value).sum();
|
|
||||||
int randomInt = ThreadLocalRandom.current().nextInt(0, totalWeight + 1);
|
|
||||||
int cumulativeWeight = 0;
|
|
||||||
for(Map.Entry<ItemStack, Integer> entry : this.bonusDropWeightMap.entrySet()) {
|
|
||||||
cumulativeWeight += entry.getValue();
|
|
||||||
if(randomInt <= cumulativeWeight) return entry.getKey();
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected @NotNull List<Listener> listeners() {
|
|
||||||
return List.of(
|
|
||||||
new BloodmoonMonsterDeathListener(),
|
|
||||||
new BloodmoonPlayerJoinListener(),
|
|
||||||
new BloodmoonEntityDamageListener()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected @NotNull List<ApplianceCommand<?>> commands() {
|
|
||||||
return List.of(
|
|
||||||
new BloodmoonCommand()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.bloodmoon;
|
|
||||||
|
|
||||||
import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.CategorizedSetting;
|
|
||||||
import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.SettingCategory;
|
|
||||||
import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.Settings;
|
|
||||||
import eu.mhsl.craftattack.spawn.common.appliances.metaGameplay.settings.datatypes.BoolSetting;
|
|
||||||
import eu.mhsl.craftattack.spawn.core.Main;
|
|
||||||
import eu.mhsl.craftattack.spawn.core.util.world.InteractSounds;
|
|
||||||
import net.kyori.adventure.text.Component;
|
|
||||||
import net.kyori.adventure.text.format.NamedTextColor;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.event.inventory.ClickType;
|
|
||||||
|
|
||||||
public class BloodmoonSetting extends BoolSetting implements CategorizedSetting {
|
|
||||||
public BloodmoonSetting() {
|
|
||||||
super(Settings.Key.Bloodmoon);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public SettingCategory category() {
|
|
||||||
return SettingCategory.Misc; // TODO: mehr als 8 bug fixen
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected String title() {
|
|
||||||
return "Blutmond";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected String description() {
|
|
||||||
return "Kämpfe während dem Blutmond gegen stärkere Monster mit besseren Drops. Kann nicht während dem Blutmond geändert werden!";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected Material icon() {
|
|
||||||
return Material.CLOCK;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected Boolean defaultValue() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: Settings deaktivierbar machen
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void change(Player player, ClickType clickType) {
|
|
||||||
if(Main.instance().getAppliance(Bloodmoon.class).bloodmoonIsActive()) {
|
|
||||||
InteractSounds.of(player).delete();
|
|
||||||
player.sendMessage(Component.text("Während dem Blutmond kann diese Einstellung nicht geändert werden!", NamedTextColor.RED));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
super.change(player, clickType);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.bloodmoon;
|
|
||||||
|
|
||||||
import net.kyori.adventure.util.Ticks;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.potion.PotionEffect;
|
|
||||||
import org.bukkit.potion.PotionEffectType;
|
|
||||||
|
|
||||||
public abstract class MobEffect {
|
|
||||||
public abstract void apply(Player p);
|
|
||||||
|
|
||||||
public static class PotionMobEffect extends MobEffect {
|
|
||||||
private final PotionEffect effect;
|
|
||||||
public PotionMobEffect(PotionEffectType type, double seconds, int amplifier) {
|
|
||||||
this.effect = new PotionEffect(type, (int) (seconds * Ticks.TICKS_PER_SECOND), amplifier);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void apply(Player p) {
|
|
||||||
p.addPotionEffect(this.effect);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class LightningMobEffect extends MobEffect {
|
|
||||||
@Override
|
|
||||||
public void apply(Player p) {
|
|
||||||
p.getWorld().strikeLightning(p.getLocation());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.bloodmoon.commands;
|
|
||||||
|
|
||||||
import eu.mhsl.craftattack.spawn.core.appliance.ApplianceCommand;
|
|
||||||
import eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.bloodmoon.Bloodmoon;
|
|
||||||
import org.bukkit.command.Command;
|
|
||||||
import org.bukkit.command.CommandSender;
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
|
||||||
import org.jetbrains.annotations.Nullable;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class BloodmoonCommand extends ApplianceCommand<Bloodmoon> {
|
|
||||||
public BloodmoonCommand() {
|
|
||||||
super("bloodmoon");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void execute(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) throws Exception {
|
|
||||||
if(args.length == 0) {
|
|
||||||
sender.sendMessage("Bloodmoon is currently %s.".formatted(this.getAppliance().bloodmoonIsActive() ? "active" : "inactive"));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch(args[0]) {
|
|
||||||
case "start": {
|
|
||||||
this.getAppliance().startBloodmoon();
|
|
||||||
sender.sendMessage("Started bloodmoon.");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case "stop": {
|
|
||||||
this.getAppliance().stopBloodmoon();
|
|
||||||
sender.sendMessage("Stopped bloodmoon.");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
default: throw new Error("No such option: '%s' !".formatted(args[0]));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public @Nullable List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
|
|
||||||
if(args.length == 1) return List.of("start", "stop");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.bloodmoon.listener;
|
|
||||||
|
|
||||||
import eu.mhsl.craftattack.spawn.core.appliance.ApplianceListener;
|
|
||||||
import eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.bloodmoon.Bloodmoon;
|
|
||||||
import org.bukkit.entity.Entity;
|
|
||||||
import org.bukkit.entity.LivingEntity;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.entity.Projectile;
|
|
||||||
import org.bukkit.event.EventHandler;
|
|
||||||
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
|
||||||
|
|
||||||
public class BloodmoonEntityDamageListener extends ApplianceListener<Bloodmoon> {
|
|
||||||
@EventHandler
|
|
||||||
public void onEntityDamage(EntityDamageByEntityEvent event) {
|
|
||||||
if(!this.getAppliance().bloodmoonIsActive()) return;
|
|
||||||
Entity damagerEntity = event.getDamager();
|
|
||||||
if(damagerEntity instanceof Projectile projectile) {
|
|
||||||
if(!(projectile.getShooter() instanceof Entity shooter)) return;
|
|
||||||
damagerEntity = shooter;
|
|
||||||
}
|
|
||||||
if(!(damagerEntity instanceof LivingEntity damager && event.getEntity() instanceof LivingEntity receiver)) return;
|
|
||||||
if(event.getFinalDamage() == 0) return;
|
|
||||||
|
|
||||||
if(this.getAppliance().isAffectedMob(damager) && receiver instanceof Player player) {
|
|
||||||
if(!this.getAppliance().getBloodmoonSetting(player)) return;
|
|
||||||
event.setDamage(event.getDamage() * this.getAppliance().mobDamageMultipier);
|
|
||||||
this.getAppliance().affectedMobEffectMap.get(damager.getType()).forEach(mobEffect -> mobEffect.apply(player));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if(this.getAppliance().isAffectedMob(receiver) && damager instanceof Player player) {
|
|
||||||
if(!this.getAppliance().getBloodmoonSetting(player)) return;
|
|
||||||
event.setDamage(event.getDamage() / this.getAppliance().mobHealthMultiplier);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.bloodmoon.listener;
|
|
||||||
|
|
||||||
import eu.mhsl.craftattack.spawn.core.appliance.ApplianceListener;
|
|
||||||
import eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.bloodmoon.Bloodmoon;
|
|
||||||
import org.bukkit.entity.LivingEntity;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.event.EventHandler;
|
|
||||||
import org.bukkit.event.entity.EntityDeathEvent;
|
|
||||||
|
|
||||||
public class BloodmoonMonsterDeathListener extends ApplianceListener<Bloodmoon> {
|
|
||||||
@EventHandler
|
|
||||||
public void onMonsterDeath(EntityDeathEvent event) {
|
|
||||||
if(!this.getAppliance().bloodmoonIsActive()) return;
|
|
||||||
if(!(event.getDamageSource().getCausingEntity() instanceof Player player)) return;
|
|
||||||
if(!this.getAppliance().getBloodmoonSetting(player)) return;
|
|
||||||
LivingEntity entity = event.getEntity();
|
|
||||||
if(!this.getAppliance().isAffectedMob(entity)) return;
|
|
||||||
|
|
||||||
event.setDroppedExp(event.getDroppedExp() * this.getAppliance().expMultiplier);
|
|
||||||
event.getDrops().addAll(this.getAppliance().getRandomBonusDrops());
|
|
||||||
entity.getWorld().strikeLightningEffect(entity.getLocation());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.bloodmoon.listener;
|
|
||||||
|
|
||||||
import eu.mhsl.craftattack.spawn.core.appliance.ApplianceListener;
|
|
||||||
import eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.bloodmoon.Bloodmoon;
|
|
||||||
import org.bukkit.event.EventHandler;
|
|
||||||
import org.bukkit.event.player.PlayerJoinEvent;
|
|
||||||
|
|
||||||
public class BloodmoonPlayerJoinListener extends ApplianceListener<Bloodmoon> {
|
|
||||||
@EventHandler
|
|
||||||
public void onPlayerJoin(PlayerJoinEvent event) {
|
|
||||||
if(!this.getAppliance().bloodmoonIsActive()) return;
|
|
||||||
this.getAppliance().addPlayerToBossBar(event.getPlayer());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user