Manual Cherry-pick needed: 8d096ea33ab0eab8b41da8294f9dd0f03c26b4f6

.github/workflows/auto-cherry-pick.yml

@@ -0,0 +1,44 @@
+name: Auto Cherry-Pick
+on:
+  push:
+    branches:
+      - "1.*" # 1.21.5, 1.21.4...のブランチでpushされたとき
+  pull_request:
+    types:
+      - closed # PRがmergeされたとき
+jobs:
+  cherry-pick:
+    if: |
+      (github.event_name == 'push' ||
+      (github.event_name == 'pull_request' && github.event.pull_request.merged == true))
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Check
+        id: check
+        run: |
+          COMMIT_MSG=$(git log -1 --pretty=%B)
+          if echo "$COMMIT_MSG" | grep -q '^\[cp\]'; then
+            echo "pickable=true" >> $GITHUB_ENV
+          fi
+      - name: Setup Git
+        if: env.pickable == 'true'
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+      - name: Chmod cherry-pick.sh
+        if: env.pickable == 'true'
+        run: |
+          if [ ! -f .github/workflows/cherry-pick.sh ]; then
+            echo "cherry-pick.sh not found"
+            exit 1
+          fi
+          git update-index --assume-unchanged .github/workflows/cherry-pick.sh
+          chmod +x .github/workflows/cherry-pick.sh
+      - name: Run cherry-pick.sh
+        if: env.pickable == 'true'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: .github/workflows/cherry-pick.sh

.github/workflows/cherry-pick.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+set -e
+
+git fetch --all
+CURRENT_BRANCH="${GITHUB_REF##*/}"
+SHA=$(git log -1 --pretty=format:"%H")
+MSG=$(git log -1 --pretty=%B)
+
+echo "Current: $CURRENT_BRANCH"
+echo "SHA: $SHA"
+
+BRANCHES=$(git for-each-ref --format='%(refname:short)' refs/remotes/origin | grep -E '^origin/1\.' | sed 's|origin/||' | sort -Vr)
+
+TARGETS=()
+FOUND=0
+while read -r b; do
+  if [ "$FOUND" = "1" ]; then
+    TARGETS+=("$b")
+  fi
+  if [ "$b" = "$CURRENT_BRANCH" ]; then
+    FOUND=1
+  fi
+done <<< "$BRANCHES"
+
+for TARGET_BRANCH in "${TARGETS[@]}"; do
+  if [ -z "$TARGET_BRANCH" ]; then
+    continue
+  fi
+
+  echo "Trying to cherry-pick to $TARGET_BRANCH..."
+
+  git reset --hard
+  git switch -c "$TARGET_BRANCH" "origin/$TARGET_BRANCH"
+
+  echo "Cherry-picking $SHA from $CURRENT_BRANCH to $TARGET_BRANCH..."
+  if git cherry-pick "$SHA"; then
+    git push origin "$TARGET_BRANCH"
+    echo "Cherry-pick successful. Pushed to $TARGET_BRANCH."
+    continue
+  fi
+
+  echo "Cherry-pick failed. Attempting to resolve conflicts..."
+
+  git cherry-pick --abort
+  gh auth setup-git
+  gh pr create \
+    --base "$TARGET_BRANCH" \
+    --head "$CURRENT_BRANCH" \
+    --title "Manual Cherry-pick needed: $SHA" \
+    --body "Cherry-pick of $SHA from $CURRENT_BRANCH to $TARGET_BRANCH failed due to conflicts."
+  exit 0
+done

.gitignore

@@ -30,6 +30,7 @@ atlassian-ide-plugin.xml
 *.zip
 *.tar.gz
 *.rar
+*.php
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
@@ -114,5 +115,7 @@ gradle-app.setting
 # Common working directory
 run/
 
+php/
+
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
+!gradle-wrapper.jar

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Pitan
+Copyright (c) 2022-2025 Pitan
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -0,0 +1,128 @@
+# MCPitanLib
+## License
+- MIT License
+
+## 日本語
+MCPitanLibはライブラリです。 1つのjarで複数のMCバージョンを対応させるためのものです。 <br />
+開発中であるため、予告なく仕様が変更されることがあったり、不具合があるかもしれません。 <br />
+私専用につくっているため、他の方が使うことをあまり想定していません。 <br />
+
+クロスバージョンかつクロスプラットフォームを目指しています。
+
+### 対応状況
+- アイテムの追加
+- ブロックの追加
+- エンティティの追加
+- ブロックエンティティの追加
+- クリエイティブタブの追加
+- GUIの追加
+- サウンドの追加
+
+となります。
+
+### 前提MOD
+- MODローダー
+  - [FabricMC](https://fabricmc.net/)
+  - [Minecraft Forge](https://files.minecraftforge.net/)
+  - [NeoForge](https://neoforged.net/)
+- Architectury API ([CurseForge](https://www.curseforge.com/minecraft/mc-mods/architectury-api) | [Modrinth](https://modrinth.com/mod/architectury-api))
+
+### ダウンロード
+- [CurseForge](https://www.curseforge.com/minecraft/mc-mods/mcpitanlibarch)
+- [Modrinth](https://modrinth.com/mod/mcpitanlibarch)
+
+### 使い方
+`build.gradle`に以下のように記述してください。
+```groovy
+repositories {
+    maven {
+        url = "https://maven.pitan76.net/"
+    }
+}
+
+dependencies {
+    // FabricMC
+    modImplementation "net.pitan76:mcpitanlib-fabric:${rootProject.mcpitanlib_version}"
+
+    // Minecraft Forge
+    //modImplementation "net.pitan76:mcpitanlib-forge:${rootProject.mcpitanlib_version}"
+
+    // NeoForge
+    //modImplementation "net.pitan76:mcpitanlib-neoforge:${rootProject.mcpitanlib_version}"
+}
+```
+
+`gradle.properties`に以下のように記述してください。
+```properties
+# Example: mcpitanlib_version=+1.18.2:3.3.3
+mcpitanlib_version=+x.x.x:x.x.x
+```
+
+バージョンは[GitHub Packages](https://github.com/PTOM76/maven/packages/?q=net.pitan76.mcpitanlib) (3.3.3以降) or [maven.pitan76.net](https://maven.pitan76.net/net/pitan76/) (3.3.3以前)で確認してください。
+
+MCPitanLibを用いたMOD開発は「common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java」を参考にしてください。
+
+## English
+MCPitanLib is a library. It is for supporting multiple MC versions with one jar. <br />
+It is under development, so the specification may change without notice, and there may be bugs. <br />
+I am creating it for my own use, so I don't expect others to use it much. <br />
+
+It aims to be cross-version and cross-platform.
+
+### Supported features
+- Adding items
+- Adding blocks
+- Adding entities
+- Adding block entities
+- Adding creative tabs
+- Adding GUIs
+- Adding sounds
+
+### Required MOD
+- MOD Loader
+  - [FabricMC](https://fabricmc.net/)
+  - [Minecraft Forge](https://files.minecraftforge.net/)
+  - [NeoForge](https://neoforged.net/)
+- [Architectury API](https://www.curseforge.com/minecraft/mc-mods/architectury-api) ([CurseForge](https://www.curseforge.com/minecraft/mc-mods/architectury-api) | [Modrinth](https://modrinth.com/mod/architectury-api))
+
+### Download
+- [CurseForge](https://www.curseforge.com/minecraft/mc-mods/mcpitanlibarch)
+- [Modrinth](https://modrinth.com/mod/mcpitanlibarch)
+
+### How to use
+Write as follows in `build.gradle`.
+```groovy
+repositories {
+    maven {
+        url = "https://maven.pitan76.net/"
+    }
+}
+
+dependencies {
+    // FabricMC
+    modImplementation "net.pitan76:mcpitanlib-fabric${rootProject.mcpitanlib_version}"
+
+    // Minecraft Forge
+    //modImplementation "net.pitan76:mcpitanlib-forge${rootProject.mcpitanlib_version}"
+
+    // NeoForge
+    //modImplementation "net.pitan76:mcpitanlib-neoforge${rootProject.mcpitanlib_version}"
+}
+```
+
+Write as follows in `gradle.properties`.
+```properties
+# Example: mcpitanlib_version=+1.18.2:3.2.4
+mcpitanlib_version=+x.x.x:x.x.x
+```
+
+Please check the version at [GitHub Packages](https://github.com/PTOM76/maven/packages/?q=net.pitan76.mcpitanlib) (for versions 3.3.3 and later) or [maven.pitan76.net](https://maven.pitan76.net/net/pitan76/) (for versions before 3.3.3).
+
+For MOD development using MCPitanLib, refer to "common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java".
+
+## Note
+### Auto Cherry-Pick (GitHub Actions)
+コミットメッセージに [cp] を含むと、Actionsで自動的にCherry-Pickを行います。 <br />
+そのコミットしたブランチからそれより下位のバージョンのブランチにCherry-Pickし、コンフリを起こした場合はそこで停止し、PRを作成します。<br />
+今のところ、そのPRは使えないので閉じる必要があります。(今後はissueにする予定です。)
+

build.gradle

@@ -1,25 +1,115 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "0.11.0-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
+    id 'com.matthewprenger.cursegradle' version '1.+'
+    id "com.modrinth.minotaur" version "2.+"
 }
 
 architectury {
     minecraft = rootProject.minecraft_version
 }
 
+def loadProperties(filename) {
+    def props = new Properties()
+    file(filename).withInputStream {
+        props.load(it)
+    }
+    return props
+}
+
+ext.info = loadProperties("$rootDir/info.properties")
+
 subprojects {
     apply plugin: "dev.architectury.loom"
+    apply plugin: "com.modrinth.minotaur"
+    apply plugin: "com.matthewprenger.cursegradle"
 
     loom {
         silentMojangMappingsLicense()
     }
 
+    repositories {
+        maven { url "https://maven.pitan76.net/" }
+        maven { url "https://maven.neoforged.net/releases/" }
+        maven { url "https://maven.shedaniel.me/" }
+    }
+
     dependencies {
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
         // The following line declares the mojmap mappings, you may use other mappings as well
         // mappings loom.officialMojangMappings()
         // The following line declares the yarn mappings you may select this one as well.
-        mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2"
+        //mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2"
+        mappings loom.layered() {
+            it.mappings("net.fabricmc:yarn:${rootProject.yarn_mappings}:v2")
+            it.mappings file("../mappings/121-1fix.tiny")
+        }
+
+        // https://mvnrepository.com/artifact/org.yaml/snakeyaml
+        implementation 'org.yaml:snakeyaml:2.0'
+    }
+
+    if (name in "fabric,neoforge".split(",")) {
+        var modLoader = name
+
+        if (System.getenv("CURSEFORGE_TOKEN") != null) {
+            curseforge {
+                apiKey = System.getenv("CURSEFORGE_TOKEN")
+                project {
+                    id = '682213'
+                    changelog = info.changelog
+                    releaseType = modLoader == "fabric" ? 'release' : 'beta'
+                    if (modLoader == "fabric") {
+                        addGameVersion "Fabric"
+                    }
+                    if (modLoader == "forge") {
+                        addGameVersion "Forge"
+                    }
+                    if (modLoader == "neoforge") {
+                        addGameVersion "NeoForge"
+                    }
+                    addGameVersion '1.21'
+                    addGameVersion '1.21.1'
+
+                    relations {
+                        if (modLoader == "fabric") {
+                            requiredDependency "fabric-api"
+                        }
+
+                        requiredDependency 'architectury-api'
+                        embeddedLibrary 'cloth-config'
+                        embeddedLibrary 'compatdatapacks'
+                    }
+
+                    mainArtifact(tasks.remapJar)
+                }
+                options {
+                    forgeGradleIntegration = false
+                }
+            }
+
+        }
+
+        if (System.getenv("MODRINTH_TOKEN") != null) {
+            modrinth {
+                token = System.getenv("MODRINTH_TOKEN")
+                projectId = 'mcpitanlibarch'
+                versionNumber = info.mod_version + "-" + modLoader
+                gameVersions = ['1.21', '1.21.1']
+                versionType = 'release'
+                uploadFile = tasks.remapJar
+                changelog = info.changelog
+                loaders = [modLoader]
+                dependencies {
+                    if (modLoader == "fabric") {
+                        required.project "fabric-api" // Fabric API
+                    }
+                    required.project "architectury-api"
+                    embedded.project "cloth-config"
+                    embedded.project "compatdatapacks"
+                }
+            }
+        }
     }
 }
 
@@ -28,9 +118,9 @@ allprojects {
     apply plugin: "architectury-plugin"
     apply plugin: "maven-publish"
 
-    archivesBaseName = rootProject.archives_base_name
-    version = rootProject.mod_version
-    group = rootProject.maven_group
+    archivesBaseName = info.archives_base_name
+    version = info.mod_version + "-" + rootProject.minecraft_version
+    group = info.maven_group
 
     repositories {
         // Add repositories to retrieve artifacts from in here.
@@ -40,9 +130,11 @@ allprojects {
         // for more information about repositories.
     }
 
-    tasks.withType(JavaCompile) {
+    tasks.withType(JavaCompile).configureEach {
         options.encoding = "UTF-8"
-        options.release = 17
+        options.release = 21
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     java {