diff --git a/README.de.md b/README.de.md index 4d2eaf9..18b58b9 100644 --- a/README.de.md +++ b/README.de.md @@ -33,7 +33,7 @@ Um das Ganze einfacher zu gestalten ist das Build-Kommando in dem Start Script m ```bash Raspberry Pi 3 TSL2561 -ADX345 +ADXL345 Pi Breakout Board Steckbrett diff --git a/README.md b/README.md index db44b7c..14691c8 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ These parts were used for our setup: ```bash Raspberry Pi 3 TSL2561 -ADX345 +ADXL345 Pi Breakout Board Breadboard diff --git a/src/main/java/org.devoxx4kids.poketime/BattleSceneController.java b/src/main/java/org/devoxx4kids/poketime/BattleSceneController.java similarity index 94% rename from src/main/java/org.devoxx4kids.poketime/BattleSceneController.java rename to src/main/java/org/devoxx4kids/poketime/BattleSceneController.java index 8bf8d84..51868fe 100644 --- a/src/main/java/org.devoxx4kids.poketime/BattleSceneController.java +++ b/src/main/java/org/devoxx4kids/poketime/BattleSceneController.java @@ -4,8 +4,6 @@ import javafx.animation.KeyValue; import javafx.animation.Timeline; import javafx.application.Platform; -import javafx.beans.value.ChangeListener; -import javafx.beans.value.ObservableValue; import javafx.fxml.FXML; import javafx.scene.control.Label; import javafx.scene.control.ListView; diff --git a/src/main/java/org.devoxx4kids.poketime/Launcher.java b/src/main/java/org/devoxx4kids/poketime/Launcher.java similarity index 98% rename from src/main/java/org.devoxx4kids.poketime/Launcher.java rename to src/main/java/org/devoxx4kids/poketime/Launcher.java index b6a83d5..0129d7d 100644 --- a/src/main/java/org.devoxx4kids.poketime/Launcher.java +++ b/src/main/java/org/devoxx4kids/poketime/Launcher.java @@ -5,4 +5,4 @@ public class Launcher { public static void main(String[] args) { Main.main(args); } -} +} \ No newline at end of file diff --git a/src/main/java/org.devoxx4kids.poketime/Main.java b/src/main/java/org/devoxx4kids/poketime/Main.java similarity index 96% rename from src/main/java/org.devoxx4kids.poketime/Main.java rename to src/main/java/org/devoxx4kids/poketime/Main.java index 0449282..f5e50cb 100644 --- a/src/main/java/org.devoxx4kids.poketime/Main.java +++ b/src/main/java/org/devoxx4kids/poketime/Main.java @@ -58,7 +58,6 @@ public class Main extends Application { static final int BOARD_WIDTH = HORIZONTAL_CELLS * CELL_SIZE; static final int BOARD_HEIGHT = VERTICAL_CELLS * CELL_SIZE; public static boolean gameover = false; - private static int anInt; public static List sprites = new ArrayList<>(); public static PixelatedClock pixelatedClock; public static Group root; @@ -277,47 +276,47 @@ private void populateCells(Group root, final SpriteView mainCharacter) { } - private void addKeyHandler(Scene scene, SpriteView mary) { + private void addKeyHandler(Scene scene, SpriteView player) { scene.addEventHandler(KeyEvent.KEY_PRESSED, - ke -> { - KeyCode keyCode = ke.getCode(); + key -> { + KeyCode keyCode = key.getCode(); switch (keyCode) { case W: case UP: - mary.move(Direction.UP); + player.move(Direction.UP); break; case A: case LEFT: - mary.move(Direction.LEFT); + player.move(Direction.LEFT); break; case S: case DOWN: - mary.move(Direction.DOWN); + player.move(Direction.DOWN); break; case D: case RIGHT: - mary.move(Direction.RIGHT); + player.move(Direction.RIGHT); break; - case Z: - if (ke.isControlDown() && ke.isShiftDown()) + case J: + if (key.isControlDown() && key.isShiftDown()) angreifen(3); break; - case X: - if (ke.isControlDown() && ke.isShiftDown()) + case K: + if (key.isControlDown() && key.isShiftDown()) nacht.setValue(!nacht.getValue()); break; - case C: - if (ke.isControlDown() && ke.isShiftDown()) + case L: + if (key.isControlDown() && key.isShiftDown()) erdbeben(); break; diff --git a/src/main/java/org.devoxx4kids.poketime/MultiplierClock.java b/src/main/java/org/devoxx4kids/poketime/MultiplierClock.java similarity index 100% rename from src/main/java/org.devoxx4kids.poketime/MultiplierClock.java rename to src/main/java/org/devoxx4kids/poketime/MultiplierClock.java diff --git a/src/main/java/org.devoxx4kids.poketime/PiSystem.java b/src/main/java/org/devoxx4kids/poketime/PiSystem.java similarity index 100% rename from src/main/java/org.devoxx4kids.poketime/PiSystem.java rename to src/main/java/org/devoxx4kids/poketime/PiSystem.java diff --git a/src/main/java/org.devoxx4kids.poketime/PixelatedClock.java b/src/main/java/org/devoxx4kids/poketime/PixelatedClock.java similarity index 100% rename from src/main/java/org.devoxx4kids.poketime/PixelatedClock.java rename to src/main/java/org/devoxx4kids/poketime/PixelatedClock.java diff --git a/src/main/java/org.devoxx4kids.poketime/SensorFactory.java b/src/main/java/org/devoxx4kids/poketime/SensorFactory.java similarity index 89% rename from src/main/java/org.devoxx4kids.poketime/SensorFactory.java rename to src/main/java/org/devoxx4kids/poketime/SensorFactory.java index 25318cd..cf6d295 100644 --- a/src/main/java/org.devoxx4kids.poketime/SensorFactory.java +++ b/src/main/java/org/devoxx4kids/poketime/SensorFactory.java @@ -2,7 +2,6 @@ import com.pi4j.component.gyroscope.analogdevices.ADXL345; import com.pi4j.io.gpio.*; -import com.pi4j.io.gpio.event.GpioPinDigitalStateChangeEvent; import com.pi4j.io.gpio.event.GpioPinListenerDigital; import com.pi4j.io.i2c.I2CBus; import com.pi4j.io.i2c.I2CDevice; @@ -49,17 +48,12 @@ public void createButton(SpriteView.PokeTrainer pokeTrainer) { if (PiSystem.isPiUnix) { final GpioPinDigitalInput myButton = gpio.provisionDigitalInputPin(RaspiPin.GPIO_07, PinPullResistance.PULL_UP); - myButton.addListener(new GpioPinListenerDigital() { - @Override - public void handleGpioPinDigitalStateChangeEvent(GpioPinDigitalStateChangeEvent event) { - - boolean knopfGedrueckt = event.getState().isLow(); - - if (knopfGedrueckt) - Main.display("Knopf gedrueckt."); - // Pokemon angreifen! - } + myButton.addListener((GpioPinListenerDigital) event -> { + boolean knopfGedrueckt = event.getState().isLow(); + if (knopfGedrueckt) + Main.display("Knopf gedrueckt."); + // ToDo: Pokemon angreifen! }); } } @@ -126,6 +120,8 @@ public void createAccelerometer() { } } } + + // Pokemon angreifen! // Main.angreifen(3); diff --git a/src/main/java/org.devoxx4kids.poketime/SpriteView.java b/src/main/java/org/devoxx4kids/poketime/SpriteView.java similarity index 98% rename from src/main/java/org.devoxx4kids.poketime/SpriteView.java rename to src/main/java/org/devoxx4kids/poketime/SpriteView.java index 0a0f83b..fdd1f20 100644 --- a/src/main/java/org.devoxx4kids.poketime/SpriteView.java +++ b/src/main/java/org/devoxx4kids/poketime/SpriteView.java @@ -265,7 +265,7 @@ public Bidiza(Main.Location loc) { } } - public static class Krebscorps extends Pokemon { + static class Krebscorps extends Pokemon { public Krebscorps(Main.Location loc) { @@ -293,13 +293,13 @@ public Mampfaxo(Main.Location loc) { } } - public static class Pokemon extends RandomWalker { + static class Pokemon extends RandomWalker { private String name; private final Image front; private final Image back; - public Pokemon(String name, Main.Location loc, double speed) { + private Pokemon(String name, Main.Location loc, double speed) { super(loadImage("/images/" + name + ".png", 4, 4), loc, 4, 4, speed); front = new Image(getClass().getResourceAsStream("/images/" + name + "-front.png"));