diff --git a/Changelog.txt b/Changelog.txt index f2e4374ef..e0f2c6db6 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -17,6 +17,7 @@ Version 2.1.0 + Certain elements of mcMMO's UI have been restyled + Added the tagline "Overhaul Era" to various locations until 3.0.0 comes out ! (Scoreboards) Scoreboards are now disabled by default, I don't like them. You can turn them back on in config.yml + + (Sounds) Readying a tool for a super ability now plays a sound + (Experience) mcMMO now notifies you when you progress in a skill! + (Experience) Coral (blocks) now give Mining XP + (Experience) Coral (plants) now give Herbalism XP diff --git a/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java index 7d3721440..af41db57d 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java @@ -3,7 +3,6 @@ package com.gmail.nossr50.commands.skills; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.TextComponentFactory; import com.gmail.nossr50.util.skills.SkillUtils; import net.md_5.bungee.api.chat.TextComponent; diff --git a/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java index 55dcf79f2..5a99d1028 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java @@ -4,9 +4,7 @@ import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.archery.Archery; -import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.TextComponentFactory; -import com.gmail.nossr50.util.skills.RankUtils; import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.entity.Player; diff --git a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java index 48668f332..5cc822613 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java @@ -2,7 +2,6 @@ package com.gmail.nossr50.commands.skills; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; -import com.gmail.nossr50.datatypes.skills.subskills.interfaces.SubSkill; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.skills.axes.Axes; import com.gmail.nossr50.util.Permissions; diff --git a/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java index ad925c599..3fa8de5a8 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java @@ -3,7 +3,6 @@ package com.gmail.nossr50.commands.skills; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.herbalism.Herbalism; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.TextComponentFactory; import com.gmail.nossr50.util.skills.RankUtils; diff --git a/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java index 575a4ba8a..8698a6824 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java @@ -1,6 +1,5 @@ package com.gmail.nossr50.commands.skills; -import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.locale.LocaleLoader; diff --git a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java index 3a0a25140..03edd0a13 100644 --- a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java +++ b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java @@ -1,19 +1,11 @@ package com.gmail.nossr50.config; import com.gmail.nossr50.datatypes.interactions.NotificationType; -import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill; -import com.gmail.nossr50.skills.alchemy.Alchemy; -import com.gmail.nossr50.skills.fishing.Fishing; -import com.gmail.nossr50.skills.mining.BlastMining; -import com.gmail.nossr50.skills.repair.ArcaneForging; -import com.gmail.nossr50.skills.salvage.Salvage; -import com.gmail.nossr50.skills.smelting.Smelting; import net.md_5.bungee.api.ChatColor; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; public class AdvancedConfig extends AutoUpdateConfigLoader { diff --git a/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java b/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java index bc2e27385..4c591b74e 100644 --- a/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java +++ b/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java @@ -2,7 +2,6 @@ package com.gmail.nossr50.database; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.Config; -import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.MobHealthbarType; import com.gmail.nossr50.datatypes.database.DatabaseType; import com.gmail.nossr50.datatypes.database.PlayerStat; diff --git a/src/main/java/com/gmail/nossr50/datatypes/json/McMMOWebLinks.java b/src/main/java/com/gmail/nossr50/datatypes/json/McMMOWebLinks.java index d09bf5030..0dbad85db 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/json/McMMOWebLinks.java +++ b/src/main/java/com/gmail/nossr50/datatypes/json/McMMOWebLinks.java @@ -1,6 +1,5 @@ package com.gmail.nossr50.datatypes.json; -import com.gmail.nossr50.datatypes.json.McMMOUrl; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.StringUtils; diff --git a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java index 75d8af808..1da6d8581 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java +++ b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java @@ -50,7 +50,6 @@ import com.gmail.nossr50.util.skills.SkillUtils; import com.gmail.nossr50.util.sounds.SoundManager; import com.gmail.nossr50.util.sounds.SoundType; import org.apache.commons.lang.Validate; -import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.entity.Player; @@ -881,6 +880,7 @@ public class McMMOPlayer { if (Config.getInstance().getAbilityMessagesEnabled()) { NotificationManager.sendPlayerInformation(player, NotificationType.TOOL, tool.getRaiseTool()); + SoundManager.sendSound(player, player.getLocation(), SoundType.TOOL_READY); } setToolPreparationMode(tool, true); diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/SuperAbilityType.java b/src/main/java/com/gmail/nossr50/datatypes/skills/SuperAbilityType.java index a7e10d79d..b89365279 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/SuperAbilityType.java +++ b/src/main/java/com/gmail/nossr50/datatypes/skills/SuperAbilityType.java @@ -1,15 +1,9 @@ package com.gmail.nossr50.datatypes.skills; import com.gmail.nossr50.config.Config; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; -import com.gmail.nossr50.datatypes.skills.subskills.interfaces.SubSkill; import com.gmail.nossr50.util.BlockUtils; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.StringUtils; -import com.gmail.nossr50.util.player.UserManager; -import com.gmail.nossr50.util.skills.RankUtils; -import com.google.common.collect.ImmutableList; -import jdk.nashorn.internal.ir.annotations.Immutable; import org.bukkit.Material; import org.bukkit.block.BlockState; import org.bukkit.entity.Player; diff --git a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java index 62bd33dd0..f26f2fddb 100644 --- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java @@ -13,7 +13,6 @@ import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.runnables.skills.BleedTimerTask; import com.gmail.nossr50.skills.archery.Archery; import com.gmail.nossr50.skills.fishing.Fishing; -import com.gmail.nossr50.skills.herbalism.Herbalism; import com.gmail.nossr50.skills.mining.BlastMining; import com.gmail.nossr50.skills.mining.MiningManager; import com.gmail.nossr50.skills.taming.Taming; diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index 4376215a9..507ee9649 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -91,7 +91,7 @@ public class mcMMO extends JavaPlugin { // XP Event Check private boolean xpEventEnabled; - private boolean isRetroModeEnabled; + private static boolean isRetroModeEnabled; /* Metadata Values */ public final static String entityMetadataKey = "mcMMO: Spawned Entity"; @@ -566,7 +566,7 @@ public class mcMMO extends JavaPlugin { * Standard mode is scaled for 1-100 * @return true if retro mode is enabled */ - public boolean isRetroModeEnabled() { + public static boolean isRetroModeEnabled() { return isRetroModeEnabled; } } diff --git a/src/main/java/com/gmail/nossr50/skills/SkillManager.java b/src/main/java/com/gmail/nossr50/skills/SkillManager.java index e1dcb2616..0201c9ad8 100644 --- a/src/main/java/com/gmail/nossr50/skills/SkillManager.java +++ b/src/main/java/com/gmail/nossr50/skills/SkillManager.java @@ -3,7 +3,6 @@ package com.gmail.nossr50.skills; import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.XPGainReason; -import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.skills.PerksUtils; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; diff --git a/src/main/java/com/gmail/nossr50/skills/mining/BlastMining.java b/src/main/java/com/gmail/nossr50/skills/mining/BlastMining.java index 39e2f65f3..0d53226ae 100644 --- a/src/main/java/com/gmail/nossr50/skills/mining/BlastMining.java +++ b/src/main/java/com/gmail/nossr50/skills/mining/BlastMining.java @@ -12,9 +12,6 @@ import org.bukkit.entity.TNTPrimed; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent.DamageModifier; -import java.util.Arrays; -import java.util.List; - public class BlastMining { // The order of the values is extremely important, a few methods depend on it to work properly /* public enum Tier { diff --git a/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java b/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java index 4ee136270..078170a18 100644 --- a/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java +++ b/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java @@ -1,6 +1,5 @@ package com.gmail.nossr50.skills.woodcutting; -import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; diff --git a/src/main/java/com/gmail/nossr50/util/EventUtils.java b/src/main/java/com/gmail/nossr50/util/EventUtils.java index 67a0cda41..512cecd55 100644 --- a/src/main/java/com/gmail/nossr50/util/EventUtils.java +++ b/src/main/java/com/gmail/nossr50/util/EventUtils.java @@ -41,7 +41,6 @@ import org.bukkit.event.Event; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.player.PlayerFishEvent; import org.bukkit.inventory.ItemStack; -import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; import java.util.HashMap; diff --git a/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java b/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java index 2dbb5caa0..07a3b6a07 100644 --- a/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java +++ b/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java @@ -14,7 +14,6 @@ import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.metadata.FixedMetadataValue; -import org.bukkit.metadata.MetadataValue; public final class MobHealthbarUtils { private MobHealthbarUtils() {} diff --git a/src/main/java/com/gmail/nossr50/util/TextComponentFactory.java b/src/main/java/com/gmail/nossr50/util/TextComponentFactory.java index 04e1530a1..793cc9d41 100644 --- a/src/main/java/com/gmail/nossr50/util/TextComponentFactory.java +++ b/src/main/java/com/gmail/nossr50/util/TextComponentFactory.java @@ -1,11 +1,11 @@ package com.gmail.nossr50.util; -import com.gmail.nossr50.datatypes.json.McMMOWebLinks; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.RankConfig; import com.gmail.nossr50.datatypes.interactions.NotificationType; import com.gmail.nossr50.datatypes.json.McMMOUrl; +import com.gmail.nossr50.datatypes.json.McMMOWebLinks; import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; diff --git a/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java b/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java index c30a03dff..9fcad6fbb 100644 --- a/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java +++ b/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java @@ -6,7 +6,9 @@ import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.StringUtils; import org.bukkit.Server; -import org.bukkit.boss.*; +import org.bukkit.boss.BarColor; +import org.bukkit.boss.BarStyle; +import org.bukkit.boss.BossBar; import org.bukkit.entity.Player; import java.util.List; diff --git a/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java b/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java index 613026873..08446e88c 100644 --- a/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java +++ b/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java @@ -6,10 +6,8 @@ import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.events.skills.McMMOPlayerNotificationEvent; -import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.TextComponentFactory; -import com.gmail.nossr50.util.skills.RankUtils; import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.Bukkit; diff --git a/src/main/java/com/gmail/nossr50/util/skills/RankUtils.java b/src/main/java/com/gmail/nossr50/util/skills/RankUtils.java index 4288771ae..da6082fb3 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/RankUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/RankUtils.java @@ -12,7 +12,6 @@ import com.gmail.nossr50.util.player.UserManager; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; -import java.util.ArrayList; import java.util.HashMap; public class RankUtils { @@ -44,7 +43,7 @@ public class RankUtils { { SkillUnlockNotificationTask skillUnlockNotificationTask = new SkillUnlockNotificationTask(mcMMOPlayer, subSkillType, newLevel); - skillUnlockNotificationTask.runTaskLater(plugin, ((count * 5) + 1) * 20); + skillUnlockNotificationTask.runTaskLater(plugin, ((count * 4) + 1) * 20); count++; } diff --git a/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java b/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java index e03d372cc..b0016359b 100644 --- a/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java +++ b/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java @@ -62,6 +62,18 @@ public class SoundManager { return Sound.ENTITY_PLAYER_LEVELUP; case FIZZ: return Sound.BLOCK_FIRE_EXTINGUISH; + case TOOL_READY: + return Sound.ITEM_ARMOR_EQUIP_GOLD; + case ROLL_ACTIVATED: + return Sound.ENTITY_LLAMA_SWAG; + case SKILL_UNLOCKED: + return Sound.UI_TOAST_CHALLENGE_COMPLETE; + case ABILITY_ACTIVATED_BERSERK: + return Sound.BLOCK_CONDUIT_AMBIENT; + case ABILITY_ACTIVATED_GENERIC: + return Sound.ITEM_TRIDENT_RIPTIDE_3; + case DEFLECT_ARROWS: + return Sound.ENTITY_ENDER_EYE_DEATH; default: return null; } diff --git a/src/main/java/com/gmail/nossr50/util/sounds/SoundType.java b/src/main/java/com/gmail/nossr50/util/sounds/SoundType.java index 0dca2dc03..0e6e1ccd7 100644 --- a/src/main/java/com/gmail/nossr50/util/sounds/SoundType.java +++ b/src/main/java/com/gmail/nossr50/util/sounds/SoundType.java @@ -7,7 +7,13 @@ public enum SoundType { ITEM_BREAK, POP, KRAKEN, - CHIMAERA_WING; + CHIMAERA_WING, + ROLL_ACTIVATED, + SKILL_UNLOCKED, + DEFLECT_ARROWS, + TOOL_READY, + ABILITY_ACTIVATED_GENERIC, + ABILITY_ACTIVATED_BERSERK; public boolean usesCustomPitch() { diff --git a/src/main/resources/sounds.yml b/src/main/resources/sounds.yml index ac9c631bb..43b5fa971 100644 --- a/src/main/resources/sounds.yml +++ b/src/main/resources/sounds.yml @@ -5,23 +5,41 @@ Sounds: # 0.0 = No Volume MasterVolume: 1.0 ANVIL: - Volume: 1.0 - Pitch: 0.3 + Volume: 1.0 + Pitch: 0.3 #Fizz, Pop, and Kraken make use of a adding and multiplying random numbers together to make a unique pitch everytime they are heard FIZZ: - Volume: 0.5 + Volume: 0.5 LEVEL_UP: - Volume: 0.75 - Pitch: 0.5 + Volume: 0.75 + Pitch: 0.5 ITEM_BREAK: - Volume: 1.0 - Pitch: 1.0 + Volume: 1.0 + Pitch: 1.0 #Fizz, Pop, and Kraken make use of a adding and multiplying random numbers together to make a unique pitch everytime they are heard POP: - Volume: 0.2 + Volume: 0.2 #Fizz, Pop, and Kraken make use of a adding and multiplying random numbers together to make a unique pitch everytime they are heard KRAKEN: - Volume: 1.0 + Volume: 1.0 CHIMAERA_WING: - Volume: 1.0 - Pitch: 0.6 \ No newline at end of file + Volume: 1.0 + Pitch: 0.6 + ROLL_ACTIVATED: + Volume: 1.0 + Pitch: 0.7 + SKILL_UNLOCKED: + Volume: 1.0 + Pitch: 1.4 + DEFLECT_ARROWS: + Volume: 1.0 + Pitch: 2.0 + TOOL_READY: + Volume: 1.0 + Pitch: 0.4 + ABILITY_ACTIVATED_GENERIC: + Volume: 1.0 + Pitch: 0.1 + ABILITY_ACTIVATED_BERSERK: + Volume: 0.5 + Pitch: 1.7 \ No newline at end of file