From 0495e1bfeb8eeb8e44a68d8c1b2f8d8acee2c5d6 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 7 Nov 2021 21:23:08 +0000 Subject: [PATCH 1/5] Codestyle --- .../reforges/integrations/ultimateskills/EffectAddAbility.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddAbility.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddAbility.kt index 4a18d03..04b832c 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddAbility.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddAbility.kt @@ -20,7 +20,8 @@ class EffectAddAbility : Effect("add_ultimateskills_ability") { config.getDouble("amount") ) player.persistentDataContainer.set( - ReforgesPlugin.getInstance().namespacedKeyFactory.create("addAbility"), PersistentDataType.STRING, + ReforgesPlugin.getInstance().namespacedKeyFactory.create("addAbility"), + PersistentDataType.STRING, NumberUtils.format(config.getDouble("amount")) + "::" + config.getString("ability", false) ) } From 4b3ef04763c854c4c7cf40349f00b20e829c47b3 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 7 Nov 2021 21:23:38 +0000 Subject: [PATCH 2/5] More codestyle --- .../reforges/integrations/ultimateskills/EffectAddAbility.kt | 2 +- .../reforges/integrations/ultimateskills/EffectAddPerk.kt | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddAbility.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddAbility.kt index 04b832c..de473b7 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddAbility.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddAbility.kt @@ -27,7 +27,7 @@ class EffectAddAbility : Effect("add_ultimateskills_ability") { } override fun handleDisable(player: Player) { - player.persistentDataContainer.get(ReforgesPlugin.getInstance().namespacedKeyFactory.create("addAbility"), PersistentDataType.STRING) + player.persistentDataContainer.get(this.plugin.namespacedKeyFactory.create("addAbility"), PersistentDataType.STRING) ?.let { HyperSkills.getInstance().api.removeAbility( player.uniqueId, diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddPerk.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddPerk.kt index 7f57eb9..ef85d1a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddPerk.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/integrations/ultimateskills/EffectAddPerk.kt @@ -2,7 +2,6 @@ package com.willfp.reforges.integrations.ultimateskills import com.willfp.eco.core.config.interfaces.JSONConfig import com.willfp.eco.util.NumberUtils -import com.willfp.reforges.ReforgesPlugin import com.willfp.reforges.effects.Effect import mc.ultimatecore.skills.HyperSkills import mc.ultimatecore.skills.objects.perks.Perk @@ -19,13 +18,13 @@ class EffectAddPerk : Effect("add_ultimateskills_perk") { Perk.valueOf(config.getString("perk", false)), config.getDouble("amount") ) - player.persistentDataContainer.set(ReforgesPlugin.getInstance().namespacedKeyFactory.create("addPerk"), PersistentDataType.STRING, + player.persistentDataContainer.set(this.plugin.namespacedKeyFactory.create("addPerk"), PersistentDataType.STRING, NumberUtils.format(config.getDouble("amount")) + "::" + config.getString("perk", false) ) } override fun handleDisable(player: Player) { - player.persistentDataContainer.get(ReforgesPlugin.getInstance().namespacedKeyFactory.create("addPerk"), PersistentDataType.STRING) + player.persistentDataContainer.get(this.plugin.namespacedKeyFactory.create("addPerk"), PersistentDataType.STRING) ?.let { HyperSkills.getInstance().api.removePerk( player.uniqueId, From 7bd0603eb6efd898ecbabc5a0f515cf2b46f2cc5 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 7 Nov 2021 21:27:05 +0000 Subject: [PATCH 3/5] Fixed lombok bug --- .../main/java/com/willfp/reforges/effects/Effect.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/reforges/effects/Effect.java b/eco-core/core-plugin/src/main/java/com/willfp/reforges/effects/Effect.java index 4ea5496..91aa4c5 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/reforges/effects/Effect.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/reforges/effects/Effect.java @@ -3,8 +3,6 @@ package com.willfp.reforges.effects; import com.willfp.eco.core.config.interfaces.JSONConfig; import com.willfp.reforges.ReforgesPlugin; import com.willfp.reforges.reforges.util.Watcher; -import lombok.AccessLevel; -import lombok.Getter; import org.bukkit.NamespacedKey; import org.bukkit.entity.Player; import org.bukkit.event.Listener; @@ -18,7 +16,6 @@ public abstract class Effect implements Listener, Watcher { /** * Instance of reforges. */ - @Getter(AccessLevel.PROTECTED) private final ReforgesPlugin plugin = ReforgesPlugin.getInstance(); /** @@ -99,6 +96,13 @@ public abstract class Effect implements Listener, Watcher { protected void handleDisable(@NotNull final Player player) { // Override when needed. } + /** + * Get instance of reforges. + * @return The instance. + */ + protected ReforgesPlugin getPlugin() { + return this.plugin; + } @Override public boolean equals(Object o) { From 6e27cd76e39171729b3348a4df788e843c545f5f Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 7 Nov 2021 21:28:37 +0000 Subject: [PATCH 4/5] 6.12.2 Migration --- .../reforges/reforges/util/ReforgeLookup.java | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeLookup.java b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeLookup.java index e2a4917..a21b7ce 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeLookup.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeLookup.java @@ -1,6 +1,7 @@ package com.willfp.reforges.reforges.util; import com.willfp.eco.core.EcoPlugin; +import com.willfp.eco.util.ListUtils; import com.willfp.reforges.ReforgesPlugin; import com.willfp.reforges.conditions.ConfiguredCondition; import com.willfp.reforges.reforges.Reforge; @@ -138,8 +139,8 @@ public class ReforgeLookup { ReforgeLookup.clearCaches(player); PLUGIN.getScheduler().run(() -> { List after = ReforgeLookup.provideReforges(player); - Map beforeFrequency = listToFrequencyMap(before); - Map afterFrequency = listToFrequencyMap(after); + Map beforeFrequency = ListUtils.listToFrequencyMap(before); + Map afterFrequency = ListUtils.listToFrequencyMap(after); List added = new ArrayList<>(); List removed = new ArrayList<>(); @@ -206,19 +207,6 @@ public class ReforgeLookup { }); } - private static Map listToFrequencyMap(@NotNull final List list) { - Map frequencyMap = new HashMap<>(); - for (T object : list) { - if (frequencyMap.containsKey(object)) { - frequencyMap.put(object, frequencyMap.get(object) + 1); - } else { - frequencyMap.put(object, 1); - } - } - - return frequencyMap; - } - static { registerProvider(player -> Map.of( player.getInventory().getItemInMainHand(), From 52b24baeef80330cb733d18716e444c518bd0a3a Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 7 Nov 2021 21:28:47 +0000 Subject: [PATCH 5/5] Updated to 3.8.2 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f2b7a88..c17d342 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 3.8.1 +version = 3.8.2 plugin-name = Reforges \ No newline at end of file