Compare commits
3 Commits
master
...
develop-bl
Author | SHA1 | Date | |
---|---|---|---|
e14c87c2fb | |||
9433495a52 | |||
4955e94306 |
@@ -38,7 +38,8 @@ 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,160 @@
|
|||||||
|
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.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.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.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
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 boolean lightningsActive = true;
|
||||||
|
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 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);
|
||||||
|
}
|
||||||
|
|
||||||
|
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 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()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,46 @@
|
|||||||
|
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 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;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected String title() {
|
||||||
|
return "Blutmond";
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected String description() {
|
||||||
|
return "Kämpfe während dem Blutmond mit stärkeren Monstern, um mit besseren Drops belohnt zu werden.";
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Material icon() {
|
||||||
|
return Material.CLOCK;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Boolean defaultValue() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: only change when bloodmoon is not active
|
||||||
|
@Override
|
||||||
|
protected void change(Player player, ClickType clickType) {
|
||||||
|
super.change(player, clickType);
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,29 @@
|
|||||||
|
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());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,44 @@
|
|||||||
|
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 " + (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: '" + 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;
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,35 @@
|
|||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,23 @@
|
|||||||
|
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());
|
||||||
|
if(this.getAppliance().lightningsActive) entity.getWorld().strikeLightningEffect(entity.getLocation());
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,14 @@
|
|||||||
|
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