diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/Cosmetic.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/Cosmetic.java index 63c97ea5..f30f1923 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/Cosmetic.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/Cosmetic.java @@ -26,7 +26,7 @@ public abstract class Cosmetic { @Getter @Setter private CosmeticSlot slot; @Getter @Setter - private boolean dyable; + private boolean dyeable; protected Cosmetic(String id, @NotNull ConfigurationNode config) { this.id = id; @@ -45,9 +45,9 @@ public abstract class Cosmetic { MessagesUtil.sendDebugMessages("Slot: " + config.node("slot").getString()); setSlot(CosmeticSlot.valueOf(config.node("slot").getString())); - setDyable(config.node("dyeable").getBoolean(false)); + setDyeable(config.node("dyeable").getBoolean(false)); - MessagesUtil.sendDebugMessages("Dyeable " + dyable); + MessagesUtil.sendDebugMessages("Dyeable " + dyeable); Cosmetics.addCosmetic(this); } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBalloonType.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBalloonType.java index dbba2294..4b7ac0d6 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBalloonType.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBalloonType.java @@ -23,7 +23,7 @@ public class CosmeticBalloonType extends Cosmetic { @Getter private final String modelName; @Getter - private List dyableParts; + private List dyeableParts; @Getter private final boolean showLead; @Getter @@ -42,8 +42,8 @@ public class CosmeticBalloonType extends Cosmetic { balloonOffset = Settings.loadVector(balloonOffsetNode); try { - if (!config.node("dyable-parts").virtual()) { - dyableParts = config.node("dyable-parts").getList(String.class); + if (!config.node("dyeable-parts").virtual()) { + dyeableParts = config.node("dyeable-parts").getList(String.class); } } catch (SerializationException e) { // Seriously? @@ -101,10 +101,10 @@ public class CosmeticBalloonType extends Cosmetic { } } - public boolean isDyablePart(String name) { + public boolean isDyeablePart(String name) { // If player does not define parts, dye whole model - if (dyableParts == null) return true; - if (dyableParts.isEmpty()) return true; - return dyableParts.contains(name); + if (dyeableParts == null) return true; + if (dyeableParts.isEmpty()) return true; + return dyeableParts.contains(name); } } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java index d054c138..87560757 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java @@ -10,7 +10,6 @@ import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticHolder; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import me.lojosho.hibiscuscommons.hooks.Hooks; import me.lojosho.hibiscuscommons.util.AdventureUtils; -import me.lojosho.hibiscuscommons.util.ColorBuilder; import me.lojosho.hibiscuscommons.util.StringUtils; import org.bukkit.*; import org.bukkit.entity.Player; @@ -26,7 +25,7 @@ public class DyeMenu { return; } ItemStack originalItem = cosmetic.getItem(); - if (originalItem == null || !cosmetic.isDyable()) return; + if (originalItem == null || !cosmetic.isDyeable()) return; Gui gui = HMCColorApi.createColorMenu(viewer); gui.updateTitle(AdventureUtils.MINI_MESSAGE.deserialize(Hooks.processPlaceholders(viewer, StringUtils.parseStringToString(Settings.getDyeMenuName())))); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java index 8d19990e..3b06adf3 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java @@ -101,7 +101,7 @@ public class TypeCosmetic extends Type { if (!actionConfig.node("on-equip").virtual()) actionStrings.addAll(actionConfig.node("on-equip").getList(String.class)); MessagesUtil.sendDebugMessages("on-equip"); // TODO: Redo this - if (cosmetic.isDyable() && Hooks.isActiveHook("HMCColor")) { + if (cosmetic.isDyeable() && Hooks.isActiveHook("HMCColor")) { DyeMenu.openMenu(viewer, cosmeticHolder, cosmetic); } else { cosmeticHolder.addCosmetic(cosmetic); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java index 2de7d95c..d53b8631 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java @@ -623,13 +623,13 @@ public class CosmeticUser implements CosmeticHolder { } public List getDyeableSlots() { - ArrayList dyableSlots = new ArrayList<>(); + ArrayList dyeableSlots = new ArrayList<>(); for (Cosmetic cosmetic : playerCosmetics.values()) { - if (cosmetic.isDyable()) dyableSlots.add(cosmetic.getSlot()); + if (cosmetic.isDyeable()) dyeableSlots.add(cosmetic.getSlot()); } - return dyableSlots; + return dyeableSlots; } @Override diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonManager.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonManager.java index a8e19a94..8269b95d 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonManager.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonManager.java @@ -11,7 +11,6 @@ import com.ticxo.modelengine.api.ModelEngineAPI; import com.ticxo.modelengine.api.entity.data.BukkitEntityData; import com.ticxo.modelengine.api.model.ActiveModel; import com.ticxo.modelengine.api.model.ModeledEntity; -import com.ticxo.modelengine.api.nms.RenderParsers; import lombok.Getter; import me.lojosho.hibiscuscommons.hooks.Hooks; import me.lojosho.hibiscuscommons.nms.NMSHandlers; @@ -82,7 +81,7 @@ public class UserBalloonManager { if (color != null) { modeledEntity.getModels().forEach((d, singleModel) -> { - if (cosmeticBalloonType.isDyablePart(d)) { + if (cosmeticBalloonType.isDyeablePart(d)) { singleModel.setDefaultTint(color); singleModel.getModelRenderer().sendToClient(ModelEngineAPI.getNMSHandler().createParsers()); }