spring-boot 3.3.3

java 21
edwarddn · Aug 30, 2024 · 7d312b6 · 7d312b6
1 parent 910006c
commit 7d312b6
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ![Dinosaur Edward Game](game-screenshot.gif)
 
-Dinosaur Edward Game is a game based on the popular Chrome dinosaur game (T-rex), developed in Java 17, using only Java without any auxiliary libraries.
+Dinosaur Edward Game is a game based on the popular Chrome dinosaur game (T-rex), developed in Java 21, using only Java without any auxiliary libraries.
 The game is created with the help of Spring Boot to start the system and Lombok to make the code less verbose.
 Additionally, the game features an artificial intelligence that uses natural selection in a genetic algorithm, allowing you to choose between playing against the network or training it.
 
@@ -21,7 +21,7 @@ Enjoy the game and have fun!
 ## Main Features
 
 - The game is inspired by the Chrome dinosaur game (T-rex).
-- Developed in Java 17, using only Java without any auxiliary libraries.
+- Developed in Java 21, using only Java without any auxiliary libraries.
 - Uses Spring Boot to start the system.
 - Uses Lombok to make the code less verbose.
 - The game features an artificial intelligence based on a neural network trained by a genetic algorithm.
@@ -48,11 +48,11 @@ Enjoy the game and have fun!
 
 ## System Requirements
 
-- Java Development Kit (JDK) 17
+- Java Development Kit (JDK) 21
 
 ## How to Run the Game
 
-1. Make sure you have Java 17 installed on your system.
+1. Make sure you have Java 21 installed on your system.
 2. Clone this repository to your development environment.
 3. Navigate to the root directory of the project.
 4. Run the following commands in the terminal to compile and execute the game:

diff --git a/pom.xml b/pom.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.2</version>
+        <version>3.3.3</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
     <groupId>br.com.edward</groupId>
     <artifactId>dinosaur</artifactId>
-    <version>1.2.0</version>
+    <version>1.3.0</version>
 
     <name>dinosaur</name>
     <description>Dinosaur Edward Game</description>
 
     <properties>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
 
         <!-- Tests -->
-        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
-        <jacoco.maven.plugin.version>0.8.8</jacoco.maven.plugin.version>
+        <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
+        <jacoco.maven.plugin.version>0.8.10</jacoco.maven.plugin.version>
 
         <!-- Package -->
         <exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
@@ -145,6 +145,10 @@
                                         <argument>${project.build.directory}/output</argument>
                                         <argument>--main-jar</argument>
                                         <argument>${project.build.finalName}.jar</argument>
+                                        <argument>--app-version</argument>
+                                        <argument>${project.version}</argument>
+                                        <argument>--vendor</argument>
+                                        <argument>Edward</argument>
                                         <argument>--icon</argument>
                                         <argument>${project.basedir}/src/main/resources/icons/icon.png</argument>
                                         <argument>--dest</argument>
@@ -157,7 +161,7 @@
                 </plugins>
             </build>
         </profile>
-         <profile>
+        <profile>
             <id>windows</id>
             <build>
                 <plugins>
@@ -181,6 +185,10 @@
                                         <argument>${project.build.directory}/output</argument>
                                         <argument>--main-jar</argument>
                                         <argument>${project.build.finalName}.jar</argument>
+                                        <argument>--app-version</argument>
+                                        <argument>${project.version}</argument>
+                                        <argument>--vendor</argument>
+                                        <argument>Edward</argument>
                                         <argument>--icon</argument>
                                         <argument>${project.basedir}/src/main/resources/icons/icon.ico</argument>
                                         <argument>--dest</argument>
@@ -219,6 +227,10 @@
                                         <argument>${project.build.directory}/output</argument>
                                         <argument>--main-jar</argument>
                                         <argument>${project.build.finalName}.jar</argument>
+                                        <argument>--app-version</argument>
+                                        <argument>${project.version}</argument>
+                                        <argument>--vendor</argument>
+                                        <argument>Edward</argument>
                                         <argument>--icon</argument>
                                         <argument>${project.basedir}/src/main/resources/icons/icon.icns</argument>
                                         <argument>--dest</argument>

diff --git a/src/main/java/br/com/edward/dinosaur/ai/NeuralNetwork.java b/src/main/java/br/com/edward/dinosaur/ai/NeuralNetwork.java
@@ -36,6 +36,10 @@ public NeuralNetwork(final NeuralNetwork neuralNetwork) {
         this.outputLayer = new Layer(random, neuralNetwork.getOutputLayer());
     }
 
+    public static Optional<NeuralNetwork> get() {
+        return ObjectUtil.readObjectFromFile(NeuralNetwork.class);
+    }
+
     public double[] getOutput(final double[] inputs) {
         final var layerInputs = new double[inputs.length];
         System.arraycopy(inputs, 0, layerInputs, 0, inputs.length);
@@ -48,8 +52,4 @@ public double[] getOutput(final double[] inputs) {
     public void save() {
         ObjectUtil.writeObjectToFile(this);
     }
-
-    public static Optional<NeuralNetwork> get() {
-        return ObjectUtil.readObjectFromFile(NeuralNetwork.class);
-    }
 }
diff --git a/src/main/java/br/com/edward/dinosaur/entity/Dinosaur.java b/src/main/java/br/com/edward/dinosaur/entity/Dinosaur.java
@@ -20,14 +20,13 @@
 @Getter
 public class Dinosaur extends BaseEntity {
 
-    private boolean better;
-    private BaseEntity lastEnemy;
-    private long score;
     private final NeuralNetwork neuralNetwork;
-
     private final Polygon polygon;
     private final double defaultPositionX;
     private final double defaultPositionY;
+    private boolean better;
+    private BaseEntity lastEnemy;
+    private long score;
     private EnumDinosaurActions state;
     private double jumpSpeed;
     private boolean death;
@@ -182,9 +181,9 @@ public void think(final BaseEntity enemy) {
                     if (this.referencePositionY == this.defaultPositionY && EnumDinosaurActions.CROUCHING.equals(this.state)) {
                         this.score += 10;
                     } else if (this.referencePositionY == this.defaultPositionY && EnumDinosaurActions.RUNNING.equals(this.state)) {
-                        this.score += 100;
+                        this.score += 5;
                     } else {
-                        this.score -= 150;
+                        this.score -= 50;
                     }
                 } else {
                     this.score += 10;

diff --git a/src/main/java/br/com/edward/dinosaur/entity/Star.java b/src/main/java/br/com/edward/dinosaur/entity/Star.java
@@ -32,6 +32,6 @@ public double getPositionX() {
 
     @Override
     public double getPositionY() {
-        return (this.referencePositionY / 100F) *  super.getConfig().getHeight();
+        return (this.referencePositionY / 100F) * super.getConfig().getHeight();
     }
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -2,6 +2,9 @@ spring:
   application:
     name: @project.name@
     version: @project.version@
+  threads:
+    virtual:
+      enabled: true
 logging:
   file:
     name: ${user.home}/dinosaur/logs/dinosaur.log

diff --git a/src/test/java/br/com/edward/dinosaur/ai/NeuralNetworkTests.java b/src/test/java/br/com/edward/dinosaur/ai/NeuralNetworkTests.java
@@ -19,7 +19,7 @@ void testNeuralNetwork() {
         final var network = new NeuralNetwork();
         assertThat(network).isNotNull();
 
-        final var output = network.getOutput(new double[] {distance, position, width, height, myPosition, speed});
+        final var output = network.getOutput(new double[]{distance, position, width, height, myPosition, speed});
         assertThat(output).hasSize(2);
 
         assertThat(output[0]).isNotNegative();