From b9e2f2877c21afa9a404a59466b5c3b7d0a7dda8 Mon Sep 17 00:00:00 2001 From: Ethan Date: Tue, 4 Aug 2020 21:51:26 -0400 Subject: [PATCH] =?UTF-8?q?Added=20Faction=20Damage=20Stat=20which=20requi?= =?UTF-8?q?res=20MythicMobs.=20These=20will=20need=20to=20be=20added=20to?= =?UTF-8?q?=20the=20respective=20files=20to=20use.=20lore-format.yml=20>?= =?UTF-8?q?=20-=20'#faction-damage-FACTION=5FNAME#'=20stats.yml=20>=20fact?= =?UTF-8?q?ion-damage-FACTION=5FNAME:=20'&7=E2=96=A0=20FACTION=20NAME=20Fa?= =?UTF-8?q?ction=20Damage:=20&f#%'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rewrote how upgrade lores are applied. --- .../java/net/Indyuce/mmoitems/MMOItems.java | 73 ++++++------------- .../comp/mythicmobs/MythicMobsLoader.java | 2 +- src/main/resources/default/lore-format.yml | 1 + src/main/resources/default/stats.yml | 1 + 4 files changed, 26 insertions(+), 51 deletions(-) diff --git a/src/main/java/net/Indyuce/mmoitems/MMOItems.java b/src/main/java/net/Indyuce/mmoitems/MMOItems.java index ae74ea46..e3a5274d 100644 --- a/src/main/java/net/Indyuce/mmoitems/MMOItems.java +++ b/src/main/java/net/Indyuce/mmoitems/MMOItems.java @@ -1,20 +1,5 @@ package net.Indyuce.mmoitems; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; - -import org.apache.commons.lang.Validate; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.Material; -import org.bukkit.entity.Player; -import org.bukkit.event.HandlerList; -import org.bukkit.event.Listener; -import org.bukkit.inventory.ItemStack; -import org.bukkit.plugin.java.JavaPlugin; - import net.Indyuce.mmoitems.api.ConfigFile; import net.Indyuce.mmoitems.api.SoulboundInfo; import net.Indyuce.mmoitems.api.item.MMOItem; @@ -32,11 +17,7 @@ import net.Indyuce.mmoitems.comp.flags.DefaultFlags; import net.Indyuce.mmoitems.comp.flags.FlagPlugin; import net.Indyuce.mmoitems.comp.flags.ResidenceFlags; import net.Indyuce.mmoitems.comp.flags.WorldGuardFlags; -import net.Indyuce.mmoitems.comp.holograms.CMIPlugin; -import net.Indyuce.mmoitems.comp.holograms.HologramSupport; -import net.Indyuce.mmoitems.comp.holograms.HologramsPlugin; -import net.Indyuce.mmoitems.comp.holograms.HolographicDisplaysPlugin; -import net.Indyuce.mmoitems.comp.holograms.TrHologramPlugin; +import net.Indyuce.mmoitems.comp.holograms.*; import net.Indyuce.mmoitems.comp.inventory.DefaultPlayerInventory; import net.Indyuce.mmoitems.comp.inventory.OrnamentPlayerInventory; import net.Indyuce.mmoitems.comp.inventory.PlayerInventory; @@ -44,6 +25,7 @@ import net.Indyuce.mmoitems.comp.inventory.RPGInventoryHook; import net.Indyuce.mmoitems.comp.itemglow.ItemGlowListener; import net.Indyuce.mmoitems.comp.itemglow.NoGlowListener; import net.Indyuce.mmoitems.comp.mmocore.MMOCoreMMOLoader; +import net.Indyuce.mmoitems.comp.mythicmobs.MythicMobsLoader; import net.Indyuce.mmoitems.comp.parse.IridescentParser; import net.Indyuce.mmoitems.comp.parse.StringInputParser; import net.Indyuce.mmoitems.comp.parse.placeholders.DefaultPlaceholderParser; @@ -53,37 +35,29 @@ import net.Indyuce.mmoitems.comp.rpg.DefaultHook; import net.Indyuce.mmoitems.comp.rpg.RPGHandler; import net.Indyuce.mmoitems.gui.PluginInventory; import net.Indyuce.mmoitems.gui.listener.GuiListener; -import net.Indyuce.mmoitems.listener.CraftingListener; -import net.Indyuce.mmoitems.listener.CustomBlockListener; -import net.Indyuce.mmoitems.listener.CustomSoundListener; -import net.Indyuce.mmoitems.listener.DisableInteractions; -import net.Indyuce.mmoitems.listener.DurabilityListener; -import net.Indyuce.mmoitems.listener.ElementListener; -import net.Indyuce.mmoitems.listener.ItemUse; -import net.Indyuce.mmoitems.listener.PlayerListener; +import net.Indyuce.mmoitems.listener.*; import net.Indyuce.mmoitems.listener.version.Listener_v1_13; -import net.Indyuce.mmoitems.manager.AbilityManager; -import net.Indyuce.mmoitems.manager.BlockManager; -import net.Indyuce.mmoitems.manager.ConfigManager; -import net.Indyuce.mmoitems.manager.CraftingManager; -import net.Indyuce.mmoitems.manager.DropTableManager; -import net.Indyuce.mmoitems.manager.EntityManager; -import net.Indyuce.mmoitems.manager.ItemGenManager; -import net.Indyuce.mmoitems.manager.ItemManager; -import net.Indyuce.mmoitems.manager.PluginUpdateManager; -import net.Indyuce.mmoitems.manager.SetManager; -import net.Indyuce.mmoitems.manager.StatManager; -import net.Indyuce.mmoitems.manager.TierManager; -import net.Indyuce.mmoitems.manager.TypeManager; -import net.Indyuce.mmoitems.manager.UpdaterManager; -import net.Indyuce.mmoitems.manager.UpgradeManager; -import net.Indyuce.mmoitems.manager.WorldGenManager; +import net.Indyuce.mmoitems.manager.*; import net.Indyuce.mmoitems.manager.recipe.RecipeManager; import net.Indyuce.mmoitems.manager.recipe.RecipeManagerDefault; import net.Indyuce.mmoitems.manager.recipe.RecipeManagerLegacy; import net.mmogroup.mmolib.MMOLib; import net.mmogroup.mmolib.api.player.MMOPlayerData; import net.mmogroup.mmolib.version.SpigotPlugin; +import org.apache.commons.lang.Validate; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.Material; +import org.bukkit.entity.Player; +import org.bukkit.event.HandlerList; +import org.bukkit.event.Listener; +import org.bukkit.inventory.ItemStack; +import org.bukkit.plugin.java.JavaPlugin; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; public class MMOItems extends JavaPlugin { public static MMOItems plugin; @@ -259,12 +233,11 @@ public class MMOItems extends JavaPlugin { new MMOItemsRewardTypes().register(); getLogger().log(Level.INFO, "Hooked onto BossShopPro"); } -// Will be used in the future. -// -// if (Bukkit.getPluginManager().getPlugin("MythicMobs") != null) { -// new MythicMobsLoader(); -// getLogger().log(Level.INFO, "Hooked onto MythicMobs"); -// } + + if (Bukkit.getPluginManager().getPlugin("MythicMobs") != null) { + new MythicMobsLoader(); + getLogger().log(Level.INFO, "Hooked onto MythicMobs"); + } findRpgPlugin(); diff --git a/src/main/java/net/Indyuce/mmoitems/comp/mythicmobs/MythicMobsLoader.java b/src/main/java/net/Indyuce/mmoitems/comp/mythicmobs/MythicMobsLoader.java index e679c95c..938e98ab 100644 --- a/src/main/java/net/Indyuce/mmoitems/comp/mythicmobs/MythicMobsLoader.java +++ b/src/main/java/net/Indyuce/mmoitems/comp/mythicmobs/MythicMobsLoader.java @@ -10,7 +10,7 @@ import java.util.LinkedList; /* * this loads mmoitems comp for mythic mobs - * since MythicMobsHook is never used + * since MythicMobsHook is purely for documentation */ public class MythicMobsLoader { diff --git a/src/main/resources/default/lore-format.yml b/src/main/resources/default/lore-format.yml index 43372f93..aaa79e2e 100644 --- a/src/main/resources/default/lore-format.yml +++ b/src/main/resources/default/lore-format.yml @@ -57,6 +57,7 @@ lore-format: - '#projectile-damage-reduction#' - '#physical-damage-reduction#' - '#undead-damage#' +- '#faction-damage-undead#' - '#block-power#' - '#block-rating#' - '#dodge-rating#' diff --git a/src/main/resources/default/stats.yml b/src/main/resources/default/stats.yml index 49bf995a..e79d0c72 100644 --- a/src/main/resources/default/stats.yml +++ b/src/main/resources/default/stats.yml @@ -23,6 +23,7 @@ undead-damage: '&7■ Undead Damage: &f#%' skill-damage: '&7■ Skill Damage: &f#%' physical-damage: '&7■ Physical Damage: &f#%' projectile-damage: '&7■ Projectile Damage: &f#%' +faction-damage-undead: '&7■ Undead Faction Damage: &f#%' # Abilities ability-format: '&2#c: #a'