EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-25 16:45:28 +02:00
Code Issues Projects Releases Wiki Activity

more refactoring for spawning items conditionally

Browse Source
This commit is contained in:
nossr50
2024-05-25 12:25:00 -07:00
parent 0708b0a6a2
commit 8633f7b63a
2 changed files with 16 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/com/gmail/nossr50/util/ItemUtils.java
View File

@@ -681,25 +681,6 @@ public final class ItemUtils {
return enchantmentWrappers.get(randomIndex);
}
/**
* Spawn item if conditions are met.
*
* @param potentialItemSpawn The item to spawn if conditions are met
* @param itemSpawnReason The reason for the item drop
* @param spawnLocation The location to spawn the item at
* @param predicate The predicate to test the item against
* @param player The player to spawn the item for
*/
public static void spawnItem(@NotNull ItemStack potentialItemSpawn,
@NotNull ItemSpawnReason itemSpawnReason,
@NotNull Location spawnLocation,
@NotNull Predicate<String> predicate,
@NotNull Player player) {
if (predicate.test(potentialItemSpawn.getType().getKey().getKey())) {
spawnItem(player, spawnLocation, potentialItemSpawn, itemSpawnReason);
}
}
/**
* Drop items at a given location.
*
@@ -879,18 +860,18 @@ public final class ItemUtils {
*
* @param potentialItemDrops The collection of items to iterate over, each one is tested and spawned if the
* predicate is true
* @param predicate The predicate to test the item against
* @param itemSpawnReason The reason for the item drop
* @param spawnLocation The location to spawn the item at
* @param predicate The predicate to test the item against
* @param player The player to spawn the item for
*/
public static void spawnItem(@NotNull Collection<ItemStack> potentialItemDrops,
@NotNull ItemSpawnReason itemSpawnReason,
@NotNull Location spawnLocation,
@NotNull Predicate<String> predicate,
@NotNull Player player) {
for (ItemStack drop : potentialItemDrops) {
spawnItem(drop, itemSpawnReason, spawnLocation, predicate, player);
}
public static void spawnItemsConditionally(@NotNull Collection<ItemStack> potentialItemDrops,
@NotNull Predicate<ItemStack> predicate,
@NotNull ItemSpawnReason itemSpawnReason,
@NotNull Location spawnLocation,
@NotNull Player player) {
potentialItemDrops.stream()
.filter(predicate)
.forEach(itemStack -> spawnItem(player, spawnLocation, itemStack, itemSpawnReason));
}
}