Merge remote-tracking branch 'origin/master' into HEAD

Author: Project516

.gitignore

@@ -23,8 +23,4 @@ gradle-app.setting
 # Ignore Gradle build output directory
 build
 
-archive.zip
-
-temp
-
-NumberGuessingGame
+archive.zip

.idea/misc.xml

@@ -1,3 +1,4 @@
 {
-  "github.copilot.enable": false
+  "github.copilot.enable": false,
+  "java.configuration.updateBuildConfiguration": "automatic"
 }

.vscode/settings.json

@@ -49,19 +49,18 @@ From the project root:
 gradle build
 ```
 
-Or from the app directory:
-```
-cd app
-gradle build
-```
-
 ### Running Tests
 
 ```
-cd app
 gradle test
 ```
 
 ### Creating Release Archive
 
-Run `./package.sh` from the project root. This will create `archive.zip` containing the application, run scripts, and README. The archive can be released to GitHub Releases.
+**On Windows:**
+Run `.\gradlew build` and `package.bat` from the project root.
+
+**On Linux/Mac:**
+Run `./package.sh` from the project root.
+
+This will create `archive.zip` containing the application, run scripts, and README. The archive can be released to GitHub Releases.

README.md

@@ -4,12 +4,6 @@ plugins {
 
     //Spotless
     id 'com.diffplug.spotless' version '8.0.0'
-    /*
-    // TeaVM
-    id 'java'
-    id 'war'
-    id "org.teavm" version "0.12.3"
-    */
 }
 
 repositories {
@@ -20,10 +14,6 @@ repositories {
 dependencies {
     // This dependency is used by the application.
     implementation libs.guava
-    /*
-    // TeaVM
-    implementation teavm.libs.jsoApis
-    */
 }
 
 testing {
@@ -63,26 +53,6 @@ spotless {
     }
 }
 
-/*
-teavm {
-    all {
-        mainClass = "io.github.project516.NumberGuessingGame.Main"
-    }
-    js {
-        addedToWebApp = true
-
-        // this is also optional, default value is <project name>.js
-        targetFileName = "NumberGuessingGame.js"
-    }
-    wasmGC {
-        addedToWebApp = true
-
-        // this is also optional, default value is <project name>.wasm
-        targetFileName = "NumberGuessingGame.wasm"
-    }
-}
-*/
-
 // Jar config
 jar {
     manifest {

app/build.gradle

@@ -0,0 +1,9 @@
+package io.github.project516.NumberGuessingGame;
+
+public class CheckGuess {
+    void check(int guess) {
+        if (guess < 1 || guess > 101) {
+            throw new IllegalArgumentException("Invalid number!");
+        }
+    }
+}

app/src/main/java/io/github/project516/NumberGuessingGame/CheckGuess.java

@@ -0,0 +1,20 @@
+package io.github.project516.NumberGuessingGame;
+
+public class DebugInfo {
+
+    SystemInfo sysInfo = new SystemInfo();
+    ReadVersionFile vFile = new ReadVersionFile();
+
+    void launchDebug() {
+        System.out.println("===== DEBUG INFO =====\n\n");
+        System.out.println("Java version: " + sysInfo.version());
+        System.out.println("Vendor: " + sysInfo.vendor());
+        System.out.println("JDK name: " + sysInfo.name());
+        System.out.println("Number Guessing Game " + vFile.readVersion());
+        System.out.println("\n\n======================\n\n");
+    }
+
+    void gameCrash() {
+        System.out.println("\n\n=====Program Crashed!=====\n\n");
+    }
+}

app/src/main/java/io/github/project516/NumberGuessingGame/DebugInfo.java

@@ -0,0 +1,8 @@
+package io.github.project516.NumberGuessingGame;
+
+public class GameInfo {
+    void about() {
+        System.out.println("This is a Number Guessing Game!");
+        System.out.println("Guess a number between 1 and 100!\n");
+    }
+}

app/src/main/java/io/github/project516/NumberGuessingGame/GameInfo.java

@@ -0,0 +1,6 @@
+package io.github.project516.NumberGuessingGame;
+
+public class GameLogic {
+    // TODO port game logic from Main to GameLogic
+    void start() {}
+}

app/src/main/java/io/github/project516/NumberGuessingGame/GameLogic.java

@@ -7,26 +7,22 @@ public static void main(String[] args) {
         int numOfGuesses = 0;
 
         ScannerHelper scan = new ScannerHelper();
-        SystemInfo sysInfo = new SystemInfo();
         RandomNumber ranNumber = new RandomNumber();
+        CheckGuess check = new CheckGuess();
+        DebugInfo debugInfo = new DebugInfo();
+        GameInfo gameInfo = new GameInfo();
 
-        try {
-
-            System.out.println("===== DEBUG INFO =====\n\n");
-            System.out.println("Java version: " + sysInfo.version());
-            System.out.println("Vendor: " + sysInfo.vendor());
-            System.out.println("JDK name: " + sysInfo.name());
-            System.out.println("\n\n======================\n\n");
+        debugInfo.launchDebug();
 
-            int number = ranNumber.number();
-
-            System.out.println("This is a Number Guessing Game!");
-            System.out.println("Guess a number between 1 and 100!\n");
+        try {
+            int number = ranNumber.number(100);
+            gameInfo.about();
 
             while (true) {
 
                 System.out.print("Guess a number: ");
                 int guess = scan.userGuess();
+                check.check(guess);
                 if (guess > number) {
                     System.out.println("You guessed to much!");
                 } else if (guess < number) {
@@ -42,7 +38,7 @@ public static void main(String[] args) {
 
         } catch (Exception e) {
 
-            System.out.println("\n\n=====Program Crashed!=====\n\n");
+            debugInfo.gameCrash();
 
             e.printStackTrace();