Skip to content

Commit bcacdf5

Browse files
im-yuukiim-yuuki
committed
chore: bump version to 1.0.0, patch errors caused by previous merge conflict
1 parent 938507d commit bcacdf5

File tree

32 files changed

+426
-345
lines changed

32 files changed

+426
-345
lines changed

‎.github/actions/setup-environment/action.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: setup-environment
2+
author: Yuuki
3+
description: Sets up the Java development environment with JDK 21 and caches the Maven repository.
4+
runs:
5+
using: "composite"
6+
steps:
7+
- name: Set MAVEN_OPTS to use local Maven repo
8+
run: |
9+
echo "MAVEN_OPTS=-Dmaven.repo.local=${HOME}/.m2/repository" >> $GITHUB_ENV
10+
shell: bash
11+
12+
- name: Set up JDK 21
13+
uses: actions/setup-java@v5
14+
with:
15+
distribution: 'temurin'
16+
java-version: '21'
17+
18+
- name: Cache Maven repository
19+
uses: actions/cache@v4
20+
with:
21+
path: ~/.m2/repository
22+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

‎.github/workflows/build-jar.yml‎

Lines changed: 66 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,76 @@
1-
name: Build Client JAR executable
2-
1+
name: Build JAR executable
32
on:
43
push:
5-
branches:
4+
branches-ignore:
65
- master
76
pull_request:
87
branches:
98
- master
9+
release:
10+
types: [published]
1011
workflow_dispatch:
1112

13+
permissions:
14+
contents: write
15+
1216
jobs:
17+
build-desktop-jar:
18+
name: Build Desktop JAR
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Checkout repository
22+
uses: actions/checkout@v5
23+
24+
- name: Setup environment
25+
uses: ./.github/actions/setup-environment
26+
27+
- name: Build Desktop JAR
28+
run: |
29+
mvn -B -f ./pom.xml clean install
30+
mvn -B -f ./desktop/pom.xml package
31+
32+
- name: Upload Desktop JAR artifact
33+
if: github.event_name != 'release'
34+
uses: actions/upload-artifact@v4
35+
with:
36+
name: desktop-jar
37+
path: |
38+
"./desktop/target/*.jar"
39+
!./desktop/target/original-*.jar
40+
41+
- name: Upload Desktop JAR to GitHub Releases
42+
if: github.event_name == 'release'
43+
env:
44+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
45+
run: |
46+
find ./desktop/target -maxdepth 1 -type f -name 'original-*.jar' -delete
47+
gh release upload ${{ github.event.release.tag_name }} ./desktop/target/*.jar --clobber
48+
49+
build-server-jar:
50+
name: Build Server JAR
51+
runs-on: ubuntu-latest
52+
steps:
53+
- name: Checkout repository
54+
uses: actions/checkout@v5
55+
56+
- name: Setup environment
57+
uses: ./.github/actions/setup-environment
58+
59+
- name: Build Server JAR
60+
run: |
61+
mvn -B -f ./server/pom.xml clean package spring-boot:repackage
62+
63+
- name: Upload Server JAR artifact
64+
if: github.event_name != 'release'
65+
uses: actions/upload-artifact@v4
66+
with:
67+
name: server-jar
68+
path: |
69+
"./server/target/*.jar"
1370
71+
- name: Upload Server JAR to GitHub Releases
72+
if: github.event_name == 'release'
73+
env:
74+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
75+
run: |
76+
gh release upload ${{ github.event.release.tag_name }} ./server/target/*.jar --clobber

‎.github/workflows/run-test.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Run Tests
2+
on:
3+
push:
4+
branches-ignore:
5+
- master
6+
pull_request:
7+
branches:
8+
- master
9+
workflow_dispatch:
10+
11+
jobs:
12+
test-all:
13+
name: Run all tests
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Checkout repository
17+
uses: actions/checkout@v5
18+
19+
- name: Setup environment
20+
uses: ./.github/actions/setup-environment
21+
22+
- name: Run tests
23+
run: mvn -B test
24+
25+
- name: Report test results
26+
if: always()
27+
uses: dorny/test-reporter@v2
28+
with:
29+
name: unit-tests
30+
path: ./*/target/surefire-reports/*.xml
31+
reporter: java-junit

‎client/pom.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
<parent>
88
<groupId>io.exterminator3618</groupId>
99
<artifactId>common</artifactId>
10-
<version>mainline</version>
10+
<version>1.0.0</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313

1414
<!--<name>Exterminator3618-Client</name>-->
1515
<artifactId>client</artifactId>
16-
<version>0.1.0-dev</version>
17-
<packaging>jar</packaging>
16+
<version>${project.parent.version}</version>
1817

1918
<properties>
2019
<maven.compiler.source>21</maven.compiler.source>
2120
<maven.compiler.target>21</maven.compiler.target>
21+
<maven.compiler.release>21</maven.compiler.release>
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2323
</properties>
2424

@@ -57,9 +57,11 @@
5757
<artifactId>ashley</artifactId>
5858
<version>1.7.4</version>
5959
</dependency>
60+
<!-- https://mvnrepository.com/artifact/org.jetbrains/annotations -->
6061
<dependency>
6162
<groupId>org.jetbrains</groupId>
6263
<artifactId>annotations</artifactId>
64+
<version>26.0.2</version>
6365
</dependency>
6466
</dependencies>
6567

‎client/src/main/java/io/exterminator3618/client/screens/GameScreen.java‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,7 @@
1414
import com.badlogic.gdx.graphics.GL20;
1515

1616
import io.exterminator3618.client.Constants;
17-
import static io.exterminator3618.client.Constants.BALL_HEIGHT;
18-
import static io.exterminator3618.client.Constants.BALL_REGION_NAME;
19-
import static io.exterminator3618.client.Constants.BALL_SPEED;
20-
import static io.exterminator3618.client.Constants.BALL_WIDTH;
21-
import static io.exterminator3618.client.Constants.BRICK_HEIGHT;
22-
import static io.exterminator3618.client.Constants.EXTRA_BALL_REGION_NAME;
23-
import static io.exterminator3618.client.Constants.PADDLE_HEIGHT;
24-
import static io.exterminator3618.client.Constants.PADDLE_REGION_NAME;
25-
import static io.exterminator3618.client.Constants.PADDLE_START_X;
26-
import static io.exterminator3618.client.Constants.PADDLE_START_Y;
27-
import static io.exterminator3618.client.Constants.PADDLE_WIDTH;
28-
import static io.exterminator3618.client.Constants.WINDOW_HEIGHT;
29-
import static io.exterminator3618.client.Constants.WINDOW_WIDTH;
17+
import static io.exterminator3618.client.Constants.*;
3018
import io.exterminator3618.client.Exterminator3618;
3119
import static io.exterminator3618.client.Physics.checkPowerUpCollision;
3220
import io.exterminator3618.client.components.Ball;

‎client/src/main/java/io/exterminator3618/client/screens/MainMenuScreen.java‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,17 @@ public final class MainMenuScreen implements Screen {
1818
private final Exterminator3618 game;
1919
private final Renderer renderer;
2020
private final SoundManager soundManager;
21-
private OrthographicCamera camera;
22-
private Vector3 touchPos = new Vector3();
21+
private final OrthographicCamera camera;
22+
private final Vector3 touchPos;
23+
24+
private final TextButton startButton;
25+
private final TextButton settingsButton;
2326

24-
private TextButton startButton;
25-
private TextButton settingsButton;
2627
public MainMenuScreen(Exterminator3618 game) {
2728
this.game = game;
28-
this.renderer = game.getRenderer();
29-
this.soundManager = game.getSoundManager();
30-
soundManager.setVolume(0.1f);
31-
soundManager.play("sound/main_menu.mp3", true);
32-
}
29+
renderer = game.getRenderer();
30+
soundManager = game.getSoundManager();
3331

34-
@Override
35-
public void show() {
3632
camera = new OrthographicCamera();
3733
camera.setToOrtho(false, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
3834

@@ -41,6 +37,13 @@ public void show() {
4137
settingsButton = new TextButton("Options", 100, 240, 200, 50);
4238
}
4339

40+
@Override
41+
public void show() {
42+
soundManager.setVolume(0.1f);
43+
soundManager.play("sound/main_menu.mp3", true);
44+
45+
}
46+
4447
@Override
4548
public void render(float delta) {
4649
Gdx.gl.glClearColor(0.1f, 0.1f, 0.1f, 1);
@@ -51,19 +54,18 @@ public void render(float delta) {
5154
// Draw text here
5255
renderer.drawLogo(Gdx.graphics.getWidth() / 2, Gdx.graphics.getHeight() / 2 + 50);
5356
renderer.drawTextMiddle("Day la Main Screen", Gdx.graphics.getWidth() / 2, Gdx.graphics.getHeight() / 2);
57+
startButton.draw(renderer);
58+
settingsButton.draw(renderer);
59+
5460
renderer.end();
5561

56-
// Transition to game screen on input
5762
if (Gdx.input.isKeyJustPressed(Input.Keys.SPACE)) {
5863
soundManager.stop(); // Stop main menu music
5964
game.launchScreen(new GameScreen(game));
6065
} else if (Gdx.input.isKeyJustPressed(Input.Keys.ESCAPE)) {
6166
Gdx.app.exit();
62-
renderer.drawText("Day la Main Screen", 300, 300);
63-
startButton.draw(renderer);
64-
settingsButton.draw(renderer);
67+
}
6568

66-
renderer.end();
6769
// 3. Xử lý Input (Logic)
6870
if (Gdx.input.justTouched()) { // Chỉ kiểm tra khi người dùng vừa nhấp
6971
// Lấy tọa độ nhấp chuột trên màn hình
@@ -73,11 +75,8 @@ public void render(float delta) {
7375
camera.unproject(touchPos);
7476

7577
// Transition to game screen on input
76-
if (Gdx.input.isKeyJustPressed(Input.Keys.SPACE)) {
77-
game.launchScreen(new GameScreen(game));
78-
} else if (Gdx.input.isKeyJustPressed(Input.Keys.ESCAPE)) {
79-
Gdx.app.exit();
80-
} else if (startButton.isClicked(touchPos.x, touchPos.y)) {
78+
if (startButton.isClicked(touchPos.x, touchPos.y)) {
79+
soundManager.stop(); // Stop main menu music
8180
game.launchScreen(new GameScreen(game));
8281
}
8382

‎desktop/pom.xml‎

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,22 @@
66
<parent>
77
<groupId>io.exterminator3618</groupId>
88
<artifactId>common</artifactId>
9-
<version>mainline</version>
9+
<version>1.0.0</version>
1010
</parent>
1111

12-
<!--<name>Exterminator3618-DesktopPlatform</name>-->
12+
<!--<name>Exterminator3618-Desktop</name>-->
1313
<artifactId>desktop</artifactId>
14-
<version>mainline</version>
14+
<version>${project.parent.version}</version>
1515
<packaging>jar</packaging>
1616

1717
<properties>
1818
<maven.compiler.source>21</maven.compiler.source>
1919
<maven.compiler.target>21</maven.compiler.target>
20+
<maven.compiler.release>21</maven.compiler.release>
2021
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2122
</properties>
2223

2324
<repositories>
24-
<repository>
25-
<id>github-packages-libgdx-packr</id>
26-
<url>https://maven.pkg.github.com/libgdx/packr</url>
27-
</repository>
2825
<repository>
2926
<id>jitpack.io</id>
3027
<url>https://jitpack.io</url>
@@ -35,8 +32,6 @@
3532
<dependency>
3633
<groupId>io.exterminator3618</groupId>
3734
<artifactId>client</artifactId>
38-
<version>0.1.0-dev</version>
39-
<scope>compile</scope>
4035
</dependency>
4136

4237
<!-- LibGDX Platform -->
@@ -80,16 +75,6 @@
8075
</exclusions>
8176
</dependency>
8277

83-
<!-- Please add the GitHub Personal Access Token with at least read:packages scope to your Maven settings.xml -->
84-
<!-- to get this dependency from GitHub Packages. -->
85-
<!-- https://github.com/libgdx/packr/packages/394128 -->
86-
<!--<dependency>-->
87-
<!-- <groupId>com.badlogicgames.packr</groupId>-->
88-
<!-- <artifactId>packr-all</artifactId>-->
89-
<!-- <version>3.0.0</version>-->
90-
<!-- <optional>true</optional>-->
91-
<!--</dependency>-->
92-
9378
<!-- https://mvnrepository.com/artifact/com.github.Vatuu/discord-rpc -->
9479
<dependency>
9580
<groupId>com.github.Vatuu</groupId>
@@ -98,4 +83,31 @@
9883
</dependency>
9984
</dependencies>
10085

86+
<build>
87+
<plugins>
88+
<plugin>
89+
<groupId>org.apache.maven.plugins</groupId>
90+
<artifactId>maven-shade-plugin</artifactId>
91+
<version>3.6.1</version>
92+
<executions>
93+
<execution>
94+
<phase>package</phase>
95+
<goals>
96+
<goal>shade</goal>
97+
</goals>
98+
<configuration>
99+
<createDependencyReducedPom>false</createDependencyReducedPom>
100+
<transformers>
101+
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
102+
<mainClass>io.exterminator3618.desktop.Launcher</mainClass>
103+
</transformer>
104+
</transformers>
105+
</configuration>
106+
</execution>
107+
</executions>
108+
</plugin>
109+
110+
</plugins>
111+
</build>
112+
101113
</project>

0 commit comments

Comments
 (0)