Merge pull request #4 from XenFork/ecs

Author: squid233

.github/workflows/gradle.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         java: [
-          22-ea
+          22
         ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
     runs-on: ${{ matrix.os }}
@@ -30,7 +30,6 @@ jobs:
         with:
           java-version: |
             ${{ matrix.java }}
-            21
           distribution: 'temurin'
       - name: Grant execute permission for gradlew
         if: ${{ runner.os != 'Windows' }}
@@ -39,15 +38,15 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
       - name: Execute Gradle build
         run: ./gradlew build
-      - name: Upload build reports
-        if: ${{ runner.os == 'Linux' && matrix.java == '22-ea' && failure() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-reports
-          path: |
-            modules/**/build/reports/
+#      - name: Upload build reports
+#        if: ${{ runner.os == 'Linux' && matrix.java == '22-ea' && failure() }}
+#        uses: actions/upload-artifact@v4
+#        with:
+#          name: build-reports
+#          path: |
+#            modules/**/build/reports/
       - name: Capture build artifacts
-        if: ${{ runner.os == 'Linux' && matrix.java == '22-ea' }}
+        if: ${{ runner.os == 'Linux' && matrix.java == '22' }}
         uses: actions/upload-artifact@v4
         with:
           name: Artifacts

.gitignore

@@ -8,7 +8,8 @@ build/
 !**/src/test/**/build/
 
 ### IntelliJ IDEA ###
-.idea/
+.idea/*
+!.idea/copyright/
 #.idea/modules.xml
 #.idea/jarRepositories.xml
 #.idea/compiler.xml

.idea/copyright/lgpl.xml

@@ -8,7 +8,7 @@
  * version 2.1 of the License, or (at your option) any later version.
  */
 
-// last updated: 2024/3/30
+// last updated: 2024/6/10
 
 plugins {
     `java-platform`
@@ -82,33 +82,37 @@ val publicationRepo: PublicationRepo? = if (hasPublication.toBoolean()) Publicat
 val projVersion: String by rootProject
 val coreVersion: String by rootProject
 val clientVersion: String by rootProject
+val mathVersion: String by rootProject
 
 val annotationsVersion: String by rootProject
 val commonsPoolVersion: String by rootProject
 val gsonVersion: String by rootProject
-val jomlVersion: String by rootProject
 val logbackVersion: String by rootProject
 val reactorVersion: String by rootProject
 
 class GameModule(
     val artifactId: String,
     val version: String,
-    val mavenName: String,
     val description: String
 )
 
 val moduleCore = GameModule(
-    "freeworld", coreVersion, "Core",
+    "freeworld", coreVersion,
     "freeworld core library"
 )
 val moduleClient = GameModule(
-    "freeworld-client", clientVersion, "Client",
+    "freeworld-client", clientVersion,
     "freeworld client library"
 )
+val moduleMath = GameModule(
+    "freeworld-math", mathVersion,
+    "freeworld math library"
+)
 
 val gameModules = listOf(
     moduleCore,
-    moduleClient
+    moduleClient,
+    moduleMath
 )
 
 version = projVersion
@@ -134,7 +138,6 @@ subprojects {
     val implementation by configurations
     dependencies {
         compileOnly("org.jetbrains:annotations:$annotationsVersion")
-        implementation("org.joml:joml:$jomlVersion")
         implementation("ch.qos.logback:logback-classic:$logbackVersion")
         implementation("com.google.code.gson:gson:$gsonVersion")
         implementation("org.apache.commons:commons-pool2:$commonsPoolVersion")
@@ -277,7 +280,7 @@ if (hasPublication.toBoolean() && publicationRepo != null) {
         }
 
         gameModules.forEach { gameModule ->
-            register<MavenPublication>("mavenJava${gameModule.mavenName}") {
+            register<MavenPublication>("mavenJava${gameModule.artifactId}") {
                 groupId = projGroupId
                 artifactId = gameModule.artifactId
                 version = gameModule.version
@@ -315,7 +318,7 @@ if (hasPublication.toBoolean() && publicationRepo != null) {
 
     signing {
         if (!publicationRepo.snapshotPredicate(projVersion) && publicationSigning.toBoolean()) {
-            gameModules.forEach { sign(publishing.publications["mavenJava${it.mavenName}"]) }
+            gameModules.forEach { sign(publishing.publications["mavenJava${it.artifactId}"]) }
             sign(publishing.publications["mavenBOM"])
         }
     }

.idea/copyright/profiles_settings.xml

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015-2023 JOML
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

build.gradle.kts

@@ -46,11 +46,11 @@ jdkEnablePreview=true
 projVersion=0.1.0-SNAPSHOT
 coreVersion=0.1.0-SNAPSHOT
 clientVersion=0.1.0-SNAPSHOT
+mathVersion=0.1.0-SNAPSHOT
 
 annotationsVersion=24.1.0
 commonsPoolVersion=2.12.0
 gsonVersion=2.10.1
-jomlVersion=1.10.5
 logbackVersion=1.4.14
 overrunglVersion=0.1.0-SNAPSHOT
 reactorVersion=2023.0.6

doc/legal/LICENSE_JOML

@@ -47,7 +47,6 @@ dependencies {
     api(project(":freeworld"))
     implementation(platform("io.github.over-run:overrungl-bom:$overrunglVersion"))
     implementation("io.github.over-run:overrungl")
-    implementation("io.github.over-run:overrungl-joml")
     implementation("io.github.over-run:overrungl-glfw")
     implementation("io.github.over-run:overrungl-opengl")
     implementation("io.github.over-run:overrungl-stb")