Skip to content

Commit cf33db5

Browse files
darrellrootdarrellroot
authored
Merge pull request #9 from netrek/development
Version 1.0.3 sound works in the jar!
2 parents 8296525 + 5f5d0b9 commit cf33db5

File tree

3 files changed

+38
-39
lines changed

3 files changed

+38
-39
lines changed

‎src/jtrek/Copyright.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,10 @@
134134
* Inc.
135135
*/
136136
public interface Copyright {
137-
String VERSION = "JTrek version 1.0.0 Beta";
137+
String VERSION = "JTrek version 1.0.3";
138138

139139
String[] AUTHORS = {
140-
"Robert Temple","Darrell Root"
140+
"Robert Temple updated by Darrell Root"
141141
};
142142

143143
//String SUPPORT = "robertt@starwave.com";

‎src/jtrek/config/Defaults.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,15 @@ public static void init() {
218218
server = properties.getPropertyAsString("server");
219219
port = properties.getPropertyAsInt("port");
220220

221-
dashboard_class = properties.getPropertyAsString("dashboardClass");
222-
player_list_class = properties.getPropertyAsString("playerListClass");
223-
sound_engine_class = properties.getPropertyAsString("soundEngineClass");
221+
dashboard_class = "jtrek.visual.KRPDashboard";
222+
//dashboard_class = properties.getPropertyAsString("dashboardClass");
223+
224+
player_list_class = "jtrek.visual.SortedPlayerList";
225+
//player_list_class = properties.getPropertyAsString("playerListClass");
226+
227+
// This get property as string thing was in the original java source. ugh? - Darrell
228+
sound_engine_class = "jtrek.visual.SoundEngineActual";
229+
//sound_engine_class = properties.getPropertyAsString("soundEngineClass");
224230

225231
//netstat = properties.getPropertyAsBoolean("netstats");
226232
//abbr_kmesg = properties.getPropertyAsBoolean("shortKillMesg");

‎src/jtrek/visual/SoundEngineActual.java

Lines changed: 27 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,28 @@
11
package jtrek.visual;
22

33
import java.io.File;
4+
import java.net.URL;
45

56
import javax.sound.sampled.*;
67

78
public class SoundEngineActual implements SoundEngine {
89
final static int clipCount = 28;
9-
final static boolean DEBUG_SOUND = true;
10+
final static boolean DEBUG_SOUND = false;
1011
Clip[] audio_clips = new Clip[clipCount];
1112

1213
private Clip getAudioClip(String filename) {
1314
try {
14-
File audioFile = new File(filename);
15-
AudioInputStream audioStream = AudioSystem.getAudioInputStream(audioFile);
15+
URL sound = getClass().getResource(filename);
16+
AudioInputStream audioStream = AudioSystem.getAudioInputStream(sound);
17+
1618
Clip audioClip = AudioSystem.getClip();
1719
audioClip.open(audioStream);
1820
return audioClip;
1921
} catch (Exception e) {
20-
try {
21-
String filenameDevelop = "src/" + filename;
22-
File audioFile = new File(filenameDevelop);
23-
AudioInputStream audioStream = AudioSystem.getAudioInputStream(audioFile);
24-
Clip audioClip = AudioSystem.getClip();
25-
audioClip.open(audioStream);
26-
return audioClip;
27-
} catch (Exception f) {
28-
if (DEBUG_SOUND) {
29-
System.err.printf("getAudioClip exception filename %s %s %s\n",filename,e.getMessage(),f.getMessage());
30-
}
31-
return null;
32-
}
22+
if (DEBUG_SOUND) {
23+
System.out.printf("getAudioClip exception filename %s %s\n",filename,e.getMessage());
24+
}
25+
return null;
3326
}
3427
}
3528

@@ -43,25 +36,25 @@ public SoundEngineActual() {
4336
}
4437
}
4538
}
46-
audio_clips[SoundPlayer.FIRE_TORP_SOUND] = getAudioClip("jtrek/resources/175266__jonccox__gun-spark.wav");
47-
audio_clips[SoundPlayer.PHASER_SOUND] = getAudioClip("jtrek/resources/175262__jonccox__gun-cannon.wav");
48-
audio_clips[SoundPlayer.FIRE_PLASMA_SOUND] = getAudioClip("jtrek/resources/175267__jonccox__gun-plasma.wav");
49-
audio_clips[SoundPlayer.EXPLOSION_SOUND] = getAudioClip("jtrek/resources/399303__deleted-user-5405837__explosion-012.wav");
50-
audio_clips[SoundPlayer.CLOAK_SOUND] = getAudioClip("jtrek/resources/71852__ludvique__digital-whoosh-soft.wav");
51-
audio_clips[SoundPlayer.UNCLOAK_SOUND] = getAudioClip("jtrek/resources/71852__ludvique__digital-whoosh-soft.wav");
52-
audio_clips[SoundPlayer.SHIELD_DOWN_SOUND] = getAudioClip("jtrek/resources/71852__ludvique__digital-whoosh-soft.wav");
53-
audio_clips[SoundPlayer.SHIELD_UP_SOUND] = getAudioClip("jtrek/resources/71852__ludvique__digital-whoosh-soft.wav");
54-
audio_clips[SoundPlayer.TORP_HIT_SOUND] = getAudioClip("jtrek/resources/175270__jonccox__gun-zap.wav");
55-
audio_clips[SoundPlayer.WARNING_SOUND] = getAudioClip("jtrek/resources/warning.au");
56-
audio_clips[SoundPlayer.ENGINE_SOUND] = getAudioClip("jtrek/resources/engine.au");
57-
audio_clips[SoundPlayer.ENTER_SHIP_SOUND] = getAudioClip("jtrek/resources/enter_ship.au");
58-
audio_clips[SoundPlayer.SELF_DESTRUCT_SOUND] = getAudioClip("jtrek/resources/399303__deleted-user-5405837__explosion-012.wav");
59-
audio_clips[SoundPlayer.PLASMA_HIT_SOUND] = getAudioClip("jtrek/resources/399303__deleted-user-5405837__explosion-012.wav");
39+
audio_clips[SoundPlayer.FIRE_TORP_SOUND] = getAudioClip("/jtrek/resources/175266__jonccox__gun-spark.wav");
40+
audio_clips[SoundPlayer.PHASER_SOUND] = getAudioClip("/jtrek/resources/175262__jonccox__gun-cannon.wav");
41+
audio_clips[SoundPlayer.FIRE_PLASMA_SOUND] = getAudioClip("/jtrek/resources/175267__jonccox__gun-plasma.wav");
42+
audio_clips[SoundPlayer.EXPLOSION_SOUND] = getAudioClip("/jtrek/resources/399303__deleted-user-5405837__explosion-012.wav");
43+
audio_clips[SoundPlayer.CLOAK_SOUND] = getAudioClip("/jtrek/resources/71852__ludvique__digital-whoosh-soft.wav");
44+
audio_clips[SoundPlayer.UNCLOAK_SOUND] = getAudioClip("/jtrek/resources/71852__ludvique__digital-whoosh-soft.wav");
45+
audio_clips[SoundPlayer.SHIELD_DOWN_SOUND] = getAudioClip("/jtrek/resources/71852__ludvique__digital-whoosh-soft.wav");
46+
audio_clips[SoundPlayer.SHIELD_UP_SOUND] = getAudioClip("/jtrek/resources/71852__ludvique__digital-whoosh-soft.wav");
47+
audio_clips[SoundPlayer.TORP_HIT_SOUND] = getAudioClip("/jtrek/resources/175270__jonccox__gun-zap.wav");
48+
audio_clips[SoundPlayer.WARNING_SOUND] = getAudioClip("/jtrek/resources/warning.au");
49+
audio_clips[SoundPlayer.ENGINE_SOUND] = getAudioClip("/jtrek/resources/engine.au");
50+
audio_clips[SoundPlayer.ENTER_SHIP_SOUND] = getAudioClip("/jtrek/resources/enter_ship.au");
51+
audio_clips[SoundPlayer.SELF_DESTRUCT_SOUND] = getAudioClip("/jtrek/resources/399303__deleted-user-5405837__explosion-012.wav");
52+
audio_clips[SoundPlayer.PLASMA_HIT_SOUND] = getAudioClip("/jtrek/resources/399303__deleted-user-5405837__explosion-012.wav");
6053
audio_clips[SoundPlayer.MESSAGE_SOUND] = getAudioClip("jtrek/resources/message.au");
61-
audio_clips[SoundPlayer.OTHER_FIRE_TORP_SOUND] = getAudioClip("jtrek/resources/175269__jonccox__gun-zap2.wav");
62-
audio_clips[SoundPlayer.OTHER_PHASER_SOUND] = getAudioClip("jtrek/resources/fire_phaser_other.au");
63-
audio_clips[SoundPlayer.OTHER_FIRE_PLASMA_SOUND] = getAudioClip("jtrek/resources/175267__jonccox__gun-plasma.wav");
64-
audio_clips[SoundPlayer.OTHER_EXPLOSION_SOUND] = getAudioClip("jtrek/resources/399303__deleted-user-5405837__explosion-012.wav");
54+
audio_clips[SoundPlayer.OTHER_FIRE_TORP_SOUND] = getAudioClip("/jtrek/resources/175269__jonccox__gun-zap2.wav");
55+
audio_clips[SoundPlayer.OTHER_PHASER_SOUND] = getAudioClip("/jtrek/resources/fire_phaser_other.au");
56+
audio_clips[SoundPlayer.OTHER_FIRE_PLASMA_SOUND] = getAudioClip("/jtrek/resources/175267__jonccox__gun-plasma.wav");
57+
audio_clips[SoundPlayer.OTHER_EXPLOSION_SOUND] = getAudioClip("/jtrek/resources/399303__deleted-user-5405837__explosion-012.wav");
6558

6659
for(int i = SoundPlayer.MESSAGE1_SOUND; i <= SoundPlayer.MESSAGE9_SOUND; ++i) {
6760
audio_clips[i] = audio_clips[SoundPlayer.MESSAGE_SOUND];

0 commit comments

Comments
 (0)