Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2024-11-26 15:45:12 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed various codestyle / misc issues

Browse Source
This commit is contained in:
Auxilor 2021-07-16 14:21:19 +02:00
parent d5948d6cf0
commit 4b2e3ba533
8 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,7 +112,7 @@ public class EcoEnchantsPlugin extends EcoPlugin {
public void onReload() {
targetYml.update();
rarityYml.update();
((EnchantDisplay) this.getDisplayModule()).update();
this.getDisplayModule().update();
EcoEnchants.values().forEach((ecoEnchant -> {
HandlerList.unregisterAll(ecoEnchant);

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java
View File

@ -133,7 +133,7 @@ public class EnchantmentCache {
String rawName = name;
name = color + name;
description.replaceAll(line -> Display.PREFIX + ((EnchantDisplay) PLUGIN.getDisplayModule()).getOptions().getDescriptionOptions().getColor() + line);
description.replaceAll(line -> Display.PREFIX + PLUGIN.getDisplayModule().getOptions().getDescriptionOptions().getColor() + line);
CACHE.put(enchantment.getKey(), new CacheEntry(enchantment, name, rawName, description, type, rarity));
}

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java
View File

@ -591,6 +591,8 @@ public class EcoEnchants {
/**
* Update all {@link EcoEnchant}s.
*
* @param plugin Instance of EcoEnchants.
*/
@ConfigUpdater
public static void update(@NotNull final EcoEnchantsPlugin plugin) {

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentRarity.java
View File

@ -92,6 +92,8 @@ public class EnchantmentRarity {
/**
* Update all rarities.
*
* @param plugin Instance of EcoEnchants.
*/
@ConfigUpdater
public static void update(@NotNull final EcoEnchantsPlugin plugin) {

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentTarget.java
View File

@ -65,6 +65,8 @@ public class EnchantmentTarget {
/**
* Update all targets.
*
* @param plugin Instance of EcoEnchants.
*/
@ConfigUpdater
public static void update(@NotNull final EcoEnchantsPlugin plugin) {

4
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/VillagerListeners.java
View File

@ -179,9 +179,7 @@ public class VillagerListeners extends PluginDependent<EcoPlugin> implements Lis
anyConflicts.set(true);
}
EcoEnchant ecoEnchant = enchant;
if (enchantment.getType().equals(ecoEnchant.getType()) && ecoEnchant.getType().isSingular()) {
if (enchantment.getType().equals(enchant.getType()) && enchant.getType().isSingular()) {
anyConflicts.set(true);
}
});

3
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/vanilla/VanillaEnchantments.java
View File

@ -1,6 +1,5 @@
package com.willfp.ecoenchants.enchantments.support.vanilla;
import com.willfp.eco.core.EcoPlugin;
import com.willfp.ecoenchants.EcoEnchantsPlugin;
import com.willfp.ecoenchants.proxy.proxies.EcoCraftEnchantmentManagerProxy;
import com.willfp.ecoenchants.util.ProxyUtils;
@ -33,6 +32,8 @@ public class VanillaEnchantments {
/**
* Update the map.
*
* @param plugin Instance of EcoEnchants.
*/
public static void update(@NotNull final EcoEnchantsPlugin plugin) {
Map<Enchantment, VanillaEnchantmentMetadata> map = new HashMap<>();

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java
View File

@ -51,6 +51,8 @@ public class WatcherTriggers extends PluginDependent<EcoPlugin> implements Liste
/**
* Update if allowed on npc.
*
* @param plugin Instance of EcoEnchants.
*/
@ConfigUpdater
public static void update(@NotNull final EcoEnchantsPlugin plugin) {