Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2025-02-23 05:41:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed forEach calls

Browse Source
This commit is contained in:
Auxilor 2021-07-26 18:04:33 +01:00
parent 90839d0bde
commit 75d3f401ec
4 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java
View File

@ -11,6 +11,7 @@ import com.willfp.ecoenchants.config.RarityYml;
import com.willfp.ecoenchants.config.TargetYml;
import com.willfp.ecoenchants.config.VanillaEnchantsYml;
import com.willfp.ecoenchants.display.EnchantDisplay;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.support.merging.anvil.AnvilListeners;
import com.willfp.ecoenchants.enchantments.support.merging.grindstone.GrindstoneListeners;
@ -25,12 +26,11 @@ import com.willfp.ecoenchants.integrations.essentials.plugins.IntegrationEssenti
import com.willfp.ecoenchants.proxy.proxies.FastGetEnchantsProxy;
import lombok.Getter;
import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.generator.BlockPopulator;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ -81,46 +81,35 @@ public class EcoEnchantsPlugin extends EcoPlugin {
@Override
protected void handleDisable() {
Bukkit.getServer().getWorlds().forEach(world -> {
List<BlockPopulator> populators = new ArrayList<>(world.getPopulators());
populators.forEach((blockPopulator -> {
if (blockPopulator instanceof LootPopulator) {
world.getPopulators().remove(blockPopulator);
}
}));
});
for (World world : Bukkit.getServer().getWorlds()) {
world.getPopulators().removeIf(blockPopulator -> blockPopulator instanceof LootPopulator);
}
}
@Override
protected void handleReload() {
this.getDisplayModule().update();
EcoEnchants.values().forEach((ecoEnchant -> {
HandlerList.unregisterAll(ecoEnchant);
for (EcoEnchant enchant : EcoEnchants.values()) {
HandlerList.unregisterAll(enchant);
this.getScheduler().runLater(() -> {
if (ecoEnchant.isEnabled()) {
this.getEventManager().registerListener(ecoEnchant);
if (enchant.isEnabled()) {
this.getEventManager().registerListener(enchant);
if (ecoEnchant instanceof TimedRunnable) {
this.getScheduler().syncRepeating((TimedRunnable) ecoEnchant, 5, ((TimedRunnable) ecoEnchant).getTime());
if (enchant instanceof TimedRunnable) {
this.getScheduler().syncRepeating((TimedRunnable) enchant, 5, ((TimedRunnable) enchant).getTime());
}
}
}, 1);
}));
}
}
@Override
protected void handleAfterLoad() {
if (this.getConfigYml().getBool("loot.enabled")) {
Bukkit.getServer().getWorlds().forEach(world -> {
List<BlockPopulator> populators = new ArrayList<>(world.getPopulators());
populators.forEach((blockPopulator -> {
if (blockPopulator instanceof LootPopulator) {
world.getPopulators().remove(blockPopulator);
}
}));
for (World world : Bukkit.getServer().getWorlds()) {
world.getPopulators().removeIf(blockPopulator -> blockPopulator instanceof LootPopulator);
world.getPopulators().add(new LootPopulator(this));
});
}
}
EssentialsManager.registerEnchantments();
}
@ -148,7 +137,7 @@ public class EcoEnchantsPlugin extends EcoPlugin {
new AnvilListeners(this),
new WatcherTriggers(this),
new VillagerListeners(this),
new ItemConversions(this)
new ItemConversions()
);
}

4
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/configs/EnchantmentConfig.java
View File

@ -63,7 +63,9 @@ public class EnchantmentConfig extends YamlExtendableConfig {
public Set<Enchantment> getEnchantments(@NotNull final String path) {
Set<Enchantment> enchantments = new HashSet<>();
List<String> enchantmentKeys = this.getStrings(path);
enchantmentKeys.forEach((key -> enchantments.add(Enchantment.getByKey(NamespacedKey.minecraft(key)))));
for (String key : enchantmentKeys) {
enchantments.add(Enchantment.getByKey(NamespacedKey.minecraft(key)));
}
return enchantments;
}

12
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/CallingCurse.java
View File

@ -47,12 +47,14 @@ public class CallingCurse extends EcoEnchant implements TimedRunnable {
private void refresh() {
players.clear();
this.getPlugin().getScheduler().runLater(() -> this.getPlugin().getServer().getOnlinePlayers().forEach(player -> {
int level = EnchantChecks.getArmorPoints(player, this, 0);
if (level > 0) {
players.put(player, level);
this.getPlugin().getScheduler().runLater(() -> {
for (Player player : this.getPlugin().getServer().getOnlinePlayers()) {
int level = EnchantChecks.getArmorPoints(player, this, 0);
if (level > 0) {
players.put(player, level);
}
}
}), 1);
}, 1);
distance = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "distance");
}

12
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Forcefield.java
View File

@ -47,12 +47,14 @@ public class Forcefield extends EcoEnchant implements TimedRunnable {
private void refresh() {
players.clear();
this.getPlugin().getScheduler().runLater(() -> this.getPlugin().getServer().getOnlinePlayers().forEach(player -> {
int level = EnchantChecks.getArmorPoints(player, this, 0);
if (level > 0) {
players.put(player, level);
this.getPlugin().getScheduler().runLater(() -> {
for (Player player : this.getPlugin().getServer().getOnlinePlayers()) {
int level = EnchantChecks.getArmorPoints(player, this, 0);
if (level > 0) {
players.put(player, level);
}
}
}), 1);
}, 1);
initialDistance = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "initial-distance");
bonus = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "bonus-per-level");
damagePerPoint = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "damage-per-level");