From d8e158dc7124387bb2ace1f6bbd26d818c1b5b0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Ple=C3=9F?= Date: Wed, 6 Jun 2012 00:59:09 +0200 Subject: [PATCH] fixes for generating correct jar file --- .idea/artifacts/crashteststeuerung_jar.xml | 1 + .idea/libraries/commons_codec_1_41.xml | 16 +++++++++++++++ crashteststeuerung.iml | 1 + .../ctdo/crashtest/domotics/IRelaisboard.java | 7 +++++++ .../ctdo/crashtest/domotics/Relaisboard.java | 12 +++++++++++ src/de/ctdo/crashtest/game/TheGame.java | 20 ++++++++++++------- src/de/ctdo/crashtest/irc/IrcClient.java | 1 - 7 files changed, 50 insertions(+), 8 deletions(-) create mode 100644 .idea/libraries/commons_codec_1_41.xml create mode 100644 src/de/ctdo/crashtest/domotics/IRelaisboard.java create mode 100644 src/de/ctdo/crashtest/domotics/Relaisboard.java diff --git a/.idea/artifacts/crashteststeuerung_jar.xml b/.idea/artifacts/crashteststeuerung_jar.xml index c7465a8..a91aff4 100644 --- a/.idea/artifacts/crashteststeuerung_jar.xml +++ b/.idea/artifacts/crashteststeuerung_jar.xml @@ -13,6 +13,7 @@ + \ No newline at end of file diff --git a/.idea/libraries/commons_codec_1_41.xml b/.idea/libraries/commons_codec_1_41.xml new file mode 100644 index 0000000..227c388 --- /dev/null +++ b/.idea/libraries/commons_codec_1_41.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/crashteststeuerung.iml b/crashteststeuerung.iml index 5b4384e..4e2f0f8 100644 --- a/crashteststeuerung.iml +++ b/crashteststeuerung.iml @@ -10,6 +10,7 @@ + diff --git a/src/de/ctdo/crashtest/domotics/IRelaisboard.java b/src/de/ctdo/crashtest/domotics/IRelaisboard.java new file mode 100644 index 0000000..a4af876 --- /dev/null +++ b/src/de/ctdo/crashtest/domotics/IRelaisboard.java @@ -0,0 +1,7 @@ +package de.ctdo.crashtest.domotics; + +public interface IRelaisboard { + + void setRelais(int relai, boolean state); + +} diff --git a/src/de/ctdo/crashtest/domotics/Relaisboard.java b/src/de/ctdo/crashtest/domotics/Relaisboard.java new file mode 100644 index 0000000..a6391b9 --- /dev/null +++ b/src/de/ctdo/crashtest/domotics/Relaisboard.java @@ -0,0 +1,12 @@ +package de.ctdo.crashtest.domotics; + + + +public class Relaisboard implements IRelaisboard { + + + @Override + public void setRelais(int relai, boolean state) { + + } +} diff --git a/src/de/ctdo/crashtest/game/TheGame.java b/src/de/ctdo/crashtest/game/TheGame.java index 13c12e2..a0f9e54 100644 --- a/src/de/ctdo/crashtest/game/TheGame.java +++ b/src/de/ctdo/crashtest/game/TheGame.java @@ -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); diff --git a/src/de/ctdo/crashtest/irc/IrcClient.java b/src/de/ctdo/crashtest/irc/IrcClient.java index a399fc6..7870a37 100644 --- a/src/de/ctdo/crashtest/irc/IrcClient.java +++ b/src/de/ctdo/crashtest/irc/IrcClient.java @@ -20,7 +20,6 @@ import java.util.List; */ public class IrcClient implements IIrcClient, jerklib.events.listeners.IRCEventListener, ILogger { private final List listenerListIRC = new ArrayList(); - private final static String CHANNEL = "#crashtest"; private Session ircsession; private final String channel;