Skip to content

Commit a133c27

Browse files
iSachiSach
committed
Sound Fix
1 parent 61342c6 commit a133c27

86 files changed

Lines changed: 3156 additions & 596 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ allprojects {
44
apply plugin: 'idea'
55

66
group = 'be.isach'
7-
version = '2.2-RELEASE'
7+
version = '2.2.1-RELEASE'
88

99
compileJava.options.encoding = 'UTF-8'
1010

@@ -25,10 +25,10 @@ allprojects {
2525
}
2626
}
2727

28-
sourceCompatibility = 1.8
29-
targetCompatibility = 1.8
28+
sourceCompatibility = 1.7
29+
targetCompatibility = 1.7
3030

31-
boolean local = true
31+
boolean local = false
3232

3333
if (local) libsDirName = '/Users/Sacha/Desktop/LOCAL/plugins'
3434

‎core/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
dependencies {
22
compile 'spigot:spigot:latest'
3-
// compile 'com.comphenix.protocol:ProtocolLib:3.6.4'
43
compile ('LibsDisguises:LibsDisguises:9.0.7') {
54
exclude group: 'org.spigotmc'
65
}

‎core/src/main/java/be/isach/ultracosmetics/UltraCosmetics.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,7 @@
2828
import be.isach.ultracosmetics.version.*;
2929
import net.milkbowl.vault.economy.Economy;
3030
import org.bukkit.Bukkit;
31-
import org.bukkit.Location;
3231
import org.bukkit.World;
33-
import org.bukkit.command.Command;
34-
import org.bukkit.command.CommandSender;
35-
import org.bukkit.craftbukkit.v1_10_R1.CraftWorld;
3632
import org.bukkit.entity.Player;
3733
import org.bukkit.event.Listener;
3834
import org.bukkit.plugin.RegisteredServiceProvider;
@@ -383,7 +379,7 @@ public static boolean usingSpigot() {
383379
*/
384380
@Override
385381
public void onEnable() {
386-
if (!getServer().getVersion().contains("1.8.8") && !getServer().getVersion().contains("1.9")) {
382+
if (!getServer().getVersion().contains("1.8.8") && !getServer().getVersion().contains("1.9") && !getServer().getVersion().contains("1.10")) {
387383
System.out.println("----------------------------\n\nUltraCosmetics requires Spigot 1.8.8 or 1.9 to work!\n\n----------------------------");
388384
getServer().getPluginManager().disablePlugin(this);
389385
return;
@@ -405,6 +401,8 @@ public void onEnable() {
405401
}
406402
} else serverVersion = ServerVersion.v1_8_R3;
407403

404+
SoundUtil.setServerVersion(serverVersion);
405+
408406
if (getServer().getVersion().contains("Spigot"))
409407
usingSpigot = true;
410408

@@ -537,7 +535,7 @@ public void onEnable() {
537535
log("");
538536

539537
registerListener(new PlayerListener());
540-
if (serverVersion == ServerVersion.v1_9_R2 || serverVersion == ServerVersion.v1_9_R1)
538+
if (serverVersion.compareTo(ServerVersion.v1_9_R1) >= 0)
541539
registerListener(new PlayerSwapItemListener());
542540

543541
log("");
@@ -679,8 +677,8 @@ public void run() {
679677
log("");
680678
log("");
681679
log("UltraCosmetics successfully finished loading and is now enabled! (server: " + serverVersion.getName() + ")");
682-
log("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=");
683680

681+
log("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=");
684682
}
685683

686684
/**

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/gadgets/Gadget.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import be.isach.ultracosmetics.util.Cuboid;
99
import be.isach.ultracosmetics.util.ItemFactory;
1010
import be.isach.ultracosmetics.util.PlayerUtils;
11+
import be.isach.ultracosmetics.util.SoundUtil;
1112
import org.bukkit.*;
1213
import org.bukkit.block.Block;
1314
import org.bukkit.entity.Player;
@@ -22,7 +23,6 @@
2223
import org.bukkit.event.inventory.InventoryDragEvent;
2324
import org.bukkit.event.player.PlayerDropItemEvent;
2425
import org.bukkit.event.player.PlayerInteractEvent;
25-
import org.bukkit.event.player.PlayerSwapHandItemsEvent;
2626
import org.bukkit.inventory.Inventory;
2727
import org.bukkit.inventory.ItemStack;
2828
import org.bukkit.scheduler.BukkitRunnable;
@@ -136,14 +136,7 @@ && getPlayer().getItemInHand().getItemMeta().getDisplayName().contains(getType()
136136
MessageManager.getMessage("Gadgets.Gadget-Ready-ActionBar").
137137
replace("%gadgetname%", (UltraCosmetics.getInstance().placeholdersHaveColor()) ?
138138
getName() : UltraCosmetics.filterColor(getName())));
139-
switch (UltraCosmetics.getServerVersion()) {
140-
case v1_8_R3:
141-
getPlayer().playSound(getPlayer().getLocation(), Sound.valueOf("NOTE_STICKS"), 1.4f, 1.5f);
142-
break;
143-
case v1_9_R1:
144-
getPlayer().playSound(getPlayer().getLocation(), Sound.UI_BUTTON_CLICK, 1.4f, 1.5f);
145-
break;
146-
}
139+
SoundUtil.playSound(getPlayer(), Sound.UI_BUTTON_CLICK, 1.4f, 1.5f);
147140
}
148141
}
149142
}

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/gadgets/GadgetBatBlaster.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import be.isach.ultracosmetics.util.MathUtils;
55
import be.isach.ultracosmetics.util.Particles;
66
import be.isach.ultracosmetics.util.UtilParticles;
7+
import be.isach.ultracosmetics.util.SoundUtil;
78
import org.bukkit.Bukkit;
89
import org.bukkit.Location;
910
import org.bukkit.Sound;
@@ -88,14 +89,7 @@ void onUpdate() {
8889
MathUtils.applyVelocity(other, bat.getLocation().getDirection().add(new Vector(0, .4f, 0)));
8990

9091

91-
switch (UltraCosmetics.getServerVersion()) {
92-
case v1_8_R3:
93-
bat.getWorld().playSound(bat.getLocation(), Sound.valueOf("BAT_HURT"), 1.0f, 1.0f);
94-
break;
95-
case v1_9_R1:
96-
bat.getWorld().playSound(bat.getLocation(), Sound.ENTITY_BAT_HURT, 1.0f, 1.0f);
97-
break;
98-
}
92+
SoundUtil.playSound(bat.getLocation(), Sound.ENTITY_BAT_HURT, 1.0f, 1.0f);
9993
UtilParticles.display(Particles.SMOKE_NORMAL, bat.getLocation());
10094

10195
bat.remove();

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/gadgets/GadgetChickenator.java‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import be.isach.ultracosmetics.UltraCosmetics;
44
import be.isach.ultracosmetics.util.ItemFactory;
5+
import be.isach.ultracosmetics.util.SoundUtil;
56
import org.bukkit.*;
67
import org.bukkit.entity.Chicken;
78
import org.bukkit.entity.EntityType;
@@ -32,28 +33,13 @@ void onRightClick() {
3233
final Chicken CHICKEN = (Chicken) getPlayer().getWorld().spawnEntity(getPlayer().getEyeLocation(), EntityType.CHICKEN);
3334
CHICKEN.setNoDamageTicks(500);
3435
CHICKEN.setVelocity(getPlayer().getLocation().getDirection().multiply(Math.PI / 1.5));
35-
switch (UltraCosmetics.getServerVersion()) {
36-
case v1_8_R3:
37-
getPlayer().playSound(getPlayer().getLocation(), Sound.valueOf("CHICKEN_IDLE"), 1.4f, 1.5f);
38-
getPlayer().playSound(getPlayer().getLocation(), Sound.valueOf("EXPLODE"), 0.3f, 1.5f);
39-
break;
40-
case v1_9_R1:
41-
getPlayer().playSound(getPlayer().getLocation(), Sound.ENTITY_CHICKEN_AMBIENT, 1.4f, 1.5f);
42-
getPlayer().playSound(getPlayer().getLocation(), Sound.ENTITY_GENERIC_EXPLODE, 0.3f, 1.5f);
43-
break;
44-
}
36+
SoundUtil.playSound(getPlayer(), Sound.ENTITY_CHICKEN_AMBIENT, 1.4f, 1.5f);
37+
SoundUtil.playSound(getPlayer(), Sound.ENTITY_GENERIC_EXPLODE, 0.3f, 1.5f);
4538
Bukkit.getScheduler().runTaskLater(UltraCosmetics.getInstance(), new Runnable() {
4639
@Override
4740
public void run() {
4841
spawnRandomFirework(CHICKEN.getLocation());
49-
switch (UltraCosmetics.getServerVersion()) {
50-
case v1_8_R3:
51-
getPlayer().playSound(getPlayer().getLocation(), Sound.valueOf("CHICKEN_HURT"), 1.4f, 1.5f);
52-
break;
53-
case v1_9_R1:
54-
getPlayer().playSound(getPlayer().getLocation(), Sound.ENTITY_CHICKEN_HURT, 1.4f, 1.5f);
55-
break;
56-
}
42+
SoundUtil.playSound(getPlayer(), Sound.ENTITY_CHICKEN_HURT, 1.4f, 1.5f);
5743
CHICKEN.remove();
5844
for (int i = 0; i < 30; i++) {
5945
final Item ITEM = CHICKEN.getWorld().dropItem(CHICKEN.getLocation(), ItemFactory.create(Material.COOKED_CHICKEN, (byte) 0, UUID.randomUUID().toString()));

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/gadgets/GadgetColorBomb.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import be.isach.ultracosmetics.util.MathUtils;
66
import be.isach.ultracosmetics.util.Particles;
77
import be.isach.ultracosmetics.util.UtilParticles;
8+
import be.isach.ultracosmetics.util.SoundUtil;
89
import org.bukkit.Bukkit;
910
import org.bukkit.Material;
1011
import org.bukkit.Sound;
@@ -87,15 +88,7 @@ public void run() {
8788
i.setPickupDelay(500000);
8889
i.setVelocity(new Vector(0, 0.5, 0).add(MathUtils.getRandomCircleVector().multiply(0.1)));
8990
items.add(i);
90-
91-
switch (UltraCosmetics.getServerVersion()) {
92-
case v1_8_R3:
93-
i.getWorld().playSound(i.getLocation(), Sound.valueOf("CHICKEN_EGG_POP"), 0.2f, 1.0f);
94-
break;
95-
case v1_9_R1:
96-
i.getWorld().playSound(i.getLocation(), Sound.ENTITY_CHICKEN_EGG, 0.2f, 1.0f);
97-
break;
98-
}
91+
SoundUtil.playSound(i.getLocation(), Sound.ENTITY_CHICKEN_EGG, .2f, 1.0f);
9992
for (Entity entity : bomb.getNearbyEntities(1.5, 1, 1.5)) {
10093
if (entity instanceof Player)
10194
if (entity.hasMetadata("NPC")) continue;

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/gadgets/GadgetExplosiveSheep.java‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import be.isach.ultracosmetics.util.MathUtils;
55
import be.isach.ultracosmetics.util.Particles;
66
import be.isach.ultracosmetics.util.UtilParticles;
7+
import be.isach.ultracosmetics.util.SoundUtil;
78
import org.bukkit.Bukkit;
89
import org.bukkit.DyeColor;
910
import org.bukkit.Location;
@@ -95,26 +96,12 @@ public SheepColorRunnable(double time, boolean red, Sheep s, GadgetExplosiveShee
9596
public void run() {
9697
if (red) s.setColor(DyeColor.RED);
9798
else s.setColor(DyeColor.WHITE);
98-
switch (UltraCosmetics.getServerVersion()) {
99-
case v1_8_R3:
100-
s.getWorld().playSound(s.getLocation(), Sound.valueOf("CLICK"), 5f, 1f);
101-
break;
102-
case v1_9_R1:
103-
s.getWorld().playSound(s.getLocation(), Sound.UI_BUTTON_CLICK, 1.4f, 1.5f);
104-
break;
105-
}
99+
SoundUtil.playSound(s.getLocation(), Sound.UI_BUTTON_CLICK, 1.4f, 1.5f);
106100
red = !red;
107101
time -= 0.2;
108102

109103
if (time < 0.5) {
110-
switch (UltraCosmetics.getServerVersion()) {
111-
case v1_8_R3:
112-
s.getWorld().playSound(s.getLocation(), Sound.valueOf("EXPLODE"), 1.4f, 1.5f);
113-
break;
114-
case v1_9_R1:
115-
s.getWorld().playSound(s.getLocation(), Sound.ENTITY_GENERIC_EXPLODE, 1.4f, 1.5f);
116-
break;
117-
}
104+
SoundUtil.playSound(s.getLocation(), Sound.ENTITY_GENERIC_EXPLODE, 1.4f, 1.5f);
118105
UtilParticles.display(Particles.EXPLOSION_HUGE, s.getLocation());
119106
for (int i = 0; i < 50; i++) {
120107
final Sheep sheep = getPlayer().getWorld().spawn(s.getLocation(), Sheep.class);

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/gadgets/GadgetFunGun.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import be.isach.ultracosmetics.UltraCosmetics;
44
import be.isach.ultracosmetics.util.Particles;
55
import be.isach.ultracosmetics.util.UtilParticles;
6+
import be.isach.ultracosmetics.util.SoundUtil;
67
import org.bukkit.Bukkit;
78
import org.bukkit.Location;
89
import org.bukkit.Sound;
@@ -49,14 +50,7 @@ public void onProjectileHit(ProjectileHitEvent event) {
4950

5051
UtilParticles.display(Particles.LAVA, 1.3f, 1f, 1.3f, location, 16);
5152
UtilParticles.display(Particles.HEART, 0.8f, 0.8f, 0.8f, location, 20);
52-
switch (UltraCosmetics.getServerVersion()) {
53-
case v1_8_R3:
54-
getPlayer().playSound(getPlayer().getLocation(), Sound.valueOf("CAT_MEOW"), 1.4f, 1.5f);
55-
break;
56-
case v1_9_R1:
57-
getPlayer().playSound(getPlayer().getLocation(), Sound.ENTITY_CAT_PURREOW, 1.4f, 1.5f);
58-
break;
59-
}
53+
SoundUtil.playSound(getPlayer(), Sound.ENTITY_CAT_PURREOW, 1.4f, 1.5f);
6054
}
6155

6256
@Override

‎core/src/main/java/be/isach/ultracosmetics/cosmetics/gadgets/GadgetMelonThrower.java‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import be.isach.ultracosmetics.UltraCosmetics;
44
import be.isach.ultracosmetics.util.ItemFactory;
5+
import be.isach.ultracosmetics.util.SoundUtil;
56
import org.bukkit.Bukkit;
67
import org.bukkit.Effect;
78
import org.bukkit.Material;
@@ -40,14 +41,7 @@ public void onTakeUpMelon(PlayerPickupItemEvent event) {
4041
if (melons.contains(event.getItem()) && event.getItem().getTicksLived() > 5
4142
&& affectPlayers) {
4243
event.getPlayer().addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 5 * 20, 2));
43-
switch (UltraCosmetics.getServerVersion()) {
44-
case v1_8_R3:
45-
getPlayer().getWorld().playSound(getPlayer().getLocation(), Sound.valueOf("BURP"), 1.4f, 1.5f);
46-
break;
47-
case v1_9_R1:
48-
getPlayer().getWorld().playSound(getPlayer().getLocation(), Sound.ENTITY_PLAYER_BURP, 1.4f, 1.5f);
49-
break;
50-
}
44+
SoundUtil.playSound(getPlayer().getLocation(), Sound.ENTITY_PLAYER_BURP, 1.4f, 1.5f);
5145
event.setCancelled(true);
5246
melons.remove(event.getItem());
5347
event.getItem().remove();
@@ -58,14 +52,7 @@ public void onTakeUpMelon(PlayerPickupItemEvent event) {
5852

5953
@Override
6054
void onRightClick() {
61-
switch (UltraCosmetics.getServerVersion()) {
62-
case v1_8_R3:
63-
getPlayer().getWorld().playSound(getPlayer().getLocation(), Sound.valueOf("EXPLODE"), 1.4f, 1.5f);
64-
break;
65-
case v1_9_R1:
66-
getPlayer().getWorld().playSound(getPlayer().getLocation(), Sound.ENTITY_GENERIC_EXPLODE, 1.4f, 1.5f);
67-
break;
68-
}
55+
SoundUtil.playSound(getPlayer().getLocation(), Sound.ENTITY_GENERIC_EXPLODE, 1.4f, 1.5f);
6956
Item item = getPlayer().getWorld().dropItem(getPlayer().getEyeLocation(), ItemFactory.create(Material.MELON_BLOCK, (byte) 0x0, UUID.randomUUID().toString()));
7057
item.setPickupDelay(0);
7158
item.setVelocity(getPlayer().getEyeLocation().getDirection().multiply(1.3d));

0 commit comments

Comments
 (0)