diff --git a/Core/src/main/java/com/songoda/core/hooks/mcmmo/McMMOHandler.java b/Core/src/main/java/com/songoda/core/hooks/mcmmo/McMMOHandler.java index b14102dd..04b7847c 100644 --- a/Core/src/main/java/com/songoda/core/hooks/mcmmo/McMMOHandler.java +++ b/Core/src/main/java/com/songoda/core/hooks/mcmmo/McMMOHandler.java @@ -17,6 +17,7 @@ import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; +import org.bukkit.permissions.Permissible; import java.lang.reflect.Method; import java.util.ArrayList; @@ -59,7 +60,7 @@ public class McMMOHandler { mcmmo_PerksUtils_handleLuckyPerks = mcmmo_PerksUtils.getDeclaredMethod("handleLuckyPerks", Player.class, mcmmo_SkillType); mcmmo_SecondaryAbility = Class.forName("com.gmail.nossr50.datatypes.skills.SecondaryAbility"); mcmmo_SecondaryAbility_valueOf = mcmmo_SecondaryAbility.getDeclaredMethod("valueOf", String.class); - mcmmo_Permissions_secondaryAbilityEnabled = com.gmail.nossr50.util.Permissions.class.getDeclaredMethod("secondaryAbilityEnabled", Player.class, mcmmo_SecondaryAbility); + mcmmo_Permissions_secondaryAbilityEnabled = com.gmail.nossr50.util.Permissions.class.getDeclaredMethod("secondaryAbilityEnabled", Permissible.class, mcmmo_SecondaryAbility); mcmmo_SkillUtils_activationSuccessful = com.gmail.nossr50.util.skills.SkillUtils.class.getDeclaredMethod("activationSuccessful", mcmmo_SecondaryAbility, Player.class, int.class, int.class); if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) { diff --git a/Core/src/main/java/com/songoda/core/hooks/stackers/WildStacker.java b/Core/src/main/java/com/songoda/core/hooks/stackers/WildStacker.java index 911f04e6..1eb66654 100644 --- a/Core/src/main/java/com/songoda/core/hooks/stackers/WildStacker.java +++ b/Core/src/main/java/com/songoda/core/hooks/stackers/WildStacker.java @@ -1,17 +1,20 @@ package com.songoda.core.hooks.stackers; +import com.bgsoftware.wildstacker.WildStackerPlugin; import com.bgsoftware.wildstacker.api.WildStackerAPI; +import com.bgsoftware.wildstacker.api.enums.SpawnCause; import com.bgsoftware.wildstacker.api.objects.StackedEntity; +import com.bgsoftware.wildstacker.utils.GeneralUtils; import org.bukkit.entity.EntityType; import org.bukkit.entity.Item; import org.bukkit.entity.LivingEntity; import org.bukkit.plugin.Plugin; public class WildStacker extends Stacker { - final Plugin plugin; + private final WildStackerPlugin plugin; - public WildStacker(Plugin plugin) { - this.plugin = plugin; + public WildStacker() { + this.plugin = WildStackerPlugin.getPlugin(); } @Override @@ -68,12 +71,6 @@ public class WildStacker extends Stacker { @Override public int getMinStackSize(EntityType type) { - int min = plugin.getConfig().getInt("entities.minimum-limits." + type.name(), -1); - - if (min == -1) { - min = plugin.getConfig().getInt("entities.minimum-limits.all", -1); - } - - return min == -1 ? 0 : min; + return plugin.getSettings().minimumRequiredEntities.getOrDefault(type, SpawnCause.DEFAULT, 0); } } diff --git a/NMS/NMS-v1_19_R1/src/main/java/com/songoda/core/nms/v1_19_R1/anvil/AnvilView.java b/NMS/NMS-v1_19_R1/src/main/java/com/songoda/core/nms/v1_19_R1/anvil/AnvilView.java index c2c4b18e..5145fc4b 100644 --- a/NMS/NMS-v1_19_R1/src/main/java/com/songoda/core/nms/v1_19_R1/anvil/AnvilView.java +++ b/NMS/NMS-v1_19_R1/src/main/java/com/songoda/core/nms/v1_19_R1/anvil/AnvilView.java @@ -142,7 +142,7 @@ public class AnvilView extends AnvilMenu implements CustomAnvil { this.customTitle = title; try { - mc_Container_title.set(this, new TranslatableComponent(customTitle != null ? customTitle : "")); + mc_Container_title.set(this, MutableComponent.create(new TranslatableContents(customTitle != null ? customTitle : ""))); } catch (Exception ex) { Logger.getLogger(AnvilView.class.getName()).log(Level.SEVERE, "Anvil Error", ex); }