Merge branch 'dev/1.21' into dev/1.21-networking

.github/workflows/build.yml

@@ -7,23 +7,21 @@ jobs:
       matrix:
         java:
           - 21
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: checkout repository
         uses: actions/checkout@v4
-      - name: validate gradle wrapper
-        uses: gradle/actions/wrapper-validation@v3
       - name: setup jdk ${{ matrix.java }}
         uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: "microsoft"
       - name: setup gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
       - name: make gradle wrapper executable
         run: chmod +x ./gradlew
       - name: build
-        run: ./gradlew build
+        run: ./gradlew build --warning-mode=all
       - name: capture build artifacts
         if: ${{ matrix.java == '21' }}
         uses: actions/upload-artifact@v4

.github/workflows/spotless.yml

@@ -0,0 +1,32 @@
+name: Run spotless
+on: [push, workflow_dispatch]
+
+permissions:
+  contents: write
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        java:
+          - 21
+    runs-on: ubuntu-24.04
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v4
+      - name: setup jdk ${{ matrix.java }}
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: "microsoft"
+      - name: setup gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: make gradle wrapper executable
+        run: chmod +x ./gradlew
+      - name: apply spotless
+        run: ./gradlew spotlessApply
+      - name: commit changes and push
+        uses: EndBug/add-and-commit@v9
+        with:
+          message: "chore: Apply Spotless"
+          default_author: github_actions

base/common/src/main/java/band/kessoku/lib/api/base/reflect/ModifiersUtil.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2024 KessokuTeaTime
+ *
+ * Licensed under the GNU Lesser General Pubic License, Version 3 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.gnu.org/licenses/lgpl-3.0.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package band.kessoku.lib.api.base.reflect;
 
 import java.lang.reflect.Member;
@@ -9,46 +24,46 @@ private ModifiersUtil() {
 
     /* === Common === */
 
-    public static boolean isPublic(Member field) {
-        return Modifier.isPublic(field.getModifiers());
+    public static boolean isPublic(Member member) {
+        return Modifier.isPublic(member.getModifiers());
     }
 
-    public static boolean isStatic(Member field) {
-        return Modifier.isStatic(field.getModifiers());
+    public static boolean isStatic(Member member) {
+        return Modifier.isStatic(member.getModifiers());
     }
 
     /* === Common Combo === */
 
-    public static boolean isPublicAndStatic(Member field) {
-        return isPublic(field) && isStatic(field);
+    public static boolean isPublicAndStatic(Member member) {
+        return isPublic(member) && isStatic(member);
     }
 
-    public static boolean isPublicOrStatic(Member field, boolean shouldPublic, boolean shouldStatic) {
-        return shouldPublic == isPublic(field) && shouldStatic == isStatic(field);
+    public static boolean isPublicOrStatic(Member member, boolean shouldPublic, boolean shouldStatic) {
+        return shouldPublic == isPublic(member) && shouldStatic == isStatic(member);
     }
 
     /* === Common End === */
 
     /* === Data Object === */
 
-    public static boolean isVolatile(Member field) {
-        return Modifier.isVolatile(field.getModifiers());
+    public static boolean isVolatile(Member member) {
+        return Modifier.isVolatile(member.getModifiers());
     }
 
-    public static boolean isTransient(Member field) {
-        return Modifier.isTransient(field.getModifiers());
+    public static boolean isTransient(Member member) {
+        return Modifier.isTransient(member.getModifiers());
     }
 
     /* === Data Object End === */
 
     /* === Low Usage Tools === */
 
-    public static boolean isFinal(Member field) {
-        return Modifier.isFinal(field.getModifiers());
+    public static boolean isFinal(Member member) {
+        return Modifier.isFinal(member.getModifiers());
     }
 
-    public static boolean isProtected(Member field) {
-        return Modifier.isProtected(field.getModifiers());
+    public static boolean isProtected(Member member) {
+        return Modifier.isProtected(member.getModifiers());
     }
 
     /* === Low Usage Tools End === */

base/common/src/main/java/band/kessoku/lib/api/base/reflect/ReflectUtil.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2024 KessokuTeaTime
+ *
+ * Licensed under the GNU Lesser General Pubic License, Version 3 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.gnu.org/licenses/lgpl-3.0.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package band.kessoku.lib.api.base.reflect;
 
 import java.lang.reflect.Field;

blockentity/common/build.gradle

@@ -0,0 +1,12 @@
+apply from: rootProject.file("gradle/scripts/klib-common.gradle")
+
+base.archivesName = rootProject.name + "-blockentity"
+
+kessoku {
+    module("base", "common")
+    module("platform", "common")
+}
+
+dependencies {
+    implementation libs.aj4j
+}

blockentity/fabric/build.gradle

@@ -0,0 +1,15 @@
+import net.fabricmc.loom.util.ModPlatform
+
+apply from: rootProject.file("gradle/scripts/klib-fabric.gradle")
+
+base.archivesName = rootProject.name + "-blockentity"
+
+kessoku {
+    module("base", "common")
+
+    common("blockentity", ModPlatform.FABRIC)
+    shadowBundle("blockentity", ModPlatform.FABRIC)
+}
+
+dependencies {
+}

blockentity/fabric/src/main/java/band/kessoku/lib/impl/blockentity/fabric/KessokuBlockEntityFabric.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2024 KessokuTeaTime
+ *
+ * Licensed under the GNU Lesser General Pubic License, Version 3 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.gnu.org/licenses/lgpl-3.0.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package band.kessoku.lib.impl.blockentity.fabric;
+
+import net.fabricmc.api.ModInitializer;
+
+public class KessokuBlockEntityFabric implements ModInitializer {
+    @Override
+    public void onInitialize() {
+
+    }
+}

blockentity/fabric/src/main/resources/fabric.mod.json

@@ -0,0 +1,36 @@
+{
+  "schemaVersion": 1,
+  "id": "kessoku_blockentity",
+  "version": "${version}",
+  "name": "Kessoku Block Entity",
+  "description": "Common blockentity API.",
+  "authors": [
+    "Kessoku Tea Time"
+  ],
+  "contact": {
+    "homepage": "https://modrinth.com/mod/kessoku-lib",
+    "sources": "https://github.com/KessokuTeaTime/KessokuLib",
+    "issues": "https://github.com/KessokuTeaTime/KessokuLib/issues"
+  },
+  "license": "LGPL-3.0-only",
+  "icon": "icon.png",
+  "entrypoints": {
+    "main": [
+      "band.kessoku.lib.impl.blockentity.fabric.KessokuBlockEntityFabric"
+    ]
+  },
+  "environment": "*",
+  "depends": {
+    "fabricloader": ">=0.16.0",
+    "minecraft": "1.21",
+    "java": ">=21",
+    "fabric-api": "*"
+  },
+  "custom": {
+    "modmenu": {
+      "badges": [
+        "library"
+      ]
+    }
+  }
+}

blockentity/neo/build.gradle

@@ -0,0 +1,12 @@
+import net.fabricmc.loom.util.ModPlatform
+
+apply from: rootProject.file("gradle/scripts/klib-neo.gradle")
+
+base.archivesName = rootProject.name + "-entrypoint"
+
+kessoku {
+    module("base", "common")
+
+    common("blockentity", ModPlatform.NEOFORGE)
+    shadowBundle("blockentity", ModPlatform.NEOFORGE)
+}

blockentity/neo/gradle.properties

@@ -0,0 +1 @@
+loom.platform=neoforge

blockentity/neo/src/main/resources/META-INF/neoforge.mods.toml

@@ -0,0 +1,29 @@
+modLoader = "javafml"
+loaderVersion = "[4,)"
+license = "LGPL-3.0-only"
+issueTrackerURL = "https://github.com/KessokuTeaTime/KessokuLib/issues"
+
+[[mods]]
+modId = "kessoku_blockentity"
+version = "${version}"
+displayName = "Kessoku Block Entity"
+description = '''
+Common blockentity API.
+'''
+logoFile = "icon.png"
+authors = "Kessoku Tea Time"
+displayURL = "https://modrinth.com/mod/kessoku-lib"
+
+[[dependencies.kessoku_blockentity]]
+modId = "neoforge"
+type = "required"
+versionRange = "[21.0,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.kessoku_blockentity]]
+modId = "minecraft"
+type = "required"
+versionRange = "[1.21,)"
+ordering = "NONE"
+side = "BOTH"

entrypoint/fabric/src/main/resources/fabric.mod.json

@@ -3,7 +3,7 @@
   "id": "kessoku_platform",
   "version": "${version}",
   "name": "Kessoku Platform",
-  "description": "Provide some basic API.",
+  "description": "Common entrypoint API.",
   "authors": [
     "Kessoku Tea Time"
   ],

entrypoint/neo/src/main/resources/META-INF/neoforge.mods.toml

@@ -8,7 +8,7 @@ modId = "kessoku_entrypoint"
 version = "${version}"
 displayName = "Kessoku Entrypoint"
 description = '''
-Provide common entrypoint API.
+Common entrypoint API.
 '''
 logoFile = "icon.png"
 authors = "Kessoku Tea Time"

event-base/fabric/src/main/resources/fabric.mod.json

@@ -3,7 +3,7 @@
   "id": "kessoku_event_base",
   "version": "${version}",
   "name": "Kessoku Event Base",
-  "description": "Provide basic API for event system.",
+  "description": "Basic API for an event system.",
   "authors": [
     "Kessoku Tea Time"
   ],

event-base/neo/src/main/resources/META-INF/neoforge.mods.toml

@@ -8,7 +8,7 @@ modId = "kessoku_event_base"
 version = "${version}"
 displayName = "Kessoku Event Base"
 description = '''
-Provide basic API for event system.
+Basic API for an event system.
 '''
 logoFile = "icon.png"
 authors = "Kessoku Tea Time"