Sound renaming fixes

Author: Eschatologue

build.gradle

@@ -40,7 +40,7 @@ dependencies {
 
     implementation "com.github.liplum:MultiCrafterLib:v1.7"
 
-//    annotationProcessor "com.github.Anuken:jabel:$jabelVersion"
+    annotationProcessor "com.github.Anuken:jabel:$jabelVersion"
 }
 
 configurations.configureEach{

src/UAW/content/blocks/UAWBlocksDefence.java

@@ -985,7 +985,7 @@ Items.pyratite, new SplashArtilleryBulletType(2.5f, 3500) {{
 
 						}};
 						makeFire = true;
-						applySound = Sounds.fire;
+						applySound = Sounds.loopFire;
 					}};
 				}},
 				UAWItems.cryogel, new SplashArtilleryBulletType(2.5f, 3500) {{
@@ -1034,7 +1034,7 @@ UAWItems.cryogel, new SplashArtilleryBulletType(2.5f, 3500) {{
 
 						}};
 						makeFire = true;
-						applySound = Sounds.fire;
+						applySound = Sounds.loopFire;
 					}};
 				}},
 				Items.plastanium, artilleryLargeFrag,
@@ -1086,7 +1086,7 @@ Items.thorium, new SplashArtilleryBulletType(2.5f, 5500) {{
 
 						}};
 						makeFire = true;
-						applySound = Sounds.fire;
+						applySound = Sounds.loopFire;
 					}};
 				}}
 			);
@@ -1383,7 +1383,7 @@ Items.silicon, new TrailBulletType(10, 30) {{
 					splashDamage = this.damage * 0.75f;
 					splashDamageRadius = 2 * tilesize;
 
-					hitSound = Sounds.dullExplosion;
+					hitSound = Sounds.explosionDull;
 
 					collidesAir = false;
 					collideTerrain = true;
@@ -1705,7 +1705,7 @@ Items.surgeAlloy, new BuckshotBulletType(18, 6f, 60f) {{
 					shootEffect = UAWFx.shootHugeColor;
 					despawnEffect = UAWFx.empExplosion(splashDamageRadius, 3, backColor);
 					status = UAWStatusEffects.EMP;
-					hitSound = Sounds.plasmaboom;
+					hitSound = Sounds.beamPlasma;
 					statusDuration = 0.3f * 60;
 					ammoMultiplier = 6f;
 					collidesAir = false;

src/UAW/entities/bullet/AftershockBulletType.java

@@ -29,7 +29,7 @@ public class AftershockBulletType extends BulletType {
 	 */
 	public int splashAmount = 3;
 
-	public Sound applySound = Sounds.shotgun;
+	public Sound applySound = Sounds.shootToxopidShotgun;
 	/** Adjust circle light color */
 	public Color frontColor = Pal.lightishOrange;
 	/** Adjust circle dark color */

src/UAW/entities/bullet/ArmorPiercingBulletType.java

@@ -10,8 +10,8 @@ public class ArmorPiercingBulletType extends TrailBulletType {
 	static final EventType.UnitDamageEvent bulletDamageEvent = new EventType.UnitDamageEvent();
 
 	/**
-	 * Refers to how much damage will ignores armour, if the damage is 50 and the {@code armorPierceScl} is 0.5 thats
-	 * mean 25 damage will still be dealt despite of armour
+	 * Refers to how much damage will ignores armour, if the damage is 50 and the {@code armorPierceScl} is 0.5 that's
+	 * mean 25 damage will still be dealt despite armour
 	 */
 	public float armorPierceScl = -1;
 

src/UAW/entities/bullet/CanisterBulletType.java

@@ -28,7 +28,7 @@ public CanisterBulletType(BulletType bulletType, int projectileCount, float spee
 		hitEffect = new MultiEffect(Fx.generatespark, Fx.steam, Fx.flakExplosionBig);
 		smokeEffect = new MultiEffect(Fx.shootBigSmoke2, Fx.blastsmoke);
 		shootEffect = UAWFx.shootSmoke(width, backColor, true);
-		hitSound = Sounds.mineDeploy;
+//		hitSound = Sounds.mineDeploy;
 		trailColor = backColor;
 		displayAmmoMultiplier = false;
 	}

src/UAW/entities/bullet/HighVelocityShellBulletType.java

@@ -16,7 +16,7 @@ public HighVelocityShellBulletType(float speed, float damage, String bulletSprit
 		this.speed = speed;
 		this.damage = damage;
 		this.sprite = bulletSprite;
-		hitSound = Sounds.artillery;
+		hitSound = Sounds.explosionArtillery;
 		pierceArmor = true;
 		height = 16f;
 		width = hitSize = height / 2;

src/UAW/entities/bullet/MineBulletType.java

@@ -51,7 +51,7 @@ public MineBulletType(float splashDamage, float splashRadius, float lifetime, St
 		speed = 3f;
 		drag = 0.055f;
 		hitShake = 8f;
-		hitSound = Sounds.plasmaboom;
+		hitSound = Sounds.explosionPlasmaSmall;
 		fragAngle = 360;
 		pierceArmor = true;
 	}

src/UAW/entities/bullet/TorpedoBulletType.java

@@ -57,7 +57,7 @@ public TorpedoBulletType(float speed, float damage) {
 		statusDuration = 3 * 60;
 		hitSoundVolume = 2.5f;
 		hitSoundPitch = 0.7f;
-		hitSound = Sounds.explosionbig;
+		hitSound = Sounds.explosionArtilleryShockBig;
 	}
 
 	@Override

src/UAW/entities/bullet/presets/StandardBullets.java

@@ -13,9 +13,7 @@ public StandardBullets(float speed, float damage, String bulletSprite, int prese
 		buildingDamageMultiplier = 0.3f;
 
 		switch (presets) {
-			default -> {
-			}
-			case 0 ->{
+            case 0 ->{
 				height = 10;
 				width = 5.5f;
 
@@ -75,7 +73,9 @@ public StandardBullets(float speed, float damage, String bulletSprite, int prese
 				}};
 				trailLengthScale = 0.8f;
 			}
-		}
+            default -> {
+            }
+        }
 	}
 
 	public StandardBullets(float speed, float damage, int presets) {

src/UAW/entities/units/CruiseMissileUnitType.java

@@ -30,7 +30,7 @@ public CruiseMissileUnitType(String name, String spriteName, int presets) {
 		range = maxRange = 3 * tilesize;
 		engineLayer = Layer.effect;
 		lowAltitude = true;
-		loopSound = Sounds.missileTrail;
+		loopSound = Sounds.loopMissileTrail;
 		loopSoundVolume = 0.4f;
 		fogRadius = 3f;
 		deathExplosionEffect = Fx.none;
@@ -42,19 +42,19 @@ public CruiseMissileUnitType(String name, String spriteName, int presets) {
 				engineSize = 5.5f * px;
 				engineOffset = 12f * px;
 				trailLength = 5;
-				deathSound = Sounds.explosionbig;
+				deathSound = Sounds.explosionMissile;
 			}
 			case 2 -> {
 				engineSize = 12 * px;
 				engineOffset = 35f * px;
 				trailLength = 9;
-				deathSound = Sounds.largeExplosion;
+				deathSound = Sounds.explosionReactor;
 			}
 			case 3 -> {
 				engineSize = 18 * px;
 				engineOffset = 57f * px;
 				trailLength = 15;
-				deathSound = Sounds.largeExplosion;
+				deathSound = Sounds.explosionReactor;
 			}
 		}
 	}