3.3.0

.github/actions/release-verification/action.yml

@@ -5,15 +5,15 @@ description: Release verification
 inputs:
   curseforge-token:
     description: CurseForge Token
-    required: true
+    required: false
 
   modrinth-token:
     description: Modrinth Token
-    required: true
+    required: false
 
   maven-password:
     description: Maven Password
-    required: true
+    required: false
 
 runs:
   using: composite

.github/actions/release-verification/scripts/project_verification.main.kts

@@ -28,6 +28,7 @@ assertFile("LICENSE")
 val wrkDir: Path = System.getenv("GITHUB_WORKSPACE")?.let(Path::of) ?: Paths.get("./")
 val gp: Map<String, String> = wrkDir.resolve("gradle.properties")
         .let { Files.lines(it) }
+        .filter { it.isNotBlank() }
         .filter { !it.trim().startsWith("#") }
         .map { it.split("=") }
         .collect(Collectors.toMap({ it[0].trim() }, { it[1].trim() }))

.github/actions/release-verification/scripts/release_destination_verification.main.kts

@@ -34,6 +34,7 @@ val executor: ExecutorService = Executors.newCachedThreadPool(BasicThreadFactory
 val wrkDir: Path = System.getenv("GITHUB_WORKSPACE")?.let(Path::of) ?: Paths.get("./")
 val gp: Map<String, String> = wrkDir.resolve("gradle.properties")
         .let { Files.lines(it) }
+        .filter { it.isNotBlank() }
         .filter { !it.trim().startsWith("#") }
         .map { it.split("=") }
         .collect(Collectors.toMap({ it[0].trim() }, { it[1].trim() }))

.github/actions/release-verification/scripts/version_verification.main.kts

@@ -27,6 +27,7 @@ fun getBranchName(branchName: String): String {
 val wrkDir: Path = System.getenv("GITHUB_WORKSPACE")?.let(Path::of) ?: Paths.get("./")
 val gp: Map<String, String> = wrkDir.resolve("gradle.properties")
         .let { Files.lines(it) }
+        .filter { it.isNotBlank() }
         .filter { !it.trim().startsWith("#") }
         .map { it.split("=") }
         .collect(Collectors.toMap({ it[0].trim() }, { it[1].trim() }))
@@ -143,9 +144,11 @@ if (allSemVer.isNotEmpty()) {
         }
     }
 
-    // if (compVer.none { toVersionOnly(it) == toVersionOnly(preDictPreVer) })
-    if (compVer.map { Semver(toVersionOnly(it)) }.distinct().none { it.isGreaterThanOrEqualTo(preDictPreVer) && it.isLowerThan(version) })
+    val compVo = compVer.map { Semver(toVersionOnly(it)) }.distinct()
+
+    if (compVo.any { it.isLowerThan(preDictPreVer) } && compVo.none { it.isGreaterThanOrEqualTo(preDictPreVer) && it.isLowerThan(version) })
         throw Exception("Pre version does not exist/以前のバージョンが存在しません: $preDictPreVer")
+
 } else {
     println("First version")
 }

.github/actions/setup/action.yml

@@ -5,6 +5,12 @@ description: The Setup
 runs:
   using: composite
   steps:
+    - name: Cache
+      uses: actions/cache@v3
+      with:
+        path: .gradle/loom-cache
+        key: ${{ runner.os }}-gradle-loom-cache
+
     - name: Setup JDK #JDKセットアップ
       uses: actions/setup-java@v3
       with:

.github/actions/update-changelog-versioncheck/scripts/update_version_check.main.kts

@@ -30,6 +30,7 @@ val vcFile: File = wrkDir.resolve(vcName).toFile()
 
 val gp: Map<String, String> = wrkDir.resolve("gradle.properties")
         .let { Files.lines(it) }
+        .filter { it.isNotBlank() }
         .filter { !it.trim().startsWith("#") }
         .map { it.split("=") }
         .collect(Collectors.toMap({ it[0].trim() }, { it[1].trim() }))

.github/workflows/released.yml

@@ -15,12 +15,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Cache
-        uses: actions/cache@v3
-        with:
-          path: .gradle/loom-cache
-          key: ${{ runner.os }}-gradle-loom-cache
-
       - name: Setup
         uses: ./.github/actions/setup
 

CHANGELOG.md

@@ -1,12 +1,15 @@
 # Changelog
+
 Changelog to track updates for this mod.  
-    Add your changes to Unreleased if you want to commit.  
-    Please write according to [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
+Add your changes to Unreleased if you want to commit.  
+Please write according to [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
 ### Added
 
+- Add new utility class
+
 ### Changed
 
 ### Deprecated
@@ -20,22 +23,29 @@ Changelog to track updates for this mod.
 ## [3.3.0-beta.1] - 2023-01-22
 
 ### Changed
+
 - Port MC1.19.3
 
 ### Removed
+
 - Separated Fabric's built-in OBJ loader ([Special Model Loader](https://github.com/TeamFelnull/SpecialModelLoader))
 
 ### Fixed
+
 - Fixed a problem that crashes without notifying when Architecture is not installed (Forge Only)
 
 ## [3.3.0-alpha.1] - 2023-01-18
 
 ### Changed
+
 - Port MC1.19.3
 
 ### Removed
+
 - Separated Fabric's built-in OBJ loader ([Special Model Loader](https://github.com/TeamFelnull/SpecialModelLoader))
 
 [Unreleased]: https://github.com/TeamFelnull/OtyacraftEngine/compare/v3.3.0-beta.1...HEAD
+
 [3.3.0-alpha.1]: https://github.com/TeamFelnull/OtyacraftEngine/commits/v3.3.0-alpha.1
+
 [3.3.0-beta.1]: https://github.com/TeamFelnull/OtyacraftEngine/compare/v3.3.0-alpha.1...v3.3.0-beta.1

build.gradle

@@ -17,7 +17,7 @@ changelog {
     Add your changes to Unreleased if you want to commit.  
     Please write according to [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
     """
-    combinePreReleases = true
+    combinePreReleases = false
 }
 
 subprojects {

common/src/main/java/dev/felnull/otyacraftengine/client/util/OENativeUtils.java

@@ -0,0 +1,34 @@
+package dev.felnull.otyacraftengine.client.util;
+
+import com.sun.jna.platform.win32.Shell32Util;
+import com.sun.jna.platform.win32.ShlObj;
+import net.minecraft.Util;
+import org.jetbrains.annotations.Nullable;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/**
+ * ネイティブ関係のユーティリティ
+ */
+public class OENativeUtils {
+    @Nullable
+    public static Path getMyMusicFolder() {
+        try {
+            if (Util.getPlatform() == Util.OS.WINDOWS)
+                return Paths.get(Shell32Util.getSpecialFolderPath(ShlObj.CSIDL_MYMUSIC, false));
+        } catch (Throwable ignored) {
+        }
+        return null;
+    }
+
+    @Nullable
+    public static Path getMyPicturesFolder() {
+        try {
+            if (Util.getPlatform() == Util.OS.WINDOWS)
+                return Paths.get(Shell32Util.getSpecialFolderPath(ShlObj.CSIDL_MYPICTURES, false));
+        } catch (Throwable ignored) {
+        }
+        return null;
+    }
+}

fabric/build.gradle

@@ -16,7 +16,6 @@ loom {
 configurations {
     common
     shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
-    shadowIn
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentFabric.extendsFrom common

forge/build.gradle

@@ -24,7 +24,6 @@ loom {
 configurations {
     common
     shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
-    shadowIn
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentForge.extendsFrom common

gradle.properties

@@ -7,7 +7,7 @@ enabled_platforms=fabric,forge
 #Mod
 archives_base_name=otyacraftengine
 mod_display_name=OtyacraftEngine
-mod_version=3.3.0-beta.1
+mod_version=3.3.0
 #Dependencies
 architectury_version=7.0.65
 fabric_loader_version=0.14.11
@@ -17,7 +17,7 @@ felnull_version=1.75
 #Upload
 curesforge_id=400337
 modrinth_id=iu3upNjC
-release_type=beta
+release_type=release
 maven_put_url=https://maven.felnull.dev/
 maven_group=dev.felnull
 maven_put_pass=

testmod-fabric/src/main/generated/.cache/0d50bffddf75e22e52fc02f1ad4a51e0aed4f3e3

@@ -1 +1 @@
-// 1.19.3	2023-01-21T16:38:04.6602346	Otyacraft Engine Test/Tags for minecraft:block
+// 1.19.3	2023-01-25T04:17:51.605033	Otyacraft Engine Test/Tags for minecraft:block

testmod-fabric/src/main/generated/.cache/7ef7386eba12df43ed28295f8b18d4d73adaecc3

@@ -1,2 +1,2 @@
-// 1.19.3	2023-01-21T16:38:04.6602346	Otyacraft Engine Test/Advancements
+// 1.19.3	2023-01-25T04:17:51.605033	Otyacraft Engine Test/Advancements
 24ed8addd22a4702b7c77f0cd605fc53795f19e4 data\otyacraftenginetest\advancements\otyacraftenginetest\root.json

testmod-fabric/src/main/generated/.cache/82fd91efd4f0f9bed8483c2564da5617cbe89e10

@@ -1,3 +1,3 @@
-// 1.19.3	2023-01-21T16:38:04.658233	Otyacraft Engine Test/Input copy
+// 1.19.3	2023-01-25T04:17:51.6040356	Otyacraft Engine Test/Input copy
 183e554347c694dd0d75591721b58459636bd6f2 assets\otyacraftenginetest\copy_test\test.json
 183e554347c694dd0d75591721b58459636bd6f2 assets\otyacraftenginetest\copy_test\fcoh\ikisugi.json

testmod-fabric/src/main/generated/.cache/8a0e335825c442d2d05946d5f5bfc9cff6867414

@@ -1,3 +1,3 @@
-// 1.19.3	2023-01-21T16:38:04.6592335	Otyacraft Engine Test/Recipes
+// 1.19.3	2023-01-25T04:17:51.6040356	Otyacraft Engine Test/Recipes
 afe1da46e75b1ff0ac6ea63110f2748c8aa84b96 data\otyacraftenginetest\recipes\test.json
 d1ccb28bcc88e720665ccb40ab3bc54348a05587 data\otyacraftenginetest\advancements\recipes\food\test.json

testmod-fabric/src/main/generated/.cache/ba2d765169f46b9a6372777275918e1ed1f0fcc3

@@ -1,2 +1,2 @@
-// 1.19.3	2023-01-21T16:38:04.6602346	Otyacraft Engine Test/Model Definitions
+// 1.19.3	2023-01-25T04:17:51.605033	Otyacraft Engine Test/Model Definitions
 d40f279d0798e10ef4fe6a50dc7c0c3b22f8f3a2 assets\otyacraftenginetest\models\item\test_item.json

testmod-fabric/src/main/generated/.cache/ce80034259a34f1a7f73e142406aa3e0d228839b

@@ -1,2 +1,3 @@
-// 1.19.3	2023-01-21T16:38:04.6572343	Otyacraft Engine Test/Tags for minecraft:item
+// 1.19.3	2023-01-25T04:17:51.6030333	Otyacraft Engine Test/Tags for minecraft:item
 7eb508a49db08b3875db67cd0383ae0d7494beb6 data\minecraft\tags\items\boats.json
+cfa612cb64f7e213d984ca4431202690f594df8a data\c\tags\items\ender_pearls.json

testmod-fabric/src/main/generated/.cache/f61dec5b33b2b836451587dc0ec0b3cbe6b0bd80

@@ -1,4 +1,4 @@
-// 1.19.3	2023-01-21T16:38:04.6592335	Otyacraft Engine Test/Model Process
+// 1.19.3	2023-01-25T04:17:51.6040356	Otyacraft Engine Test/Model Process
 d949ee0f371db9fc9b8bceb58f7d74284b47ade3 assets\otyacraftenginetest\models\item\slide.json
 8cb44dd96d67f1401394f517ced825ebc2b7728e assets\otyacraftenginetest\models\item\glock_17.json
 b2c02147d1dbbc14042fc6c1a40e7f1072660b5b assets\otyacraftenginetest\models\item\magazine.json

testmod-fabric/src/main/generated/data/c/tags/items/ender_pearls.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:ender_pearl"
+  ]
+}