Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@

import net.codingarea.challenges.plugin.challenges.custom.settings.action.EntityTargetAction;
import net.codingarea.challenges.plugin.challenges.type.helper.SubSettingsHelper;
import net.codingarea.challenges.plugin.utils.bukkit.misc.version.MinecraftVersion;
import net.codingarea.challenges.plugin.utils.bukkit.misc.wrapper.AttributeWrapper;
import net.codingarea.challenges.plugin.utils.item.DefaultItem;
import net.codingarea.challenges.plugin.utils.item.ItemBuilder;
import net.codingarea.challenges.plugin.utils.misc.MinecraftNameWrapper;
import org.bukkit.Material;
import org.bukkit.attribute.Attribute;
import org.bukkit.attribute.AttributeInstance;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package net.codingarea.challenges.plugin.challenges.custom.settings.sub;

import lombok.Getter;
import net.anweisen.utilities.common.misc.StringUtils;
import net.codingarea.challenges.plugin.challenges.custom.settings.sub.builder.*;
import net.codingarea.challenges.plugin.content.Message;
Expand All @@ -15,6 +16,7 @@
import java.util.function.Consumer;
import java.util.function.Predicate;

@Getter
public abstract class SubSettingsBuilder {

private String key;
Expand Down Expand Up @@ -59,11 +61,7 @@ public static EmptySubSettingsBuilder createEmpty() {

public abstract boolean hasSettings();

public SubSettingsBuilder getParent() {
return parent;
}

public SubSettingsBuilder setParent(SubSettingsBuilder parent) {
public SubSettingsBuilder setParent(SubSettingsBuilder parent) {

SubSettingsBuilder parentBuilder = getParent();
if (parentBuilder != null) {
Expand All @@ -75,15 +73,7 @@ public SubSettingsBuilder setParent(SubSettingsBuilder parent) {

}

public SubSettingsBuilder getChild() {
return child;
}

public String getKey() {
return key;
}

public SubSettingsBuilder setKey(String key) {
public SubSettingsBuilder setKey(String key) {
this.key = key;
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public Material getMaterial() {
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onPickup(FoodLevelChangeEvent event) {
if (!(event.getEntity() instanceof Player)) return;
if (event.getFoodLevel() < ((Player) event.getEntity()).getFoodLevel()) {
if (event.getFoodLevel() < event.getEntity().getFoodLevel()) {
createData()
.entity(event.getEntity())
.event(event)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerMoveEvent;

import java.util.Objects;

public class StandsOnSpecificBlockTrigger extends ChallengeTrigger {

public StandsOnSpecificBlockTrigger(String name) {
Expand All @@ -24,7 +26,7 @@ public Material getMaterial() {
public void onMove(PlayerMoveEvent event) {
if (BlockUtils.isSameBlockLocation(event.getTo(), event.getFrom())) return;
Block blockBelow = BlockUtils.getBlockBelow(
event.getTo());
Objects.requireNonNull(event.getTo()));
if (blockBelow == null) return;

createData()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@
import net.codingarea.challenges.plugin.content.Prefix;
import net.codingarea.challenges.plugin.management.menu.MenuType;
import net.codingarea.challenges.plugin.management.scheduler.task.ScheduledTask;
import net.codingarea.challenges.plugin.utils.bukkit.misc.version.MinecraftVersion;
import net.codingarea.challenges.plugin.utils.bukkit.misc.wrapper.AttributeWrapper;
import net.codingarea.challenges.plugin.utils.item.ItemBuilder;
import net.codingarea.challenges.plugin.utils.misc.NameHelper;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.attribute.Attribute;
import org.bukkit.attribute.AttributeInstance;
import org.bukkit.boss.BarColor;
import org.bukkit.entity.Player;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.jetbrains.annotations.NotNull;

import java.util.Collection;
import java.util.Objects;

@Since("2.1.3")
public class BlockMobsChallenge extends Setting {
Expand All @@ -45,7 +46,7 @@ public void onBlockBreak(BlockBreakEvent event) {
LivingEntity entity = (LivingEntity) event.getBlock().getWorld()
.spawnEntity(event.getBlock().getLocation().add(0.5, 0, 0.5), type);

Collection<ItemStack> drops = event.getBlock().getDrops(event.getPlayer().getEquipment().getItemInMainHand());
Collection<ItemStack> drops = event.getBlock().getDrops(Objects.requireNonNull(event.getPlayer().getEquipment()).getItemInMainHand());

int i = 0;
// Put every stack in a different slot to make sure everything drops properly
Expand All @@ -56,7 +57,8 @@ public void onBlockBreak(BlockBreakEvent event) {

switch (i) {
case 0:
equipment.setHelmetDropChance(1);
assert equipment != null;
equipment.setHelmetDropChance(1);
break;
case 1:
slot = EquipmentSlot.CHEST;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

@Since("2.0.2")
public class UncraftItemsChallenge extends TimedChallenge {
Expand Down Expand Up @@ -105,8 +106,8 @@ private static List<ItemStack> getIngredientsOfRecipe(@Nonnull Recipe recipe) {
ingredients.add(furnace.getInput());
} else if (MinecraftVersion.current().isNewerOrEqualThan(MinecraftVersion.V1_14) && recipe instanceof SmithingRecipe) {
SmithingRecipe smithing = (SmithingRecipe) recipe;
ingredients.add(smithing.getBase().getItemStack());
ingredients.add(smithing.getAddition().getItemStack());
ingredients.add(Objects.requireNonNull(smithing.getBase()).getItemStack());
ingredients.add(Objects.requireNonNull(smithing.getAddition()).getItemStack());
}

return ingredients;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.util.LinkedList;
import java.util.List;
import java.util.Objects;

@Since("2.2.0")
public class NoSharedAdvancementsChallenge extends Setting {
Expand Down Expand Up @@ -51,7 +52,7 @@ public void loadGameState(@NotNull Document document) {
List<String> advancementKeys = document.getStringList("advancements");
for (String advancementKey : advancementKeys) {
try {
advancementsDone.add(Bukkit.getAdvancement(BukkitReflectionUtils.fromString(advancementKey)));
advancementsDone.add(Bukkit.getAdvancement(Objects.requireNonNull(BukkitReflectionUtils.fromString(advancementKey))));
} catch (Exception exception) {
// DON'T EXIST
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,12 @@
import net.codingarea.challenges.plugin.management.scheduler.task.ScheduledTask;
import net.codingarea.challenges.plugin.spigot.events.PlayerJumpEvent;
import net.codingarea.challenges.plugin.utils.bukkit.command.PlayerCommand;
import net.codingarea.challenges.plugin.utils.bukkit.misc.version.MinecraftVersion;
import net.codingarea.challenges.plugin.utils.bukkit.misc.wrapper.AttributeWrapper;
import net.codingarea.challenges.plugin.utils.item.ItemBuilder;
import net.codingarea.challenges.plugin.utils.misc.BlockUtils;
import net.codingarea.challenges.plugin.utils.misc.NameHelper;
import net.codingarea.challenges.plugin.utils.misc.TriFunction;
import org.bukkit.Material;
import org.bukkit.attribute.Attribute;
import org.bukkit.attribute.AttributeInstance;
import org.bukkit.boss.BarColor;
import org.bukkit.command.Command;
Expand Down Expand Up @@ -565,8 +563,8 @@ public void onMove(@Nonnull PlayerDropItemEvent event) {
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onMove(@Nonnull EntityDamageEvent event) {
if (!shouldExecuteEffect()) return;
if (!(event.getEntity() instanceof Player)) return;;
Player player = (Player) event.getEntity();
if (!(event.getEntity() instanceof Player)) return;
Player player = (Player) event.getEntity();
if (ignorePlayer(player)) return;
SavedStatistic.DAMAGE_TAKEN.increaseStatistic(player, event.getCause().name(), ChallengeHelper.getFinalDamage(event));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ public RandomEventChallenge() {
setCategory(SettingCategory.RANDOMIZER);
events = new Event[]{
new SpeedEvent(),
new SpawnEntitiesEvent(),
new SpawnEntitiesEvent(),
new HoleEvent(),
new FlyEvent(),
new CobWebEvent(),
new CobWebEvent(),
new ReplaceOresEvent(),
new SicknessEvent()
};
Expand Down Expand Up @@ -186,7 +186,7 @@ public void run(@Nonnull Player player) {
}
}

public class SpawnEntitiesEvent implements Event {
public static class SpawnEntitiesEvent implements Event {

@Nonnull
@Override
Expand All @@ -210,7 +210,7 @@ public void run(@Nonnull Player player) {

}

public class CobWebEvent implements Event {
public static class CobWebEvent implements Event {

@Nonnull
@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public RandomItemDroppingChallenge() {
}

public static void dropRandomItem(Player player) {
if (player.getInventory().getContents().length <= 0) return;
if (player.getInventory().getContents().length == 0) return;
dropRandomItem(player.getLocation(), player.getInventory());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ protected void onTimeActivation() {

for (Player player : Bukkit.getOnlinePlayers()) {
if (ignorePlayer(player)) continue;
if (player.getInventory().getContents().length <= 0) continue;
if (player.getInventory().getContents().length == 0) continue;

Bukkit.getScheduler().runTask(plugin, () -> {
InventoryUtils.removeRandomItem(player.getInventory());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public RandomItemSwappingChallenge() {
}

public static void swapRandomItems(Player player) {
if (player.getInventory().getContents().length <= 0) return;
if (player.getInventory().getContents().length == 0) return;
int slot = InventoryUtils.getRandomFullSlot(player.getInventory());
if (slot == -1) return;
swapItemToRandomSlot(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import net.codingarea.challenges.plugin.content.Message;
import net.codingarea.challenges.plugin.management.menu.MenuType;
import net.codingarea.challenges.plugin.management.menu.generator.categorised.SettingCategory;
import net.codingarea.challenges.plugin.utils.bukkit.misc.version.MinecraftVersion;
import net.codingarea.challenges.plugin.utils.bukkit.misc.wrapper.AttributeWrapper;
import net.codingarea.challenges.plugin.utils.item.ItemBuilder;
import net.codingarea.challenges.plugin.utils.item.ItemBuilder.PotionBuilder;
Expand All @@ -15,7 +14,6 @@
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.World.Environment;
import org.bukkit.attribute.Attribute;
import org.bukkit.attribute.AttributeInstance;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import net.codingarea.challenges.plugin.management.scheduler.task.ScheduledTask;
import net.codingarea.challenges.plugin.management.scheduler.task.TimerTask;
import net.codingarea.challenges.plugin.management.scheduler.timer.TimerStatus;
import net.codingarea.challenges.plugin.utils.bukkit.misc.version.MinecraftVersion;
import net.codingarea.challenges.plugin.utils.bukkit.misc.wrapper.AttributeWrapper;
import net.codingarea.challenges.plugin.utils.item.ItemBuilder;
import net.codingarea.challenges.plugin.utils.misc.InventoryUtils;
Expand Down Expand Up @@ -186,13 +185,11 @@ public void execute() {
private static class EntityDamageLoop implements Loop {

private final LivingEntity entity;
private final DamageCause damageCause;
private final double damage;
private final double damage;

public EntityDamageLoop(LivingEntity entity, DamageCause cause, double damage) {
this.entity = entity;
this.damageCause = cause;
this.damage = damage;
this.damage = damage;
}

@Override
Expand Down Expand Up @@ -301,7 +298,7 @@ private boolean decreaseDurability() {
org.bukkit.inventory.meta.Damageable damageable = (org.bukkit.inventory.meta.Damageable) itemStack.getItemMeta();
if (damageable == null) return false;
damageable.setDamage(damageable.getDamage() + 1);
itemStack.setItemMeta((ItemMeta) damageable);
itemStack.setItemMeta(damageable);

for (int slot = 0; slot < player.getInventory().getSize(); slot++) {
ItemStack item = player.getInventory().getItem(slot);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,7 @@ public ItemBuilder createDisplayItem() {
return new ItemBuilder(Material.BLUE_TERRACOTTA, Message.forName("item-snake-challenge"));
}

@Override
protected void onEnable() {

}

@Override
@Override
protected void onDisable() {
blocks.clear();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package net.codingarea.challenges.plugin.challenges.implementation.goal;

import lombok.Getter;
import net.anweisen.utilities.bukkit.utils.animation.SoundSample;
import net.codingarea.challenges.plugin.utils.item.ItemUtils;
import net.anweisen.utilities.common.annotations.Since;
Expand Down Expand Up @@ -36,11 +37,15 @@
@Since("2.0")
public class CollectAllItemsGoal extends SettingGoal implements SenderCommand {

private final int totalItemsCount;
@Getter
private final int totalItemsCount;
private SeededRandomWrapper random;
private List<Material> allItemsToFind;
private List<Material> itemsToFind;
private Material currentItem;
@Getter
private List<Material> allItemsToFind;
@Getter
private List<Material> itemsToFind;
@Getter
private Material currentItem;

public CollectAllItemsGoal() {
random = new SeededRandomWrapper();
Expand Down Expand Up @@ -168,23 +173,7 @@ public void writeGameState(@Nonnull Document document) {
document.set("found", totalItemsCount - itemsToFind.size());
}

public Material getCurrentItem() {
return currentItem;
}

public List<Material> getItemsToFind() {
return itemsToFind;
}

public List<Material> getAllItemsToFind() {
return allItemsToFind;
}

public int getTotalItemsCount() {
return totalItemsCount;
}

private String getItemDisplayName(@Nullable Material material) {
private String getItemDisplayName(@Nullable Material material) {
if (material == null) return "Unbekannt";

String name = material.name();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@
import net.codingarea.challenges.plugin.management.menu.MenuType;
import net.codingarea.challenges.plugin.management.menu.generator.categorised.SettingCategory;
import net.codingarea.challenges.plugin.management.server.ChallengeEndCause;
import net.codingarea.challenges.plugin.utils.bukkit.misc.version.MinecraftVersion;
import net.codingarea.challenges.plugin.utils.bukkit.misc.wrapper.AttributeWrapper;
import net.codingarea.challenges.plugin.utils.item.ItemBuilder;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.attribute.Attribute;
import org.bukkit.attribute.AttributeInstance;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ public KillAllMonsterGoal() {
static List<EntityType> getAllMobsToKill() {
LinkedList<EntityType> list = new LinkedList<>(Arrays.asList(EntityType.values()));
list.removeIf(type -> !type.isAlive());
list.removeIf(type -> !Monster.class.isAssignableFrom(type.getEntityClass()));
list.removeIf(type -> {
assert type.getEntityClass() != null;
return !Monster.class.isAssignableFrom(type.getEntityClass());
});
list.add(EntityType.PHANTOM);
list.add(EntityType.ENDER_DRAGON);
list.add(EntityType.SHULKER);
Expand Down
Loading