Skip to content

feat: migrate from Yarn to Mojang official mappings#43

Merged
turtton merged 1 commit into
mainfrom
feat/mojmap-migration
May 7, 2026
Merged

feat: migrate from Yarn to Mojang official mappings#43
turtton merged 1 commit into
mainfrom
feat/mojmap-migration

Conversation

@turtton

@turtton turtton commented May 7, 2026

Copy link
Copy Markdown
Owner

Summary

  • Yarn mappings → officialMojangMappings() に移行
  • Ravel IntelliJ plugin で 23 ファイルを自動 remap、手動で 1.21.11 クライアント描画コードを Mojmap 名に変換
  • Stonecutter 条件分岐で MC バージョン間の API 差分を処理(ResourceLocation/Identifier, critereon/criterion 等)

Changes

  • build.gradle.kts: mappings(loom.officialMojangMappings()) に変更
  • 25 source files: Yarn → Mojmap クラス/メソッド名へリネーム
  • 1.21.11 rendering: SubmitNodeCollector, RenderTypes, PoseStack 等の Mojmap 名に更新
  • FluidStoragePersistentState.kt: DataFixTypes.LEVEL を両バージョンで統一使用(null NPE 修正)
  • ConnectedTankDataGenerator.kt: inner class を CTRecipeProvider にリネーム(vanilla 名衝突回避)
  • .gitignore: versions/ 追加(Stonecutter 作業ディレクトリ)

Verification

  • ./gradlew build: 両バージョン (1.21.8 + 1.21.11) ビルド成功
  • Game tests: 34 tests × 2 versions pass
  • ./gradlew spotlessCheck: pass

- Switch from yarn mappings to loom.officialMojangMappings()
- Remap all source files (23 Kotlin/Java files) via Ravel
- Update 1.21.11 client rendering code to Mojmap names
- Add Stonecutter conditionals for ResourceLocation/Identifier,
  critereon/criterion, and recipeKey.location()/identifier() diffs
- Fix DataFixTypes null safety (use LEVEL for both versions)
- Rename inner RecipeProvider to CTRecipeProvider to avoid collision
- Add versions/ to .gitignore (Stonecutter working directory)
@turtton turtton merged commit aed9af4 into main May 7, 2026
2 checks passed
@turtton turtton deleted the feat/mojmap-migration branch May 7, 2026 07:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant