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

Moved Spout stuff to its own config file.

Browse Source
This commit is contained in:
GJ
2012-05-23 10:50:47 -04:00
parent 9525ce8299
commit 63f683982f
19 changed files with 311 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java
View File

@ -18,6 +18,7 @@ import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.SpoutConfig;
import com.gmail.nossr50.config.TreasuresConfig;
import com.gmail.nossr50.config.mods.CustomBlocksConfig;
import com.gmail.nossr50.datatypes.PlayerProfile;
@ -129,7 +130,7 @@ public class Excavation {
Excavation.excavationProcCheck(block, player);
}
if (Config.getInstance().spoutEnabled) {
if (SpoutConfig.getInstance().spoutEnabled) {
SpoutSounds.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
}
}

5
src/main/java/com/gmail/nossr50/skills/gathering/Mining.java
View File

@ -19,6 +19,7 @@ import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.SpoutConfig;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
@ -332,7 +333,7 @@ public class Mining {
miningBlockCheck(player, block);
if (Config.getInstance().spoutEnabled) {
if (SpoutConfig.getInstance().spoutEnabled) {
SpoutSounds.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
}
}
@ -377,7 +378,7 @@ public class Mining {
miningBlockCheck(player, block);
if (Config.getInstance().spoutEnabled) {
if (SpoutConfig.getInstance().spoutEnabled) {
SpoutSounds.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
}
}

3
src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java
View File

@ -14,6 +14,7 @@ import org.bukkit.event.block.BlockBreakEvent;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.SpoutConfig;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.datatypes.mods.CustomBlock;
@ -387,7 +388,7 @@ public class WoodCutting {
Skills.abilityDurabilityLoss(player.getItemInHand(), Config.getInstance().getAbilityToolDamage());
}
if (Config.getInstance().spoutEnabled) {
if (SpoutConfig.getInstance().spoutEnabled) {
SpoutSounds.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
}
}

5
src/main/java/com/gmail/nossr50/skills/repair/Repair.java
View File

@ -13,6 +13,7 @@ import org.getspout.spoutapi.player.SpoutPlayer;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.SpoutConfig;
import com.gmail.nossr50.spout.SpoutSounds;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
@ -46,7 +47,7 @@ public class Repair {
Skills.XpCheckSkill(SkillType.REPAIR, player);
//CLANG CLANG
if (configInstance.spoutEnabled) {
if (SpoutConfig.getInstance().spoutEnabled) {
SpoutSounds.playRepairNoise(player, mcMMO.p);
}
}
@ -242,7 +243,7 @@ public class Repair {
PlayerProfile PP = Users.getProfile(player);
if (!PP.getPlacedAnvil()) {
if (configInstance.spoutEnabled) {
if (SpoutConfig.getInstance().spoutEnabled) {
SpoutPlayer sPlayer = SpoutManager.getPlayer(player);
if (sPlayer.isSpoutCraftEnabled()) {