ctdo
/
crashtest
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes for generating correct jar file

This commit is contained in:
Lucas Pleß 2012-06-06 00:59:09 +02:00
parent 9456b6305b
commit d8e158dc71
7 changed files with 50 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/artifacts/crashteststeuerung_jar.xml
View File

@ -13,6 +13,7 @@
<element id="extracted-dir" path="$PROJECT_DIR$/libs/httpcore-4.1.4.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/libs/httpmime-4.1.3.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/libs/javampd-4.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/libs/jerklib.jar" path-in-jar="/" />
</root>
</artifact>
</component>

16
.idea/libraries/commons_codec_1_41.xml Normal file
View File

@ -0,0 +1,16 @@
<component name="libraryTable">
<library name="commons-codec-1.41">
<CLASSES>
<root url="jar://$PROJECT_DIR$/libs/commons-codec-1.4.jar!/" />
<root url="jar://$PROJECT_DIR$/libs/commons-logging-1.1.1.jar!/" />
<root url="jar://$PROJECT_DIR$/libs/httpclient-4.1.3.jar!/" />
<root url="jar://$PROJECT_DIR$/libs/httpclient-cache-4.1.3.jar!/" />
<root url="jar://$PROJECT_DIR$/libs/httpcore-4.1.4.jar!/" />
<root url="jar://$PROJECT_DIR$/libs/httpmime-4.1.3.jar!/" />
<root url="jar://$PROJECT_DIR$/libs/javampd-4.0.jar!/" />
<root url="jar://$PROJECT_DIR$/libs/jerklib.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

1
crashteststeuerung.iml
View File

@ -10,6 +10,7 @@
<orderEntry type="library" name="commons-codec-1.4" level="project" />
<orderEntry type="library" name="javampd-4.0" level="project" />
<orderEntry type="library" name="jerklib" level="project" />
<orderEntry type="library" name="commons-codec-1.41" level="project" />
</component>
</module>

7
src/de/ctdo/crashtest/domotics/IRelaisboard.java Normal file
View File

@ -0,0 +1,7 @@
package de.ctdo.crashtest.domotics;
public interface IRelaisboard {
void setRelais(int relai, boolean state);
}

12
src/de/ctdo/crashtest/domotics/Relaisboard.java Normal file
View File

@ -0,0 +1,12 @@
package de.ctdo.crashtest.domotics;
public class Relaisboard implements IRelaisboard {
@Override
public void setRelais(int relai, boolean state) {
}
}

20
src/de/ctdo/crashtest/game/TheGame.java
View File

@ -16,7 +16,7 @@ public class TheGame implements StatemachineListener, GuiEventListener, IRCEvent
public TheGame(IGuiControl guiControl) {
this.guiControl = guiControl;
this.ircClient = new IrcClient("crashtest", "#crashtest","irc.ctdo.de");
this.ircClient = new IrcClient("crashtest", "#crashtest","irc.hackint.eu");
this.bunti = new BuntiClient("bunti.ctdo.de", 8080);
this.mpdController = new MPDController("dampfradio.raum.ctdo.de");
this.machine = new Statemachine();
@ -46,8 +46,9 @@ public class TheGame implements StatemachineListener, GuiEventListener, IRCEvent
case IDLE:
machine.stopTimer();
mpdController.playSong("start", "mix");
mpdController.setVolume(45);
mpdController.playSong("start", "mix");
bunti.setPar56(0,0,0);
bunti.setLampel(false,false,false);
@ -55,8 +56,9 @@ public class TheGame implements StatemachineListener, GuiEventListener, IRCEvent
guiControl.showCountDown(false);
break;
case ENTERED_ROOM:
mpdController.playSong("Modem", "Dial_In_and_HF Longplay");
mpdController.setVolume(70);
mpdController.playSong("tidirium", "welcome");
bunti.setLampel(false,false,false);
bunti.setPar56(20,0,100);
@ -86,8 +88,9 @@ public class TheGame implements StatemachineListener, GuiEventListener, IRCEvent
guiControl.showCountDown(true);
break;
case TABLE_GAME_FOUR:
mpdController.playSong("Mo-Do","9 Eins Zwei Polizei");
mpdController.setVolume(60);
mpdController.playSong("Mo-Do","9 Eins Zwei Polizei");
bunti.setLampel(false,true,false);
bunti.setPar56(255,55,0);
@ -101,8 +104,9 @@ public class TheGame implements StatemachineListener, GuiEventListener, IRCEvent
guiControl.showCountDown(true);
break;
case TABLE_GAME_SIX:
mpdController.playSong("Zlatko & Jürgen","Großer Bruder");
mpdController.setVolume(60);
mpdController.playSong("Zlatko & Jürgen","Großer Bruder");
bunti.setLampel(false,true,false);
bunti.setPar56(255,100,0);
@ -118,8 +122,9 @@ public class TheGame implements StatemachineListener, GuiEventListener, IRCEvent
sayScore();
break;
case ROKET_STARTED:
mpdController.playSong("The Underdog Project", "Summer Jam");
mpdController.setVolume(50);
mpdController.playSong("The Underdog Project", "Summer Jam");
bunti.setLampel(false,false,true);
bunti.setPar56(0, 255, 0);
@ -130,8 +135,9 @@ public class TheGame implements StatemachineListener, GuiEventListener, IRCEvent
machine.startTimer(7*60);
break;
case ROKET_DONE:
mpdController.playSong("Coldplay", "Amsterdam");
mpdController.setVolume(50);
mpdController.playSong("Coldplay", "Amsterdam");
bunti.setLampel(true,true,true);
bunti.setPar56(255, 196, 0);

1
src/de/ctdo/crashtest/irc/IrcClient.java
View File

@ -20,7 +20,6 @@ import java.util.List;
*/
public class IrcClient implements IIrcClient, jerklib.events.listeners.IRCEventListener, ILogger {
private final List<IRCEventListener> listenerListIRC = new ArrayList<IRCEventListener>();
private final static String CHANNEL = "#crashtest";
private Session ircsession;
private final String channel;