EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 19:24:44 +02:00
Code Issues Projects Releases Wiki Activity

Readying a Tool now has a sound

Browse Source
This commit is contained in:
nossr50
2019-01-20 00:46:33 -08:00
parent b8a146f8bd
commit 6ad9c8e664
25 changed files with 57 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/gmail/nossr50/util/EventUtils.java
View File

@ -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;

1
src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java
View File

@ -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() {}

2
src/main/java/com/gmail/nossr50/util/TextComponentFactory.java
View File

@ -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;

4
src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java
View File

@ -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;

2
src/main/java/com/gmail/nossr50/util/player/NotificationManager.java
View File

@ -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;

3
src/main/java/com/gmail/nossr50/util/skills/RankUtils.java
View File

@ -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++;
}

12
src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java
View File

@ -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;
}

8
src/main/java/com/gmail/nossr50/util/sounds/SoundType.java
View File

@ -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()
{